dm-rails 1.1.0.rc1 → 1.1.0.rc2

data/Gemfile

@@ -2,21 +2,16 @@ require 'pathname'
 
 source 'http://rubygems.org'
 
-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.0.2'
+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.1.0.rc2'
+DO_VERSION     = '~> 0.10.2'
+DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
 
-group :runtime do
-
-  gem 'actionpack',      '~> 3.0.4', :require => 'action_pack'
-  gem 'activesupport',   '~> 3.0.4', :require => 'active_support'
-  gem 'dm-core',         DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}"
-  gem 'dm-active_model', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-active_model#{REPO_POSTFIX}"
-  gem 'i18n',            '~> 0.5.0'
-  gem 'railties',        '~> 3.0.4', :require => 'rails'
-
-end
+gem 'actionpack',      '~> 3.0.4', :require => 'action_pack'
+gem 'dm-active_model', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-active_model#{REPO_POSTFIX}"
+gem 'railties',        '~> 3.0.4', :require => 'rails'
 
 group :development do
 
@@ -26,30 +21,29 @@ group :development do
 
 end
 
-group :quality do
+platforms :mri_18 do
+  group :quality do
 
-  gem 'rcov',      '~> 0.9.9', :platforms => :mri_18
-  gem 'yard',      '~> 0.6'
-  gem 'yardstick', '~> 0.2'
+    gem 'rcov',      '~> 0.9.9'
+    gem 'yard',      '~> 0.6'
+    gem 'yardstick', '~> 0.2'
 
+  end
 end
 
 group :datamapper do
   adapters = ENV['ADAPTER'] || ENV['ADAPTERS']
   adapters = adapters.to_s.tr(',', ' ').split.uniq - %w[ in_memory ]
 
-  DO_VERSION     = '~> 0.10.2'
-  DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
-
   if (do_adapters = DM_DO_ADAPTERS & adapters).any?
-    options = {}
-    options[:git] = "#{DATAMAPPER}/do#{REPO_POSTFIX}" if ENV['DO_GIT'] == 'true'
+    do_options = {}
+    do_options[:git] = "#{DATAMAPPER}/do#{REPO_POSTFIX}" if ENV['DO_GIT'] == 'true'
 
-    gem 'data_objects', DO_VERSION, options.dup
+    gem 'data_objects', DO_VERSION, do_options.dup
 
     do_adapters.each do |adapter|
       adapter = 'sqlite3' if adapter == 'sqlite'
-      gem "do_#{adapter}", DO_VERSION, options.dup
+      gem "do_#{adapter}", DO_VERSION, do_options.dup
     end
 
     gem 'dm-do-adapter', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-do-adapter#{REPO_POSTFIX}"

data/README.rdoc

@@ -90,16 +90,16 @@ Using {bundler}[http://github.com/carlhuda/bundler] it's really easy to get an a
 
   source 'http://rubygems.org'
 
-  RAILS_VERSION = '~> 3.0.0.rc'
-  DM_VERSION    = '~> 1.0.0'
-  RSPEC_VERSION = '~> 2.0.0.beta.19'
+  RAILS_VERSION = '~> 3.0.4'
+  DM_VERSION    = '~> 1.1.0.rc2'
+  RSPEC_VERSION = '~> 2.5.0'
 
   gem 'activesupport',      RAILS_VERSION, :require => 'active_support'
   gem 'actionpack',         RAILS_VERSION, :require => 'action_pack'
   gem 'actionmailer',       RAILS_VERSION, :require => 'action_mailer'
   gem 'railties',           RAILS_VERSION, :require => 'rails'
 
-  gem 'dm-rails',          '~> 1.1.0.rc1'
+  gem 'dm-rails',          '~> 1.1.0.rc2'
   gem 'dm-sqlite-adapter', DM_VERSION
 
   # You can use any of the other available database adapters.

data/VERSION

@@ -1,2 +1,2 @@
-1.1.0.rc1
+1.1.0.rc2
 

data/dm-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-rails}
-  s.version = "1.1.0.rc1"
+  s.version = "1.1.0.rc2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Gamsjaeger (snusnu)", "Dan Kubb"]
-  s.date = %q{2011-02-28}
+  s.date = %q{2011-03-01}
   s.description = %q{Integrate DataMapper with Rails 3}
   s.email = %q{gamsnjaga@gmail.com}
   s.extra_rdoc_files = [
@@ -73,20 +73,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<actionpack>, ["~> 3.0.4"])
-      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.4"])
-      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.2"])
-      s.add_runtime_dependency(%q<dm-active_model>, ["~> 1.0.2"])
-      s.add_runtime_dependency(%q<i18n>, ["~> 0.5.0"])
+      s.add_runtime_dependency(%q<dm-active_model>, ["~> 1.1.0.rc2"])
       s.add_runtime_dependency(%q<railties>, ["~> 3.0.4"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3.1"])
     else
       s.add_dependency(%q<actionpack>, ["~> 3.0.4"])
-      s.add_dependency(%q<activesupport>, ["~> 3.0.4"])
-      s.add_dependency(%q<dm-core>, ["~> 1.0.2"])
-      s.add_dependency(%q<dm-active_model>, ["~> 1.0.2"])
-      s.add_dependency(%q<i18n>, ["~> 0.5.0"])
+      s.add_dependency(%q<dm-active_model>, ["~> 1.1.0.rc2"])
       s.add_dependency(%q<railties>, ["~> 3.0.4"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rake>, ["~> 0.8.7"])
@@ -94,10 +88,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<actionpack>, ["~> 3.0.4"])
-    s.add_dependency(%q<activesupport>, ["~> 3.0.4"])
-    s.add_dependency(%q<dm-core>, ["~> 1.0.2"])
-    s.add_dependency(%q<dm-active_model>, ["~> 1.0.2"])
-    s.add_dependency(%q<i18n>, ["~> 0.5.0"])
+    s.add_dependency(%q<dm-active_model>, ["~> 1.1.0.rc2"])
     s.add_dependency(%q<railties>, ["~> 3.0.4"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rake>, ["~> 0.8.7"])

metadata

@@ -2,7 +2,7 @@
 name: dm-rails
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.1.0.rc1
+  version: 1.1.0.rc2
 platform: ruby
 authors: 
 - Martin Gamsjaeger (snusnu)
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-28 00:00:00 -08:00
+date: 2011-03-01 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,52 +26,19 @@ dependencies:
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: dm-active_model
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.0.4
+        version: 1.1.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: dm-core
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: dm-active_model
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: i18n
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: railties
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -79,10 +46,10 @@ dependencies:
         version: 3.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -90,10 +57,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -101,10 +68,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -112,7 +79,7 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id006
 description: Integrate DataMapper with Rails 3
 email: gamsnjaga@gmail.com
 executables: []