orm_adapter 0.0.6 → 0.0.7

data/History.txt

@@ -1,22 +1,27 @@
+== 0.0.7
+
+  * Lazy load Active Record [José Valim]
+
+
 == 0.0.6
 
-  * ActiveRecord 3.1 association compatibility [Ian White]
+  * Active Record 3.1 association compatibility [Ian White]
   * Compatibility with mongoid master wrt. OrmAdapter::Base#get [Frank Wöckener]. Closes #9 [Ian White]
 
 
 == 0.0.5
-  
+
   * Adds Mongo Mapper adapter [Luke Cunningham]
-  
+
 
 == 0.0.4
-  
+
   * Adds ability to order results from #find_first and #find_all [Ian White]
   * Rationalise development dependencies and release process [Ian White]
-  
+
 
 == 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

data/lib/orm_adapter/adapters/active_record.rb

@@ -4,11 +4,8 @@ rescue LoadError
   require 'active_record'
 end
 
-class ActiveRecord::Base
-  extend OrmAdapter::ToAdapter
-  
-  class OrmAdapter < ::OrmAdapter::Base
-
+module OrmAdapter
+  class ActiveRecord < Base
     # Do not consider these to be part of the class list
     def self.except_classes
       @@except_classes ||= [
@@ -56,37 +53,42 @@ class ActiveRecord::Base
       conditions, order = extract_conditions_and_order!(options)
       klass.all :conditions => conditions_to_fields(conditions), :order => order_clause(order)
     end
-    
+
     # @see OrmAdapter::Base#create!
     def create!(attributes)
       klass.create!(attributes)
     end
-    
+
   protected
 
     # Introspects the klass to convert and objects in conditions into foreign key and type fields
     def conditions_to_fields(conditions)
       fields = {}
       conditions.each do |key, value|
-        if value.is_a?(ActiveRecord::Base) && (assoc = klass.reflect_on_association(key.to_sym)) && assoc.belongs_to?
-          
-          if ActiveRecord::VERSION::STRING < "3.1"
-            fields[assoc.primary_key_name] = value.send(value.class.primary_key)          
+        if value.is_a?(::ActiveRecord::Base) && (assoc = klass.reflect_on_association(key.to_sym)) && assoc.belongs_to?
+
+          if ::ActiveRecord::VERSION::STRING < "3.1"
+            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 # >= 3.1
-            fields[assoc.foreign_key] = value.send(value.class.primary_key)          
+            fields[assoc.foreign_key] = value.send(value.class.primary_key)
             fields[assoc.foreign_type] = value.class.base_class.name.to_s if assoc.options[:polymorphic]
           end
-          
+
         else
           fields[key] = value
         end
       end
       fields
     end
-    
+
     def order_clause(order)
       order.map {|pair| "#{pair[0]} #{pair[1]}"}.join(",")
     end
   end
 end
+
+ActiveSupport.on_load(:active_record) do
+  extend ::OrmAdapter::ToAdapter
+  self::OrmAdapter = ::OrmAdapter::ActiveRecord
+end

data/lib/orm_adapter/version.rb

@@ -1,3 +1,3 @@
 module OrmAdapter
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: orm_adapter
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-10 00:00:00.000000000Z
+date: 2012-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70325765408420 !ruby/object:Gem::Requirement
+  requirement: &2157226320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70325765408420
+  version_requirements: *2157226320
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &70325765407660 !ruby/object:Gem::Requirement
+  requirement: &2157225580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 1.2.5
   type: :development
   prerelease: false
-  version_requirements: *70325765407660
+  version_requirements: *2157225580
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70325765407000 !ruby/object:Gem::Requirement
+  requirement: &2157224780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70325765407000
+  version_requirements: *2157224780
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70325765395440 !ruby/object:Gem::Requirement
+  requirement: &2157224140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *70325765395440
+  version_requirements: *2157224140
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70325765394680 !ruby/object:Gem::Requirement
+  requirement: &2157223380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *70325765394680
+  version_requirements: *2157223380
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70325765393900 !ruby/object:Gem::Requirement
+  requirement: &2157222660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: 2.0.0.beta.20
   type: :development
   prerelease: false
-  version_requirements: *70325765393900
+  version_requirements: *2157222660
 - !ruby/object:Gem::Dependency
   name: mongo_mapper
-  requirement: &70325765393280 !ruby/object:Gem::Requirement
+  requirement: &2157208000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *70325765393280
+  version_requirements: *2157208000
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70325765392740 !ruby/object:Gem::Requirement
+  requirement: &2157204220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *70325765392740
+  version_requirements: *2157204220
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70325765391920 !ruby/object:Gem::Requirement
+  requirement: &2157203000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *70325765391920
+  version_requirements: *2157203000
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &70325765391020 !ruby/object:Gem::Requirement
+  requirement: &2157201880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *70325765391020
+  version_requirements: *2157201880
 - !ruby/object:Gem::Dependency
   name: datamapper
-  requirement: &70325765388180 !ruby/object:Gem::Requirement
+  requirement: &2157201200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70325765388180
+  version_requirements: *2157201200
 - !ruby/object:Gem::Dependency
   name: dm-sqlite-adapter
-  requirement: &70325765368920 !ruby/object:Gem::Requirement
+  requirement: &2157199880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70325765368920
+  version_requirements: *2157199880
 - !ruby/object:Gem::Dependency
   name: dm-active_model
-  requirement: &70325765367400 !ruby/object:Gem::Requirement
+  requirement: &2157197540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,7 +154,7 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70325765367400
+  version_requirements: *2157197540
 description: Provides a single point of entry for using basic features of ruby ORMs
 email: ian.w.white@gmail.com
 executables: []
@@ -205,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: orm_adapter
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: orm_adapter provides a single point of entry for using basic features of