orm_adapter 0.0.1 → 0.0.2

data/Gemfile

@@ -3,12 +3,13 @@ source "http://rubygems.org"
 gem "yard"
 
 group :test do
-  gem "activerecord", "~>3.0.0"
-  gem "mongoid", "~>2.0.0.beta.17"
-  gem "rspec", "~>2.0.0.beta.22"
+  gem "activerecord", "~> 3.0.0"
+  gem "mongoid", "~> 2.0.0.beta.17"
+  gem "rspec", "~> 2.0.0.rc"
   gem "jeweler"
   gem "rake"
   gem "sqlite3-ruby"
   gem "datamapper"
   gem "dm-sqlite-adapter"
+  gem "dm-active_model"
 end

data/Gemfile.lock

@@ -14,7 +14,7 @@ GEM
     addressable (2.2.1)
     arel (1.0.1)
       activesupport (~> 3.0.0)
-    bson (1.0.9)
+    bson (1.1)
     builder (2.1.2)
     data_objects (0.10.2)
       addressable (~> 2.1)
@@ -81,16 +81,16 @@ GEM
       tzinfo (~> 0.3.22)
       will_paginate (~> 3.0.pre)
     rake (0.8.7)
-    rspec (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
-      rspec-mocks (= 2.0.0.beta.22)
-    rspec-core (2.0.0.beta.22)
-    rspec-expectations (2.0.0.beta.22)
+    rspec (2.0.0.rc)
+      rspec-core (= 2.0.0.rc)
+      rspec-expectations (= 2.0.0.rc)
+      rspec-mocks (= 2.0.0.rc)
+    rspec-core (2.0.0.rc)
+    rspec-expectations (2.0.0.rc)
       diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
+    rspec-mocks (2.0.0.rc)
+      rspec-core (= 2.0.0.rc)
+      rspec-expectations (= 2.0.0.rc)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
     sqlite3-ruby (1.3.1)

data/History.txt

@@ -1,3 +1,9 @@
+== master
+
+  * 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]
+
+
 == 0.0.1
 
   * Initial release [Ian White, José Valim]

data/README.rdoc

@@ -1,9 +1,7 @@
-= orm_adapter
+= ORM Adapter
 
 Provides a single point of entry for popular ruby ORMs.  Its target audience is gem authors who want to support more than one ORM.
 
-Currently supported ORMs are ActiveRecord, DataMapper and MongoId.
-
 
 == Example of use
 
@@ -20,10 +18,29 @@ Currently supported ORMs are ActiveRecord, DataMapper and MongoId.
   user_model.create!(:name => 'fred')     # create a fred 
   
 
+== Supported ORMs
+
+Currently supported ORMs are *ActiveRecord*, *DataMapper* and *MongoId*.
+
+We welcome you to write new adapters as gems. ORM Adapter will stay focused in having these three 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>
+
+
+== Goals
+
+ORM Adapter goal is to support a minimum API used by most of the plugins that needs agnosticism beyond Active Model.
+
+ORM Adapter will support only basic methods, as +get+, +find_first+, <tt>create!</tt> and so forth. It is not ORM Adapter's goal to support different query constructions, handle table joins, etc.
+
+If you need complex queries, we recommend you to subclass ORM Adapters in your plugin and extend it expressing these query conditions as part of your domain logic.
+
+
 == History
 
+orm_adapter is an extraction from {pickle}[http://github.com/ianwhite/pickle] by {Ian White}[http://github.com/ianwhite].  Pickle's orm adapter included work by {Daniel Neighman}[http://github.com/hassox], {Josh Bassett}[http://github.com/nullobject], {Marc Lee}[http://github.com/maleko], and {Sebastian Zuchmanski}[http://github.com/sebcioz].
 
-orm_adapter is an extraction from {pickle}[http://github.com/ianwhite/pickle] by {Ian White}[http://github.com/ianwhite].  Pickle's orm adapter included work by {Daniel Neighman}[http://github.com/hassox] and {Josh Bassett}[http://github.com/nullobject].  {José Valim}[http://github.com/josevalim] suggested the extraction, and worked on the first release with Ian.
+{José Valim}[http://github.com/josevalim] suggested the extraction, and worked on the first release with Ian.
 
 
 == Copyright

data/Rakefile

@@ -16,7 +16,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "orm_adapter"
-    gem.version = OrmAdapter::Version::String
+    gem.version = OrmAdapter::VERSION
     gem.summary = %Q{Provides a single point of entry for using basic features of ruby ORMs}
     gem.description = %Q{Provides a single point of entry for using basic features of ruby ORMs}
     gem.email = "ian.w.white@gmail.com"

data/lib/orm_adapter/adapters/active_record.rb

@@ -37,7 +37,12 @@ class ActiveRecord::Base
 
     # Get an instance by id of the model
     def get!(id)
-      klass.find(id)
+      klass.find(wrap_key(id))
+    end
+
+    # Get an instance by id of the model
+    def get(id)
+      klass.first :conditions => { klass.primary_key => wrap_key(id) }
     end
 
     # Find the first instance matching conditions
@@ -59,15 +64,12 @@ class ActiveRecord::Base
 
     # Introspects the klass to convert and objects in conditions into foreign key and type fields
     def conditions_to_fields(conditions)
-      conditions.inject({}) do |fields, (key, value)|
+      conditions = conditions.dup
+      conditions.each do |key, value|
         if value.is_a?(ActiveRecord::Base) && klass.column_names.include?("#{key}_id")
-          if klass.column_names.include?("#{key}_type")
-            fields.merge("#{key}_id" => value.id, "#{key}_type" => value.class.base_class.name)
-          else
-            fields.merge("#{key}_id" => value.id)
-          end
-        else
-          fields.merge(key => value)
+          conditions.delete(key)
+          conditions["#{key}_id"]   = value.id          
+          conditions["#{key}_type"] = value.class.base_class.name if klass.column_names.include?("#{key}_type")
         end
       end
     end

data/lib/orm_adapter/adapters/data_mapper.rb

@@ -28,6 +28,11 @@ module DataMapper
         klass.get!(id)
       end
 
+      # Get an instance by id of the model
+      def get(id)
+        klass.get(id)
+      end
+
       # Find the first instance matching conditions
       def find_first(conditions)
         klass.first(conditions)

data/lib/orm_adapter/adapters/mongoid.rb

@@ -24,7 +24,12 @@ module Mongoid
 
       # Get an instance by id of the model
       def get!(id)
-        klass.find(id)
+        klass.find(wrap_key(id))
+      end
+
+      # Get an instance by id of the model
+      def get(id)
+        klass.first(:conditions => { :id => wrap_key(id) })
       end
 
       # Find the first instance matching conditions

data/lib/orm_adapter/base.rb

@@ -28,11 +28,24 @@ module OrmAdapter
       raise NotSupportedError
     end
     
-    # Get an instance by id of the model
+    # Get an instance by id of the model. Raises an error if a model is not found.
+    # This should comply with ActiveModel#to_key API, i.e.:
+    #
+    #   User.to_adapter.get!(@user.to_key) == @user
+    #
     def get!(id)
       raise NotSupportedError
     end
 
+    # Get an instance by id of the model. Returns nil if a model is not found.
+    # This should comply with ActiveModel#to_key API, i.e.:
+    #
+    #   User.to_adapter.get(@user.to_key) == @user
+    #
+    def get
+      raise NotSupportedError
+    end
+
     # Find the first instance matching conditions
     def find_first(conditions)
       raise NotSupportedError
@@ -47,9 +60,15 @@ module OrmAdapter
     def create!(attributes)
       raise NotSupportedError
     end
+
+    protected
+
+    def wrap_key(key)
+      key.is_a?(Array) ? key.first : key
+    end
   end
 
-  class NotSupportedError < RuntimeError
+  class NotSupportedError < NotImplementedError
     def to_s
       "method not supported by this orm adapter"
     end

data/lib/orm_adapter/version.rb

@@ -1,16 +1,3 @@
-require 'yaml'
-
 module OrmAdapter
-  module Version
-    Hash = YAML.load_file(File.dirname(__FILE__) + '/../../VERSION.yml')
-    Major = Hash[:major]
-    Minor = Hash[:minor]
-    Patch = Hash[:patch]
-    Build = Hash[:build]
-    String = "#{Major}.#{Minor}.#{Patch}#{".#{Build}" if Build}"
-    
-    def self.to_s
-      String
-    end
-  end
+  VERSION = "0.0.2"
 end

data/orm_adapter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{orm_adapter}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   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-06}
+  s.date = %q{2010-10-10}
   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 = [
@@ -24,7 +24,6 @@ Gem::Specification.new do |s|
      "LICENSE",
      "README.rdoc",
      "Rakefile",
-     "VERSION.yml",
      "lib/orm_adapter.rb",
      "lib/orm_adapter/adapters/active_record.rb",
      "lib/orm_adapter/adapters/data_mapper.rb",
@@ -36,6 +35,7 @@ Gem::Specification.new do |s|
      "spec/orm_adapter/adapters/active_record_spec.rb",
      "spec/orm_adapter/adapters/data_mapper_spec.rb",
      "spec/orm_adapter/adapters/mongoid_spec.rb",
+     "spec/orm_adapter/example_app_shared.rb",
      "spec/orm_adapter_spec.rb",
      "spec/spec_helper.rb"
   ]
@@ -48,6 +48,7 @@ Gem::Specification.new do |s|
     "spec/orm_adapter/adapters/active_record_spec.rb",
      "spec/orm_adapter/adapters/data_mapper_spec.rb",
      "spec/orm_adapter/adapters/mongoid_spec.rb",
+     "spec/orm_adapter/example_app_shared.rb",
      "spec/orm_adapter_spec.rb",
      "spec/spec_helper.rb"
   ]

data/spec/orm_adapter/adapters/active_record_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'orm_adapter/example_app_shared'
 
 if !defined?(ActiveRecord::Base)
   puts "** require 'active_record' to run the specs in #{__FILE__}"
@@ -8,7 +9,6 @@ else
   ActiveRecord::Migration.suppress_messages do
     ActiveRecord::Schema.define(:version => 0) do
       create_table(:users, :force => true) {|t| t.string :name; t.belongs_to :site }
-      create_table(:sites, :force => true) {|t| t.string :name }
       create_table(:notes, :force => true) {|t| t.belongs_to :owner, :polymorphic => true }
     end
   end
@@ -16,12 +16,7 @@ else
   module ArOrmSpec
     class User < ActiveRecord::Base
       belongs_to :site, :class_name => "ArOrmSpec::Site"
-      has_many :ar_notes, :as => :owner
-    end
-
-    class Site < ActiveRecord::Base
-      has_many :users, :class_name => 'ArOrmSpec::User'
-      has_many :notes, :as => :owner, :class_name => 'ArOrmSpec::Note'
+      has_many :notes, :as => :owner
     end
 
     class AbstractNoteClass < ActiveRecord::Base
@@ -33,116 +28,27 @@ else
     end
   
     # here be the specs!
-    describe ActiveRecord::Base::OrmAdapter do
+    describe '[ActiveRecord orm adapter]' do
       before do
         User.delete_all
         Note.delete_all
-        Site.delete_all
       end
 
-      subject { ActiveRecord::Base::OrmAdapter }
-
-      specify "except_classes should return the names of active record session store classes" do
-        subject.except_classes.should == ["CGI::Session::ActiveRecordStore::Session", "ActiveRecord::SessionStore::Session"]
-      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, Site, Note]
-      end
-    
-      describe "get!(id)" do
-        specify "should return the instance of klass with id if it exists" do
-          user = User.create!
-          User.to_adapter.get!(user.id).should == user
-        end
-      
-        specify "should raise an error if the klass does not have an instance with that id" do
-          lambda { User.to_adapter.get!(1) }.should raise_error
-        end
-      end
-    
-      describe "find_first(klass, conditions)" do
-        specify "should return first model matching conditions, if it exists" do
-          user = User.create! :name => "Fred"
-          User.to_adapter.find_first(:name => "Fred").should == user
-        end
+      describe "the OrmAdapter class" do
+        subject { ActiveRecord::Base::OrmAdapter }
 
-        specify "should return nil if no conditions match" do
-          User.to_adapter.find_first(:name => "Betty").should == nil
-        end
-      
-        specify "should handle belongs_to objects in attributes hash" do
-          site = Site.create!
-          user = User.create! :name => "Fred", :site => site
-          User.to_adapter.find_first(:site => site).should == user
+        specify "#except_classes should return the names of active record session store classes" do
+          subject.except_classes.should == ["CGI::Session::ActiveRecordStore::Session", "ActiveRecord::SessionStore::Session"]
         end
 
-        specify "should handle belongs_to :polymorphic objects in attributes hash" do
-          site = Site.create!
-          note = Note.create! :owner => site
-          Note.to_adapter.find_first(:owner => site).should == note
+        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]
         end
       end
     
-      describe "find_all(klass, conditions)" do
-        specify "should return all models matching conditions" do
-          user1 = User.create! :name => "Fred"
-          user2 = User.create! :name => "Fred"
-          user3 = User.create! :name => "Betty"
-          User.to_adapter.find_all(:name => "Fred").should == [user1, user2]
-        end
-
-        specify "should return empty array if no conditions match" do
-          User.to_adapter.find_all(:name => "Betty").should == []
-        end
-      
-        specify "should handle belongs_to objects in conditions hash" do
-          site1, site2 = Site.create!, Site.create!
-          user1, user2 = User.create!(:site => site1), User.create!(:site => site2)
-          User.to_adapter.find_all(:site => site1).should == [user1]
-        end
-      
-        specify "should handle polymorphic belongs_to objects in conditions hash" do
-          site1, site2 = Site.create!, Site.create!
-          note1, note2 = site1.notes.create!, site2.notes.create!
-          Note.to_adapter.find_all(:owner => site1).should == [note1]
-        end
-      end
-
-      describe "create!(klass, attributes)" do
-        it "should create a model using the given attributes" do
-          User.to_adapter.create!(:name => "Fred")
-          User.last.name.should == "Fred"
-        end
-      
-        it "should raise error if the create fails" do
-          lambda { User.to_adapter.create!(:non_existent => true) }.should raise_error
-        end
-      
-        it "should handle belongs_to objects in attributes hash" do
-          site = Site.create!
-          User.to_adapter.create!(:site => site)
-          User.last.site.should == site
-        end
-      
-        it "should handle polymorphic belongs_to objects in attributes hash" do
-          site = Site.create!
-          Note.to_adapter.create!(:owner => site)
-          Note.last.owner.should == site
-        end
-      
-        it "should handle has_many objects in attributes hash" do
-          users = [User.create!, User.create!]
-          Site.to_adapter.create!(:users => users)
-          Site.last.users.should == users
-        end
-      end
-      
-      describe "<model class>#to_adapter" do
-        it "should return an adapter instance for the receiver" do
-          User.to_adapter.should be_a(OrmAdapter::Base)
-          User.to_adapter.klass.should == User
-        end
+      it_should_behave_like "example app with orm_adapter" do
+        let(:user_class) { User }
+        let(:note_class) { Note }
       end
     end
   end

data/spec/orm_adapter/adapters/data_mapper_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'orm_adapter/example_app_shared'
 
 if !defined?(DataMapper)
   puts "** require 'dm-core' to run the specs in #{__FILE__}"
@@ -32,86 +33,20 @@ else
         Note.destroy
       end
       
-      subject { DataMapper::Resource::OrmAdapter }
-    
-      specify "model_classes should return all of datamapper resources" do
-        subject.model_classes.should == [User, Note]
-      end
-    
-      describe "get!(klass, id)" do
-        specify "should return the instance of klass with id if it exists" do
-          user = User.create!
-          User.to_adapter.get!(user.id).should == user
-        end
-      
-        specify "should raise an error if the klass does not have an instance with that id" do
-          lambda { User.to_adapter.get!(1) }.should raise_error
-        end
-      end
-    
-      describe "find_first(klass, conditions)" do
-        specify "should return first model matching conditions, if it exists" do
-          user = User.create! :name => "Fred"
-          User.to_adapter.find_first(:name => "Fred").should == user
-        end
+      describe "the OrmAdapter class" do
+        subject { DataMapper::Resource::OrmAdapter }
 
-        specify "should return nil if no conditions match" do
-          User.to_adapter.find_first(:name => "Betty").should == nil
-        end
-      
-        specify "should handle belongs_to objects in attributes hash" do
-          user = User.create!
-          note = Note.create! :owner => user
-          Note.to_adapter.find_first(:owner => user).should == note
+        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]
         end
       end
-    
-      describe "find_all(klass, conditions)" do
-        specify "should return all models matching conditions" do
-          user1 = User.create! :name => "Fred"
-          user2 = User.create! :name => "Fred"
-          user3 = User.create! :name => "Betty"
-          User.to_adapter.find_all(:name => "Fred").should == [user1, user2]
-        end
 
-        specify "should return empty array if no conditions match" do
-          User.to_adapter.find_all(:name => "Betty").should == []
-        end
-      
-        specify "should handle belongs_to objects in conditions hash" do
-          user1, user2 = User.create!, User.create!
-          note1, note2 = user1.notes.create!, user2.notes.create!
-          Note.to_adapter.find_all(:owner => user1).should == [note1]
-        end
-      end
-
-      describe "create!(klass, attributes)" do
-        it "should create a model using the given attributes" do
-          User.to_adapter.create!(:name => "Fred")
-          User.last.name.should == "Fred"
-        end
-      
-        it "should raise error if the create fails" do
-          lambda { subject.create!(:non_existent => true) }.should raise_error
-        end
-      
-        it "should handle belongs_to objects in attributes hash" do
-          user = User.create!
-          Note.to_adapter.create!(:owner => user)
-          Note.last.owner.should == user
-        end
-      
-        it "should handle has_many objects in attributes hash" do
-          notes = [Note.create!, Note.create!]
-          User.to_adapter.create!(:notes => notes)
-          User.last.notes.should == notes
-        end
-      end
-      
-      describe "<model class>#to_adapter" do
-        it "should return an adapter instance for the receiver" do
-          User.to_adapter.should be_a(OrmAdapter::Base)
-          User.to_adapter.klass.should == User
+      it_should_behave_like "example app with orm_adapter" do
+        let(:user_class) { User }
+        let(:note_class) { Note }
+        
+        def reload_model(model)
+          model.class.get(model.id)
         end
       end
     end

data/spec/orm_adapter/adapters/mongoid_spec.rb

@@ -1,4 +1,5 @@
 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__}"
@@ -28,81 +29,17 @@ else
         Note.delete_all
       end
       
-      subject { Mongoid::Document::OrmAdapter }
-    
-      specify "model_classes should return all of mongoid resources" do
-        (subject.model_classes & [User, Note]).to_set.should == [User, Note].to_set
-      end
-    
-      describe "get!(klass, id)" do
-        specify "should return the instance of klass with id if it exists" do
-          user = User.create!
-          User.to_adapter.get!(user.id).should == user
-        end
-      
-        specify "should raise an error if the klass does not have an instance with that id" do
-          lambda { User.to_adapter.get!(1) }.should raise_error
-        end
-      end
-    
-      describe "find_first(klass, conditions)" do
-        specify "should return first model matching conditions, if it exists" do
-          user = User.create! :name => "Fred"
-          User.to_adapter.find_first(:name => "Fred").should == user
-        end
+      describe "the OrmAdapter class" do
+        subject { Mongoid::Document::OrmAdapter }
 
-        specify "should return nil if no conditions match" do
-          User.to_adapter.find_first(:name => "Betty").should == nil
-        end
-      
-        specify "should handle belongs_to objects in attributes hash" do
-          user = User.create!
-          note = Note.create! :owner => user
-          Note.to_adapter.find_first(:owner => user).should == note
+        specify "#model_classes should return all document classes" do
+          (subject.model_classes & [User, Note]).to_set.should == [User, Note].to_set
         end
       end
     
-      describe "find_all(klass, conditions)" do
-        specify "should return all models matching conditions" do
-          user1 = User.create! :name => "Fred"
-          user2 = User.create! :name => "Fred"
-          user3 = User.create! :name => "Betty"
-          User.to_adapter.find_all(:name => "Fred").should == [user1, user2]
-        end
-
-        specify "should return empty array if no conditions match" do
-          User.to_adapter.find_all(:name => "Betty").should == []
-        end
-      
-        specify "should handle belongs_to objects in conditions hash" do
-          user1, user2 = User.create!, User.create!
-          note1, note2 = Note.create!(:owner_id => user1.id), Note.create!(:owner_id => user2.id)
-          Note.to_adapter.find_all(:owner => user1).should == [note1]
-        end
-      end
-
-      describe "create!(klass, attributes)" do
-        it "should create a model using the given attributes" do
-          User.to_adapter.create!(:name => "Fred")
-          User.last.name.should == "Fred"
-        end
-      
-        it "should raise error if the create fails" do
-          lambda { User.to_adapter.create!(foo) }.should raise_error
-        end
-      
-        it "should handle belongs_to objects in attributes hash" do
-          user = User.create!
-          Note.to_adapter.create!(:owner => user)
-          Note.last.owner.should == user
-        end
-      end
-      
-      describe "<model class>#to_adapter" do
-        it "should return an adapter instance for the receiver" do
-          User.to_adapter.should be_a(OrmAdapter::Base)
-          User.to_adapter.klass.should == User
-        end
+      it_should_behave_like "example app with orm_adapter" do
+        let(:user_class) { User }
+        let(:note_class) { Note }
       end
     end
   end

data/spec/orm_adapter/example_app_shared.rb

@@ -0,0 +1,143 @@
+# to test your new orm_adapter, make an example app that matches the functionality
+# found in the existing specs for example, look at spec/orm_adapter/adapters/active_record_spec.rb
+#
+# Then you can execute this shared spec as follows:
+#
+#   it_should_behave_like "execute app with orm_adapter" do
+#     let(:user_class) { User }
+#     let(:note_class) { Note }
+#
+#     # optionaly define the following functions if the ORM does not support
+#     # this syntax - this should NOT use the orm_adapter, because we're testing that
+#     def create_model(klass, attrs = {})
+#       klass.create!(attrs)
+#     end
+#
+#     def reload_model(model)
+#       model.class.find(model.id)
+#     end
+#   end
+#
+shared_examples_for "example app with orm_adapter" do
+  
+  def create_model(klass, attrs = {})
+    klass.create!(attrs)
+  end
+  
+  def reload_model(model)
+    model.class.find(model.id)
+  end
+      
+  describe "an ORM class" do
+    subject { note_class }
+  
+    it "#to_adapter should return an adapter instance" do
+      subject.to_adapter.should be_a(OrmAdapter::Base)
+    end
+
+    it "#to_adapter should return an adapter for the receiver" do
+      subject.to_adapter.klass.should == subject
+    end
+
+    it "#to_adapter should be cached" do
+      subject.to_adapter.object_id.should == subject.to_adapter.object_id
+    end
+  end
+  
+  describe "adapter instance" do
+    let(:note_adapter) { note_class.to_adapter }
+    let(:user_adapter) { user_class.to_adapter }
+    
+    describe "#get!(id)" do
+      it "should return the instance with id if it exists" do
+        user = create_model(user_class)
+        user_adapter.get!(user.id).should == user
+      end
+
+      it "should allow to_key like arguments" do
+        user = create_model(user_class)
+        user_adapter.get!(user.to_key).should == user
+      end
+
+      it "should raise an error if there is no instance with that id" do
+        lambda { user_adapter.get!("non-exitent id") }.should raise_error
+      end
+    end
+
+    describe "#get(id)" do
+      it "should return the instance with id if it exists" do
+        user = create_model(user_class)
+        user_adapter.get(user.id).should == user
+      end
+
+      it "should allow to_key like arguments" do
+        user = create_model(user_class)
+        user_adapter.get(user.to_key).should == user
+      end
+
+      it "should return nil if there is no instance with that id" do
+        user_adapter.get("non-exitent id").should be_nil
+      end
+    end
+  
+    describe "#find_first(conditions)" do
+      it "should return first model matching conditions, if it exists" do
+        user = create_model(user_class, :name => "Fred")
+        user_adapter.find_first(:name => "Fred").should == user
+      end
+
+      it "should return nil if no conditions match" do
+        user_adapter.find_first(:name => "Betty").should == nil
+      end
+      
+      it "when conditions contain associated object, should return first model if it exists" do
+        user = create_model(user_class)
+        note = create_model(note_class, :owner => user)
+        note_adapter.find_first(:owner => user).should == note
+      end
+    end
+    
+    describe "#find_all(conditions)" do
+      it "should return only models matching conditions" do
+        user1 = create_model(user_class, :name => "Fred")
+        user2 = create_model(user_class, :name => "Fred")
+        user3 = create_model(user_class, :name => "Betty")
+        user_adapter.find_all(:name => "Fred").should == [user1, user2]
+      end
+
+      it "should return empty array if no conditions match" do
+        user_adapter.find_all(:name => "Fred").should == []
+      end
+      
+      it "when conditions contain associated object, should return first model if it exists" do
+        user1, user2 = create_model(user_class), create_model(user_class)
+        note1 = create_model(note_class, :owner => user1)
+        note2 = create_model(note_class, :owner => user2)
+        note_adapter.find_all(:owner => user2).should == [note2]
+      end
+    end
+
+    describe "#create!(attributes)" do
+      it "should create a model with the passed attributes" do
+        user = user_adapter.create!(:name => "Fred")
+        reload_model(user).name.should == "Fred"
+      end
+
+      it "should raise error when create fails" do
+        lambda { user_adapter.create!(:user => create_model(note_class)) }.should raise_error
+      end
+      
+      it "when attributes contain an associated object, should create a model with the attributes" do
+        user = create_model(user_class)
+        note = note_adapter.create!(:owner => user)
+        reload_model(note).owner.should == user
+      end
+      
+      it "when attributes contain an has_many assoc, should create a model with the attributes" do
+        notes = [create_model(note_class), create_model(note_class)]
+        user = user_adapter.create!(:notes => notes)
+        reload_model(user).notes.should == notes
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -11,4 +11,5 @@ $:.unshift(File.dirname(__FILE__) + '/../lib')
   end
 end
 
+require 'dm-active_model' if defined?(DataMapper)
 require 'orm_adapter'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: orm_adapter
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Ian White
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-06 00:00:00 +01:00
+date: 2010-10-10 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -37,7 +37,6 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION.yml
 - lib/orm_adapter.rb
 - lib/orm_adapter/adapters/active_record.rb
 - lib/orm_adapter/adapters/data_mapper.rb
@@ -49,6 +48,7 @@ files:
 - spec/orm_adapter/adapters/active_record_spec.rb
 - spec/orm_adapter/adapters/data_mapper_spec.rb
 - spec/orm_adapter/adapters/mongoid_spec.rb
+- spec/orm_adapter/example_app_shared.rb
 - spec/orm_adapter_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -89,5 +89,6 @@ test_files:
 - spec/orm_adapter/adapters/active_record_spec.rb
 - spec/orm_adapter/adapters/data_mapper_spec.rb
 - spec/orm_adapter/adapters/mongoid_spec.rb
+- spec/orm_adapter/example_app_shared.rb
 - spec/orm_adapter_spec.rb
 - spec/spec_helper.rb

data/VERSION.yml

@@ -1,4 +0,0 @@
---- 
-:major: 0
-:minor: 0
-:patch: 1