ar-octopus 0.0.2 → 0.0.3

data/spec/octopus/model_spec.rb

@@ -24,13 +24,46 @@ describe Octopus::Model do
     end
 
     it "should support both groups and alone shards" do
-      User.using(:alone_shard).create!(:name => "Alone")
+      u = User.using(:alone_shard).create!(:name => "Alone")
       User.using(:alone_shard).count.should == 1
       User.using(:canada).count.should == 0
       User.using(:brazil).count.should == 0
       User.count.should == 0
     end
 
+    describe "#current_shard attribute" do
+      it "should store the attribute when you create or find an object" do
+        u = User.using(:alone_shard).create!(:name => "Alone")
+        u.current_shard.should == :alone_shard
+        User.using(:canada).create!(:name => 'oi')
+        u = User.using(:canada).find_by_name("oi")
+        u.current_shard.should == :canada      
+      end
+
+      it "should store the attribute when you find multiple instances" do
+        5.times { User.using(:alone_shard).create!(:name => "Alone") }
+        User.using(:alone_shard).all.each do |u|
+          u.current_shard.should == :alone_shard
+        end
+      end
+
+      it "should works when you find, and after that, alter that object" do
+        alone_user = User.using(:alone_shard).create!(:name => "Alone")
+        master_user = User.using(:master).create!(:name => "Master")
+        alone_user.name = "teste"
+        alone_user.save
+        User.using(:master).find(:first).name.should == "Master"
+        User.using(:alone_shard).find(:first).name.should == "teste"
+      end
+
+      it "should work for the reload method" do
+        User.using(:alone_shard).create!(:name => "Alone")
+        u = User.using(:alone_shard).where(:name => "Alone").first
+        u.reload
+        u.name.should == "Alone"
+      end
+    end
+
     describe "passing a block" do
       it "should allow queries be executed inside the block, ponting to a specific shard" do
         User.using(:canada) do
@@ -50,20 +83,6 @@ describe Octopus::Model do
       end
     end
 
-    describe "when you have a relationship" do
-      it "should find all models in the specified shard" do
-        pending()
-        # brazil_client = Client.using(:brazil).create!(:name => "Brazil Client")
-        # master_client = Client.create!(:name => "Master Client")
-        # 
-        # item_brazil = Item.using(:brazil).create!(:name => "Brazil Item", :client => brazil_client)
-        # item_master = Item.create!(:name => "Master Item", :client => master_client)
-        # c = Client.using(:brazil).find_by_name("Brazil Client")
-        # Client.using(:master).create!(:name => "teste")
-        # c.items.should == [item_brazil]
-      end
-    end
-
     describe "raising errors" do
       it "should raise a error when you specify a shard that doesn't exist" do
         lambda { User.using(:crazy_shard) }.should raise_error("Nonexistent Shard Name: crazy_shard")
@@ -83,7 +102,39 @@ describe Octopus::Model do
       User.using(:alone_shard).find(:all).should == []
     end
   end
+  
+  describe "AR basic methods" do
+    it "increment" do
+      u = User.using(:brazil).create!(:name => "Teste", :number => 10)
+      u = User.using(:brazil).find_by_number(10)
+      u.increment(:number)
+      u.save()
+      u = User.using(:brazil).find_by_number(11).should_not be_nil        
+    end
+
+    it "increment!" do
+      u = User.using(:brazil).create!(:name => "Teste", :number => 10)
+      u = User.using(:brazil).find_by_number(10)
+      u.increment!(:number)
+      u = User.using(:brazil).find_by_number(11).should_not be_nil
+    end
+
+    it "toggle" do
+      u = User.using(:brazil).create!(:name => "Teste", :admin => false)
+      u = User.using(:brazil).find_by_name('Teste')
+      u.toggle(:admin)
+      u.save()
+      u = User.using(:brazil).find_by_name('Teste').admin.should be_true
+    end
 
+    it "toggle!" do
+      u = User.using(:brazil).create!(:name => "Teste", :admin => false)
+      u = User.using(:brazil).find_by_name('Teste')
+      u.toggle!(:admin)
+      u = User.using(:brazil).find_by_name('Teste').admin.should be_true
+    end
+  end
+  
   describe "#replicated_model method" do
     it "should be replicated" do
       using_enviroment :production_replicated do 

data/spec/octopus/proxy_spec.rb

@@ -62,7 +62,7 @@ describe Octopus::Proxy do
     before(:each) do
       Octopus.stub!(:env).and_return("production_replicated")
       @proxy = Octopus::Proxy.new(Octopus.config())
-      ActiveRecord::Base.class_eval("@@connection_proxy = nil")
+      clean_connection_proxy()
     end
     
     it "should have the replicated attribute as true" do

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 MIGRATIONS_ROOT = File.expand_path(File.join(File.dirname(__FILE__),  'migrations'))
 require 'spec'
 require 'spec/autorun'
-require "database_connection"
+require "spec/database_connection"
 require "action_pack"
 require "action_controller"
 require 'octopus'
@@ -22,7 +22,7 @@ end
 
 def clean_all_shards()
   ActiveRecord::Base.using(:master).connection.shards.keys.each do |shard_symbol|
-    ['schema_migrations', 'users', 'clients', 'cats', 'items'].each do |tables|
+    ['schema_migrations', 'users', 'clients', 'cats', 'items', 'keyboards', 'computers', 'permissions_roles', 'roles', 'permissions', 'assignments', 'projects', 'programmers'].each do |tables|
       ActiveRecord::Base.using(shard_symbol).connection.execute("DELETE FROM #{tables};") 
     end
   end
@@ -37,13 +37,17 @@ def migrating_to_version(version, &block)
   end
 end
 
+def clean_connection_proxy()
+  Thread.current[:connection_proxy] = nil  
+end
+
 def using_enviroment(enviroment, &block)
   begin
-    Octopus.class_eval("@@env = '#{enviroment.to_s}'")
-    ActiveRecord::Base.class_eval("@@connection_proxy = nil")
+    Octopus.instance_variable_set(:@env, enviroment.to_s)
+    clean_connection_proxy()
     yield
   ensure
-    Octopus.class_eval("@@env = 'production'")      
-    ActiveRecord::Base.class_eval("@@connection_proxy = nil")
+    Octopus.instance_variable_set(:@env, 'production')
+    clean_connection_proxy()
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ar-octopus
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Thiago Pradi
@@ -16,16 +17,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-14 00:00:00 -03:00
+date: 2010-06-22 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -52,7 +55,10 @@ files:
 - doc/libraries.textile
 - doc/shards.yml
 - lib/octopus.rb
+- lib/octopus/association.rb
+- lib/octopus/association_collection.rb
 - lib/octopus/controller.rb
+- lib/octopus/has_and_belongs_to_many_association.rb
 - lib/octopus/migration.rb
 - lib/octopus/model.rb
 - lib/octopus/proxy.rb
@@ -70,6 +76,7 @@ files:
 - spec/migrations/7_raise_exception_with_invalid_multiple_shard_names.rb
 - spec/migrations/8_raise_exception_with_invalid_group_name.rb
 - spec/migrations/9_raise_exception_with_multiple_invalid_group_names.rb
+- spec/octopus/association_spec.rb
 - spec/octopus/controller_spec.rb
 - spec/octopus/migration_spec.rb
 - spec/octopus/model_spec.rb
@@ -87,23 +94,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Easy Database Sharding for ActiveRecord
@@ -121,6 +132,7 @@ test_files:
 - spec/migrations/7_raise_exception_with_invalid_multiple_shard_names.rb
 - spec/migrations/8_raise_exception_with_invalid_group_name.rb
 - spec/migrations/9_raise_exception_with_multiple_invalid_group_names.rb
+- spec/octopus/association_spec.rb
 - spec/octopus/controller_spec.rb
 - spec/octopus/migration_spec.rb
 - spec/octopus/model_spec.rb