orm_adapter 0.0.4 → 0.0.5

data/Gemfile.lock.development

@@ -1,115 +1,123 @@
 PATH
   remote: .
   specs:
-    orm_adapter (0.0.4)
+    orm_adapter (0.0.5)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
+    activemodel (3.0.7)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+      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.3)
-    addressable (2.2.2)
-    arel (2.0.6)
-    bson (1.1.5)
-    bson_ext (1.1.5)
+    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.2)
+    data_objects (0.10.5)
       addressable (~> 2.1)
-    datamapper (1.0.2)
-      dm-aggregates (= 1.0.2)
-      dm-constraints (= 1.0.2)
-      dm-core (= 1.0.2)
-      dm-migrations (= 1.0.2)
-      dm-serializer (= 1.0.2)
-      dm-timestamps (= 1.0.2)
-      dm-transactions (= 1.0.2)
-      dm-types (= 1.0.2)
-      dm-validations (= 1.0.2)
+    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.0.3)
-      activemodel (~> 3.0.0)
-      dm-core (~> 1.0.2)
-    dm-aggregates (1.0.2)
-      dm-core (~> 1.0.2)
-    dm-constraints (1.0.2)
-      dm-core (~> 1.0.2)
-      dm-migrations (~> 1.0.2)
-    dm-core (1.0.2)
-      addressable (~> 2.2)
-      extlib (~> 0.9.15)
-    dm-do-adapter (1.0.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.0.2)
-    dm-migrations (1.0.2)
-      dm-core (~> 1.0.2)
-    dm-serializer (1.0.2)
-      dm-core (~> 1.0.2)
-      fastercsv (~> 1.5.3)
-      json_pure (~> 1.4)
-    dm-sqlite-adapter (1.0.2)
-      dm-do-adapter (~> 1.0.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)
+      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.0.2)
-      dm-core (~> 1.0.2)
-    dm-transactions (1.0.2)
-      dm-core (~> 1.0.2)
-    dm-types (1.0.2)
-      dm-core (~> 1.0.2)
-      fastercsv (~> 1.5.3)
-      json_pure (~> 1.4)
-      stringex (~> 1.1.0)
-      uuidtools (~> 2.1.1)
-    dm-validations (1.0.2)
-      dm-core (~> 1.0.2)
-    do_sqlite3 (0.10.2)
-      data_objects (= 0.10.2)
-    extlib (0.9.15)
-    fastercsv (1.5.3)
+    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)
+      fastercsv (~> 1.5.4)
+      json (~> 1.4.6)
+      stringex (~> 1.2.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)
+    fastercsv (1.5.4)
     git (1.2.5)
     i18n (0.5.0)
-    json_pure (1.4.6)
-    mongo (1.1.5)
-      bson (>= 1.1.5)
-    mongoid (2.0.0.beta.20)
+    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)
       activemodel (~> 3.0)
-      mongo (~> 1.1)
+      mongo (~> 1.3)
       tzinfo (~> 0.3.22)
       will_paginate (~> 3.0.pre)
+    plucky (0.3.8)
+      mongo (~> 1.3)
     rake (0.8.7)
-    rspec (2.4.0)
-      rspec-core (~> 2.4.0)
-      rspec-expectations (~> 2.4.0)
-      rspec-mocks (~> 2.4.0)
-    rspec-core (2.4.0)
-    rspec-expectations (2.4.0)
+    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)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.4.0)
-    sqlite3-ruby (1.3.2)
-    stringex (1.1.0)
-    tzinfo (0.3.23)
-    uuidtools (2.1.1)
+    rspec-mocks (2.5.0)
+    sqlite3 (1.3.3)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
+    stringex (1.2.1)
+    tzinfo (0.3.27)
+    uuidtools (2.1.2)
     will_paginate (3.0.pre2)
-    yard (0.6.4)
+    yard (0.6.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activerecord (>= 3.0.0)
-  bson_ext (>= 1.1.5)
+  bson_ext (>= 1.3.0)
   bundler (>= 1.0.0)
   datamapper (>= 1.0)
   dm-active_model (>= 1.0)
   dm-sqlite-adapter (>= 1.0)
   git (>= 1.2.5)
+  mongo_mapper (>= 0.9.0)
   mongoid (>= 2.0.0.beta.20)
   orm_adapter!
   rake (>= 0.8.7)

data/History.txt

@@ -1,3 +1,8 @@
+== 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]

data/README.rdoc

@@ -7,7 +7,7 @@ Provides a single point of entry for popular ruby ORMs.  Its target audience is
 
   require 'orm_adapter'
 
-  User # is it an ActiveRecord, DM Resource, or MongoId Document?
+  User # is it an ActiveRecord, DM Resource, MongoMapper or MongoId Document?
   
   User.to_adapter.find_first :name => 'Fred' # we don't care!
   
@@ -22,9 +22,9 @@ Provides a single point of entry for popular ruby ORMs.  Its target audience is
   
 == Supported ORMs
 
-Currently supported ORMs are *ActiveRecord*, *DataMapper* and *MongoId*.
+Currently supported ORMs are *ActiveRecord*, *DataMapper*, *MongoMapper*, and *MongoId*.
 
-We welcome you to write new adapters as gems. ORM Adapter will stay focused in having these three major ORMs working.
+We welcome you to write new adapters as gems. ORM Adapter will stay focused in having these major ORMs working.
 
 To write an adapter look at <tt>lib/orm_adapter/adapters/active_record.rb</tt> for an example of implementation.  To see how to test it, look at <tt>spec/orm_adapter/example_app_shared.rb</tt>, <tt>spec/orm_adapter/adapters/active_record_spec.rb</tt>.  You'll need to require the target ORM in <tt>spec/spec_helper.rb</tt>
 
@@ -52,6 +52,8 @@ orm_adapter is an extraction from {pickle}[http://github.com/ianwhite/pickle] by
 
 {José Valim}[http://github.com/josevalim] suggested the extraction, and worked on the first release with Ian.
 
+{Luke Cunningham}[http://github.com/icaruswings] contributes the Mongo Mapper adapter.
+
 
 == Development
 

data/Rakefile

@@ -43,7 +43,7 @@ namespace :release do
       raise "** Gemfile.lock.development has been updated, please commit these changes."
     end
     
-    if (git.status.changed + git.status.added + git.status.deleted).any?
+    if git.status.changed.any? || git.status.added.any? || git.status.deleted.any?
       raise "** repo is not clean, try committing some files"
     end
     

data/lib/orm_adapter/adapters/mongo_mapper.rb

@@ -0,0 +1,68 @@
+require 'mongo_mapper'
+
+module MongoMapper
+  module Document
+    module ClassMethods
+      include OrmAdapter::ToAdapter
+    end
+    
+    class OrmAdapter < ::OrmAdapter::Base
+      # Do not consider these to be part of the class list
+      def self.except_classes
+        @@except_classes ||= []
+      end
+
+      # Gets a list of the available models for this adapter
+      def self.model_classes
+        ObjectSpace.each_object(Class).to_a.select {|klass| klass.ancestors.include? MongoMapper::Document}
+      end
+
+      # get a list of column names for a given class
+      def column_names
+        klass.column_names
+      end
+
+      # @see OrmAdapter::Base#get!
+      def get!(id)
+        klass.find!(wrap_key(id))
+      end
+
+      # @see OrmAdapter::Base#get
+      def get(id)
+        klass.first({ :id => wrap_key(id) })
+      end
+
+      # @see OrmAdapter::Base#find_first
+      def find_first(conditions)
+        conditions, order = extract_conditions_and_order!(conditions)
+        conditions = conditions.merge(:sort => order) unless order.nil?
+        klass.first(conditions_to_fields(conditions))
+      end
+
+      # @see OrmAdapter::Base#find_all
+      def find_all(conditions)
+        conditions, order = extract_conditions_and_order!(conditions)
+        conditions = conditions.merge(:sort => order) unless order.nil?
+        klass.all(conditions_to_fields(conditions))
+      end
+
+      # @see OrmAdapter::Base#create!
+      def create!(attributes)
+        klass.create!(attributes)
+      end
+
+    protected
+
+      # converts and documents to ids
+      def conditions_to_fields(conditions)
+        conditions.inject({}) do |fields, (key, value)|
+          if value.is_a?(MongoMapper::Document) && klass.key?("#{key}_id")
+            fields.merge("#{key}_id" => value.id)
+          else
+            fields.merge(key => value)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/orm_adapter/version.rb

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

data/lib/orm_adapter.rb

@@ -16,4 +16,5 @@ end
 
 require 'orm_adapter/adapters/active_record' if defined?(ActiveRecord::Base)
 require 'orm_adapter/adapters/data_mapper'   if defined?(DataMapper::Resource)
-require 'orm_adapter/adapters/mongoid'       if defined?(Mongoid::Document)
+require 'orm_adapter/adapters/mongoid'       if defined?(Mongoid::Document)
+require 'orm_adapter/adapters/mongo_mapper'  if defined?(MongoMapper::Document)

data/orm_adapter.gemspec

@@ -24,7 +24,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake", ">= 0.8.7"
   s.add_development_dependency "activerecord", ">= 3.0.0"
   s.add_development_dependency "mongoid", ">= 2.0.0.beta.20"
-  s.add_development_dependency "bson_ext", ">= 1.1.5"
+  s.add_development_dependency "mongo_mapper", ">= 0.9.0"
+  s.add_development_dependency "bson_ext", ">= 1.3.0"
   s.add_development_dependency "rspec", ">= 2.4.0"
   s.add_development_dependency "sqlite3-ruby", ">= 1.3.2"
   s.add_development_dependency "datamapper", ">= 1.0"

data/spec/orm_adapter/adapters/mongo_mapper_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+require 'orm_adapter/example_app_shared'
+
+if !defined?(MongoMapper) || !(Mongo::Connection.new.db('orm_adapter_spec') rescue nil)
+  puts "** require 'mongo_mapper' and start mongod to run the specs in #{__FILE__}"
+else  
+  
+  MongoMapper.connection = Mongo::Connection.new
+  MongoMapper.database = "orm_adapter_spec"
+  
+  
+  module MongoMapperOrmSpec
+    class User
+      include MongoMapper::Document
+      key :name
+      key :rating
+      many :notes, :foreign_key => :owner_id, :class_name => 'MongoMapperOrmSpec::Note'
+    end
+
+    class Note
+      include MongoMapper::Document
+      key :body, :default => "made by orm"
+      belongs_to :owner, :class_name => 'MongoMapperOrmSpec::User'
+    end
+    
+    # here be the specs!
+    describe MongoMapper::Document::OrmAdapter do
+      
+      before do
+        MongoMapper.database.collections.each do | coll |
+          coll.remove
+        end
+      end
+      
+      describe "the OrmAdapter class" do
+        subject { MongoMapper::Document::OrmAdapter }
+
+        specify "#model_classes should return all document classes" do
+          (subject.model_classes & [User, Note]).to_set.should == [User, Note].to_set
+        end
+      end
+    
+      it_should_behave_like "example app with orm_adapter" do
+        let(:user_class) { User }
+        let(:note_class) { Note }
+      end
+    end
+  end
+end

data/spec/orm_adapter/adapters/mongoid_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'orm_adapter/example_app_shared'
 
 if !defined?(Mongoid) || !(Mongo::Connection.new.db('orm_adapter_spec') rescue nil)
-  puts "** require 'mongoid' start mongod to run the specs in #{__FILE__}"
+  puts "** require 'mongoid' and start mongod to run the specs in #{__FILE__}"
 else  
   
   Mongoid.configure do |config|

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ require 'rspec'
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 
-['dm-core', 'mongoid', 'active_record'].each do |orm|
+['dm-core', 'mongoid', 'active_record', 'mongo_mapper'].each do |orm|
   begin
     require orm
   rescue LoadError

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: orm_adapter
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 4
-  version: 0.0.4
+  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors: 
 - Ian White
@@ -16,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-04 00:00:00 +00:00
+date: 2011-05-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,11 +22,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
   type: :development
   version_requirements: *id001
@@ -43,11 +33,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 2
-        - 5
         version: 1.2.5
   type: :development
   version_requirements: *id002
@@ -59,11 +44,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        - 0
         version: 0.6.0
   type: :development
   version_requirements: *id003
@@ -75,11 +55,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
         version: 0.8.7
   type: :development
   version_requirements: *id004
@@ -91,11 +66,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
   type: :development
   version_requirements: *id005
@@ -107,109 +77,86 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 62196427
-        segments: 
-        - 2
-        - 0
-        - 0
-        - beta
-        - 20
         version: 2.0.0.beta.20
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: bson_ext
+  name: mongo_mapper
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 1
-        - 5
-        version: 1.1.5
+        version: 0.9.0
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: bson_ext
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 2
-        - 4
-        - 0
-        version: 2.4.0
+        version: 1.3.0
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
+  name: rspec
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 3
-        - 2
-        version: 1.3.2
+        version: 2.4.0
   type: :development
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: datamapper
+  name: sqlite3-ruby
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+        version: 1.3.2
   type: :development
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: dm-sqlite-adapter
+  name: datamapper
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
         version: "1.0"
   type: :development
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: dm-active_model
+  name: dm-sqlite-adapter
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
         version: "1.0"
   type: :development
   version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: dm-active_model
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "1.0"
+  type: :development
+  version_requirements: *id013
 description: Provides a single point of entry for using basic features of ruby ORMs
 email: ian.w.white@gmail.com
 executables: []
@@ -229,6 +176,7 @@ files:
 - lib/orm_adapter.rb
 - lib/orm_adapter/adapters/active_record.rb
 - lib/orm_adapter/adapters/data_mapper.rb
+- lib/orm_adapter/adapters/mongo_mapper.rb
 - lib/orm_adapter/adapters/mongoid.rb
 - lib/orm_adapter/base.rb
 - lib/orm_adapter/to_adapter.rb
@@ -236,6 +184,7 @@ files:
 - orm_adapter.gemspec
 - spec/orm_adapter/adapters/active_record_spec.rb
 - spec/orm_adapter/adapters/data_mapper_spec.rb
+- spec/orm_adapter/adapters/mongo_mapper_spec.rb
 - spec/orm_adapter/adapters/mongoid_spec.rb
 - spec/orm_adapter/base_spec.rb
 - spec/orm_adapter/example_app_shared.rb
@@ -255,31 +204,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: orm_adapter
-rubygems_version: 1.3.7
+rubygems_version: 1.5.1
 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: 
 - spec/orm_adapter/adapters/active_record_spec.rb
 - spec/orm_adapter/adapters/data_mapper_spec.rb
+- spec/orm_adapter/adapters/mongo_mapper_spec.rb
 - spec/orm_adapter/adapters/mongoid_spec.rb
 - spec/orm_adapter/base_spec.rb
 - spec/orm_adapter/example_app_shared.rb