ar-octopus 0.0.18 → 0.0.19

data/Rakefile

@@ -29,7 +29,7 @@ begin
     gem.authors = ["Thiago Pradi", "Mike Perham", "Amit Agarwal"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
     gem.add_dependency('activerecord', '>= 3.0.0beta')
-    gem.version = "0.0.18"
+    gem.version = "0.0.19"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/ar-octopus.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ar-octopus}
-  s.version = "0.0.18"
+  s.version = "0.0.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thiago Pradi", "Mike Perham", "Amit Agarwal"]

data/lib/octopus.rb

@@ -7,6 +7,12 @@ module Octopus
   
   def self.config()
     @config ||= HashWithIndifferentAccess.new(YAML.load_file(Octopus.directory() + "/config/shards.yml"))
+    
+    if !@config[Octopus.env].nil? && @config[Octopus.env()]['excluded_enviroments']
+      self.excluded_enviroments = @config[Octopus.env()]['excluded_enviroments']
+    end
+    
+    @config
   end
 
   # Returns the Rails.root_to_s when you are using rails

data/lib/octopus/association.rb

@@ -74,7 +74,7 @@ module Octopus::Association
         return_val = association.send(constructor, attributees)
       end
 
-      if have_a_valid_shard?
+      if should_set_current_shard?
         return_val.current_shard = self.current_shard
       end
 

data/lib/octopus/controller.rb

@@ -1,6 +1,6 @@
 module Octopus::Controller
   def using(shard, &block)
-    ActiveRecord::Base.connection.run_queries_on_shard(shard, &block)
+    ActiveRecord::Base.using(shard, &block)
   end
 end
 

data/lib/octopus/migration.rb

@@ -1,5 +1,7 @@
 module Octopus::Migration  
   def using(*args, &block)
+    Octopus.config()
+
     args.each do |shard|
       if !ActiveRecord::Base.using(shard).connection.table_exists?(ActiveRecord::Migrator.schema_migrations_table_name())
         ActiveRecord::Base.using(shard).connection.initialize_schema_migrations_table 
@@ -19,6 +21,18 @@ module Octopus::Migration
   end
 
   def using_group(*args)
+    Octopus.config()
+
+    args.each do |group_shard|
+      shards = self.connection().instance_variable_get(:@groups)[group_shard] || []
+
+      shards.each do |shard|
+        if !ActiveRecord::Base.using(shard).connection.table_exists?(ActiveRecord::Migrator.schema_migrations_table_name())
+          ActiveRecord::Base.using(shard).connection.initialize_schema_migrations_table 
+        end
+      end
+    end
+
     if args.size == 1
       self.connection().block = true
       self.connection().current_group = args.first

data/lib/octopus/model.rb

@@ -60,13 +60,13 @@ module Octopus::Model
     def set_connection(*args)
       if(args.size == 1)
         arg = args.first
-        arg.current_shard = self.current_shard if arg.respond_to?(:current_shard) && have_a_valid_shard?
+        arg.current_shard = self.current_shard if arg.respond_to?(:current_shard) && should_set_current_shard?
       end
 
-      self.connection.current_shard = self.current_shard if have_a_valid_shard?
+      self.connection.current_shard = self.current_shard if should_set_current_shard?
     end
 
-    def have_a_valid_shard?
+    def should_set_current_shard?
       self.respond_to?(:current_shard) && self.current_shard != nil
     end
   end

data/lib/octopus/persistence.rb

@@ -1,6 +1,6 @@
 module Octopus::Persistence
   def reload_connection()
-    set_connection() if have_a_valid_shard?
+    set_connection() if should_set_current_shard?
   end
 
   def update_attribute(name, value)

data/lib/octopus/proxy.rb

@@ -3,7 +3,7 @@ class Octopus::Proxy
 
   def initialize(config)    
     initialize_shards(config)
-    initialize_replication(config) if have_a_valid_configuration?(config) && config[Octopus.env()]["replicated"]
+    initialize_replication(config) if have_config_for_enviroment?(config) && config[Octopus.env()]["replicated"]
   end
 
   def initialize_shards(config)
@@ -12,11 +12,7 @@ class Octopus::Proxy
     @shards[:master] = ActiveRecord::Base.connection_pool()
     @current_shard = :master
     
-    if have_a_valid_configuration?(config) && config[Octopus.env()]['excluded_enviroments']
-      Octopus.excluded_enviroments = config[Octopus.env()]['excluded_enviroments']
-    end
-    
-    shards_config = config[Octopus.env()]["shards"] if have_a_valid_configuration?(config)
+    shards_config = config[Octopus.env()]["shards"] if have_config_for_enviroment?(config)
     shards_config ||= []
 
     shards_config.each do |key, value|
@@ -75,10 +71,6 @@ class Octopus::Proxy
     current_shard.is_a?(Array) ? current_shard.first : current_shard
   end
 
-  def have_a_valid_configuration?(config)
-    !config[Octopus.env()].nil?
-  end
-
   def add_transaction_record(record)
     if !select_connection().instance_variable_get(:@_current_transaction_records).nil?
       select_connection().add_transaction_record(record)
@@ -169,6 +161,10 @@ class Octopus::Proxy
   def should_send_queries_to_replicated_databases?(method)
     @replicated && method.to_s =~ /select/
   end
+  
+  def have_config_for_enviroment?(config)
+    !config[Octopus.env()].nil?
+  end
 
   def send_queries_to_multiple_groups(method, *args, &block)
     method_return = nil

data/spec/octopus/model_spec.rb

@@ -36,6 +36,11 @@ describe Octopus::Model do
       User.create!(:name => 'oi')
       User.count.should == 1
     end
+    
+    it "should clean #current_shard from proxy when using execute" do
+      ActiveRecord::Base.using(:canada).connection().execute("select * from users limit 1;")
+      ActiveRecord::Base.connection.current_shard.should == :master
+    end
 
     it "should allow scoping dynamically" do
       User.using(:canada).using(:master).using(:canada).create!(:name => 'oi')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ar-octopus
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: false
   segments: 
   - 0
   - 0
-  - 18
-  version: 0.0.18
+  - 19
+  version: 0.0.19
 platform: ruby
 authors: 
 - Thiago Pradi