dm-core 0.9.4 → 0.9.5

data/Rakefile

@@ -13,7 +13,7 @@ AUTHOR = "Sam Smoot"
 EMAIL  = "ssmoot@gmail.com"
 GEM_NAME = "dm-core"
 GEM_VERSION = DataMapper::VERSION
-GEM_DEPENDENCIES = ["data_objects", GEM_VERSION], ["extlib", "=0.9.4"],
+GEM_DEPENDENCIES = ["data_objects", ">=0.9.5"], ["extlib", ">=0.9.5"],
                    ["rspec", ">=1.1.3"], ["addressable", ">=1.0.4"]
 
 

data/lib/dm-core.rb

@@ -20,7 +20,7 @@ require 'rubygems'
 gem 'addressable', '>=1.0.4'
 require 'addressable/uri'
 
-gem 'extlib', '=0.9.4'
+gem 'extlib', '>=0.9.5'
 require 'extlib'
 
 begin

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

@@ -1,4 +1,4 @@
-gem 'data_objects', '=0.9.4'
+gem 'data_objects', '=0.9.5'
 require 'data_objects'
 
 module DataMapper
@@ -265,7 +265,7 @@ module DataMapper
 
           statement = ''
 
-          query.links.each do |relationship|
+          query.links.reverse.each do |relationship|
             parent_table_name = relationship.parent_model.storage_name(query.repository.name)
             child_table_name  = relationship.child_model.storage_name(query.repository.name)
 

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

@@ -1,4 +1,4 @@
-gem 'do_mysql', '=0.9.4'
+gem 'do_mysql', '=0.9.5'
 require 'do_mysql'
 
 module DataMapper

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

@@ -1,4 +1,4 @@
-gem 'do_postgres', '=0.9.4'
+gem 'do_postgres', '=0.9.5'
 require 'do_postgres'
 
 module DataMapper

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

@@ -1,4 +1,4 @@
-gem 'do_sqlite3', '=0.9.4'
+gem 'do_sqlite3', '=0.9.5'
 require 'do_sqlite3'
 
 module DataMapper

data/lib/dm-core/model.rb

@@ -148,7 +148,7 @@ module DataMapper
       create_property_getter(property)
       create_property_setter(property)
 
-      @properties[repository_name] << property
+      @properties[repository_name][property.name] = property
 
       # Add property to the other mappings as well if this is for the default
       # repository.

data/lib/dm-core/property_set.rb

@@ -7,6 +7,16 @@ module DataMapper
       @property_for[name] || raise(ArgumentError, "Unknown property '#{name}'", caller)
     end
 
+    def []=(name, property)
+      if existing_property = detect { |p| p.name == name }
+        property.hash
+        @entries[@entries.index(existing_property)] = property
+      else
+        add(property)
+      end
+      property
+    end
+
     def has_property?(name)
       !!@property_for[name]
     end

data/lib/dm-core/version.rb

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

data/spec/integration/association_spec.rb

@@ -416,7 +416,7 @@ if ADAPTER
         a = Area.new(:machine_id => m.id)
         a.machine.should == m
       end
-      
+
       it "should not have a machine when orphaned" do
         a = Area.new(:machine_id => 42)
         a.machine.should be_nil
@@ -1168,6 +1168,11 @@ if ADAPTER
       # misc
       #
 
+      it 'should join tables in the right order during has 1 => has n => has 1 queries' do
+        child = Sweets::Shop.first.children(:name => 'Snotling nr 3').booger(:name.like => 'ooger')
+        child.should_not be_nil
+      end
+
       it 'should raise exception if you try to change it' do
         lambda do
           Sweets::Shop.first.wife = Sweets::Wife.new(:name => 'Larry')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-core
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors: 
 - Sam Smoot
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-21 00:00:00 -05:00
+date: 2008-08-26 00:00:00 -05: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.4
+        version: 0.9.5
     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.4
+        version: 0.9.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec