dm-core 0.9.3 → 0.9.4

data/spec/integration/resource_spec.rb

@@ -7,15 +7,15 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
 if ADAPTER
   describe "DataMapper::Resource with #{ADAPTER}" do
-    
+
     load_models_for_metaphor :zoo
-    
+
     before(:each) do
       DataMapper.auto_migrate!(ADAPTER)
       @zoo = Zoo.new(:name => "San Francisco")
       repository(ADAPTER) { @zoo.save }
     end
-    
+
   # --- Move somewhere ----
     it "should be able to destroy objects" do
       lambda { @zoo.destroy.should be_true }.should_not raise_error
@@ -47,7 +47,7 @@ if ADAPTER
         zoo.name = "San Francisco"
       end
     end
-    
+
     describe '#eql?' do
       it "should return true if the objects are the same instances"
       it "should return false if the other object is not an instance of the same model"
@@ -56,19 +56,68 @@ if ADAPTER
       it "should return true if all the properties are the same"
       it "should return false if any of the properties are different"
     end
-    
+
+    describe '#hash' do
+      it "should return the same hash values for unsaved objects that are equal" do
+        e1 = Employee.new(:name => "John")
+        e2 = Employee.new(:name => "John")
+        e1.hash.should == e2.hash
+      end
+
+      it "should return the same hash values for saved objects that are equal" do
+        # Make sure that the object_id's are not the same
+        e1 = e2 = nil
+        repository(ADAPTER) do
+          e1 = Employee.create(:name => "John")
+        end
+        repository(ADAPTER) do
+          e2 = Employee.get("John")
+        end
+        e1.hash.should == e2.hash
+      end
+
+      it "should return a different hash value for different objects of the same type" do
+        e1 = Employee.create(:name => "John")
+        e2 = Employee.create(:name => "Dan")
+        e1.hash.should_not == e2.hash
+      end
+
+      it "should return a different hash value for different types of objects with the same key"
+    end
+
     describe '#id' do
       it "should be awesome"
     end
-    
+
     describe '#inspect' do
       it "should return a string representing the object"
     end
-    
+
     describe '#key' do
-      it "should be awesome"
+      describe "original_value[:key]" do
+        it "should be used when an existing resource's key changes" do
+          employee = Employee.create(:name => "John")
+          employee.name = "Jon"
+          employee.key.should == ["John"]
+        end
+
+        it "should be used when saving an existing resource" do
+          repository(ADAPTER) do
+            employee = Employee.create(:name => "John")
+            employee.name = "Jon"
+            employee.save.should == true
+            Employee.get("Jon").should == employee
+          end
+        end
+
+        it "should not be used when a new resource's key changes" do
+          employee = Employee.new(:name => "John")
+          employee.name = "Jon"
+          employee.key.should == ["Jon"]
+        end
+      end
     end
-    
+
     describe '#pretty_print' do
       it "should display a pretty version of inspect"
     end
@@ -86,7 +135,7 @@ if ADAPTER
       end
 
     end
-    
+
     describe '#repository' do
       it "should return the repository associated with the object if there is one"
       it "should return the repository associated with the model if the object doesn't have one"

data/spec/integration/sti_spec.rb

@@ -38,6 +38,29 @@ if HAS_SQLITE3
       end
     end
 
+    describe "with the identity map" do
+      before :all do
+        Book.auto_migrate!(:sqlite3)
+        repository(:sqlite3) do
+          Propaganda.create(:title => "Something", :isbn => "129038")
+        end
+      end
+
+      it "should find the base model in the identity map" do
+        repository(:sqlite3) do
+          book = Book.first
+          book.object_id.should == Propaganda.first.object_id
+        end
+      end
+
+      it "should find the child model in the identity map" do
+        repository(:sqlite3) do
+          book = Propaganda.first
+          book.object_id.should == Book.first.object_id
+        end
+      end
+    end
+
     describe "with a parent class" do
       before :all do
         Book.auto_migrate!(:sqlite3).should be_true

data/spec/models/zoo.rb

@@ -9,7 +9,7 @@ class Zoo
   property :size,         Integer
 
   has n, :animals
-  
+
   def to_s
     name
   end
@@ -39,8 +39,7 @@ end
 class Employee
   include DataMapper::Resource
 
-  property :id,   Serial
-  property :name, String
+  property :name, String, :key => true
 end
 
 class Keeper < Employee

data/spec/spec_helper.rb

@@ -16,6 +16,14 @@ end
   DataMapper.setup(repository_name, "mock://localhost/#{repository_name}")
 end
 
+# These environment variables will override the default connection string:
+#   MYSQL_SPEC_URI
+#   POSTGRES_SPEC_URI
+#   SQLITE3_SPEC_URI
+#
+# For example, in the bash shell, you might use:
+#   export MYSQL_SPEC_URI="mysql://localhost/dm_core_test?socket=/opt/local/var/run/mysql5/mysqld.sock"
+#
 def setup_adapter(name, default_uri)
   begin
     DataMapper.setup(name, ENV["#{name.to_s.upcase}_SPEC_URI"] || default_uri)
@@ -66,7 +74,7 @@ end
 
 class Comment
   include DataMapper::Resource
-  
+
   property :id,         Serial # blah
 end
 

data/spec/unit/adapters/postgres_adapter_spec.rb

@@ -115,9 +115,17 @@ if HAS_POSTGRES
         end
       end
 
-      it 'should execute the superclass destroy_model_storage' do
+      it 'should not execute the superclass destroy_model_storage if the storage does not exist' do
         rv = mock('inside super')
         @adapter.class.superclass.send(:define_method, :destroy_model_storage) { rv }
+        @adapter.destroy_model_storage(@repository, @model).should_not == rv
+      end
+
+      it 'should execute the superclass destroy_model_storage if the storage exists' do
+        rv = mock('inside super')
+        @adapter.class.superclass.send(:define_method, :destroy_model_storage) { rv }
+        @adapter.stub!(:storage_exists?).and_return(true)
+
         @adapter.destroy_model_storage(@repository, @model).should == rv
       end
     end

data/spec/unit/associations/many_to_one_spec.rb

@@ -101,7 +101,13 @@ describe DataMapper::Associations::ManyToOne::Proxy do
       end
 
       it 'should return the result of the save' do
+        child_key = mock("child_key")
+        child_key.should_receive(:set).and_return(true)
+        parent_key = mock("parent_key")
+        parent_key.should_receive(:get).and_return(1)
         @relationship.should_receive(:with_repository).and_yield(@repository)
+        @relationship.should_receive(:child_key).and_return(child_key)
+        @relationship.should_receive(:parent_key).and_return(parent_key)
         save_results = mock('save results')
         @parent.should_receive(:save).with(no_args).and_return(save_results)
         @association.save.object_id.should == save_results.object_id

data/spec/unit/auto_migrations_spec.rb

@@ -85,7 +85,8 @@ describe DataMapper::AutoMigrations do
 
       models.each do |model|
         DataMapper::Resource.descendants << model
-        model.should_receive(:auto_migrate!).with(@repository_name)
+        model.should_receive(:auto_migrate_down!).with(@repository_name)
+        model.should_receive(:auto_migrate_up!).with(@repository_name)
       end
 
       DataMapper::AutoMigrator.auto_migrate(@repository_name)

data/spec/unit/naming_conventions_spec.rb

@@ -1,28 +1,36 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
 describe "DataMapper::NamingConventions" do
-  it "should coerce a string into the Underscored convention" do
-    DataMapper::NamingConventions::Underscored.call('User').should == 'user'
-    DataMapper::NamingConventions::Underscored.call('UserAccountSetting').should == 'user_account_setting'
-  end
+  describe "Resource" do
+    it "should coerce a string into the Underscored convention" do
+      DataMapper::NamingConventions::Resource::Underscored.call('User').should == 'user'
+      DataMapper::NamingConventions::Resource::Underscored.call('UserAccountSetting').should == 'user_account_setting'
+    end
 
-  it "should coerce a string into the UnderscoredAndPluralized convention" do
-    DataMapper::NamingConventions::UnderscoredAndPluralized.call('User').should == 'users'
-    DataMapper::NamingConventions::UnderscoredAndPluralized.call('UserAccountSetting').should == 'user_account_settings'
-  end
+    it "should coerce a string into the UnderscoredAndPluralized convention" do
+      DataMapper::NamingConventions::Resource::UnderscoredAndPluralized.call('User').should == 'users'
+      DataMapper::NamingConventions::Resource::UnderscoredAndPluralized.call('UserAccountSetting').should == 'user_account_settings'
+    end
 
-  it "should coerce a string into the UnderscoredAndPluralized convention joining namespace with underscore" do
-    DataMapper::NamingConventions::UnderscoredAndPluralized.call('Model::User').should == 'model_users'
-    DataMapper::NamingConventions::UnderscoredAndPluralized.call('Model::UserAccountSetting').should == 'model_user_account_settings'
-  end
+    it "should coerce a string into the UnderscoredAndPluralized convention joining namespace with underscore" do
+      DataMapper::NamingConventions::Resource::UnderscoredAndPluralized.call('Model::User').should == 'model_users'
+      DataMapper::NamingConventions::Resource::UnderscoredAndPluralized.call('Model::UserAccountSetting').should == 'model_user_account_settings'
+    end
+
+    it "should coerce a string into the  UnderscoredAndPluralizedWithoutModule convention" do
+      DataMapper::NamingConventions::Resource::UnderscoredAndPluralizedWithoutModule.call('Model::User').should == 'users'
+      DataMapper::NamingConventions::Resource::UnderscoredAndPluralizedWithoutModule.call('Model::UserAccountSetting').should == 'user_account_settings'
+    end
 
-  it "should coerce a string into the  UnderscoredAndPluralizedWithoutModule convention" do
-    DataMapper::NamingConventions::UnderscoredAndPluralizedWithoutModule.call('Model::User').should == 'users'
-    DataMapper::NamingConventions::UnderscoredAndPluralizedWithoutModule.call('Model::UserAccountSetting').should == 'user_account_settings'
+    it "should coerce a string into the Yaml convention" do
+      DataMapper::NamingConventions::Resource::Yaml.call('UserSetting').should == 'user_settings.yaml'
+      DataMapper::NamingConventions::Resource::Yaml.call('User').should == 'users.yaml'
+    end
   end
 
-  it "should coerce a string into the Yaml convention" do
-    DataMapper::NamingConventions::Yaml.call('UserSetting').should == 'user_settings.yaml'
-    DataMapper::NamingConventions::Yaml.call('User').should == 'users.yaml'
+  describe "Field" do
+    it "should accept a property as input" do
+      DataMapper::NamingConventions::Field::Underscored.call(Article.blog_id).should == 'blog_id'
+    end
   end
 end

data/spec/unit/property_spec.rb

@@ -292,10 +292,9 @@ describe DataMapper::Property do
     Potato.new().should respond_to(:public?)
   end
 
-  it "should raise an ArgumentError when created with an invalid option" do
-    lambda{
-      DataMapper::Property.new(Tomato,:botanical_name,String,{:foo=>:bar})
-    }.should raise_error(ArgumentError)
+  it "should move unknown options into Property#extra_options" do
+    d = DataMapper::Property.new(Tomato,:botanical_name,String,{:foo=>:bar})
+    d.extra_options.should == {:foo => :bar}
   end
 
   it 'should return the attribute value from a given instance' do

data/spec/unit/resource_spec.rb

@@ -1,9 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
-# rSpec completely FUBARs everything if you give it a Module here.
-# So we give it a String of the module name instead.
-# DO NOT CHANGE THIS!
-describe "DataMapper::Resource" do
+describe DataMapper::Resource do
 
   load_models_for_metaphor :zoo
 
@@ -72,20 +69,6 @@ class Planet
   end
 end
 
-class BlackHole
-  include DataMapper::Resource
-
-  property :id, Integer, :key => true
-  property :data, Object, :reader => :private
-end
-
-class LegacyStar
-  include DataMapper::Resource
-  def self.default_repository_name
-    :legacy
-  end
-end
-
 class Phone
   include DataMapper::Resource
 
@@ -124,10 +107,7 @@ class Cyclist
   property :victories,  Integer
 end
 
-# rSpec completely FUBARs everything if you give it a Module here.
-# So we give it a String of the module name instead.
-# DO NOT CHANGE THIS!
-describe "DataMapper::Resource" do
+describe DataMapper::Resource do
 
   it 'should provide #save' do
     Planet.new.should respond_to(:save)
@@ -328,6 +308,23 @@ describe "DataMapper::Resource" do
     jupiter.attributes.should == attributes.merge(new_age)
   end
 
+  # Illustrates a possible controller situation, where an expected params
+  # key does not exist.
+  it "update_attributes(nil) should raise an exception" do
+    hincapie = Cyclist.new
+    params = {}
+    lambda {
+      hincapie.update_attributes(params[:does_not_exist])
+    }.should raise_error(ArgumentError)
+  end
+
+  it "update_attributes(:not_a_hash) should raise an exception" do
+    hincapie = Cyclist.new
+    lambda {
+      hincapie.update_attributes(:not_a_hash).should be_false
+    }.should raise_error(ArgumentError)
+  end
+
   # :core is a private accessor so Ruby should raise NameError
   it "should not be able to set private attributes" do
     lambda {

data/tasks/gemspec.rb

@@ -0,0 +1,23 @@
+desc "Generate gemspec"
+task :gemspec do |x|
+  # Clean up extraneous files before checking manifest
+  %x[rake clean]
+
+  # Check the manifest before generating the gemspec
+  manifest = %x[rake check_manifest]
+  manifest.gsub!("(in /usr/local/projects/dm/dm-core)\n", "")
+
+  unless manifest.empty?
+    print "\n", "#"*68, "\n"
+    print <<-EOS
+  Manifest.txt is not up-to-date. Please review the changes below.
+  If the changes are correct, run 'rake check_manifest | patch'
+  and then run this command again.
+EOS
+    print "#"*68, "\n\n"
+    puts manifest
+  else
+    %x[rake debug_gem > #{GEM_NAME}.gemspec]
+    puts "Successfully created gemspec for #{GEM_NAME}!"
+  end
+end

data/tasks/hoe.rb

@@ -19,6 +19,14 @@ Run 'rubyforge setup' to prepare your env for access to Rubyforge
   RUBYFORGE_USERNAME.replace @config["username"]
 end
 
+# Remove hoe dependency
+class Hoe
+  def extra_dev_deps
+    @extra_dev_deps.reject! { |dep| dep[0] == "hoe" }
+    @extra_dev_deps
+  end
+end
+
 hoe = Hoe.new(GEM_NAME, GEM_VERSION) do |p|
 
   p.developer(AUTHOR, EMAIL)
@@ -29,7 +37,7 @@ hoe = Hoe.new(GEM_NAME, GEM_VERSION) do |p|
 
   p.rubyforge_name = PROJECT_NAME if PROJECT_NAME
 
-  p.clean_globs |= ["{coverage,doc,log}/", "**/*.db", "profile_results.*", "**/.*.sw?", "*.gem", ".config", "**/.DS_Store"]
+  p.clean_globs |= ["{coverage,doc,log,tmp}", "**/*.{log,db}", "profile_results.*", "**/.DS_Store"]
 
   GEM_DEPENDENCIES.each do |dep|
     p.extra_deps << dep

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-core
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - Sam Smoot
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-24 00:00:00 -05:00
+date: 2008-08-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: extlib
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -52,16 +52,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.0.4
     version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.7.0
-    version: 
 description: Faster, Better, Simpler.
 email: 
 - ssmoot@gmail.com
@@ -75,6 +65,7 @@ extra_rdoc_files:
 - README.txt
 files: 
 - .autotest
+- CONTRIBUTING
 - FAQ
 - History.txt
 - MIT-LICENSE
@@ -195,6 +186,7 @@ files:
 - tasks/ci.rb
 - tasks/dm.rb
 - tasks/doc.rb
+- tasks/gemspec.rb
 - tasks/hoe.rb
 - tasks/install.rb
 has_rdoc: true