dm-core 0.9.6 → 0.9.7

data/.gitignore

@@ -0,0 +1,18 @@
+*.log
+log/*
+doc
+cov
+pkg
+.DS_Store
+coverage/*
+*.db
+spec/integration/*.db*
+nbproject
+profile_results.*
+\#*
+TAGS
+lib/coverage.html
+*.rbc
+_Yardoc
+.yardoc
+tmp/*

data/Manifest.txt

@@ -1,4 +1,5 @@
 .autotest
+.gitignore
 CONTRIBUTING
 FAQ
 History.txt
@@ -9,6 +10,7 @@ README.txt
 Rakefile
 SPECS
 TODO
+dm-core.gemspec
 lib/dm-core.rb
 lib/dm-core/adapters.rb
 lib/dm-core/adapters/abstract_adapter.rb

data/Rakefile

@@ -13,8 +13,8 @@ AUTHOR = "Sam Smoot"
 EMAIL  = "ssmoot@gmail.com"
 GEM_NAME = "dm-core"
 GEM_VERSION = DataMapper::VERSION
-GEM_DEPENDENCIES = ["data_objects", ">=0.9.5"], ["extlib", ">=0.9.5"],
-                   ["rspec", ">=1.1.3"], ["addressable", ">=1.0.4"]
+GEM_DEPENDENCIES = ["data_objects", "~>0.9.7"], ["extlib", "~>0.9.8"],
+                   ["rspec", ">=1.1.3"], ["addressable", "~>2.0"]
 
 
 PROJECT_NAME = "datamapper"

data/dm-core.gemspec

@@ -0,0 +1,41 @@
+Gem::Specification.new do |s|
+  s.name = %q{dm-core}
+  s.version = "0.9.7"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Sam Smoot"]
+  s.date = %q{2008-07-24}
+  s.description = %q{Faster, Better, Simpler!}
+  s.email = ["ssmoot@gmail.com"]
+  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt"]
+  s.files = [".autotest", "CONTRIBUTING", "FAQ", "History.txt", "MIT-LICENSE", "Manifest.txt", "QUICKLINKS", "README.txt", "Rakefile", "SPECS", "TODO", "lib/dm-core.rb", "lib/dm-core/adapters.rb", "lib/dm-core/adapters/abstract_adapter.rb", "lib/dm-core/adapters/data_objects_adapter.rb", "lib/dm-core/adapters/mysql_adapter.rb", "lib/dm-core/adapters/postgres_adapter.rb", "lib/dm-core/adapters/sqlite3_adapter.rb", "lib/dm-core/associations.rb", "lib/dm-core/associations/many_to_many.rb", "lib/dm-core/associations/many_to_one.rb", "lib/dm-core/associations/one_to_many.rb", "lib/dm-core/associations/one_to_one.rb", "lib/dm-core/associations/relationship.rb", "lib/dm-core/associations/relationship_chain.rb", "lib/dm-core/auto_migrations.rb", "lib/dm-core/collection.rb", "lib/dm-core/dependency_queue.rb", "lib/dm-core/hook.rb", "lib/dm-core/identity_map.rb", "lib/dm-core/is.rb", "lib/dm-core/logger.rb", "lib/dm-core/migrations/destructive_migrations.rb", "lib/dm-core/migrator.rb", "lib/dm-core/model.rb", "lib/dm-core/naming_conventions.rb", "lib/dm-core/property.rb", "lib/dm-core/property_set.rb", "lib/dm-core/query.rb", "lib/dm-core/repository.rb", "lib/dm-core/resource.rb", "lib/dm-core/scope.rb", "lib/dm-core/support.rb", "lib/dm-core/support/array.rb", "lib/dm-core/support/assertions.rb", "lib/dm-core/support/errors.rb", "lib/dm-core/support/kernel.rb", "lib/dm-core/support/symbol.rb", "lib/dm-core/transaction.rb", "lib/dm-core/type.rb", "lib/dm-core/type_map.rb", "lib/dm-core/types.rb", "lib/dm-core/types/boolean.rb", "lib/dm-core/types/discriminator.rb", "lib/dm-core/types/object.rb", "lib/dm-core/types/paranoid_boolean.rb", "lib/dm-core/types/paranoid_datetime.rb", "lib/dm-core/types/serial.rb", "lib/dm-core/types/text.rb", "lib/dm-core/version.rb", "script/all", "script/performance.rb", "script/profile.rb", "spec/integration/association_spec.rb", "spec/integration/association_through_spec.rb", "spec/integration/associations/many_to_many_spec.rb", "spec/integration/associations/many_to_one_spec.rb", "spec/integration/associations/one_to_many_spec.rb", "spec/integration/auto_migrations_spec.rb", "spec/integration/collection_spec.rb", "spec/integration/data_objects_adapter_spec.rb", "spec/integration/dependency_queue_spec.rb", "spec/integration/model_spec.rb", "spec/integration/mysql_adapter_spec.rb", "spec/integration/postgres_adapter_spec.rb", "spec/integration/property_spec.rb", "spec/integration/query_spec.rb", "spec/integration/repository_spec.rb", "spec/integration/resource_spec.rb", "spec/integration/sqlite3_adapter_spec.rb", "spec/integration/sti_spec.rb", "spec/integration/strategic_eager_loading_spec.rb", "spec/integration/transaction_spec.rb", "spec/integration/type_spec.rb", "spec/lib/logging_helper.rb", "spec/lib/mock_adapter.rb", "spec/lib/model_loader.rb", "spec/lib/publicize_methods.rb", "spec/models/vehicles.rb", "spec/models/zoo.rb", "spec/spec.opts", "spec/spec_helper.rb", "spec/unit/adapters/abstract_adapter_spec.rb", "spec/unit/adapters/adapter_shared_spec.rb", "spec/unit/adapters/data_objects_adapter_spec.rb", "spec/unit/adapters/postgres_adapter_spec.rb", "spec/unit/associations/many_to_many_spec.rb", "spec/unit/associations/many_to_one_spec.rb", "spec/unit/associations/one_to_many_spec.rb", "spec/unit/associations/one_to_one_spec.rb", "spec/unit/associations/relationship_spec.rb", "spec/unit/associations_spec.rb", "spec/unit/auto_migrations_spec.rb", "spec/unit/collection_spec.rb", "spec/unit/data_mapper_spec.rb", "spec/unit/identity_map_spec.rb", "spec/unit/is_spec.rb", "spec/unit/migrator_spec.rb", "spec/unit/model_spec.rb", "spec/unit/naming_conventions_spec.rb", "spec/unit/property_set_spec.rb", "spec/unit/property_spec.rb", "spec/unit/query_spec.rb", "spec/unit/repository_spec.rb", "spec/unit/resource_spec.rb", "spec/unit/scope_spec.rb", "spec/unit/transaction_spec.rb", "spec/unit/type_map_spec.rb", "spec/unit/type_spec.rb", "tasks/ci.rb", "tasks/dm.rb", "tasks/doc.rb", "tasks/gemspec.rb", "tasks/hoe.rb", "tasks/install.rb"]
+  s.has_rdoc = true
+  s.homepage = %q{http://datamapper.org}
+  s.rdoc_options = ["--main", "README.txt"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{datamapper}
+  s.rubygems_version = %q{1.2.0}
+  s.summary = %q{An Object/Relational Mapper for Ruby}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if current_version >= 3 then
+      s.add_runtime_dependency(%q<data_objects>, ["~> 0.9.7"])
+      s.add_runtime_dependency(%q<extlib>, ["~> 0.9.8"])
+      s.add_runtime_dependency(%q<rspec>, [">= 1.1.3"])
+      s.add_runtime_dependency(%q<addressable>, ["~> 2.0"])
+    else
+      s.add_dependency(%q<data_objects>, ["~> 0.9.7"])
+      s.add_dependency(%q<extlib>, ["~> 0.9.8"])
+      s.add_dependency(%q<rspec>, [">= 1.1.3"])
+      s.add_dependency(%q<addressable>, ["~> 2.0"])
+    end
+  else
+    s.add_dependency(%q<data_objects>, ["~> 0.9.7"])
+    s.add_dependency(%q<extlib>, ["~> 0.9.8"])
+    s.add_dependency(%q<rspec>, [">= 1.1.3"])
+    s.add_dependency(%q<addressable>, ["~> 2.0"])
+  end
+end

data/lib/dm-core.rb

@@ -17,10 +17,10 @@ require 'yaml'
 
 require 'rubygems'
 
-gem 'addressable', '>=1.0.4'
+gem 'addressable', '~>2.0'
 require 'addressable/uri'
 
-gem 'extlib', '>=0.9.5'
+gem 'extlib', '~>0.9.8'
 require 'extlib'
 require "extlib/inflection"
 

data/lib/dm-core/adapters/data_objects_adapter.rb

@@ -1,4 +1,4 @@
-gem 'data_objects', '>=0.9.5'
+gem 'data_objects', '~>0.9.7'
 require 'data_objects'
 
 module DataMapper
@@ -125,16 +125,18 @@ module DataMapper
           return uri_or_options
         end
 
-        adapter  = uri_or_options.delete(:adapter).to_s
-        user     = uri_or_options.delete(:username)
-        password = uri_or_options.delete(:password)
-        host     = uri_or_options.delete(:host)
-        port     = uri_or_options.delete(:port)
-        database = uri_or_options.delete(:database)
-        query    = uri_or_options.to_a.map { |pair| pair * '=' } * '&'
-        query    = nil if query == ''
+        query = uri_or_options.except(:adapter, :username, :password, :host, :port, :database).map { |pair| pair.join('=') }.join('&')
+        query = nil if query.blank?
 
-        return DataObjects::URI.parse(Addressable::URI.new(adapter, user, password, host, port, database, query, nil))
+        return DataObjects::URI.parse(Addressable::URI.new(
+          :scheme   => uri_or_options[:adapter].to_s,
+          :user     => uri_or_options[:username],
+          :password => uri_or_options[:password],
+          :host     => uri_or_options[:host],
+          :port     => uri_or_options[:port],
+          :path     => uri_or_options[:database],
+          :query    => query
+        ))
       end
 
       # TODO: clean up once transaction related methods move to dm-more/dm-transactions

data/lib/dm-core/adapters/mysql_adapter.rb

@@ -1,4 +1,4 @@
-gem 'do_mysql', '>=0.9.5'
+gem 'do_mysql', '~>0.9.7'
 require 'do_mysql'
 
 module DataMapper

data/lib/dm-core/adapters/postgres_adapter.rb

@@ -1,4 +1,4 @@
-gem 'do_postgres', '>=0.9.5'
+gem 'do_postgres', '~>0.9.7'
 require 'do_postgres'
 
 module DataMapper

data/lib/dm-core/adapters/sqlite3_adapter.rb

@@ -1,4 +1,4 @@
-gem 'do_sqlite3', '>=0.9.5'
+gem 'do_sqlite3', '~>0.9.7'
 require 'do_sqlite3'
 
 module DataMapper

data/lib/dm-core/auto_migrations.rb

@@ -73,12 +73,8 @@ module DataMapper
     # @api private
     def auto_migrate_down!(repository_name = self.repository_name)
       # repository_name ||= default_repository_name
-      if self.superclass != Object
-        self.superclass.auto_migrate!(repository_name)
-      else
-        repository(repository_name) do |r|
-          r.adapter.destroy_model_storage(r, self)
-        end
+      repository(repository_name) do |r|
+        r.adapter.destroy_model_storage(r, self.base_model)
       end
     end
 
@@ -88,12 +84,8 @@ module DataMapper
     # @param Symbol repository_name the repository to be migrated
     # @api private
     def auto_migrate_up!(repository_name = self.repository_name)
-      if self.superclass != Object
-        self.superclass.auto_migrate!(repository_name)
-      else
-        repository(repository_name) do |r|
-          r.adapter.create_model_storage(r, self)
-        end
+      repository(repository_name) do |r|
+        r.adapter.create_model_storage(r, self.base_model)
       end
     end
 

data/lib/dm-core/model.rb

@@ -362,7 +362,7 @@ module DataMapper
 
     # TODO: spec this
     def to_query(repository, key, query = {})
-      conditions = Hash[ *self.key(repository_name).zip(key).flatten ]
+      conditions = Hash[ *self.key(repository.name).zip(key).flatten ]
       Query.new(repository, self, query.merge(conditions))
     end
 

data/lib/dm-core/query.rb

@@ -51,10 +51,11 @@ module DataMapper
       @limit        = other.limit         unless other.limit         == nil
       @order        = other.order         unless other.order         == model.default_order
       @add_reversed = other.add_reversed? unless other.add_reversed? == false
-      @fields       = other.fields        unless other.fields        == @properties.defaults
       @links        = other.links         unless other.links         == []
       @includes     = other.includes      unless other.includes      == []
 
+      @fields == @properties.defaults ? @fields = other.fields : @fields |= other.fields
+
       update_conditions(other)
 
       self

data/lib/dm-core/version.rb

@@ -1,3 +1,3 @@
 module DataMapper
-  VERSION = '0.9.6' unless defined?(DataMapper::VERSION)
+  VERSION = '0.9.7' unless defined?(DataMapper::VERSION)
 end

data/spec/integration/auto_migrations_spec.rb

@@ -39,7 +39,10 @@ class EveryType
 end
 
 module Publications
-  class ShortStoryCollection
+  class StoryCollection
+  end
+
+  class ShortStoryCollection < StoryCollection
     include DataMapper::Resource
     property :serial, Serial
     property :date,   Date,    :nullable => false, :default => TODAY, :index => :date_date_time
@@ -153,6 +156,10 @@ if HAS_SQLITE3
         end
       end
 
+      it 'should handle a model which inherits from a regular object' do
+        lambda { Publications::ShortStoryCollection.auto_migrate!(:sqlite3) }.should_not raise_error
+      end
+
       it 'should escape a namespaced model' do
         Publications::ShortStoryCollection.auto_migrate!(:sqlite3).should be_true
         @adapter.query('SELECT "name" FROM "sqlite_master" WHERE type = ?', 'table').should include('publications_short_story_collections')
@@ -259,6 +266,10 @@ if HAS_MYSQL
         end
       end
 
+      it 'should handle a model which inherits from a regular object' do
+        lambda { Publications::ShortStoryCollection.auto_migrate!(:mysql) }.should_not raise_error
+      end
+
       it 'should escape a namespaced model' do
         Publications::ShortStoryCollection.auto_migrate!(:mysql).should be_true
         @adapter.query('SHOW TABLES').should include('publications_short_story_collections')
@@ -389,6 +400,10 @@ if HAS_POSTGRES
         pending 'TODO'
       end
 
+      it 'should handle a model which inherits from a regular object' do
+        lambda { Publications::ShortStoryCollection.auto_migrate!(:postgres) }.should_not raise_error
+      end
+
       it 'should escape a namespaced model' do
         Publications::ShortStoryCollection.auto_migrate!(:postgres).should be_true
         @adapter.query('SELECT "tablename" FROM "pg_tables" WHERE "tablename" NOT LIKE ?', 'pg_%').should include('publications_short_story_collections')

data/spec/unit/associations/many_to_one_spec.rb

@@ -19,7 +19,7 @@ describe DataMapper::Associations::ManyToOne::Proxy do
 
   before do
     @child        = mock('child', :kind_of? => true)
-    @parent       = mock('parent')
+    @parent       = mock('parent', :nil? => false, :new_record? => false)
     @relationship = mock('relationship', :kind_of? => true, :get_parent => @parent, :attach_parent => nil)
     @association  = DataMapper::Associations::ManyToOne::Proxy.new(@relationship, @child)
 
@@ -62,7 +62,7 @@ describe DataMapper::Associations::ManyToOne::Proxy do
   describe '#save' do
     describe 'when the parent is nil' do
       before do
-        @parent.should_receive(:nil?).with(no_args).and_return(true)
+        @parent.stub!(:nil?).and_return(true)
       end
 
       it 'should not save the parent' do

data/spec/unit/model_spec.rb

@@ -1,15 +1,18 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
 describe 'DataMapper::Model' do
-  module ModelSpec
-    class Resource
-      include DataMapper::Resource
+  before do
+    Object.send(:remove_const, :ModelSpec) if defined?(ModelSpec)
+    module ModelSpec
+      class Resource
+        include DataMapper::Resource
 
-      storage_names[:legacy] = 'legacy_resource'
+        storage_names[:legacy] = 'legacy_resource'
 
-      property :id,   Serial
-      property :name, String
-      property :type, Discriminator
+        property :id,   Serial
+        property :name, String
+        property :type, Discriminator
+      end
     end
   end
 
@@ -87,7 +90,7 @@ describe 'DataMapper::Model' do
   describe '#storage_names' do
     it 'should return a Hash mapping each repository to a storage location' do
       ModelSpec::Resource.storage_names.should be_kind_of(Hash)
-      ModelSpec::Resource.storage_names.should == { :default => 'model_spec_resources', :legacy => 'legacy_resource' }
+      ModelSpec::Resource.storage_names.should == { :legacy => 'legacy_resource' }
     end
   end
 
@@ -165,12 +168,7 @@ describe 'DataMapper::Model' do
 
   describe '#storage_exists?' do
     it 'should return whether or not the storage exists' do
-      ModelSpec::Resource.should_receive(:repository).with(:default) do
-        repository = mock('repository')
-        repository.should_receive(:storage_exists?).with('model_spec_resources').and_return(true)
-        repository
-      end
-      ModelSpec::Resource.storage_exists?.should == true
+      ModelSpec::Resource.storage_exists?.should == false
     end
   end
 

data/spec/unit/query_spec.rb

@@ -219,6 +219,17 @@ describe DataMapper::Query do
       @query.update(other).should == @query
     end
 
+    it "should merge #fields if :fields != model.properties.defaults" do
+      other = DataMapper::Query.new(@repository, Article, :fields => [ :blog_id ])
+      @query.update(other).fields.should == Article.properties.slice(:id, :author, :blog_id)
+    end
+
+    it "should replace #fields if fields == model.properties.defaults" do
+      query = DataMapper::Query.new(@repository, Article, :fields => Article.properties.defaults.map { |property| property.name })
+      other = DataMapper::Query.new(@repository, Article, :fields => [ :blog_id ])
+      query.update(other).fields.should == Article.properties.slice(:blog_id)
+    end
+
     describe 'should overwrite the attribute' do
       it '#reload? with other reload?' do
         other = DataMapper::Query.new(@repository, Article, :reload => true)
@@ -303,11 +314,6 @@ describe DataMapper::Query do
         end
       end
 
-      it "#fields with other fields unique values" do
-        other = DataMapper::Query.new(@repository, Article, :fields => [ :blog_id ])
-        @query.update(other).fields.should == Article.properties.slice(:blog_id)
-      end
-
       it '#conditions with other conditions when they are unique' do
         # set the initial conditions
         @query.update(:title => 'On DataMapper')

data/spec/unit/transaction_spec.rb

@@ -240,9 +240,9 @@ describe DataMapper::Transaction do
         @transaction_primitive.should_receive(:begin)
         @transaction_primitive.should_receive(:rollback)
         @transaction_primitive.should_receive(:close)
-        p = Proc.new do raise "test exception, never mind me" end
-        @transaction.should_receive(:within).with(&p)
-        lambda do @transaction.commit(&p) end.should raise_error(Exception, /test exception, never mind me/)
+        p = Proc.new do end
+        @transaction.should_receive(:within).with(&p).and_raise(Exception.new('test exception, never mind me'))
+        lambda { @transaction.commit(&p) }.should raise_error(Exception, /test exception, never mind me/)
       end
     end
   end
@@ -280,8 +280,8 @@ describe DataMapper::Transaction do
   describe "#method_missing" do
     before :each do
       @transaction = DataMapper::Transaction.new(@adapter, @repository)
-      @adapter.should_receive(:is_a?).any_number_of_times.with(Spec::Mocks::AnyArgsConstraint).and_return(false)
-      @adapter.should_receive(:is_a?).any_number_of_times.with(Spec::Mocks::NoArgsConstraint).and_return(false)
+      @adapter.should_receive(:is_a?).any_number_of_times.with(any_args).and_return(false)
+      @adapter.should_receive(:is_a?).any_number_of_times.with(no_args).and_return(false)
       @adapter.should_receive(:is_a?).any_number_of_times.with(Regexp).and_return(false)
     end
     it "should delegate calls to [a method we have]_if_[state](adapter) to [a method we have](adapter) if state of adapter is [state]" do
@@ -326,11 +326,11 @@ describe DataMapper::Transaction do
   describe "#each_adapter" do
     before :each do
       @transaction = DataMapper::Transaction.new(@adapter, @repository)
-      @adapter.should_receive(:is_a?).any_number_of_times.with(Spec::Mocks::AnyArgsConstraint).and_return(false)
-      @adapter.should_receive(:is_a?).any_number_of_times.with(Spec::Mocks::NoArgsConstraint).and_return(false)
+      @adapter.should_receive(:is_a?).any_number_of_times.with(any_args).and_return(false)
+      @adapter.should_receive(:is_a?).any_number_of_times.with(no_args).and_return(false)
       @adapter.should_receive(:is_a?).any_number_of_times.with(Regexp).and_return(false)
-      @repository_adapter.should_receive(:is_a?).any_number_of_times.with(Spec::Mocks::AnyArgsConstraint).and_return(false)
-      @repository_adapter.should_receive(:is_a?).any_number_of_times.with(Spec::Mocks::NoArgsConstraint).and_return(false)
+      @repository_adapter.should_receive(:is_a?).any_number_of_times.with(any_args).and_return(false)
+      @repository_adapter.should_receive(:is_a?).any_number_of_times.with(no_args).and_return(false)
       @repository_adapter.should_receive(:is_a?).any_number_of_times.with(Regexp).and_return(false)
     end
     it "should send the first argument to itself once for each adapter" do
@@ -386,8 +386,8 @@ describe DataMapper::Transaction do
   describe "#do_adapter" do
     before :each do
       @transaction = DataMapper::Transaction.new(@adapter, @repository)
-      @adapter.should_receive(:is_a?).any_number_of_times.with(Spec::Mocks::AnyArgsConstraint).and_return(false)
-      @adapter.should_receive(:is_a?).any_number_of_times.with(Spec::Mocks::NoArgsConstraint).and_return(false)
+      @adapter.should_receive(:is_a?).any_number_of_times.with(any_args).and_return(false)
+      @adapter.should_receive(:is_a?).any_number_of_times.with(no_args).and_return(false)
       @adapter.should_receive(:is_a?).any_number_of_times.with(Regexp).and_return(false)
     end
     it "should raise if there is no connection for the adapter" do
@@ -447,8 +447,8 @@ describe DataMapper::Transaction do
       @other_adapter = mock("adapter")
       @other_adapter.should_receive(:is_a?).any_number_of_times.with(Array).and_return(false)
       @other_adapter.should_receive(:is_a?).any_number_of_times.with(DataMapper::Adapters::AbstractAdapter).and_return(true)
-      @other_adapter.should_receive(:is_a?).any_number_of_times.with(Spec::Mocks::AnyArgsConstraint).and_return(false)
-      @other_adapter.should_receive(:is_a?).any_number_of_times.with(Spec::Mocks::NoArgsConstraint).and_return(false)
+      @other_adapter.should_receive(:is_a?).any_number_of_times.with(any_args).and_return(false)
+      @other_adapter.should_receive(:is_a?).any_number_of_times.with(no_args).and_return(false)
       @other_adapter.should_receive(:is_a?).any_number_of_times.with(Regexp).and_return(false)
       @transaction = DataMapper::Transaction.new(@other_adapter)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-core
 version: !ruby/object:Gem::Version 
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors: 
 - Sam Smoot
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-12 00:00:00 -06:00
+date: 2008-11-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,9 +18,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.5
+        version: 0.9.7
     version: 
 - !ruby/object:Gem::Dependency 
   name: extlib
@@ -28,9 +28,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.5
+        version: 0.9.8
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -48,9 +48,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.4
+        version: "2.0"
     version: 
 description: Faster, Better, Simpler.
 email: 
@@ -65,6 +65,7 @@ extra_rdoc_files:
 - README.txt
 files: 
 - .autotest
+- .gitignore
 - CONTRIBUTING
 - FAQ
 - History.txt
@@ -75,6 +76,7 @@ files:
 - Rakefile
 - SPECS
 - TODO
+- dm-core.gemspec
 - lib/dm-core.rb
 - lib/dm-core/adapters.rb
 - lib/dm-core/adapters/abstract_adapter.rb
@@ -215,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: An Object/Relational Mapper for Ruby