dm-rails 1.2.0 → 1.2.1

data/Gemfile

@@ -7,7 +7,7 @@ REPO_POSTFIX   = SOURCE == :path ? ''                                : '.git'
 DATAMAPPER     = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://github.com/datamapper'
 DM_VERSION     = '~> 1.2.0'
 DO_VERSION     = '~> 0.10.6'
-RAILS_VERSION  = '~> 3.1.0'
+RAILS_VERSION  = '~> 3.0'
 DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
 CURRENT_BRANCH = ENV.fetch('GIT_BRANCH', 'master')
 

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

data/dm-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "dm-rails"
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Gamsjaeger (snusnu)", "Dan Kubb"]
-  s.date = "2011-10-09"
+  s.date = "2012-02-15"
   s.description = "Integrate DataMapper with Rails 3"
   s.email = "gamsnjaga@gmail.com"
   s.extra_rdoc_files = [
@@ -67,16 +67,16 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<dm-core>, ["~> 1.2.0"])
       s.add_runtime_dependency(%q<dm-active_model>, ["~> 1.2.0"])
-      s.add_runtime_dependency(%q<actionpack>, ["~> 3.1.0"])
-      s.add_runtime_dependency(%q<railties>, ["~> 3.1.0"])
+      s.add_runtime_dependency(%q<actionpack>, ["~> 3.0"])
+      s.add_runtime_dependency(%q<railties>, ["~> 3.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rake>, ["~> 0.9.2"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3.2"])
     else
       s.add_dependency(%q<dm-core>, ["~> 1.2.0"])
       s.add_dependency(%q<dm-active_model>, ["~> 1.2.0"])
-      s.add_dependency(%q<actionpack>, ["~> 3.1.0"])
-      s.add_dependency(%q<railties>, ["~> 3.1.0"])
+      s.add_dependency(%q<actionpack>, ["~> 3.0"])
+      s.add_dependency(%q<railties>, ["~> 3.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rake>, ["~> 0.9.2"])
       s.add_dependency(%q<rspec>, ["~> 1.3.2"])
@@ -84,8 +84,8 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<dm-core>, ["~> 1.2.0"])
     s.add_dependency(%q<dm-active_model>, ["~> 1.2.0"])
-    s.add_dependency(%q<actionpack>, ["~> 3.1.0"])
-    s.add_dependency(%q<railties>, ["~> 3.1.0"])
+    s.add_dependency(%q<actionpack>, ["~> 3.0"])
+    s.add_dependency(%q<railties>, ["~> 3.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rake>, ["~> 0.9.2"])
     s.add_dependency(%q<rspec>, ["~> 1.3.2"])

data/lib/dm-rails/mass_assignment_security.rb

@@ -8,17 +8,17 @@ module ActiveModel
     # 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.
-    module Sanitizer
+    Sanitizer.send(Sanitizer.is_a?(Module) ? :module_eval : :class_eval) do
       # Returns all attributes not denied by the authorizer.
       #
       # @param [Hash{Symbol,String,::DataMapper::Property,::DataMapper::Relationship=>Object}] attributes
       #   Names and values of attributes to sanitize.
       # @return [Hash]
       #   Sanitized hash of attributes.
-      def sanitize(attributes)
+      def sanitize(attributes, authorizer = nil)
         sanitized_attributes = attributes.reject do |key, value|
           key_name = key.name rescue key
-          deny?(key_name)
+          authorizer ? authorizer.deny?(key_name) : deny?(key_name)
         end
         debug_protected_attribute_removal(attributes, sanitized_attributes)
         sanitized_attributes

metadata

@@ -1,145 +1,102 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dm-rails
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 1.2.1
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 0
-  version: 1.2.0
 platform: ruby
-authors: 
+authors:
 - Martin Gamsjaeger (snusnu)
 - Dan Kubb
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-09 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-15 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: dm-core
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70172354940660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: dm-active_model
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70172354940660
+- !ruby/object:Gem::Dependency
+  name: dm-active_model
+  requirement: &70172354940180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: actionpack
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70172354940180
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: &70172354939700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 1
-        - 0
-        version: 3.1.0
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: railties
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70172354939700
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: &70172354939220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 1
-        - 0
-        version: 3.1.0
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: jeweler
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70172354939220
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &70172354938740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 6
-        - 4
+      - !ruby/object:Gem::Version
         version: 1.6.4
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70172354938740
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70172354954620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70172354954620
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70172354954140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 3
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.3.2
   type: :development
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: *70172354954140
 description: Integrate DataMapper with Rails 3
 email: gamsnjaga@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .document
 - Gemfile
 - LICENSE
@@ -179,36 +136,26 @@ files:
 - tasks/yardstick.rake
 homepage: http://github.com/datamapper/dm-rails
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: datamapper
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Use DataMapper with Rails 3
 test_files: []
-