ardm-rails 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2933e49f63b73ee07f74e9ff9a0dcb1694061d4d
-  data.tar.gz: 0585a03a45a67aa3d91a07dd10c3f78347e5c9aa
+  metadata.gz: 1ab5215b9fd21d7a6f1fd98851112a1bdbdd01fe
+  data.tar.gz: 73cf4db29e9fd2b938fb514d04c8026ff5954165
 SHA512:
-  metadata.gz: 587d9b29fdcde870d34e5fb8a19f10f5b12d4891f858eb5b8cd7f350fc503eab2df584d9f1363e252e310c326360c5390eb4a19f8eef506508795b4ee22182b3
-  data.tar.gz: f34b82f1552aa789167e7d5acd6ed6bdfeb082f5cd0bd17860c070ca6c05ea2dbd047efe8251c49c0e981355401a98506d2752c6165d4403662504ad481c0347
+  metadata.gz: 1919cc87c17b6f0552142e4d65dbd80ec53cde582d1c752979133d28c22ae23dec35ba31dac256dbfa39a861c4ab33718ed0483113a098b069aab48007e533d2
+  data.tar.gz: 8695b359d9ddbad6bdc96965ed268e257c8e09bf4e93d20ff54e6e3a59a85c3e85f2ca44f92f44f32fa3fdf1bc89b26fda57166de2f934793de47f8f58583fce

data/Gemfile

@@ -7,9 +7,9 @@ gemspec
 SOURCE         = ENV.fetch('SOURCE', :git).to_sym
 REPO_POSTFIX   = SOURCE == :path ? ''                                : '.git'
 DATAMAPPER     = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://github.com/ar-dm'
-DM_VERSION     = '~> 1.2.0'
+DM_VERSION     = '~> 1.2'
 DO_VERSION     = '~> 0.10.12'
-RAILS_VERSION  = [ '>= 3.0', '< 5.0' ]
+RAILS_VERSION  = '~> 4.0'
 DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
 CURRENT_BRANCH = ENV.fetch('GIT_BRANCH', 'master')
 
@@ -20,7 +20,10 @@ gem 'ardm-active_model', DM_VERSION, SOURCE => "#{DATAMAPPER}/ardm-active_model#
 # Rails dependencies
 gem 'actionpack', RAILS_VERSION, :require => 'action_pack'
 gem 'railties',   RAILS_VERSION, :require => 'rails'
-gem 'protected_attributes'
+
+group :protected_attributes do
+  gem 'protected_attributes'
+end
 
 group :datamapper do
   adapters = ENV['ADAPTER'] || ENV['ADAPTERS']

data/ardm-rails.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |gem|
   gem.require_paths    = ["lib"]
 
   gem.add_runtime_dependency 'ardm-core',         '~> 1.2'
-  gem.add_runtime_dependency 'ardm-active_model', '~> 1.2'
-  gem.add_runtime_dependency 'actionpack',        '>= 3.0', '< 5.0'
-  gem.add_runtime_dependency 'railties',          '>= 3.0', '< 5.0'
+  gem.add_runtime_dependency 'ardm-active_model', '~> 1.3'
+  gem.add_runtime_dependency 'actionpack',        '~> 4.0'
+  gem.add_runtime_dependency 'railties',          '~> 4.0'
 
   gem.add_development_dependency 'rake',      '~> 0.9'
   gem.add_development_dependency 'rspec',     '~> 1.3'

data/lib/dm-rails/mass_assignment_security.rb

@@ -3,25 +3,50 @@ require 'active_support/core_ext/class/attribute'
 require 'active_support/concern'
 require 'active_model'
 
-if defined?(::ActiveModel::MassAssignmentSecurity)
+begin
+  require 'protected_attributes'
+rescue LoadError
+  module DataMapper
+    # In rails ~> 4.0, protected_attributes must be required to use this feature.
+    # By requiring it here, we avoid gem load order problems that would cause
+    # the module to not exist if protected attributes was loaded after dm-rails.
+    #
+    # Also this dummy module is inserted to avoid throwing a useless error when the
+    # module would otherwise not exist. This is less mysterious than some part of
+    # the DataMapper code just going missing because you didn't add
+    # protected_attributes to your Gemfile.
+    module MassAssignmentSecurity
+      extend ::ActiveSupport::Concern
+
+      included do
+        raise "Add 'protected_attributes' to your Gemfile to use DataMapper::MassAssignmentSecurity"
+      end
+    end
+  end
+else
   module ActiveModel
     module MassAssignmentSecurity
-      # Provides a patched version of the Sanitizer used in Rails to handle property
-      # and relationship objects as keys. There is no way to inject a custom sanitizer
-      # without reimplementing the permission sets.
+      # Provides a patched version of the Sanitizer used in protected_attributes to
+      # handle property and relationship objects as keys. There is no way to inject
+      # a custom sanitizer without reimplementing the permission sets.
       Sanitizer.send(Sanitizer.is_a?(Module) ? :module_eval : :class_eval) do
         # Returns all attributes not denied by the authorizer.
         #
+        # @param [Class] klass
+        #   Model class
         # @param [Hash{Symbol,String,::DataMapper::Property,::DataMapper::Relationship=>Object}] attributes
         #   Names and values of attributes to sanitize.
+        # @param [#deny?] authorizer
+        #   Usually a ActiveModel::MassAssignmentSecurity::PermissionSet responding to deny?
         # @return [Hash]
         #   Sanitized hash of attributes.
-        def sanitize(attributes, authorizer = nil)
+        def sanitize(klass, attributes, authorizer)
+          rejected = []
           sanitized_attributes = attributes.reject do |key, value|
             key_name = key.name rescue key
-            authorizer ? authorizer.deny?(key_name) : deny?(key_name)
+            rejected << key_name if authorizer.deny?(key_name)
           end
-          debug_protected_attribute_removal(attributes, sanitized_attributes)
+          process_removed_attributes(klass, rejected) unless rejected.empty?
           sanitized_attributes
         end
       end

data/lib/dm-rails/multiparameter_attributes.rb

@@ -110,7 +110,7 @@ module Rails
             next
           end
 
-          klass = properties[name].dump_class
+          klass = properties[name].primitive
           begin
             attributes[name] =
               if klass == Time

data/lib/dm-rails/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Rails
-    VERSION = '1.3.0'
+    VERSION = '1.3.1'
   end
 end

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ require 'dm-core/spec/setup'
 require 'dm-core/spec/lib/adapter_helpers'
 require 'dm-core/spec/lib/spec_helper'
 require 'dm-core/spec/lib/pending_helpers'
+require 'dm-rails/railtie'
 
 DataMapper::Spec.setup
 DataMapper.finalize

data/spec/unit/mass_assignment_security_spec.rb

@@ -5,9 +5,10 @@ begin
 rescue LoadError
 end
 
-require 'dm-rails/mass_assignment_security'
-
-if defined?(DataMapper::MassAssignmentSecurity)
+# Unfortunately, the only way to test both branches of this code is to
+#   bundle --without protected_attributes
+# and then run the spec again.
+if defined?(ActiveModel::MassAssignmentSecurity)
   # Because mass-assignment security is based on ActiveModel we just have to
   # ensure that ActiveModel is called.
   describe DataMapper::MassAssignmentSecurity do
@@ -48,4 +49,14 @@ if defined?(DataMapper::MassAssignmentSecurity)
       end
     end
   end
+else
+  describe DataMapper::MassAssignmentSecurity do
+    it "raises if the DataMapper::MassAssignmentSecurity is included" do
+      expect {
+        class Fake
+          include ::DataMapper::MassAssignmentSecurity
+        end
+      }.to raise_error("Add 'protected_attributes' to your Gemfile to use DataMapper::MassAssignmentSecurity")
+    end
+  end
 end

data/spec/unit/multiparameter_attributes_spec.rb

@@ -108,7 +108,7 @@ describe Rails::DataMapper::MultiparameterAttributes do
         and_return(attributes['composite'])
 
       composite_property = mock(::DataMapper::Property)
-      composite_property.stub!(:dump_class).and_return(::Rails::DataMapper::Models::Composite)
+      composite_property.stub!(:primitive).and_return(::Rails::DataMapper::Models::Composite)
 
       resource = ::Rails::DataMapper::Models::Fake.new
       resource.stub!(:properties).and_return('composite' => composite_property)
@@ -127,7 +127,7 @@ describe Rails::DataMapper::MultiparameterAttributes do
         should_receive(:new).with('a string').and_raise(composite_exception)
 
       composite_property = mock(::DataMapper::Property)
-      composite_property.stub!(:dump_class).and_return(::Rails::DataMapper::Models::Composite)
+      composite_property.stub!(:primitive).and_return(::Rails::DataMapper::Models::Composite)
 
       resource = ::Rails::DataMapper::Models::Fake.new
       resource.stub!(:properties).and_return('composite' => composite_property)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ardm-rails
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Martin Emde
@@ -32,54 +32,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement