rapid_api 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7be5a951b804eca79ba595e4bc916c4c50ab6dfad139c890f9f235ffbf8d4656
-  data.tar.gz: 3c70c06609a2760e41920e7bcc83a358d151ea2f3a5b89afcccd092a35fa11ee
+  metadata.gz: bd5b7f38b622bb70a7153cdb907e8261f9b0bce7160e63be0952d30b41b31217
+  data.tar.gz: cd08b0e83ac2fb977fdae26a3dc103c6b7ee839f63a48c24fc7a943bb510cb8e
 SHA512:
-  metadata.gz: 8ab4b799f58a483723b45fc720318d127be9f3a48e9b22ca926d6470c0045f77f5a34a218f8af635a6486cb22c5734d3433f81517e6b2ec5f9459c97d64df175
-  data.tar.gz: ab8442c402ff6bf09c4771a3c27a8ec4f01eaa71560e2d190e2d1724233a1d7889dc7bbb131375e73c277fa4515e4e9e7ea6325a34ff81e7c12acf376a1b0079
+  metadata.gz: ab1900d7a216b238989bd3d66e0b5d3356537627b99dfc5082799b8ca48f771b81693ff50dab6ad4fb19c216fe56d73cdbe8f6f48b43b6cb685f15e4aff5c42e
+  data.tar.gz: bd176ec865a92ebf48f860baed9c478bdf3dc7b35a2e8574442f98c1ac2e04932ba69ff437f911eb3f3c8b13c7956840baddebddab844ff79ec89af43623a635

data/lib/rapid_api/action_controller/errors.rb

@@ -51,7 +51,7 @@ module RapidApi
       end
 
       def _not_authorized(e)
-        render_error_message 'Not Authenticated', :unauthorized, e
+        render_error_message 'Not Authorized', :unauthorized, e
       end
 
       def _not_found(e)

data/lib/rapid_api/action_controller/resource_actions.rb

@@ -56,13 +56,27 @@ module RapidApi
       def destroy
         id           = _adapted_serializer.deserialize_id(params, _params_key)
         query_result = _adapted_model.destroy id, scope
-        if query_result.has_errors?
-          not_processable! query_result.errors
+        if query_result.found?
+          if query_result.has_errors?
+            not_processable! query_result.errors
+          else
+            head :no_content
+          end
         else
-          head :no_content
+          not_found!
         end
       end
 
+      def find_member
+        id = _adapted_serializer.deserialize_id(params, _params_key)
+        query_result = _adapted_model.find id, scope
+        @member = query_result
+      end
+
+      def render_member_ok(member)
+        render json: _adapted_serializer.serialize(member) , status: response_code_for(:ok)
+      end
+
       private
 
       def _adapted_model
@@ -115,10 +129,11 @@ module RapidApi
         end
 
         def serializer
-          #TODO: BDW - This convention is too dependent on AMS. This should be
-          # decoupled in some way.
+          module_name = self.name.to_s.deconstantize
+          serializer_name = "#{model_class_name}Serializer"
+          serializer_name = "#{module_name}::#{serializer_name}" unless module_name.empty?
           @serializer ||=  begin
-                             "#{model_class_name}Serializer".constantize
+                             serializer_name.constantize
                            rescue NameError
                            end
         end

data/lib/rapid_api/action_controller/scope.rb

@@ -10,15 +10,18 @@ module RapidApi
         @scope ||= {}
       end
 
-      protected
-
       def define_scope
-        return unless try :_scope_array
+        tmp_scope_array = [*_scope_array]
         self.class.scope_params.each_with_index do |key, index|
-          scope[key] = _scope_array[index]
+          scope[key] = tmp_scope_array[index]
         end
       end
 
+      protected
+
+      def _scope_array
+        []
+      end
 
       module ClassMethods
         attr_accessor :scope_by_proc, :scope_params

data/lib/rapid_api/model_adapters/active_record_adapter.rb

@@ -7,16 +7,13 @@ module RapidApi
         QueryResult.new data: member
       end
 
-      def find_all(params=nil, scope=nil)
-        params ||= {}
-        scope  ||= {}
+      def find_all(params={}, scope={})
         scoped_params = params.merge scope
         collection = klass.where(scoped_params)
         QueryResult.new data: collection
       end
 
-      def create(params, scope=nil)
-        scope ||= {}
+      def create(params, scope={})
         create_params = params.merge scope
         member = klass.create create_params
         _query_result_for_member member
@@ -24,20 +21,24 @@ module RapidApi
 
       def update(id, params, scope=nil)
         member = _find_member_with_scope(id, scope)
-        member.update_attributes params
+        if member.present?
+          member.update_attributes params
+        end
         _query_result_for_member member
       end
 
       def destroy(id, scope=nil)
         member = _find_member_with_scope(id, scope)
-        member.destroy
+        if member.present?
+          member.destroy
+        end
         _query_result_for_member member
       end
 
       private
 
       def _query_result_for_member(member)
-        QueryResult.new data: member, errors: member.errors
+        QueryResult.new data: member, errors: member.try(:errors)
       end
 
       def _find_member_with_scope(id, scope)

data/lib/rapid_api/serializer_adapters/ams_adapter.rb

@@ -9,19 +9,37 @@ module RapidApi
 
       def serialize_collection(collection)
         collection_serializer = ActiveModel::Serializer::CollectionSerializer.new collection, {
-                             each_serializer: klass
+                             serializer: klass
                            }
         ActiveModelSerializers::Adapter.create(collection_serializer).to_json
       end
 
       def serialize_errors(query_result)
         serializer = ActiveModel::Serializer::ErrorSerializer.new(query_result)
-        ActiveModelSerializers::Adapter.create(serializer).to_json
+        if ActiveModelSerializers.config.adapter == :attributes
+          { errors: serializer.as_json }
+        else
+          ActiveModelSerializers::Adapter.create(serializer).to_json
+        end
       end
 
-      # NOTE: Need to add support for :attributes serialization
       def deserialize_attributes(params, root_key)
-        params.require(:data).require(:attributes)
+        #TODO: test attributes deserialization
+        if ActiveModelSerializers.config.adapter == :attributes
+          params.require(root_key)
+        else
+          attributes = params
+          if params[:data][:attributes].present?
+            attributes = params.require(:data).require(:attributes)
+          end
+          if params[:data][:relationships].present?
+            relationships = params.require(:data).require(:relationships)
+            relationships.keys.each do |attribute|
+             attributes["#{attribute}_id"] = relationships[attribute][:data].try(:[], :id)
+            end
+          end
+          attributes
+        end
       end
 
       def deserialize_id(params, root_key)

data/lib/rapid_api/services/base_service.rb

@@ -0,0 +1,63 @@
+module RapidApi
+  module Services
+    class RapidApi::Services::BaseService
+
+      attr_accessor :params,
+                    :response,
+                    :bang_mode
+
+      def self.method_missing(meth, *args, &block)
+        if meth[-1] == '!'
+          meth = meth.to_s.split('!')[0].to_sym
+          bang_mode = true
+        else
+          bang_mode = false
+        end
+        if instance_methods.include? meth
+          service = self.new(*args)
+          service.bang_mode = bang_mode
+          service.send(meth)
+          if bang_mode
+            return service.response.value
+          else
+            return service.response
+          end
+        else
+          super
+        end
+      end
+
+      def initialize(params={})
+        @params   = params
+        @response = ServiceResponse.new
+        after_initialize
+      end
+
+      def after_initialize
+      end
+
+      def add_error(key, message)
+        raise "#{key}: #{message}" if bang_mode
+
+        error_key = response.errors[key]
+        error_key ||= []
+        error_key << message
+      end
+
+      def return_value(value)
+        response.value = value
+      end
+
+      protected
+
+      def _transfer_errors_from_active_record(model)
+        if model.errors.any?
+          model.errors.keys.each do |k|
+            response.errors[k]= model.errors[k]
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/rapid_api/services/service_response.rb

@@ -0,0 +1,16 @@
+module RapidApi
+  module Services
+    class ServiceResponse
+      attr_accessor :value, :errors
+
+      def has_errors?
+        !errors.empty?
+      end
+
+      def errors
+        @errors ||= HashWithIndifferentAccess.new
+      end
+
+    end
+  end
+end

data/lib/rapid_api/services.rb

@@ -0,0 +1,8 @@
+require 'rapid_api/services/service_response'
+require 'rapid_api/services/base_service'
+
+module RapidApi
+  module Services
+
+  end
+end

data/lib/rapid_api/version.rb

@@ -1,3 +1,3 @@
 module RapidApi
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/rapid_api.rb

@@ -5,6 +5,7 @@ require 'rapid_api/serializer_adapters'
 require 'rapid_api/action_controller'
 require 'rapid_api/auth'
 require 'rapid_api/configuration'
+require 'rapid_api/services'
 
 module RapidApi
 

data/test/unit/rapid_api/action_controller/errors_test.rb

@@ -30,7 +30,7 @@ class ActionControllerErrorsTest < ActionController::TestCase
   def test_unauthenticated_error
     get :unauthenticated_action
     assert_response :unauthorized
-    assert_equal ['Not Authenticated'], JSON.parse(@controller.response.body)['errors']
+    assert_equal ['Not Authorized'], JSON.parse(@controller.response.body)['errors']
   end
 
   def test_server_error

data/test/unit/rapid_api/action_controller/resource_actions_test.rb

@@ -150,7 +150,7 @@ module ActionController
     def test_destroy
       BricksController.adapted_model = Minitest::Mock.new
       BricksController.serializer = TestSerializerAdapter
-      query_result = RapidApi::ModelAdapters::QueryResult.new()
+      query_result = RapidApi::ModelAdapters::QueryResult.new(data: 'data')
       BricksController.adapted_model.expect :destroy, query_result, ["1", {color: 'blue'}]
       post :destroy, params: {id: 1}
       assert_response :no_content
@@ -160,7 +160,7 @@ module ActionController
     def test_destroy_errors
       BricksController.adapted_model = Minitest::Mock.new
       BricksController.serializer = TestSerializerAdapter
-      query_result = RapidApi::ModelAdapters::QueryResult.new(errors: 'dummy error')
+      query_result = RapidApi::ModelAdapters::QueryResult.new(data: 'data', errors: 'dummy error')
       BricksController.adapted_model.expect :destroy, query_result, ["1", {color: 'blue'}]
       post :destroy, params: {id: 1}
       assert_response :unprocessable_entity

data/test/unit/rapid_api/serializer_adapters/ams_adapter_test.rb

@@ -13,9 +13,9 @@ module RapidApi
       end
 
       def test_serialize
-        brick = Brick.create color: 'yellow', weight: 10, material: 'paper'
+        brick = Brick.new color: 'yellow', weight: 10, material: 'paper'
         serialized_brick = @adapter.serialize brick
-        assert_equal "{\"data\":{\"id\":\"#{brick.id}\",\"type\":\"bricks\",\"attributes\":{\"color\":\"yellow\",\"weight\":\"10.0\",\"material\":\"paper\"}}}", serialized_brick
+        assert_equal "{\"data\":{\"type\":\"bricks\",\"attributes\":{\"color\":\"yellow\",\"weight\":\"10.0\",\"material\":\"paper\"}}}", serialized_brick
       end
 
       def test_serialize_collection

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rapid_api
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - briandavidwetzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-20 00:00:00.000000000 Z
+date: 2018-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -125,6 +125,9 @@ files:
 - lib/rapid_api/serializer_adapters.rb
 - lib/rapid_api/serializer_adapters/abstract.rb
 - lib/rapid_api/serializer_adapters/ams_adapter.rb
+- lib/rapid_api/services.rb
+- lib/rapid_api/services/base_service.rb
+- lib/rapid_api/services/service_response.rb
 - lib/rapid_api/version.rb
 - test/integration/ams_ar_test.rb
 - test/support/code_climate.rb