orm_adapter_rails4_fix 0.4.1

data/spec/orm_adapter/adapters/mongo_mapper_spec.rb

@@ -0,0 +1,41 @@
+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
+    
+      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

@@ -0,0 +1,39 @@
+require 'spec_helper'
+require 'orm_adapter/example_app_shared'
+
+if !defined?(Mongoid) || !(Mongo::Connection.new.db('orm_adapter_spec') rescue nil)
+  puts "** require 'mongoid' and start mongod to run the specs in #{__FILE__}"
+else  
+  
+  Mongoid.configure do |config|
+    config.master = Mongo::Connection.new.db('orm_adapter_spec')
+  end
+  
+  module MongoidOrmSpec
+    class User
+      include Mongoid::Document
+      field :name
+      field :rating
+      has_many_related :notes, :foreign_key => :owner_id, :class_name => 'MongoidOrmSpec::Note'
+    end
+
+    class Note
+      include Mongoid::Document
+      field :body, :default => "made by orm"
+      belongs_to_related :owner, :class_name => 'MongoidOrmSpec::User'
+    end
+    
+    # here be the specs!
+    describe Mongoid::Document::OrmAdapter do
+      before do
+        User.delete_all
+        Note.delete_all
+      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/base_spec.rb

@@ -0,0 +1,81 @@
+require 'spec_helper'
+
+describe OrmAdapter::Base do
+  subject { OrmAdapter::Base.new(Object) }
+
+  describe "#extract_conditions!" do
+    let(:conditions) { {:foo => 'bar'} }
+    let(:order) { [[:foo, :asc]] }
+    let(:limit) { 1 }
+    let(:offset) { 2 }
+
+    it "(<conditions>)" do
+      subject.send(:extract_conditions!, conditions).should == [conditions, [], nil, nil]
+    end
+
+    it "(:conditions => <conditions>)" do
+      subject.send(:extract_conditions!, :conditions => conditions).should == [conditions, [], nil, nil]
+    end
+
+    it "(:order => <order>)" do
+      subject.send(:extract_conditions!, :order => order).should == [{}, order, nil, nil]
+    end
+
+    it "(:limit => <limit>)" do
+      subject.send(:extract_conditions!, :limit => limit).should == [{}, [], limit, nil]
+    end
+
+    it "(:offset => <offset>)" do
+      subject.send(:extract_conditions!, :offset => offset).should == [{}, [], nil, offset]
+    end
+
+    it "(:conditions => <conditions>, :order => <order>)" do
+      subject.send(:extract_conditions!, :conditions => conditions, :order => order).should == [conditions, order, nil, nil]
+    end
+
+    it "(:conditions => <conditions>, :limit => <limit>)" do
+      subject.send(:extract_conditions!, :conditions => conditions, :limit => limit).should == [conditions, [], limit, nil]
+    end
+
+    it "(:conditions => <conditions>, :offset => <offset>)" do
+      subject.send(:extract_conditions!, :conditions => conditions, :offset => offset).should == [conditions, [], nil, offset]
+    end
+
+    describe "#valid_object?" do
+      it "determines whether an object is valid for the current model class" do
+        subject.send(:valid_object?, Object.new).should be_true
+        subject.send(:valid_object?, String.new).should be_false
+      end
+    end
+
+    describe "#normalize_order" do
+      specify "(nil) returns []" do
+        subject.send(:normalize_order, nil).should == []
+      end
+
+      specify ":foo returns [[:foo, :asc]]" do
+        subject.send(:normalize_order, :foo).should == [[:foo, :asc]]
+      end
+
+      specify "[:foo] returns [[:foo, :asc]]" do
+        subject.send(:normalize_order, [:foo]).should == [[:foo, :asc]]
+      end
+
+      specify "[:foo, :desc] returns [[:foo, :desc]]" do
+        subject.send(:normalize_order, [:foo, :desc]).should == [[:foo, :desc]]
+      end
+
+      specify "[:foo, [:bar, :asc], [:baz, :desc], :bing] returns [[:foo, :asc], [:bar, :asc], [:baz, :desc], [:bing, :asc]]" do
+        subject.send(:normalize_order, [:foo, [:bar, :asc], [:baz, :desc], :bing]).should == [[:foo, :asc], [:bar, :asc], [:baz, :desc], [:bing, :asc]]
+      end
+
+      specify "[[:foo, :wtf]] raises ArgumentError" do
+        lambda { subject.send(:normalize_order, [[:foo, :wtf]]) }.should raise_error(ArgumentError)
+      end
+
+      specify "[[:foo, :asc, :desc]] raises ArgumentError" do
+        lambda { subject.send(:normalize_order, [[:foo, :asc, :desc]]) }.should raise_error(ArgumentError)
+      end
+    end
+  end
+end

data/spec/orm_adapter/example_app_shared.rb

@@ -0,0 +1,240 @@
+# 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!("nonexistent 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("nonexistent id").should be_nil
+      end
+    end
+
+    describe "#find_first" do
+      describe "(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 'should return the first model if no conditions passed' do
+          user = create_model(user_class)
+          create_model(user_class)
+          user_adapter.find_first.should == user
+        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
+
+        it "understands :id as a primary key condition (allowing scoped finding)" do
+          create_model(user_class, :name => "Fred")
+          user = create_model(user_class, :name => "Fred")
+          user_adapter.find_first(:id => user.id, :name => "Fred").should == user
+          user_adapter.find_first(:id => user.id, :name => "Not Fred").should be_nil
+        end
+      end
+
+      describe "(:order => <order array>)" do
+        it "should return first model in specified order" do
+          user1 = create_model(user_class, :name => "Fred", :rating => 1)
+          user2 = create_model(user_class, :name => "Fred", :rating => 2)
+          user_adapter.find_first(:order => [:name, [:rating, :desc]]).should == user2
+        end
+      end
+
+      describe "(:conditions => <conditions hash>, :order => <order array>)" do
+        it "should return first model matching conditions, in specified order" do
+          user1 = create_model(user_class, :name => "Fred", :rating => 1)
+          user2 = create_model(user_class, :name => "Fred", :rating => 2)
+          user_adapter.find_first(:conditions => {:name => "Fred"}, :order => [:rating, :desc]).should == user2
+        end
+      end
+    end
+
+    describe "#find_all" do
+      describe "(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 all models if no conditions passed" 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.should == [user1, user2, user3]
+        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 "(:order => <order array>)" do
+        it "should return all models in specified order" do
+          user1 = create_model(user_class, :name => "Fred", :rating => 1)
+          user2 = create_model(user_class, :name => "Fred", :rating => 2)
+          user3 = create_model(user_class, :name => "Betty", :rating => 1)
+          user_adapter.find_all(:order => [:name, [:rating, :desc]]).should == [user3, user2, user1]
+        end
+      end
+
+      describe "(:conditions => <conditions hash>, :order => <order array>)" do
+        it "should return only models matching conditions, in specified order" do
+          user1 = create_model(user_class, :name => "Fred", :rating => 1)
+          user2 = create_model(user_class, :name => "Fred", :rating => 2)
+          user3 = create_model(user_class, :name => "Betty", :rating => 1)
+          user_adapter.find_all(:conditions => {:name => "Fred"}, :order => [:rating, :desc]).should == [user2, user1]
+        end
+      end
+
+      describe "(:limit => <number of items>)" do
+        it "should return a limited set of matching models" do
+          user1 = create_model(user_class, :name => "Fred", :rating => 1)
+          user2 = create_model(user_class, :name => "Fred", :rating => 2)
+          user3 = create_model(user_class, :name => "Betty", :rating => 1)
+          user_adapter.find_all(:limit => 1).should == [user1]
+          user_adapter.find_all(:limit => 2).should == [user1, user2]
+        end
+      end
+
+      describe "(:offset => <offset number>) with limit (as DataMapper doesn't allow offset on its own)" do
+        it "should return an offset set of matching models" do
+          user1 = create_model(user_class, :name => "Fred", :rating => 1)
+          user2 = create_model(user_class, :name => "Fred", :rating => 2)
+          user3 = create_model(user_class, :name => "Betty", :rating => 1)
+          user_adapter.find_all(:limit => 3, :offset => 0).should == [user1, user2, user3]
+          user_adapter.find_all(:limit => 3, :offset => 1).should == [user2, user3]
+          user_adapter.find_all(:limit => 1, :offset => 1).should == [user2]
+        end
+      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
+
+    describe "#destroy(instance)" do
+      it "should destroy the instance if it exists" do
+        user = create_model(user_class)
+        user_adapter.destroy(user).should == true
+        user_adapter.get(user.id).should be_nil
+      end
+
+      it "should return nil if passed with an invalid instance" do
+        user_adapter.destroy("nonexistent instance").should be_nil
+      end
+
+      it "should not destroy the instance if it doesn't match the model class" do
+        user = create_model(user_class)
+        note_adapter.destroy(user).should be_nil
+        user_adapter.get(user.id).should == user
+      end
+    end
+  end
+end

data/spec/orm_adapter_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe OrmAdapter do
+  subject { OrmAdapter }
+  
+  describe "when a new adapter is created (by inheriting form OrmAdapter::Base)" do
+    let!(:adapter) { Class.new(OrmAdapter::Base) }
+    
+    its(:adapters) { should include(adapter) }
+    
+    after { OrmAdapter.adapters.delete(adapter) }
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,15 @@
+require 'rubygems'
+require 'rspec'
+
+$:.unshift(File.dirname(__FILE__) + '/../lib')
+
+['dm-core', 'mongoid', 'active_record', 'mongo_mapper'].each do |orm|
+  begin
+    require orm
+  rescue LoadError
+    puts "#{orm} not available"
+  end
+end
+
+require 'dm-active_model' if defined?(DataMapper)
+require 'orm_adapter'

metadata

@@ -0,0 +1,290 @@
+--- !ruby/object:Gem::Specification
+name: orm_adapter_rails4_fix
+version: !ruby/object:Gem::Version
+  version: 0.4.1
+  prerelease: 
+platform: ruby
+authors:
+- Ian White
+- Jose Valim
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2012-10-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.5
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta.20
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta.20
+- !ruby/object:Gem::Dependency
+  name: mongo_mapper
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: bson_ext
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.2
+- !ruby/object:Gem::Dependency
+  name: datamapper
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: dm-sqlite-adapter
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: dm-active_model
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
+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:
+- .gitignore
+- .rspec
+- .travis.yml
+- Gemfile
+- Gemfile.lock.development
+- History.txt
+- LICENSE
+- README.rdoc
+- Rakefile
+- 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
+- lib/orm_adapter/version.rb
+- 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
+- spec/orm_adapter_spec.rb
+- spec/spec_helper.rb
+homepage: http://github.com/ianwhite/orm_adapter
+licenses: []
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: 1.3.6
+requirements: []
+rubyforge_project: orm_adapter
+rubygems_version: 1.8.24
+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
+- spec/orm_adapter_spec.rb
+- spec/spec_helper.rb
+has_rdoc: