strong_resources 0.1.6 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb1daeb75ed867b843e6bcd4e4dc2a5f6adfccf5
-  data.tar.gz: f08f4275ad58016de9de43e69c15b2d195de23e6
+  metadata.gz: 06127d5fd4f5c9f0913a1f71ffb939e931e267b6
+  data.tar.gz: 04ff9b25c85ede98987536ee36df0cbb541b713b
 SHA512:
-  metadata.gz: c3c5d873e46cf32a0298e8d0f8b5a94be90a64551d50d59d05c6acfe5c6c38b5b28dd00cb05c6eee256d038e06c064a46a62c9fc375d04a2df09175eb9b7f363
-  data.tar.gz: 4a0d314a8e02ec93776e1ccc249f41e3764c6453ef2e6095b99e8f57e7b36aead5029d605816d9f2fbe2bcb51c2ea4f7eb8821e9d1231a72283cd5161ee520f9
+  metadata.gz: f488ee7c0225d22cc92a7e573d947dc714bc24b44c9c44fc3ede2177d5be8d3f6be4263744c73ea7e30dd9dbfcb63b42dffe0eabc0c96401037fa0a9c85d7f22
+  data.tar.gz: 2a844362aec52e073ff1e26af09a44faf5dd16377627b94f28c0dbba76c9602ebd7c2170782441eb3152c9039ab95fda0f0c35cc25764772dd4232972f69c225

data/lib/strong_resources/controller/mixin.rb

@@ -10,20 +10,52 @@ module StrongResources
         end
       end
 
+      # TODO: refactor
+      def apply_strong_params
+        deserializer = deserialized_params
+
+        unless deserializer.attributes.respond_to?(:permit)
+          deserializer.attributes = ActionController::Parameters.new(deserializer.attributes)
+        end
+        deserializer.attributes = deserializer.attributes.permit(strong_resource)
+
+        deserializer.relationships.each_pair do |name, relationship_payload|
+          [relationship_payload].flatten.each do |rp|
+            apply_strong_param(rp, strong_resource[:relationships][name])
+          end
+        end
+      end
+
+      # TODO: refactor
+      def apply_strong_param(relationship_payload, permitted)
+        if relationship_payload[:meta][:method] == :disassociate
+          raise 'not allowed disass' unless permitted[:_disassociate]
+        end
+
+        if relationship_payload[:meta][:method] == :destroy
+          raise 'not allowed destroy' unless permitted[:_destroy]
+        end
+
+        unless relationship_payload[:attributes].respond_to?(:permit)
+          relationship_payload[:attributes] = ActionController::Parameters.new(relationship_payload[:attributes])
+        end
+
+        relationship_payload[:attributes] = relationship_payload[:attributes].permit(permitted)
+        relationship_payload[:relationships].each_pair do |name, rp|
+          [rp].flatten.each do |_rp|
+            apply_strong_param(_rp, permitted[:relationships][name])
+          end
+        end
+      end
+
       def strong_resource
         resource = self.class._strong_resources[action_name.to_sym]
         _params = params
-        _params = _params.require(resource.require) if resource.require
-        _params.permit(resource.permits(self))
-      end
-
-      def update_action?
-        action_name == 'update'
+        resource.permits(self)
       end
 
       module ClassMethods
         def strong_resource(name, opts = {}, &blk)
-          opts[:require] ||= name unless opts[:require] == false
           resource = StrongResource.from(name, opts, &blk)
 
           resources = { create: resource, update: resource }

data/lib/strong_resources/strong_resource.rb

@@ -1,16 +1,17 @@
 module StrongResources
   class StrongResource
-    attr_accessor :attributes, :relations, :require, :relation_type,
+    attr_accessor :attributes,
+      :relations,
+      :relation_type,
       :only,
       :except,
-      :delete,
+      :disassociate,
       :destroy
     attr_reader :name, :customized_actions, :jsonapi_type
 
     def self.from(name, opts = {}, &blk)
       config   = StrongResources.config.strong_resources[name]
       resource = new(name)
-      resource.require = opts[:require]
       resource.instance_eval(&config[:base])
       resource.instance_eval(&blk) if blk
       resource
@@ -32,8 +33,8 @@ module StrongResources
       end
     end
 
-    def delete?
-      !!@delete
+    def disassociate?
+      !!@disassociate
     end
 
     def destroy?
@@ -60,26 +61,26 @@ module StrongResources
                  resource: nil,
                  only: nil,
                  except: nil,
-                 delete: false,
+                 disassociate: false,
                  destroy: false,
                  &blk)
       resource_name = resource || name.to_s.singularize.to_sym
       related_resource = self.class.from(resource_name)
       related_resource.instance_eval(&blk) if block_given?
       related_resource.relation_type = :has_many
-      add_relation(name, related_resource, only, except, delete, destroy)
+      add_relation(name, related_resource, only, except, disassociate, destroy)
     end
 
     def belongs_to(name,
                    resource: nil,
                    only: nil,
                    except: nil,
-                   delete: false,
+                   disassociate: false,
                    destroy: false,
                    &blk)
       resource_name = resource || name
       related_resource = self.class.from(resource_name, &blk)
-      add_relation(name, related_resource, only, except, delete, destroy)
+      add_relation(name, related_resource, only, except, disassociate, destroy)
     end
 
     def has_one(*args, &blk)
@@ -92,7 +93,9 @@ module StrongResources
           related_resource = opts[:resource]
           related = related_permits(related_resource, controller)
 
-          permits.merge!(:"#{relation_name}_attributes" => related)
+          permits[:relationships] ||= {}
+          permits[:relationships][relation_name] = related
+          permits
         end
       end
     end
@@ -101,6 +104,7 @@ module StrongResources
 
     def base_permits(resource, controller)
       permits = {}
+      permits.merge!(id: StrongResources.type_for_param(:id))
       resource.attributes.each_pair do |name, opts|
         next if (opts[:if] and opts[:if].call(controller) == false)
         permits.merge!(name => StrongResources.type_for_param(opts[:type]))
@@ -114,27 +118,24 @@ module StrongResources
     def related_permits(related_resource, controller)
       related_resource.permits(controller).tap do |permits|
         permits.merge!(id: StrongResources.type_for_param(:id))
-
-        if controller.update_action?
-          merge_delete_destroy(related_resource, permits)
-        end
+        merge_disassociate_destroy(related_resource, permits)
       end
     end
 
-    def merge_delete_destroy(related_resource, permits)
-      if related_resource.delete?
-        permits.merge!(_delete: StrongResources.type_for_param(:boolean))
+    def merge_disassociate_destroy(related_resource, permits)
+      if related_resource.disassociate?
+        permits.merge!(_disassociate: true)
       end
 
       if related_resource.destroy?
-        permits.merge!(_destroy: StrongResources.type_for_param(:boolean))
+        permits.merge!(_destroy: true)
       end
     end
 
-    def add_relation(name, resource, only, except, delete, destroy)
+    def add_relation(name, resource, only, except, disassociate, destroy)
       resource.only = only
       resource.except = except
-      resource.delete = delete
+      resource.disassociate = disassociate
       resource.destroy = destroy
 
       self.relations[name] = {

data/lib/strong_resources/version.rb

@@ -1,3 +1,3 @@
 module StrongResources
-  VERSION = "0.1.6"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strong_resources
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.6.0
 platform: ruby
 authors:
 - Lee Richmond
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-28 00:00:00.000000000 Z
+date: 2017-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stronger_parameters
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Auto-generate swagger docs and strong params