orm_adapter 0.0.5 → 0.0.6

data/Gemfile.lock.development

@@ -1,110 +1,115 @@
 PATH
   remote: .
   specs:
-    orm_adapter (0.0.5)
+    orm_adapter (0.0.6)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.7)
-      activesupport (= 3.0.7)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.7)
-    addressable (2.2.5)
-    arel (2.0.9)
-    bcrypt-ruby (2.1.4)
-    bson (1.3.0)
-    bson_ext (1.3.0)
-    builder (2.1.2)
-    data_objects (0.10.5)
+    activemodel (3.1.3)
+      activesupport (= 3.1.3)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activesupport (3.1.3)
+      multi_json (~> 1.0)
+    addressable (2.2.6)
+    arel (2.2.1)
+    bcrypt-ruby (3.0.1)
+    bson (1.5.2)
+    bson_ext (1.5.2)
+      bson (= 1.5.2)
+    builder (3.0.0)
+    data_objects (0.10.7)
       addressable (~> 2.1)
-    datamapper (1.1.0)
-      dm-aggregates (= 1.1.0)
-      dm-constraints (= 1.1.0)
-      dm-core (= 1.1.0)
-      dm-migrations (= 1.1.0)
-      dm-serializer (= 1.1.0)
-      dm-timestamps (= 1.1.0)
-      dm-transactions (= 1.1.0)
-      dm-types (= 1.1.0)
-      dm-validations (= 1.1.0)
-    diff-lcs (1.1.2)
-    dm-active_model (1.1.0)
-      activemodel (~> 3.0.4)
-      dm-core (~> 1.1.0)
-    dm-aggregates (1.1.0)
-      dm-core (~> 1.1.0)
-    dm-constraints (1.1.0)
-      dm-core (~> 1.1.0)
-    dm-core (1.1.0)
-      addressable (~> 2.2.4)
-    dm-do-adapter (1.1.0)
-      data_objects (~> 0.10.2)
-      dm-core (~> 1.1.0)
-    dm-migrations (1.1.0)
-      dm-core (~> 1.1.0)
-    dm-serializer (1.1.0)
-      dm-core (~> 1.1.0)
+    datamapper (1.2.0)
+      dm-aggregates (~> 1.2.0)
+      dm-constraints (~> 1.2.0)
+      dm-core (~> 1.2.0)
+      dm-migrations (~> 1.2.0)
+      dm-serializer (~> 1.2.0)
+      dm-timestamps (~> 1.2.0)
+      dm-transactions (~> 1.2.0)
+      dm-types (~> 1.2.0)
+      dm-validations (~> 1.2.0)
+    diff-lcs (1.1.3)
+    dm-active_model (1.2.0)
+      activemodel (~> 3.1.0)
+      dm-core (~> 1.2.0)
+    dm-aggregates (1.2.0)
+      dm-core (~> 1.2.0)
+    dm-constraints (1.2.0)
+      dm-core (~> 1.2.0)
+    dm-core (1.2.0)
+      addressable (~> 2.2.6)
+    dm-do-adapter (1.2.0)
+      data_objects (~> 0.10.6)
+      dm-core (~> 1.2.0)
+    dm-migrations (1.2.0)
+      dm-core (~> 1.2.0)
+    dm-serializer (1.2.1)
+      dm-core (~> 1.2.0)
       fastercsv (~> 1.5.4)
-      json (~> 1.4.6)
-    dm-sqlite-adapter (1.1.0)
-      dm-do-adapter (~> 1.1.0)
-      do_sqlite3 (~> 0.10.2)
-    dm-timestamps (1.1.0)
-      dm-core (~> 1.1.0)
-    dm-transactions (1.1.0)
-      dm-core (~> 1.1.0)
-    dm-types (1.1.0)
-      bcrypt-ruby (~> 2.1.4)
-      dm-core (~> 1.1.0)
+      json (~> 1.6.1)
+      json_pure (~> 1.6.1)
+      multi_json (~> 1.0.3)
+    dm-sqlite-adapter (1.2.0)
+      dm-do-adapter (~> 1.2.0)
+      do_sqlite3 (~> 0.10.6)
+    dm-timestamps (1.2.0)
+      dm-core (~> 1.2.0)
+    dm-transactions (1.2.0)
+      dm-core (~> 1.2.0)
+    dm-types (1.2.1)
+      bcrypt-ruby (~> 3.0.0)
+      dm-core (~> 1.2.0)
       fastercsv (~> 1.5.4)
-      json (~> 1.4.6)
-      stringex (~> 1.2.0)
+      json (~> 1.6.1)
+      multi_json (~> 1.0.3)
+      stringex (~> 1.3.0)
       uuidtools (~> 2.1.2)
-    dm-validations (1.1.0)
-      dm-core (~> 1.1.0)
-    do_sqlite3 (0.10.5)
-      data_objects (= 0.10.5)
+    dm-validations (1.2.0)
+      dm-core (~> 1.2.0)
+    do_sqlite3 (0.10.7)
+      data_objects (= 0.10.7)
     fastercsv (1.5.4)
     git (1.2.5)
-    i18n (0.5.0)
-    json (1.4.6)
-    mongo (1.3.0)
-      bson (>= 1.3.0)
-    mongo_mapper (0.9.0)
-      activemodel (~> 3.0.0)
-      activesupport (~> 3.0.0)
-      plucky (~> 0.3.6)
-    mongoid (2.0.1)
+    i18n (0.6.0)
+    json (1.6.4)
+    json_pure (1.6.4)
+    mongo (1.5.2)
+      bson (= 1.5.2)
+    mongo_mapper (0.10.1)
       activemodel (~> 3.0)
+      activesupport (~> 3.0)
+      plucky (~> 0.4.0)
+    mongoid (2.4.0)
+      activemodel (~> 3.1)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
-      will_paginate (~> 3.0.pre)
-    plucky (0.3.8)
+    multi_json (1.0.4)
+    plucky (0.4.3)
       mongo (~> 1.3)
-    rake (0.8.7)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.2)
-    rspec-expectations (2.5.0)
+    rake (0.9.2.2)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    sqlite3 (1.3.3)
+    rspec-mocks (2.8.0)
+    sqlite3 (1.3.5)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
-    stringex (1.2.1)
-    tzinfo (0.3.27)
+    stringex (1.3.0)
+    tzinfo (0.3.31)
     uuidtools (2.1.2)
-    will_paginate (3.0.pre2)
-    yard (0.6.8)
+    yard (0.7.4)
 
 PLATFORMS
   ruby

data/History.txt

@@ -1,3 +1,9 @@
+== 0.0.6
+
+  * ActiveRecord 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]

data/lib/orm_adapter/adapters/active_record.rb

@@ -69,8 +69,15 @@ class ActiveRecord::Base
       fields = {}
       conditions.each do |key, value|
         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]
+          
+          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_type] = value.class.base_class.name.to_s if assoc.options[:polymorphic]
+          end
+          
         else
           fields[key] = value
         end

data/lib/orm_adapter/adapters/mongoid.rb

@@ -29,7 +29,7 @@ module Mongoid
 
       # @see OrmAdapter::Base#get
       def get(id)
-        klass.first(:conditions => { :id => wrap_key(id) })
+        klass.where(:_id => wrap_key(id)).first
       end
 
       # @see OrmAdapter::Base#find_first

data/lib/orm_adapter/version.rb

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

metadata

@@ -1,171 +1,166 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: orm_adapter
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.6
   prerelease: 
-  version: 0.0.5
 platform: ruby
-authors: 
+authors:
 - Ian White
 - Jose Valim
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-09 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-10 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70325765408420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: git
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70325765408420
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: &70325765407660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.5
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70325765407660
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &70325765407000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.6.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70325765407000
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70325765395440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70325765395440
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &70325765394680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: mongoid
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70325765394680
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  requirement: &70325765393900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0.beta.20
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: mongo_mapper
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70325765393900
+- !ruby/object:Gem::Dependency
+  name: mongo_mapper
+  requirement: &70325765393280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.0
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: bson_ext
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70325765393280
+- !ruby/object:Gem::Dependency
+  name: bson_ext
+  requirement: &70325765392740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.3.0
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *70325765392740
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70325765391920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.4.0
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *70325765391920
+- !ruby/object:Gem::Dependency
+  name: sqlite3-ruby
+  requirement: &70325765391020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.3.2
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: datamapper
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *70325765391020
+- !ruby/object:Gem::Dependency
+  name: datamapper
+  requirement: &70325765388180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "1.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: dm-sqlite-adapter
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *70325765388180
+- !ruby/object:Gem::Dependency
+  name: dm-sqlite-adapter
+  requirement: &70325765368920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "1.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: dm-active_model
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: *70325765368920
+- !ruby/object:Gem::Dependency
+  name: dm-active_model
+  requirement: &70325765367400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "1.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id013
+  prerelease: false
+  version_requirements: *70325765367400
 description: Provides a single point of entry for using basic features of ruby ORMs
 email: ian.w.white@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Gemfile.lock.development
@@ -190,35 +185,33 @@ files:
 - spec/orm_adapter/example_app_shared.rb
 - spec/orm_adapter_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/ianwhite/orm_adapter
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: orm_adapter
-rubygems_version: 1.5.1
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: orm_adapter provides a single point of entry for using basic features of popular ruby ORMs.  Its target audience is gem authors who want to support many ruby ORMs.
-test_files: 
+summary: orm_adapter provides a single point of entry for using basic features of
+  popular ruby ORMs.  Its target audience is gem authors who want to support many
+  ruby ORMs.
+test_files:
 - spec/orm_adapter/adapters/active_record_spec.rb
 - spec/orm_adapter/adapters/data_mapper_spec.rb
 - spec/orm_adapter/adapters/mongo_mapper_spec.rb
@@ -227,3 +220,4 @@ test_files:
 - spec/orm_adapter/example_app_shared.rb
 - spec/orm_adapter_spec.rb
 - spec/spec_helper.rb
+has_rdoc: