ar-octopus 0.3.3 → 0.3.4

data/Rakefile

@@ -37,7 +37,7 @@ begin
     gem.add_development_dependency "jeweler", ">= 1.4"
     gem.add_development_dependency "actionpack", ">= 2.3"
     gem.add_dependency('activerecord', '>= 2.3')
-    gem.version = "0.3.3"
+    gem.version = "0.3.4"
   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.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thiago Pradi", "Mike Perham"]

data/lib/octopus/model.rb

@@ -14,7 +14,7 @@ module Octopus::Model
       return self if defined?(::Rails) && !Octopus.environments.include?(Rails.env.to_s)
       
       clean_table_name()
-      hijack_initializer()
+      hijack_initializer() if !respond_to?(:set_current_shard)
 
       self.connection_proxy.using_enabled = true
 

data/spec/octopus/scope_proxy_spec.rb

@@ -14,6 +14,6 @@ describe Octopus::ScopeProxy do
   end
   
   it "should raise a exception when trying to send a query to a shard that don't exists" do
-    lambda { User.where(:name => "Thiago").using(:dont_exists).all }.should raise_exception("Nonexistent Shard Name: dont_exists")
+    lambda { User.using(:dont_exists).all }.should raise_exception("Nonexistent Shard Name: dont_exists")
   end
 end

data/spec/spec_helper.rb

@@ -1,12 +1,8 @@
 require "rubygems"
-if ENV["VERSION"]
-  gem 'activerecord', ENV["VERSION"]
-  gem 'activesupport', ENV["VERSION"]
-  gem 'actionpack', ENV["VERSION"]
-end
-
 require "bundler"
+
 Bundler.setup()
+
 require File.expand_path(File.dirname(__FILE__)) + "/database_connection"
 require "octopus"
 require "octopus_helper"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ar-octopus
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Thiago Pradi