ar-simple-idmap 0.1.6 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.2.0

data/lib/identity_map/action_controller/dispatcher.rb

@@ -56,8 +56,6 @@ end
 
 if defined? ::ActionDispatch
   ActionDispatch::Callbacks.send :include, DispatcherMethods
-  RAILS_DEFAULT_LOGGER.warn "CACHING OBJECTS"
 else
   ActionController::Dispatcher.send :include, DispatcherMethods
-  RAILS_DEFAULT_LOGGER.warn "CACHING OBJECTS"
 end

data/lib/identity_map/active_record/base.rb

@@ -12,6 +12,7 @@ module ActiveRecord
                   alias_method_chain :instantiate, :identity_map
                 end
                 alias_method_chain :create, :identity_map
+                alias_method_chain :destroy, :identity_map
             end
 		  end
 	  end
@@ -49,10 +50,11 @@ module ActiveRecord
               from_arg0 = args.size == 1 ||
                     args[1].is_a?(Hash) && !args[1].values.any?
               from_condition_ids = !from_arg0 &&
-                    (args[0] == :all || args[0] == :first)
+                    (args[0] == :all || args[0] == :first) &&
                     args.size == 2 && args[1].is_a?(Hash) &&
                     args[1].all?{|key, value| key == :conditions || value.blank?} &&
-                    args[1][:conditions].try(:keys) == [:id]
+                    args[1][:conditions].is_a?(Hash) &&
+                    args[1][:conditions].keys == [:id]
 			  if from_arg0 || from_condition_ids
 				ids = from_arg0 ? args[0] : args[1][:conditions][:id]
 				if ids.is_a?(Array)

data/lib/identity_map/cache.rb

@@ -21,7 +21,7 @@ module ActiveRecord
 		
 		def delete(id)
 		  @object.id = id
-		  @objects.delete(id)
+		  @objects.delete(@object.id)
 		end
 	  end
 	  
@@ -86,4 +86,4 @@ module ActiveRecord
 	extend ThreadIdentityMap::ClassMethods
 #	self.class.send :alias_method_chain, :uncached, :identity_map
   end
-end
+end

data/spec/identity_map_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/spec_helper'
 describe "Customers" do
 	
 	before(:each) do
-		Thread.current["identity_map"] = Cache.new
+		ActiveRecord::Base.create_identity_map
 	end
 	
 	it "should load the same model twice" do
@@ -11,27 +11,105 @@ describe "Customers" do
 		c2 = Customer.first
 		c1.__id__.should == c2.__id__
 	end
+    
+    it "should fetch loaded model from cache" do
+        c1 = Customer.first
+        Customer.connection.should_not_receive(:select_all)
+        c2 = Customer.find(c1.id)
+    end
 	
 	it "should work for has_many associations" do
 		p1 = PhoneNumber.first
-		p2 = Customer.first.phone_numbers.first
+		ps = Customer.first.phone_numbers
+        p2 = ps.first
 		p1.__id__.should == p2.__id__
 	end
 	
 	it "should work for belongs_to assocations" do
 		d1 = Customer.first
-		d2 = PhoneNumber.first.customer
+		p1 = PhoneNumber.first
+        Customer.connection.should_not_receive(:select_all)
+        d2 = p1.customer
 		d1.__id__.should == d2.target.__id__
 	end
 	
-	it "should work for creating objects" do
-		c1 = Customer.create(:name => "billy")
-		c2 = Customer.find_by_name("billy")
-		c1.__id__.should == c2.__id__
-	end
+    describe "creation and deletion:" do
+        before(:each) do
+            @billy = Customer.create(:name => "billy")
+        end
+        
+        it "should work for creating objects" do
+            c2 = Customer.find_by_name("billy")
+            @billy.__id__.should == c2.__id__
+            Customer.connection.should_not_receive(:select_all)
+            c3 = Customer.find(@billy.id)
+            @billy.__id__.should == c3.__id__
+        end
 	
+        it "should work for destroyed objects" do
+            @billy.destroy
+            c2 = Customer.find_by_id(@billy.id)
+            c2.should be_nil
+        end
+        
+        after(:each) do
+            @billy.destroy unless @billy.destroyed?
+        end
+	end
+    
+    describe "switching identity map:" do
+        it "should disable id_map with `without_id_map`" do
+            c1, c2, c3 = Customer.first, nil, nil
+            Customer.without_id_map do
+              c2 = Customer.first
+              c3 = Customer.first
+            end
+            c1.__id__.should_not == c2.__id__
+            c1.__id__.should_not == c3.__id__
+            c3.__id__.should_not == c2.__id__
+        end
+        
+        it "should use current id_map with `with_id_map(false)`" do
+            c1, c2, c3 = Customer.first, nil, nil
+            Customer.with_id_map(false) do
+              c2 = Customer.first
+              Customer.connection.should_not_receive(:select_all)
+              c3 = Customer.find(c2.id)
+            end
+            c1.__id__.should == c2.__id__
+            c1.__id__.should == c3.__id__
+            c3.__id__.should == c2.__id__
+        end
+        
+        it "should create new id_map with `with_id_map`" do
+            c1, c2, c3 = Customer.first, nil, nil
+            Customer.with_id_map do
+              c2 = Customer.first
+              Customer.connection.should_not_receive(:select_all)
+              c3 = Customer.find(c2.id)
+            end
+            c1.__id__.should_not == c2.__id__
+            c1.__id__.should_not == c3.__id__
+            c3.__id__.should == c2.__id__
+        end
+        
+        it "should reenable id_map with `with_id_map`" do
+            c1, c2, c3 = Customer.first, nil, nil
+            Customer.without_id_map do
+                Customer.with_id_map do
+                  c2 = Customer.first
+                  Customer.connection.should_not_receive(:select_all)
+                  c3 = Customer.find(c2.id)
+                end
+            end
+            c1.__id__.should_not == c2.__id__
+            c1.__id__.should_not == c3.__id__
+            c3.__id__.should == c2.__id__
+        end
+    end
+    
 	after(:each) do
-		Thread.current["identity_map"] = nil
+		ActiveRecord::Base.drop_identity_map
 	end
 	
-end
+end

data/spec/spec_helper.rb

@@ -1,38 +1,42 @@
-begin
-  require File.dirname(__FILE__) + '/../../../../spec/spec_helper'
-rescue LoadError
-  puts "You need to install rspec in your base app"
-  exit
-end
+require 'rubygems'
+require 'spec'
+require 'active_support'
+require 'active_support/test_case'
+require 'active_record'
+require 'active_record/test_case'
+require 'action_controller'
+require 'action_view'
+require 'identity_map'
+
+#ActiveRecord::Base.logger = Logger.new(STDOUT)
+
+ActiveRecord::Base.establish_connection(
+    :adapter=>'sqlite3',
+    :database=>'spec/identity_map.test.sqlite3'
+)
 
-plugin_spec_dir = File.dirname(__FILE__)
-ActiveRecord::Base.logger = Logger.new(plugin_spec_dir + "/debug.log")
-
-def load_schema
-  config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
-  ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
-
-  db_adapter = ENV['DB']
-  # no db passed, try one of these fine config-free DBs before bombing.
-  db_adapter ||=
-    begin
-      require 'rubygems'
-      require 'sqlite'
-      'sqlite'
-    rescue MissingSourceFile
-      begin
-        require 'sqlite3'
-        'sqlite3'
-      rescue MissingSourceFile
-      end
-    end
-
-  if db_adapter.nil?
-    raise "No DB Adapter selected. Pass the DB= option to pick one, or install Sqlite or Sqlite3."
+ActiveRecord::Schema.define(:version => 0) do
+  puts "Creating Schema"
+  create_table :customers, :force => true do |t|
+    t.string :name
   end
+  create_table :phone_numbers, :force => true do |t|
+    t.string :number
+    t.integer :customer_id
+  end
+end
 
-  ActiveRecord::Base.establish_connection(config[db_adapter])
-  load(File.dirname(__FILE__) + "/db/schema.rb")
-  require File.dirname(__FILE__) + '/../init.rb'
+class Customer < ActiveRecord::Base
+  use_id_map
+  has_many :phone_numbers
 end
-require File.dirname(__FILE__) + '/test_models.rb'
+
+customer = Customer.create(:name => "Boneman")
+
+class PhoneNumber < ActiveRecord::Base
+  use_id_map
+  belongs_to :customer
+end
+
+phone_number = customer.phone_numbers.create(:number => "8675309")
+

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 6
-  version: 0.1.6
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Sokolov Yura aka funny_falcon
@@ -54,12 +54,9 @@ files:
 - lib/identity_map/active_record/associations.rb
 - lib/identity_map/active_record/base.rb
 - lib/identity_map/cache.rb
-- spec/database.yml
-- spec/db/schema.rb
 - spec/identity_map_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/test_models.rb
 has_rdoc: true
 homepage: http://github.com/funny-falcon/identity-map
 licenses: []
@@ -95,7 +92,5 @@ signing_key:
 specification_version: 3
 summary: Simple identity map for ActiveRecord
 test_files: 
-- spec/db/schema.rb
-- spec/test_models.rb
 - spec/identity_map_spec.rb
 - spec/spec_helper.rb

data/spec/database.yml

@@ -1,21 +0,0 @@
-sqlite:
-  :adapter: sqlite
-  :database: vendor/plugins/identity_map/spec/db/identity_map_plugin.sqlite.db
-
-sqlite3:
-  :adapter: sqlite3
-  :database: vendor/plugins/identity_map/spec/db/identity_map_plugin.sqlite3.db
-
-postgresql:
-  :adapter: postgresql
-  :username: postgres
-  :password: postgres
-  :database: identity_map_plugin_test
-  :min_messages: ERROR
-
-mysql:
-  :adapter: mysql
-  :host: localhost
-  :username: root
-  :password:
-  :database: identity_map_plugin_test

data/spec/db/schema.rb

@@ -1,10 +0,0 @@
-ActiveRecord::Schema.define(:version => 0) do
-  puts "Creating Schema"
-  create_table :customers, :force => true do |t|
-    t.string :name
-  end
-  create_table :phone_numbers, :force => true do |t|
-    t.string :number
-    t.integer :customer_id
-  end
-end

data/spec/test_models.rb

@@ -1,13 +0,0 @@
-load_schema
-
-class Customer < ActiveRecord::Base
-  has_many :phone_numbers
-end
-
-customer = Customer.create(:name => "Boneman")
-
-class PhoneNumber < ActiveRecord::Base
-  belongs_to :customer
-end
-
-phone_number = customer.phone_numbers.create(:number => "8675309")