effective_resources 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab07e09ae92fa3b5b45c6aaea043524311cf55ee
-  data.tar.gz: a1932eebb584d966fc283bde64a4ccef8da30fc2
+  metadata.gz: 41ccd958aa2d034e20655b10bfe8a830bf162dad
+  data.tar.gz: d56e278ea8440a596378c2e5f943c32cc5a4c1dc
 SHA512:
-  metadata.gz: fa2a85a3c35493d374fbd6ecc681edb1e33db170adc18e3b9839d2d5968c6f2b47cfa9fa862798d9e8b92e68b17da2a24c27b1aa8bdf2785851e3a1621a3102e
-  data.tar.gz: 035d29dfab61fd4de301630257e82f5022cc31bc57515065e17303eb703b1a000c524806961c189ee9265d29a6d6611f4fdc6932f4b35e8f6c930922936cdf5b
+  metadata.gz: c2bd71876feb1b9437d2d2026f44e69f3aa93ff3a17a1b2c9e22b3c9c794a7128531321787e4fc6b5f3061bacb89e1186de8f2852dea56a47628da31dde44499
+  data.tar.gz: 74dc40f978cb4af876f258a5c1acd32c2865c65b030a8516b40d620a4981ce6544016bb75e40833059ba82f9c6212c7ba8baf12f8bbce6268ccb465ef0d3d6a3

data/app/controllers/concerns/effective/crud_controller/actions.rb

@@ -269,7 +269,7 @@ module Effective
           self.resources ||= resource_scope.where(id: params[:ids])
         end
 
-        if effective_resource.scope?(action)
+        if request.get? && effective_resource.scope?(action)
           self.resources ||= resource_scope.public_send(action)
         end
 

data/app/controllers/concerns/effective/crud_controller/permitted_params.rb

@@ -50,7 +50,17 @@ module Effective
           end
         end
 
-        permitted_params = permitted_params.map { |k, v| v.first == :array ? { k => [] } : k }
+        permitted_params = permitted_params.map do |k, (datatype, v)|
+          if datatype == :array
+            { k => [] }
+          elsif datatype == :permitted_param && k.to_s.ends_with?('_ids')
+            { k => [] }
+          elsif datatype == :effective_address
+            { k => EffectiveAddresses.permitted_params }
+          else
+            k
+          end
+        end
 
         # Recursively add any accepts_nested_resources
         effective_resource.nested_resources.each do |nested|

data/app/models/effective/resources/attributes.rb

@@ -18,6 +18,11 @@ module Effective
         belong_tos.inject({}) do |h, ass|
           unless ass.foreign_key == 'site_id' && ass.respond_to?(:acts_as_site_specific)
             h[ass.foreign_key.to_sym] = [:integer, :index => true]
+
+            if ass.options[:polymorphic]
+              h[ass.foreign_type.to_sym] = [:integer, :index => true]
+            end
+
           end; h
         end
       end
@@ -26,6 +31,15 @@ module Effective
         has_manys_ids.inject({}) { |h, ass| h[ass] = [:array]; h }
       end
 
+      def has_ones_attributes
+        has_ones_ids.inject({}) { |h, ass| h[ass] = [:array]; h }
+      end
+
+      def effective_addresses_attributes
+        return {} unless instance.respond_to?(:effective_address_names)
+        instance.effective_address_names.inject({}) { |h, name| h[name] = [:effective_address]; h }
+      end
+
       # All will include primary_key, created_at, updated_at and belongs_tos
       # This is the attributes as defined by the effective_resources do .. end block
       # { :name => [:string, { permitted: false }], ... }
@@ -33,7 +47,12 @@ module Effective
         atts = (model ? model.attributes : {})
 
         if all # Probably being called by permitted_attributes
-          primary_key_attribute.merge(belong_tos_attributes).merge(has_manys_attributes).merge(atts)
+          primary_key_attribute
+            .merge(belong_tos_attributes)
+            .merge(has_manys_attributes)
+            .merge(has_ones_attributes)
+            .merge(effective_addresses_attributes)
+            .merge(atts)
         else  # This is the migrator. This should match table_attributes
           belong_tos_attributes.merge(atts.reject { |_, v| v[0] == :permitted_param })
         end
@@ -46,7 +65,8 @@ module Effective
 
         (attributes.keys - [klass.primary_key]).inject({}) do |h, name|
           if klass.respond_to?(:column_for_attribute) # Rails 4+
-            h[name.to_sym] = [klass.column_for_attribute(name).type]
+            column = klass.column_for_attribute(name)
+            h[name.to_sym] = [column.type] if column.table_name # Rails 5 attributes API
           else
             h[name.to_sym] = [klass.columns_hash[name].type]
           end; h

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.0.2'.freeze
+  VERSION = '1.0.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-19 00:00:00.000000000 Z
+date: 2018-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails