ardm-rails 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ee37817b3138702b11b1a53f059dae1d478072a
-  data.tar.gz: 650aa77a728d03716f1ebdd01e5ea90ccfe8e4ef
+  metadata.gz: 2933e49f63b73ee07f74e9ff9a0dcb1694061d4d
+  data.tar.gz: 0585a03a45a67aa3d91a07dd10c3f78347e5c9aa
 SHA512:
-  metadata.gz: f003e028147197caf7d814c88b2b22a214fcfda02e2cacf40a190223738b350423563be7ed119ee93abe2538bc7edaf9c131fad8f8e8c2cfbf37f506206287df
-  data.tar.gz: 003413ceb5a497b0714ca587739bdc79e1bfae0ab11495ec75d38459c74ae507992f190e109310ee1d8a6f80a34833c5b0cff2e6f53acad5d498a442787046b8
+  metadata.gz: 587d9b29fdcde870d34e5fb8a19f10f5b12d4891f858eb5b8cd7f350fc503eab2df584d9f1363e252e310c326360c5390eb4a19f8eef506508795b4ee22182b3
+  data.tar.gz: f34b82f1552aa789167e7d5acd6ed6bdfeb082f5cd0bd17860c070ca6c05ea2dbd047efe8251c49c0e981355401a98506d2752c6165d4403662504ad481c0347

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 sudo: false
+script: "bundle exec rake spec"
 rvm:
   - 1.9.3
   - 2.0.0

data/Gemfile

@@ -8,18 +8,19 @@ 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'
-DO_VERSION     = '~> 0.10.6'
-RAILS_VERSION  = '~> 3.0'
+DO_VERSION     = '~> 0.10.12'
+RAILS_VERSION  = [ '>= 3.0', '< 5.0' ]
 DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
 CURRENT_BRANCH = ENV.fetch('GIT_BRANCH', 'master')
 
 # DataMapper dependencies
-gem 'ardm-core',         DM_VERSION, SOURCE => "#{DATAMAPPER}/ardm-core#{REPO_POSTFIX}", :branch => CURRENT_BRANCH
+gem 'ardm-core',         DM_VERSION, SOURCE => "#{DATAMAPPER}/ardm-core#{REPO_POSTFIX}",         :branch => CURRENT_BRANCH
 gem 'ardm-active_model', DM_VERSION, SOURCE => "#{DATAMAPPER}/ardm-active_model#{REPO_POSTFIX}", :branch => CURRENT_BRANCH
 
 # Rails dependencies
 gem 'actionpack', RAILS_VERSION, :require => 'action_pack'
 gem 'railties',   RAILS_VERSION, :require => 'rails'
+gem 'protected_attributes'
 
 group :datamapper do
   adapters = ENV['ADAPTER'] || ENV['ADAPTERS']

data/README.rdoc

@@ -151,7 +151,7 @@ Using {bundler}[http://github.com/carlhuda/bundler] it's really easy to get an a
 
 DataMapper supports connecting to and working with multiple repositories easily. In order to be able to take full advantage of that feature in rails, you can configure as many repositories for your different environments as you wish. All you need to do is follow some simple naming conventions and you're good to go. Have a look at the #{adapter}_defaults declarations in the sample files below. That's the only convention you need to follow. Your default declarations should always end with "defaults". This is necessary for dm-rails to not confuse these with any of your environment declarations. In fact, dm-rails looks at the content of your database.yml and rejects every key that matches /defaults/. The remaining entries represent the repository configurations for the available environments.
 
-An example for setting up a single repository for every environment.
+An example for setting up a single repository for every environment. This will setup an implicit 'default' repository.
 
   defaults: &defaults
     adapter: mysql

data/lib/dm-rails/configuration.rb

@@ -24,7 +24,7 @@ module Rails
           environment, config = pair.first, pair.last
           repositories[environment] = begin
             c = config['repositories'] || {}
-            c['default'] = config.except('repositories') if config.except('repositories')
+            c['default'] ||= config.except('repositories') if config.except('repositories')
             normalize_repository_config(c)
           end
           repositories

data/lib/dm-rails/mass_assignment_security.rb

@@ -3,87 +3,90 @@ require 'active_support/core_ext/class/attribute'
 require 'active_support/concern'
 require 'active_model'
 
-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.
-    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, authorizer = nil)
-        sanitized_attributes = attributes.reject do |key, value|
-          key_name = key.name rescue key
-          authorizer ? authorizer.deny?(key_name) : deny?(key_name)
+if defined?(::ActiveModel::MassAssignmentSecurity)
+  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.
+      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, authorizer = nil)
+          sanitized_attributes = attributes.reject do |key, value|
+            key_name = key.name rescue key
+            authorizer ? authorizer.deny?(key_name) : deny?(key_name)
+          end
+          debug_protected_attribute_removal(attributes, sanitized_attributes)
+          sanitized_attributes
         end
-        debug_protected_attribute_removal(attributes, sanitized_attributes)
-        sanitized_attributes
       end
     end
   end
-end
 
-module DataMapper
-  # Include this module into a DataMapper model to enable ActiveModel's mass
-  # assignment security.
-  #
-  # To use second parameter of {#attributes=} make sure to include this module
-  # last.
-  module MassAssignmentSecurity
-    extend ::ActiveSupport::Concern
-    include ::ActiveModel::MassAssignmentSecurity
+  module DataMapper
+    # Include this module into a DataMapper model to enable ActiveModel's mass
+    # assignment security.
+    #
+    # To use second parameter of {#attributes=} make sure to include this module
+    # last.
+    module MassAssignmentSecurity
+      extend ::ActiveSupport::Concern
+
+      include ::ActiveModel::MassAssignmentSecurity
 
-    module ClassMethods
-      extend ::ActiveModel::MassAssignmentSecurity::ClassMethods
+      module ClassMethods
+        extend ::ActiveModel::MassAssignmentSecurity::ClassMethods
 
-      def logger
-        @logger ||= ::DataMapper.logger
+        def logger
+          @logger ||= ::DataMapper.logger
+        end
       end
-    end
 
-    # Sanitizes the specified +attributes+ according to the defined mass-assignment
-    # security rules and calls +super+ with the result.
-    #
-    # Use either +attr_accessible+ to specify which attributes are allowed to be
-    # assigned via {#attributes=}, or +attr_protected+ to specify which attributes
-    # are *not* allowed to be assigned via {#attributes=}.
-    #
-    # +attr_accessible+ and +attr_protected+ are mutually exclusive.
-    #
-    # @param [Hash{Symbol,String,::DataMapper::Property,::DataMapper::Relationship=>Object}] attributes
-    #   Names and values of attributes to sanitize.
-    # @param [Boolean] guard_protected_attributes
-    #   Determines whether mass-security rules are applied (when +true+) or not.
-    # @return [Hash]
-    #   Sanitized hash of attributes.
-    # @api public
-    #
-    # @example [Usage]
-    #   class User
-    #     include DataMapper::Resource
-    #     include DataMapper::MassAssignmentSecurity
-    #
-    #     property :name, String
-    #     property :is_admin, Boolean
-    #
-    #     # Only allow name to be set via #attributes=
-    #     attr_accessible :name
-    #   end
-    #
-    #   user = User.new
-    #   user.attributes = { :username => 'Phusion', :is_admin => true }
-    #   user.username  # => "Phusion"
-    #   user.is_admin  # => false
-    #
-    #   user.send(:attributes=, { :username => 'Phusion', :is_admin => true }, false)
-    #   user.is_admin  # => true
-    def attributes=(attributes, guard_protected_attributes = true)
-      attributes = sanitize_for_mass_assignment(attributes) if guard_protected_attributes
-      super(attributes)
+      # Sanitizes the specified +attributes+ according to the defined mass-assignment
+      # security rules and calls +super+ with the result.
+      #
+      # Use either +attr_accessible+ to specify which attributes are allowed to be
+      # assigned via {#attributes=}, or +attr_protected+ to specify which attributes
+      # are *not* allowed to be assigned via {#attributes=}.
+      #
+      # +attr_accessible+ and +attr_protected+ are mutually exclusive.
+      #
+      # @param [Hash{Symbol,String,::DataMapper::Property,::DataMapper::Relationship=>Object}] attributes
+      #   Names and values of attributes to sanitize.
+      # @param [Boolean] guard_protected_attributes
+      #   Determines whether mass-security rules are applied (when +true+) or not.
+      # @return [Hash]
+      #   Sanitized hash of attributes.
+      # @api public
+      #
+      # @example [Usage]
+      #   class User
+      #     include DataMapper::Resource
+      #     include DataMapper::MassAssignmentSecurity
+      #
+      #     property :name, String
+      #     property :is_admin, Boolean
+      #
+      #     # Only allow name to be set via #attributes=
+      #     attr_accessible :name
+      #   end
+      #
+      #   user = User.new
+      #   user.attributes = { :username => 'Phusion', :is_admin => true }
+      #   user.username  # => "Phusion"
+      #   user.is_admin  # => false
+      #
+      #   user.send(:attributes=, { :username => 'Phusion', :is_admin => true }, false)
+      #   user.is_admin  # => true
+      def attributes=(attributes, guard_protected_attributes = true)
+        attributes = sanitize_for_mass_assignment(attributes) if guard_protected_attributes
+        super(attributes)
+      end
     end
   end
 end

data/lib/dm-rails/multiparameter_attributes.rb

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

data/lib/dm-rails/session_store.rb

@@ -13,8 +13,8 @@ module Rails
         include ::DataMapper::Resource
 
         property :id,         Serial
-        property :session_id, String,   :required => true, :unique => true
-        property :data,       Object,   :required => true
+        property :session_id, String,   :required => true, :unique => true, :length => 0..150
+        property :data,       Object,   :required => false
         property :updated_at, DateTime,                    :index => true
 
         def self.name
@@ -27,7 +27,9 @@ module Rails
 
       end
 
-      SESSION_RECORD_KEY = 'rack.session.record'.freeze
+      # for backward compatibility with Rails 3.0
+      ENV_SESSION_OPTIONS_KEY = ::Rack::Session::Abstract::ENV_SESSION_OPTIONS_KEY unless const_defined?("ENV_SESSION_OPTIONS_KEY")
+      SESSION_RECORD_KEY      = 'rack.session.record'.freeze
 
       class_attribute :session_class
       self.session_class = Session
@@ -41,7 +43,7 @@ module Rails
         [ sid, session.data ]
       end
 
-      def set_session(env, sid, session_data)
+      def set_session(env, sid, session_data, options = {})
         session            = get_session_resource(env, sid)
         session.data       = session_data
         session.updated_at = DateTime.now if session.dirty?
@@ -60,8 +62,13 @@ module Rails
         self.class.session_class.first_or_new(:session_id => sid)
       end
 
+      def destroy_session(env, sid = nil, options = {})
+        sid ||= current_session_id(env)
+        find_session(sid).destroy
+      end
+
       def destroy(env)
-        find_session(current_session_id(env)).destroy
+        destroy_session(env)
       end
 
     end

data/lib/dm-rails/setup.rb

@@ -5,25 +5,32 @@ require 'dm-rails/railties/log_listener'
 
 module Rails
   module DataMapper
-
     def self.setup(environment)
       ::DataMapper.logger.info "[datamapper] Setting up the #{environment.inspect} environment:"
-      configuration.repositories[environment].each do |name, config|
-        setup_with_instrumentation(name.to_sym, config)
+      env = configuration.repositories[environment] ||= begin
+        database_url = ENV['DATABASE_URL']
+        if database_url.present?
+          { 'default' => { 'url' => database_url } }
+        else
+          fail KeyError, "The environment #{environment} is unknown"
+        end
       end
+      env.symbolize_keys.each { |pair| setup_with_instrumentation(*pair) }
       finalize
     end
 
     def self.setup_with_instrumentation(name, options)
+      # The url option is the convention used by rails, while uri is legacy dm-rails
+      url = options.fetch('url', options['uri'])
+      args, database, adapter_name = if url
+        database_uri = ::Addressable::URI.parse(url)
+        [database_uri, database_uri.path[1..-1], database_uri.scheme]
+      else
+        [options, *options.values_at('database', 'adapter')]
+      end
 
-      adapter = if options['uri']
-                  database_uri = ::Addressable::URI.parse(options['uri'])
-                  ::DataMapper.logger.info "[datamapper] Setting up #{name.inspect} repository: '#{database_uri.path}' on #{database_uri.scheme}"
-                  ::DataMapper.setup(name, database_uri)
-                else
-                  ::DataMapper.logger.info "[datamapper] Setting up #{name.inspect} repository: '#{options['database']}' on #{options['adapter']}"
-                 ::DataMapper.setup(name, options)
-                end
+      ::DataMapper.logger.info "[datamapper] Setting up #{name.inspect} repository: '#{database}' on #{adapter_name}"
+      adapter = ::DataMapper.setup(name, args)
 
       if convention = configuration.resource_naming_convention[name]
         adapter.resource_naming_convention = convention

data/lib/dm-rails/storage.rb

@@ -167,13 +167,14 @@ module Rails
       private
 
         def execute(statement)
-          system(
+          command = [
             'mysql',
-            (username.blank? ? '' : "--user=#{username}"),
-            (password.blank? ? '' : "--password=#{password}"),
+            username.present? ? "--user=#{username}"     : nil,
+            password.present? ? "--password=#{password}" : nil,
             '-e',
-            statement
-          )
+            statement,
+          ].compact
+          system(*command)
         end
 
         def collation

data/lib/dm-rails/version.rb

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

data/spec/spec.opts

@@ -1,3 +1,2 @@
---format progress
 --color
 --backtrace

data/spec/unit/mass_assignment_security_spec.rb

@@ -1,43 +1,51 @@
 require 'spec_helper'
+
+begin
+  require 'protected_attributes'
+rescue LoadError
+end
+
 require 'dm-rails/mass_assignment_security'
 
-# Because mass-assignment security is based on ActiveModel we just have to
-# ensure that ActiveModel is called.
-describe DataMapper::MassAssignmentSecurity do
-  before :all do
-    class Fake
-      super_module = Module.new do
-        def _super_attributes=(*args)
-        end
+if defined?(DataMapper::MassAssignmentSecurity)
+  # Because mass-assignment security is based on ActiveModel we just have to
+  # ensure that ActiveModel is called.
+  describe DataMapper::MassAssignmentSecurity do
+    before :all do
+      class Fake
+        super_module = Module.new do
+          def _super_attributes=(*args)
+          end
 
-        def attributes=(*args)
-          self.send(:_super_attributes=, *args)
+          def attributes=(*args)
+            self.send(:_super_attributes=, *args)
+          end
         end
-      end
-      include super_module
+        include super_module
 
-      include ::DataMapper::MassAssignmentSecurity
+        include ::DataMapper::MassAssignmentSecurity
+      end
     end
-  end
 
-  describe '#attributes=' do
-    it 'calls super with sanitized attributes' do
-      attributes = { :name => 'John', :is_admin => true }
-      sanitized_attributes = { :name => 'John' }
-      model = Fake.new
-      model.should_receive(:sanitize_for_mass_assignment).with(attributes).and_return(sanitized_attributes)
-      model.should_receive(:_super_attributes=).with(sanitized_attributes)
+    describe '#attributes=' do
+      it 'calls super with sanitized attributes' do
+        attributes = { :name => 'John', :is_admin => true }
+        sanitized_attributes = { :name => 'John' }
+        model = Fake.new
+        model.should_receive(:sanitize_for_mass_assignment).with(attributes).and_return(sanitized_attributes)
+        model.should_receive(:_super_attributes=).with(sanitized_attributes)
 
-      model.attributes = attributes
-    end
+        model.attributes = attributes
+      end
 
-    it 'skips sanitation when called with true' do
-      attributes = { :name => 'John', :is_admin => true }
-      sanitized_attributes = { :name => 'John' }
-      model = Fake.new
-      model.should_receive(:_super_attributes=).with(attributes)
+      it 'skips sanitation when called with true' do
+        attributes = { :name => 'John', :is_admin => true }
+        sanitized_attributes = { :name => 'John' }
+        model = Fake.new
+        model.should_receive(:_super_attributes=).with(attributes)
 
-      model.send(:attributes=, attributes, true)
+        model.send(:attributes=, attributes, true)
+      end
     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!(:primitive).and_return(::Rails::DataMapper::Models::Composite)
+      composite_property.stub!(:dump_class).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!(:primitive).and_return(::Rails::DataMapper::Models::Composite)
+      composite_property.stub!(:dump_class).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.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Martin Emde
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-29 00:00:00.000000000 Z
+date: 2015-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ardm-core
@@ -125,7 +125,6 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - ardm-rails.gemspec
 - lib/ardm-rails.rb
 - lib/dm-rails.rb

data/VERSION

@@ -1 +0,0 @@
-1.2.1