tpitale-dm-rails 1.2.1 → 1.2.2

data/.gitignore

@@ -0,0 +1,35 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## Rubinius
+*.rbc
+
+## PROJECT::GENERAL
+*.gem
+coverage
+rdoc
+pkg
+tmp
+doc
+log
+.yardoc
+measurements
+
+## BUNDLER
+.bundle
+Gemfile.*
+
+## PROJECT::SPECIFIC
+vendor

data/Gemfile

@@ -1,13 +1,14 @@
 require 'pathname'
 
-source 'http://rubygems.org'
+source :rubygems
+
+gemspec
 
 SOURCE         = ENV.fetch('SOURCE', :git).to_sym
 REPO_POSTFIX   = SOURCE == :path ? ''                                : '.git'
 DATAMAPPER     = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://github.com/datamapper'
-DM_VERSION     = '~> 1.2.0'
+DM_VERSION     = '~> 1.3.0.beta'
 DO_VERSION     = '~> 0.10.6'
-RAILS_VERSION  = '~> 3.1.0'
 DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
 CURRENT_BRANCH = ENV.fetch('GIT_BRANCH', 'master')
 
@@ -15,18 +16,6 @@ CURRENT_BRANCH = ENV.fetch('GIT_BRANCH', 'master')
 gem 'dm-core',         DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}", :branch => CURRENT_BRANCH
 gem 'dm-active_model', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-active_model#{REPO_POSTFIX}", :branch => CURRENT_BRANCH
 
-# Rails dependencies
-gem 'actionpack', RAILS_VERSION, :require => 'action_pack'
-gem 'railties',   RAILS_VERSION, :require => 'rails'
-
-group :development do
-
-  gem 'jeweler', '~> 1.6.4'
-  gem 'rake',    '~> 0.9.2'
-  gem 'rspec',   '~> 1.3.2'
-
-end
-
 platforms :mri_18 do
   group :quality do
 

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/Rakefile

@@ -1,27 +1,7 @@
 require 'rubygems'
 require 'rake'
 
-begin
-  gem 'jeweler', '~> 1.6.4'
-  require 'jeweler'
-
-  Jeweler::Tasks.new do |gem|
-    gem.name        = 'dm-rails'
-    gem.summary     = 'Use DataMapper with Rails 3'
-    gem.description = 'Integrate DataMapper with Rails 3'
-    gem.email       = 'gamsnjaga@gmail.com'
-    gem.homepage    = 'http://github.com/datamapper/%s' % gem.name
-    gem.authors     = [ 'Martin Gamsjaeger (snusnu)', 'Dan Kubb' ]
-
-    gem.rubyforge_project = 'datamapper'
-  end
-
-  Jeweler::GemcutterTasks.new
-
-  FileList['tasks/**/*.rake'].each { |task| import task }
-rescue LoadError
-  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler'
-end
+FileList['tasks/**/*.rake'].each { |task| import task }
 
 require "spec/rake/spectask"
 Spec::Rake::SpecTask.new

data/dm-rails.gemspec

@@ -1,94 +1,25 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+require File.expand_path('../lib/dm-rails/version', __FILE__)
 
-Gem::Specification.new do |s|
-  s.name = "tpitale-dm-rails"
-  s.version = "1.2.1"
+Gem::Specification.new do |gem|
+  gem.authors     = [ 'Martin Gamsjaeger (snusnu)', 'Dan Kubb' ]
+  gem.email       = [ 'gamsnjaga@gmail.com' ]
+  gem.summary     = "Integrate DataMapper with Rails 3"
+  gem.description = gem.summary
+  gem.homepage    = "http://datamapper.org"
 
-  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.description = "Integrate DataMapper with Rails 3"
-  s.email = "gamsnjaga@gmail.com"
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    "Gemfile",
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "dm-rails.gemspec",
-    "lib/dm-rails.rb",
-    "lib/dm-rails/configuration.rb",
-    "lib/dm-rails/mass_assignment_security.rb",
-    "lib/dm-rails/middleware/identity_map.rb",
-    "lib/dm-rails/multiparameter_attributes.rb",
-    "lib/dm-rails/railtie.rb",
-    "lib/dm-rails/railties/controller_runtime.rb",
-    "lib/dm-rails/railties/database.rake",
-    "lib/dm-rails/railties/i18n_support.rb",
-    "lib/dm-rails/railties/log_listener.rb",
-    "lib/dm-rails/railties/log_subscriber.rb",
-    "lib/dm-rails/session_store.rb",
-    "lib/dm-rails/setup.rb",
-    "lib/dm-rails/storage.rb",
-    "lib/generators/data_mapper.rb",
-    "lib/generators/data_mapper/migration/migration_generator.rb",
-    "lib/generators/data_mapper/migration/templates/migration.rb",
-    "lib/generators/data_mapper/model/model_generator.rb",
-    "lib/generators/data_mapper/model/templates/model.rb",
-    "lib/generators/data_mapper/observer/observer_generator.rb",
-    "lib/generators/data_mapper/observer/templates/observer.rb",
-    "spec/models/fake.rb",
-    "spec/models/topic.rb",
-    "spec/spec.opts",
-    "spec/spec_helper.rb",
-    "spec/unit/mass_assignment_security_spec.rb",
-    "spec/unit/multiparameter_attributes_spec.rb",
-    "tasks/clean.rake",
-    "tasks/yard.rake",
-    "tasks/yardstick.rake"
-  ]
-  s.homepage = "http://github.com/datamapper/dm-rails"
-  s.require_paths = ["lib"]
-  s.rubyforge_project = "datamapper"
-  s.rubygems_version = "1.8.11"
-  s.summary = "Use DataMapper with Rails 3"
+  gem.files            = `git ls-files`.split("\n")
+  gem.test_files       = `git ls-files -- {spec}/*`.split("\n")
+  gem.extra_rdoc_files = %w[LICENSE README.rdoc]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  gem.name          = "tpitale-dm-rails"
+  gem.require_paths = [ "lib" ]
+  gem.version       = DataMapper::Rails::VERSION
 
-    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_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<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rake>, ["~> 0.9.2"])
-      s.add_dependency(%q<rspec>, ["~> 1.3.2"])
-    end
-  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<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rake>, ["~> 0.9.2"])
-    s.add_dependency(%q<rspec>, ["~> 1.3.2"])
-  end
-end
+  gem.add_runtime_dependency('dm-active_model', '~> 1.2.1')
+  gem.add_runtime_dependency('actionpack',      '~> 3.0')
+  gem.add_runtime_dependency('railties',        '~> 3.0')
 
+  gem.add_development_dependency('rake',      '~> 0.9.2')
+  gem.add_development_dependency('rspec',     '~> 1.3.2')
+end

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

@@ -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

data/lib/dm-rails/session_store.rb

@@ -74,4 +74,4 @@ module Rails
     end
 
   end
-end
+end

data/lib/dm-rails/version.rb

@@ -0,0 +1,5 @@
+module DataMapper
+  module Rails
+    VERSION = '1.2.2'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tpitale-dm-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,66 +10,59 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-09 00:00:00.000000000Z
+date: 2012-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dm-core
-  requirement: &70167497981900 !ruby/object:Gem::Requirement
+  name: dm-active_model
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70167497981900
-- !ruby/object:Gem::Dependency
-  name: dm-active_model
-  requirement: &70167497981360 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *70167497981360
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70167497980780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70167497980780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70167497980240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70167497980240
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &70167497979600 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.4
-  type: :development
-  prerelease: false
-  version_requirements: *70167497979600
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70167497979020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +70,15 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70167497979020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70167497978480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,9 +86,15 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *70167497978480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.2
 description: Integrate DataMapper with Rails 3
-email: gamsnjaga@gmail.com
+email:
+- gamsnjaga@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -98,11 +102,11 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - .document
+- .gitignore
 - Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - dm-rails.gemspec
 - lib/dm-rails.rb
 - lib/dm-rails/configuration.rb
@@ -118,6 +122,7 @@ files:
 - lib/dm-rails/session_store.rb
 - lib/dm-rails/setup.rb
 - lib/dm-rails/storage.rb
+- lib/dm-rails/version.rb
 - lib/generators/data_mapper.rb
 - lib/generators/data_mapper/migration/migration_generator.rb
 - lib/generators/data_mapper/migration/templates/migration.rb
@@ -134,7 +139,7 @@ files:
 - tasks/clean.rake
 - tasks/yard.rake
 - tasks/yardstick.rake
-homepage: http://github.com/datamapper/dm-rails
+homepage: http://datamapper.org
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -153,9 +158,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: datamapper
-rubygems_version: 1.8.6
+rubyforge_project: 
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Use DataMapper with Rails 3
+summary: Integrate DataMapper with Rails 3
 test_files: []

data/VERSION

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