"check_exists" should use same request format as "create" and "update". Bumped major version. 100% test coverage 💯

Author: fbacall

lib/tess/api/api_resource.rb

@@ -54,7 +54,7 @@ def error_message(exception)
         begin
           JSON.parse(exception.response)
         rescue JSON::ParserError
-          { error_message: exception }
+          { 'exception' => "#{exception.class.name}: #{exception.message}" }
         end
       end
 

lib/tess/api/uploader.rb

@@ -2,84 +2,18 @@ module Tess
   module API
     class Uploader
 
-      # The following methods are just to maintain backwards compatibility
-      def self.check_material(material)
-        warn '[DEPRECATION] Uploader.check_material is deprecated, please use Material#exists? instead'
-        material.exists?
-      end
-
-      def self.create_material(material)
-        warn '[DEPRECATION] Uploader.create_material is deprecated, please use Material#create instead'
-        material.create
-      end
-
-      def self.update_material(material)
-        warn '[DEPRECATION] Uploader.update_material is deprecated, please use Material#update instead'
-        material.update
-      end
-
-      def self.create_or_update_material(material)
-        warn '[DEPRECATION] Uploader.create_or_update_material is deprecated, please use Material#create_or_update instead'
-        material.create_or_update
-      end
-
-      def self.check_event(event)
-        warn '[DEPRECATION] Uploader.check_event is deprecated, please use Event#exists? instead'
-        event.exists?
-      end
-
-      def self.create_event(event)
-        warn '[DEPRECATION] Uploader.create_event is deprecated, please use Event#create instead'
-        event.create
-      end
-
-      def self.update_event(event)
-        warn '[DEPRECATION] Uploader.update_event is deprecated, please use Event#update instead'
-        event.update
-      end
-
-      def self.create_or_update_event(event)
-        warn '[DEPRECATION] Uploader.create_or_update_event is deprecated, please use Event#create_or_update instead'
-        event.create_or_update
-      end
-
-      def self.check_content_provider(content_provider)
-        warn '[DEPRECATION] Uploader.check_content_provider is deprecated, please use ContentProvider#exists? instead'
-        content_provider.exists?
-      end
-
-      def self.create_content_provider(content_provider)
-        warn '[DEPRECATION] Uploader.create_content_provider is deprecated, please use ContentProvider#create instead'
-        content_provider.create
-      end
-
-      def self.update_content_provider(content_provider)
-        warn '[DEPRECATION] Uploader.update_content_provider is deprecated, please use ContentProvider#update instead'
-        content_provider.update
-      end
-
-      def self.create_or_update_content_provider(content_provider)
-        warn '[DEPRECATION] Uploader.create_or_update_content_provider is deprecated, please use ContentProvider#create_or_update instead'
-        content_provider.create_or_update
-      end
-
       def self.do_upload(data, auth, data_type, action, method)
-        # The data to post must be converted to JSON and
-        # the proper auth details added.
+        payload = { data_type => data.dump }
+
         if auth
-          payload = { user_email: Tess::API.config['user_email'],
-                      user_token: Tess::API.config['user_token'],
-                     data_type => data.dump
-          }.to_json
-        else
-          payload = data.to_json
+          payload[:user_email] = Tess::API.config['user_email']
+          payload[:user_token] = Tess::API.config['user_token']
         end
 
         response = RestClient::Request.execute(method: method.to_sym,
                                                url: (Tess::API.base_url + action),
-                                               payload: payload,
+                                               payload: payload.to_json,
                                                headers: { content_type: 'application/json'})
-
         begin
           JSON.parse(response.body)
         rescue JSON::ParserError

tess_api_client.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name        = 'tess_api_client'
-  s.version     = '0.2.0'
-  s.date        = '2016-11-11'
-  s.summary     = 'Libraries for uploading files to http://tess.oerc.ox.ac.uk'
+  s.version     = '0.3.0'
+  s.date        = '2017-03-17'
+  s.summary     = 'Libraries for uploading files to https://github.com/ElixirUK/TeSS'
   s.description = 'Uses the a Custom RoR API on https://tess.elixir-uk.org to upload data in the format being used by the TeSS project.'
   s.authors     = ['Milo Thurston','Niall Beard','Aleksandra Nenadic','Finn Bacall']
   s.email       = 'milo.thurston@oerc.ox.ac.uk'

test/content_provider_test.rb

@@ -39,6 +39,22 @@ class ContentProviderTest < Test::Unit::TestCase
           title: 'Re-branded Content Provider',
           keywords: ['hip', '#hashtag']
         })
+
+    @content_provider_with_missing_fields = Tess::API::ContentProvider.new(
+        { title: '',
+          url: '',
+        })
+
+    @not_found_content_provider = Tess::API::ContentProvider.new(
+        { id: 404040404,
+          title: 'I will return a 404 or something',
+          url: 'http://example.com/content_providers/404',
+        })
+
+    @bad_response_content_provider = Tess::API::ContentProvider.new(
+        { title: 'I will return a 500 or something',
+          url: 'http://example.com/content_providers/500',
+        })
   end
 
   test 'can initialize a content provider' do
@@ -182,5 +198,26 @@ class ContentProviderTest < Test::Unit::TestCase
       assert @non_existing_content_provider.id
     end
   end
-  
+
+  test 'stores errors messages on bad create' do
+    VCR.use_cassette('missing_fields_content_provider_create_response') do
+      res = @content_provider_with_missing_fields.create
+      assert res['errors']['title'].any?
+      assert res['errors']['url'].any?
+    end
+  end
+
+  test 'stores 505 exception message on bad create' do
+    VCR.use_cassette('bad_content_provider_create_response') do
+      res = @bad_response_content_provider.create
+      assert_equal 'RestClient::InternalServerError: 500 Internal Server Error', res['errors']['exception']
+    end
+  end
+
+  test 'stores 404 exception message on bad update' do
+    VCR.use_cassette('bad_content_provider_update_response') do
+      res = @not_found_content_provider.update
+      assert_equal 'RestClient::NotFound: 404 Not Found', res['errors']['exception']
+    end
+  end
 end

test/fixtures/missing_email_config.txt

@@ -0,0 +1,7 @@
+[Main]
+host = localhost
+protocol = http
+port = 3000
+user_token = my_secret_api_string
+debug = true
+google_api_key = 12345