orm_adapter 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -29,6 +29,9 @@ GEM
       dm-types (= 1.0.2)
       dm-validations (= 1.0.2)
     diff-lcs (1.1.2)
+    dm-active_model (1.0.2)
+      activemodel (~> 3.0.0)
+      dm-core (~> 1.0.2)
     dm-aggregates (1.0.2)
       dm-core (~> 1.0.2)
     dm-constraints (1.0.2)
@@ -106,10 +109,11 @@ PLATFORMS
 DEPENDENCIES
   activerecord (~> 3.0.0)
   datamapper
+  dm-active_model
   dm-sqlite-adapter
   jeweler
   mongoid (~> 2.0.0.beta.17)
   rake
-  rspec (~> 2.0.0.beta.22)
+  rspec (~> 2.0.0.rc)
   sqlite3-ruby
   yard

data/History.txt

@@ -1,4 +1,12 @@
-== master
+== 0.0.3
+  
+  * ActiveRecord's OrmAdapter handles non standard foreign key names [Ian White]
+  * fix ruby 1.9.2 problems. [Ian White]
+    - removes "can't add a new key into hash during iteration" problem with ActiveRecord OrmAdapter
+    - removes problem with rspec 2 mocks interacting with ruby 1.9.2 #to_ary
+
+
+== 0.0.2
 
   * Add #get to the API. Ensure both #get and #get! complies with to_key requirements. [José Valim]
   * Extract tests into shared example. Give instructions on how to write a new adapter. [Ian White]

data/lib/orm_adapter/adapters/active_record.rb

@@ -64,14 +64,16 @@ class ActiveRecord::Base
 
     # Introspects the klass to convert and objects in conditions into foreign key and type fields
     def conditions_to_fields(conditions)
-      conditions = conditions.dup
+      fields = {}
       conditions.each do |key, value|
-        if value.is_a?(ActiveRecord::Base) && klass.column_names.include?("#{key}_id")
-          conditions.delete(key)
-          conditions["#{key}_id"]   = value.id          
-          conditions["#{key}_type"] = value.class.base_class.name if klass.column_names.include?("#{key}_type")
+        if value.is_a?(ActiveRecord::Base) && (assoc = klass.reflect_on_association(key.to_sym)) && assoc.belongs_to?
+          fields[assoc.primary_key_name] = value.send(value.class.primary_key)          
+          fields[assoc.options[:foreign_type]] = value.class.base_class.name.to_s if assoc.options[:polymorphic]
+        else
+          fields[key] = value
         end
       end
+      fields
     end
   end
 end

data/lib/orm_adapter/version.rb

@@ -1,3 +1,3 @@
 module OrmAdapter
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/orm_adapter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{orm_adapter}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ian White", "Jose Valim"]
-  s.date = %q{2010-10-10}
+  s.date = %q{2010-10-12}
   s.description = %q{Provides a single point of entry for using basic features of ruby ORMs}
   s.email = %q{ian.w.white@gmail.com}
   s.extra_rdoc_files = [

data/spec/orm_adapter/adapters/active_record_spec.rb

@@ -42,7 +42,7 @@ else
         end
 
         specify "#model_classes should return all of the non abstract model classes (that are not in except_classes)" do
-          subject.model_classes.should == [User, Note]
+          subject.model_classes.should include(User, Note)
         end
       end
     
@@ -50,6 +50,26 @@ else
         let(:user_class) { User }
         let(:note_class) { Note }
       end
+      
+      describe "#conditions_to_fields" do
+        describe "with non-standard association keys" do
+          class PerverseNote < Note
+            belongs_to :user, :foreign_key => 'owner_id'
+            belongs_to :pwner, :polymorphic => true, :foreign_key => 'owner_id', :foreign_type => 'owner_type'
+          end
+          
+          let(:user) { User.create! }
+          let(:adapter) { PerverseNote.to_adapter }
+          
+          it "should convert polymorphic object in conditions to the appropriate fields" do
+            adapter.send(:conditions_to_fields, :pwner => user).should == {'owner_id' => user.id, 'owner_type' => user.class.name}
+          end
+          
+          it "should convert belongs_to object in conditions to the appropriate fields" do
+            adapter.send(:conditions_to_fields, :user => user).should == {'owner_id' => user.id}
+          end
+        end
+      end
     end
   end
 end

data/spec/orm_adapter_spec.rb

@@ -9,7 +9,7 @@ describe OrmAdapter do
     its(:adapters) { should include(adapter) }
     
     describe "and the adapter has a model class" do
-      let(:model) { mock('model class') }
+      let(:model) { Class.new }
       
       before { adapter.stub!(:model_classes).and_return([model]) }
       

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: orm_adapter
 version: !ruby/object:Gem::Version 
-  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Ian White
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-10 00:00:00 +02:00
+date: 2010-10-12 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -65,7 +64,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -74,7 +72,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"