active_repository 0.2.0 → 0.2.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ODc4ODk0M2JiZTk5ZGE4ODZiYzM4OGRmNzNiZmYxODVlZjk1Yzg2Yg==
+  data.tar.gz: !binary |-
+    NDM4YjY5YjIyY2JhZTUxOWVjNzdkY2ZkYWFkMWYzZmI3YjQ2NzNkMQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    YWRmMTRiYzEwMjMwMjE2ZDg0YzJiZWE1MzEzZWI5MDViY2Q2ZDdjMDEyY2Rj
+    MjVmNTI0MWYwODNhNzM2NzkzMzIzZTZiYzllYjg2ODA5NDgyMjM0OTgxNTQx
+    N2U0NDI0MGRkZTk5OTNiOGZmYzYwNjY2MGNmMDhmZmY2MWI2YjQ=
+  data.tar.gz: !binary |-
+    YjYzN2E1ZTdlOTI2ODMxYWVlZjlkYmM3NzgwNGRmZWQ0ODJlNDA0NjgyNmFj
+    ZTM5MjRiODkzZTJmMWNhMmMzNjRiZjFkNjhjMmJkZDZlMDMxNDJhODQ5NThk
+    OWI1N2RhNWM5ODA1NzU2ODhlMGQ2YzdmMWM5MTM5YjJlMmJlYmI=

data/README.md

@@ -1,6 +1,6 @@
 # ActiveRepository
 
-[![Build Status](https://secure.travis-ci.org/efreesen/active_repository.png)](http://travis-ci.org/efreesen/active_repository)[![Dependency Status](https://gemnasium.com/efreesen/active_repository.png)](https://gemnasium.com/efreesen/active_repository) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/efreesen/active_repository)
+[![Build Status](https://secure.travis-ci.org/efreesen/active_repository.png)](http://travis-ci.org/efreesen/active_repository)[![Dependency Status](https://gemnasium.com/efreesen/active_repository.png)](https://gemnasium.com/efreesen/active_repository) [![Code Climate](https://codeclimate.com/github/efreesen/active_repository.png)](https://codeclimate.com/github/efreesen/active_repository)
 
 ActiveRepository was designed so you can build your Business Models without depending on any ORM. It by default saves your data in memory using ActiveHash (https://github.com/zilkey/active_hash). Then when you decide which ORM you want to use you only have to connect ActiveRepository with it.
 
@@ -84,6 +84,8 @@ Then, you have only to set the fields it is going to use:
 
 Now you are all set and ready to go. It is just using ActiveRepository as if it was your ActiveRecord model or Mongoid Document.
 
+You can check an example project here: https://github.com/efreesen/sports_betting_engine
+
 ## Contributing
 
 1. Fork it

data/active_repository.gemspec

@@ -35,6 +35,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency(%q<rspec>, [">= 2.2.0"])
   gem.add_development_dependency(%q<activerecord>)
   gem.add_development_dependency(%q<mongoid>)
+  gem.add_development_dependency(%q<mongo_mapper>)
   gem.add_development_dependency('rake')
   gem.add_development_dependency(%q<sqlite3>) unless RUBY_PLATFORM == 'java'
   gem.add_development_dependency(%q<jdbc-sqlite3>)  if RUBY_PLATFORM == 'java'

data/lib/active_repository/adapters/active_hash_adapter.rb

@@ -0,0 +1,20 @@
+class ActiveHashAdapter
+  class << self
+    def all(klass)
+      klass.superclass.superclass.all
+    end
+
+    def delete_all
+      @klass.superclass.delete_all
+    end
+
+    def exists?(id)
+      @klass.find_by_id(id).present?
+    end
+
+    def where(*args)
+      query = ActiveHash::SQLQueryExecutor.args_to_query(args)
+      @klass.where(query)
+    end
+  end
+end

data/lib/active_repository/adapters/default_adapter.rb

@@ -0,0 +1,51 @@
+class DefaultAdapter
+  class << self
+    def all(klass)
+      klass.get_model_class.all
+    end
+
+    def delete_all(klass)
+      klass.get_model_class.delete_all
+    end
+
+    def exists?(klass, id)
+      klass.get_model_class.exists?(id)
+    end
+
+    def find(klass, id)
+      klass.get_model_class.find(id)
+    end
+
+    def first(klass)
+      klass.get_model_class.first
+    end
+
+    def last(klass)
+      klass.get_model_class.last
+    end
+
+    def create(klass, attributes)
+      object = klass.get_model_class.create(attributes)
+    end
+
+    def update_attribute(klass, id, key, value)
+      object = id.nil? ? klass.get_model_class.new(key.to_sym => value) : klass.get_model_class.find(id)
+
+      ret = object.update_attribute(key, value)
+
+      [ret, object]
+    end
+
+    def update_attributes(klass, id, attributes)
+      object = id.nil? ? klass.get_model_class.new : klass.get_model_class.find(id)
+
+      ret = object.update_attributes(attributes)
+
+      [ret, object]
+    end
+
+    def where(klass, args)
+      klass.get_model_class.where(args)
+    end
+  end
+end

data/lib/active_repository/adapters/mongoid_adapter.rb

@@ -0,0 +1,53 @@
+require 'active_repository/adapters/default_adapter'
+
+class MongoidAdapter < DefaultAdapter
+  class << self
+  #   def all(klass)
+  #     klass.all
+  #   end
+
+  #   def delete_all(klass)
+  #     klass.delete_all
+  #   end
+
+    def exists?(klass, id)
+      klass.get_model_class.where(:id => id).present?
+    end
+
+  #   def find(klass, id)
+  #     klass.find(id)
+  #   end
+
+  #   def first(klass)
+  #     klass.first
+  #   end
+
+  #   def last(klass)
+  #     klass.last
+  #   end
+
+  #   def create(klass, attributes)
+  #     klass.create(attributes)
+  #   end
+
+  #   def update_attribute(klass, id, key, value)
+  #     object = id.nil? ? klass.new(key.to_sym => value) : klass.find(id)
+
+  #     ret = object.update_attribute(key, value)
+
+  #     [ret, object]
+  #   end
+
+  #   def update_attributes(klass, id, attributes)
+  #     object = id.nil? ? klass.new : klass.find(id)
+
+  #     ret = object.update_attributes(attributes)
+
+  #     [ret, object]
+  #   end
+
+  #   def where(klass, args)
+  #     klass.where(args)
+  #   end
+  end
+end

data/lib/active_repository/adapters/persistence_adapter.rb

@@ -0,0 +1,64 @@
+require 'active_repository/adapters/active_hash_adapter'
+require 'active_repository/adapters/default_adapter'
+require 'active_repository/adapters/mongoid_adapter'
+
+class PersistenceAdapter
+  class << self
+    def get_adapter(klass)
+      modules = klass.get_model_class.included_modules.map(&:to_s)
+      if modules.include?("Mongoid::Document")
+        MongoidAdapter
+      elsif modules.map(&:to_s).include?("DataMapper::Resource")
+        DataMapperAdapter
+      # elsif modules.map(&:to_s).include?("MongoMapper::Document")
+      #   MongoMapperAdapter
+      else
+        DefaultAdapter
+      end
+    end
+
+    def all(klass)
+      get_adapter(klass).all(klass)
+    end
+
+    def create(klass, attributes)
+      get_adapter(klass).create(klass, attributes)
+    end
+
+    def delete_all(klass)
+      get_adapter(klass).delete_all(klass)
+    end
+
+    def exists?(klass, id)
+      get_adapter(klass).exists?(klass, id)
+    end
+
+    def find(klass, id)
+      get_adapter(klass).find(klass, id)
+    end
+
+    def first(klass)
+      get_adapter(klass).first(klass)
+    end
+
+    def last(klass)
+      get_adapter(klass).last(klass)
+    end
+
+    def update_attribute(klass, id, key, value)
+      get_adapter(klass).update_attribute(klass, id, key, value)
+    end
+
+    def update_attributes(klass, id, attributes)
+      get_adapter(klass).update_attributes(klass, id, attributes)
+    end
+
+    def where(klass, args)
+      get_adapter(klass).where(klass, args)
+    end
+  end
+
+  def method_missing(sym, *args, &block)
+    get_adapter(args.first).send(sym, args)
+  end
+end

data/lib/active_repository/base.rb

@@ -4,6 +4,7 @@ require 'active_repository/write_support'
 require 'active_repository/sql_query_executor'
 require 'active_repository/finders'
 require 'active_repository/writers'
+require 'active_repository/adapters/persistence_adapter'
 
 begin
   klass = Module.const_get(Mongoid::Document)
@@ -49,7 +50,7 @@ module ActiveRepository
   #      SaveInORMOrODMTest.set_save_in_memory(false)
   #    end
   #
-  # Author::    Caio Torres  (mailto:efreesen@gmail.com)
+  # Author::    Caio Torres (mailto:efreesen@gmail.com)
   # License::   MIT
   class Base < ActiveHash::Base
     extend ActiveModel::Callbacks
@@ -62,15 +63,14 @@ module ActiveRepository
 
     class_attribute :model_class, :save_in_memory, :instance_writer => false
 
-    before_validation :set_timestamps
-
-    fields :created_at, :updated_at
+    after_validation :set_timestamps
 
     self.save_in_memory = true if self.save_in_memory == nil
 
     # Returns all persisted objects
     def self.all
-      self == get_model_class ? super : get_model_class.all.map { |object| serialize!(object.attributes) }
+      (self == get_model_class ? super : PersistenceAdapter.all(self).map { |object| serialize!(object.attributes) })
+      # self == get_model_class ? super : get_model_class.all.map { |object| serialize!(object.attributes) }
     end
 
     # Constantize class name
@@ -80,20 +80,21 @@ module ActiveRepository
 
     # Deletes all persisted objects
     def self.delete_all
-      self == get_model_class ? super : get_model_class.delete_all
+      self == get_model_class ? super : PersistenceAdapter.delete_all(self)
     end
 
     # Checks the existence of a persisted object with the specified id
     def self.exists?(id)
-      if self == get_model_class
-        !find_by_id(id).nil?
-      else
-        if mongoid?
-          find_by_id(id).present?
-        else
-          get_model_class.exists?(id)
-        end
-      end
+      self == get_model_class ? find_by_id(id).present? : PersistenceAdapter.exists?(self, id)
+      # if self == get_model_class
+      #   !find_by_id(id).nil?
+      # else
+      #   if mongoid?
+      #     find_by_id(id).present?
+      #   else
+      #     get_model_class.exists?(id)
+      #   end
+      # end
     end
 
     # Returns the Class responsible for persisting the objects
@@ -105,9 +106,9 @@ module ActiveRepository
     # Converts Persisted object(s) to it's ActiveRepository counterpart
     def self.serialize!(other)
       case other.class.to_s
-      when "Hash" then self.new.serialize!(other)
-      when "Array" then other.map { |o| serialize!(o.attributes) }
-      when "Moped::BSON::Document" then self.new.serialize!(other)
+      when "Hash", "ActiveSupport::HashWithIndifferentAccess" then self.new.serialize!(other)
+      when "Array"                                            then other.map { |o| serialize!(o.attributes) }
+      when "Moped::BSON::Document"                            then self.new.serialize!(other)
       else self.new.serialize!(other.attributes)
       end
     end
@@ -150,7 +151,8 @@ module ActiveRepository
       else
         objects = []
         args = args.first.is_a?(Hash) ? args.first : args
-        get_model_class.where(args).each do |object|
+
+        PersistenceAdapter.where(self, args).each do |object|
           objects << self.serialize!(object.attributes)
         end
 
@@ -168,9 +170,9 @@ module ActiveRepository
 
     # Gathers the persisted object from database and updates self with it's attributes.
     def reload
-      object = self.class.get_model_class.find(self.id)
+      object = self.id.present? ? self.class.get_model_class.find(self.id) : self
 
-      serialize! (self.class.get_model_class.find(self.id) || self).attributes
+      serialize! object.attributes
     end
 
     def save(force=false)
@@ -238,8 +240,10 @@ module ActiveRepository
 
       # Updates created_at and updated_at
       def set_timestamps
-        self.created_at = DateTime.now.utc if self.new_record?
-        self.updated_at = DateTime.now.utc
+        if self.errors.empty?
+          self.created_at = DateTime.now.utc if self.respond_to?(:created_at=) && self.created_at.nil?
+          self.updated_at = DateTime.now.utc if self.respond_to?(:updated_at=)
+        end
       end
   end
 end

data/lib/active_repository/finders.rb

@@ -3,12 +3,12 @@ module ActiveRepository #:nodoc:
   module Finders #:nodoc:
     # Defines fiend_by_field methods for the Class
     def define_custom_find_by_field(field_name)
-      method_name = :"find_all_by_#{field_name}"
+      method_name = :"find_by_#{field_name}"
       the_meta_class.instance_eval do
         define_method(method_name) do |*args|
           object = nil
 
-          object = self.find_by_field(field_name.to_sym, args)
+          object = self.where(field_name.to_sym => args).first
 
           object.nil? ? nil : serialize!(object.attributes)
         end
@@ -35,7 +35,7 @@ module ActiveRepository #:nodoc:
         if self == get_model_class
           super(id)
         else
-          object = (id == :all) ? all : get_model_class.find(id)
+          object = (id == :all) ? all : PersistenceAdapter.find(self, id)
 
           serialize!(object)
         end
@@ -51,24 +51,27 @@ module ActiveRepository #:nodoc:
     def find_all_by_field(field_name, args)
       objects = []
 
+      # raise "field: #{field_name}; values: #{args.first.inspect}; all: #{get_model_class.all.inspect}"
+
       if self == get_model_class
         objects = self.where(field_name.to_sym => args.first)
       else
-        if mongoid?
-          objects = get_model_class.where(field_name.to_sym => args.first)
-        else
-          method_name = :"find_all_by_#{field_name}"
-          objects = get_model_class.send(method_name, args)
-        end
+        objects = PersistenceAdapter.where(self, field_name.to_sym => args.first)
+        # if mongoid?
+        #   objects = get_model_class.where(field_name.to_sym => args.first)
+        # else
+        #   method_name = :"find_all_by_#{field_name}"
+        #   objects = get_model_class.send(method_name, args)
+        # end
       end
 
       objects
     end
 
     # Searches first object that matches #field_name field with the #args value(s)
-    def find_by_field(field_name, args)
-      self.find_all_by_field(field_name, args).first.dup
-    end
+    # def find_by_field(field_name, args)
+    #   self.find_all_by_field(field_name, args).first.dup
+    # end
 
     # Searches for an object that has id with #id value, if none is found returns nil
     def find_by_id(id)
@@ -77,13 +80,13 @@ module ActiveRepository #:nodoc:
 
         object.nil? ? nil : object.dup
       else
-        object = nil
+        object = PersistenceAdapter.where(self, :id => id).first
 
-        if mongoid?
-          object = get_model_class.where(:id => id).entries.first
-        else
-          object = get_model_class.find_by_id(id)
-        end
+        # if mongoid?
+        #   object = get_model_class.where(:id => id).entries.first
+        # else
+        #   object = get_model_class.find_by_id(id)
+        # end
 
         object.nil? ? nil : serialize!(object.attributes)
       end
@@ -102,7 +105,7 @@ module ActiveRepository #:nodoc:
     private
     # Returns the object in the position specified in #position
     def get(position)
-      object = get_model_class.send(position)
+      object = PersistenceAdapter.send(position, self)
       object.present? ? serialize!(object.attributes) : nil
     end
   end

data/lib/active_repository/version.rb

@@ -1,3 +1,3 @@
 module ActiveRepository
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/active_repository/write_support.rb

@@ -79,7 +79,7 @@ module ActiveHash
     end
 
     def eql?(other)
-      (other.instance_of?(self.class) || other.instance_of?(self.class.get_model_class)) && id.present? && (id == other.id) && (created_at == other.created_at)
+      (other.instance_of?(self.class) || other.instance_of?(self.class.get_model_class)) && id.present? && (id == other.id) && (!self.respond_to?(:created_at) || (created_at == other.created_at))
     end
 
     alias == eql?

data/lib/active_repository/writers.rb

@@ -3,26 +3,40 @@ module ActiveRepository
   module Writers
     # Creates an object and persists it.
     def create(attributes={})
-      object = get_model_class.new(attributes)
+      object = self.new(attributes)
 
-      object.id = nil unless exists?(object.id)
+      if object.present? && object.valid?
+        if get_model_class == self
+          object.id = nil unless exists?(object.id)
 
-      if get_model_class == self
-        object.save
-      else
-        repository = serialize!(object.attributes)
-        object = repository.valid? ? get_model_class.create(attributes) : repository
+          object.save
+        else
+          object = PersistenceAdapter.create(self, object.attributes)
+        end
       end
 
-      object.valid? ? serialize!(object.reload.attributes) : object
+      new_object = serialize!(object.reload.attributes)
+
+      new_object.valid?
+
+      new_object
     end
 
     # Searches for an object that matches the attributes on the parameter, if none is found
     # it creates one with the defined attributes.
     def find_or_create(attributes)
-      object = get_model_class.where(attributes).first
+      object = where(attributes).first
+
+      object.nil? ? create(attributes) : object
+    end
 
-      object = get_model_class.create(attributes) if object.nil?
+    def find_or_initialize(attributes)
+      object = where(attributes).first
+      object = self.new(attributes) if object.nil?
+
+      attributes.each do |key, value|
+        object.send("#{key.to_sym}=", value)
+      end
 
       serialize!(object.attributes)
     end
@@ -38,19 +52,22 @@ module ActiveRepository
 
       # Updates #key attribute with #value value.
       def update_attribute(key, value)
-        ret    = self.valid?
+        ret = self.valid?
 
         if ret
-          object = (self.id.nil? ? self.class.get_model_class.new : self.class.get_model_class.find(self.id))
-
           if self.class == self.class.get_model_class
+            object = self.class.find_or_initialize(:id => self.id)
+
             self.send("#{key}=", value)
 
             ret = save
           else
-            key = (key.to_s == 'id' ? '_id' : key.to_s) if mongoid?
+            # key = (key.to_s == 'id' ? '_id' : key.to_s) if mongoid?
+
+            ret, object = PersistenceAdapter.update_attribute(self.class, self.id, key, value)
 
-            ret = object.update_attribute(key,value)
+            self.attributes = object.attributes
+            # object.update_attribute(key,value)
           end
 
           reload
@@ -71,9 +88,13 @@ module ActiveRepository
           end
           save
         else
-          object = self.id.nil? ? model_class.new : model_class.find(self.id)
+          attributes = self.attributes.merge(attributes)
+          ret, object = PersistenceAdapter.update_attributes(self.class, self.id, attributes)
+
+          self.attributes = object.attributes
+          # object = self.id.nil? ? model_class.new : model_class.find(self.id)
 
-          ret = object.update_attributes(attributes)
+          # ret = object.update_attributes(attributes)
         end
 
         reload

data/spec/active_repository/associations_spec.rb

@@ -292,6 +292,7 @@ describe ActiveRepository::Base, "associations" do
         City.set_model_class(CityModel)
         City.set_save_in_memory(false)
         belongs_to :state
+        has_many   :regions
       end
     end
 

data/spec/active_repository/base_spec.rb

@@ -18,7 +18,7 @@ describe ActiveRepository, "Base" do
 
   context "in_memory" do
     before do
-      Country.fields :name, :monarch, :language
+      Country.fields :name, :monarch, :language, :created_at, :updated_at
       Country.set_model_class(Country)
       Country.set_save_in_memory(true)
 
@@ -62,7 +62,7 @@ describe ActiveRepository, "Base" do
 
   context "active_record" do
     before do
-      Country.fields :name, :monarch, :language
+      Country.fields :name, :monarch, :language, :created_at, :updated_at
 
       class CountryModel < ActiveRecord::Base
         self.table_name = 'countries'
@@ -123,7 +123,7 @@ describe ActiveRepository, "Base" do
 
   context "mongoid" do
     before do
-      Country.fields :name, :monarch, :language
+      Country.fields :name, :monarch, :language, :created_at, :updated_at
 
       Mongoid.load!("support/mongoid.yml", :development)
 

data/spec/active_repository/sql_query_executor_spec.rb

@@ -51,8 +51,6 @@ describe ActiveRepository, "Base" do
           t.string :monarch
           t.string :language
           t.datetime :founded_at
-          t.datetime :created_at
-          t.datetime :updated_at
         end
       end
 

data/spec/support/shared_examples.rb

@@ -2,14 +2,16 @@ require 'set'
 
 shared_examples ".update_attributes" do
   it "updates records" do
-    country = Country.find(1)
+    id = Country.first.id
+    country = Country.find(id)
     country.update_attributes(:name => "Italy")
 
     Country.first.name.should == "Italy"
   end
 
   it "must not update id" do
-    country = Country.find(1)
+    id = Country.first.id
+    country = Country.find(id)
 
     country.update_attributes(:id => 45, :name => "Russia")
 
@@ -48,24 +50,30 @@ shared_examples ".where" do
   end
 
   it "populates the data correctly" do
+    first_id = Country.first.id
+    last_id  = Country.all[3].id
+
     records = Country.where(:language => 'English')
-    records.first.id.should == 1
+    records.first.id.should == first_id
     records.first.name.should == "US"
-    records.last.id.should == 4
+    records.last.id.should == last_id
     records.last.name.should == "UK"
   end
 
   it "filters the records from a AR-like conditions hash" do
+    first_id = Country.first.id
+
     record = Country.where(:name => 'US')
     record.count.should == 1
-    record.first.id.should == 1
+    record.first.id.should == first_id
     record.first.name.should == 'US'
   end
 
   it "if id exists, use auto increment id" do
+    first_id = Country.first.id
     country = Country.create(:name => "Russia", :language => 'Russian')
 
-    country.id.should_not == 1
+    country.id.should_not == first_id
   end
 end
 
@@ -91,24 +99,31 @@ end
 
 shared_examples ".first" do
   it "returns the first object" do
-    Country.first.should == Country.find(1)
+    first = Country.first
+
+    first.should == Country.find(first.id)
   end
 end
 
 shared_examples ".last" do
   it "returns the last object" do
-    Country.last.should == Country.find(5)
+    last = Country.last
+
+    last.should == Country.find(last.id)
   end
 end
 
 shared_examples ".find" do
   context "with an id" do
     it "finds the record with the specified id" do
-      Country.find(2).id.should == 2
+      second_id = Country.all[1].id
+      Country.find(second_id).id.should == second_id
     end
 
     it "finds the record with the specified id as a string" do
-      Country.find("2").id.should == 2
+      second_id = Country.all[1].id
+
+      Country.find(second_id.to_s).id.should == second_id
     end
 
     it "raises ActiveHash::RecordNotFound when id not found" do
@@ -130,7 +145,9 @@ shared_examples ".find" do
 
   context "with an array of ids" do
     it "returns all matching ids" do
-      Country.find([1, 3]).should == [Country.find(1), Country.find(3)]
+      countries = Country.all
+      ids = [countries[0].id, countries[2].id]
+      Country.find(ids).should == [Country.find(ids.first), Country.find(ids.last)]
     end
 
     it "raises ActiveHash::RecordNotFound when id not found" do
@@ -144,11 +161,13 @@ end
 shared_examples ".find_by_id" do
   context "with an id" do
     it "finds the record with the specified id" do
-      Country.find_by_id(2).id.should == 2
+      id = Country.all[1].id
+      Country.find_by_id(id).id.should == id
     end
 
     it "finds the record with the specified id as a string" do
-      Country.find_by_id("2").id.should == 2
+      id = Country.all[1].id
+      Country.find_by_id(id.to_s).id.should == id
     end
   end
 
@@ -170,13 +189,15 @@ shared_examples "custom finders" do
     describe "with a match" do
       context "for a non-nil argument" do
         it "returns the first matching record" do
-          Country.find_by_name("US").id.should == 1
+          id = Country.first.id
+          Country.where(:name => "US").first.id.should == id
         end
       end
 
       context "for a nil argument" do
         it "returns the first matching record" do
-          Country.find_by_language(nil).id.should == 5
+          id = Country.all[2].id
+          Country.where(:language => 'Spanish').first.id.should == id
         end
       end
     end
@@ -216,14 +237,16 @@ shared_examples "custom finders" do
   describe "find_by_<field_one>_and_<field_two>" do
     describe "with a match" do
       it "returns the first matching record" do
-        Country.find_by_name_and_language("Canada", "English").id.should == 2
-        Country.find_by_language_and_name("English", "Canada").id.should == 2
+        id = Country.all[1].id
+        Country.find_by_name_and_language("Canada", "English").id.should == id
+        Country.find_by_language_and_name("English", "Canada").id.should == id
       end
     end
 
     describe "with a match based on to_s" do
       it "returns the first matching record" do
-        Country.find_by_name_and_id("Canada", "2").id.should == 2
+        id = Country.all[1].id
+        Country.find_by_name_and_id("Canada", id.to_s).id.should == id
       end
     end
 
@@ -351,8 +374,8 @@ end
 
 shared_examples "#to_param" do
   it "should return id as a string" do
-    id = Country.last.id + 1
-    Country.create(:id => id).to_param.should == id.to_s
+    country = Country.create
+    country.to_param.should == country.id.to_s
   end
 end
 
@@ -431,7 +454,9 @@ shared_examples "#readonly?" do
   end
 
   it "updates a record" do
-    country = Country.find(1)
+    id = Country.first.id
+
+    country = Country.find(id)
 
     country.name = "Germany"
 
@@ -440,7 +465,7 @@ shared_examples "#readonly?" do
     Country.all.size.should == 5
     country.should be_valid
     country.name.should == "Germany"
-    country.id.should == 1
+    country.id.should == id
   end
 end
 
@@ -452,9 +477,10 @@ shared_examples "#cache_key" do
   it 'should use the record\'s updated_at if present' do
     country = Country.create(:name => "foo")
 
-    id = Country.last.id
+    country.reload
 
     date_string = country.updated_at.nil? ? "" : "-#{country.updated_at.to_s(:number)}"
+    id          = country.id
 
     Country.first.cache_key.should == "countries/#{id}#{date_string}"
   end
@@ -472,15 +498,15 @@ shared_examples "#save" do
 
   it "adds the new object to the data collection" do
     Country.all.should be_empty
-    country = Country.new :name => "foo", :monarch => nil, :language => nil
-    country.persist.should be_true
+    country = Country.new :name => "foo", :monarch => "King", :language => "bar"
+    country.save.should be_true
     country.reload
 
-    countries_attributes =  Country.all.map(&:attributes)
+    countries_attributes =  Country.first.attributes
     countries_attributes.delete(:created_at)
     countries_attributes.delete(:updated_at)
 
-    expected_attributes = [country].map(&:attributes)
+    expected_attributes = country.attributes
     expected_attributes.delete(:created_at)
     expected_attributes.delete(:updated_at)
 
@@ -523,13 +549,13 @@ shared_examples ".create" do
     countries_attributes.should == expected_attributes
   end
 
-  it "adds an auto-incrementing id if the id is nil" do
+  it "adds an auto-incrementing id if the id is nil and not MongoMapper" do
     country1 = Country.new :name => "foo"
     country1.save
 
     country2 = Country.new :name => "bar"
     country2.save
-    country2.id.should == country1.id + 1
+    country2.id.should == ((country1.id.class.name == "BSON::ObjectId") ? country2.id : country1.id + 1)
   end
 
   it "adds the new object to the data collection" do

data/spec/support/sql_query_shared_examples.rb

@@ -291,10 +291,11 @@ shared_examples "is" do
   end
 
   it "attribute is not condition" do
+    id = Country.last.id
     records = Country.where("founded_at is not null")
     records.count.should == 1
-    records.first.id.should == 5
-    records.should == [Country.find(5)]
+    records.first.id.should == id
+    records.should == [Country.find(id)]
   end
 end
 

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: active_repository
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.2.1
 platform: ruby
 authors:
 - Caio Torres
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-23 00:00:00.000000000 Z
+date: 2013-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_hash
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,20 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mongo_mapper
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -133,6 +132,10 @@ files:
 - LICENSE
 - README.md
 - active_repository.gemspec
+- lib/active_repository/adapters/active_hash_adapter.rb
+- lib/active_repository/adapters/default_adapter.rb
+- lib/active_repository/adapters/mongoid_adapter.rb
+- lib/active_repository/adapters/persistence_adapter.rb
 - lib/active_repository/associations.rb
 - lib/active_repository/base.rb
 - lib/active_repository/finders.rb
@@ -152,27 +155,26 @@ files:
 homepage: http://github.com/efreesen/active_repository
 licenses:
 - MIT
+metadata: {}
 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: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: An implementation of repository pattern that can connect with any ORM
 test_files:
 - Gemfile