ar-octopus 0.7.0 → 0.8.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDBkZGI5ZDAzMjU4MzkxZjVlYWZjMGI5ODQ0NDhiYjI1NTM5NjNkOQ==
+    ZWQzNDQ0MzMzZWViNTFiYjY5MWRlODZjN2M2MGFlNDMwM2RjMTY2Mw==
   data.tar.gz: !binary |-
-    MGE2MWM1YWZiNDQzNGQ3ZDE2ZTU4ZDljMzA1Nzk5N2Q2YzNjZTBlMA==
+    YmUzNzY2YzQ0ZWUwOWVjZDI4ZWQwOGEyMGZmOWY3NDg1MzA0MjNhZg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MDM1OTdhNGQwYjZkMjhiMTVmMDRmZmM2NmMyNzAwN2E3NTNhN2ZmM2ZmODZh
-    OGQ3ODUyZjU3ZTNjNzM0NDYzYmNiMjBjOGMxNmI4OTdkYTZjYTZhYzE1Mzgz
-    MmY5NTA1NGFmMTljNmIwNGUxNGY3NTU2ZWEzZTkyZmViNTBiYWY=
+    ODcyN2VkMDQ3Zjk4MjVlYTEyMGMxYmU4NmFhMmI1ZmM0OGFkMDc5Mzk1MWRk
+    OWIyYzMwMTY5MjVhYjE1MDljOTlkMjI4N2E3OTYyMGY4YzIyMGUwZGVjZTM4
+    ZTI3ZGRiZWU2NjkyNGQzNDcwNTM3Y2FlNjM3MWIwNGI4MGIzMWY=
   data.tar.gz: !binary |-
-    YWRmMDc0MjU5YzY1Y2MxNWJiZjRhMzhiMDk3MzAyMzc0NjhmZDk2NTUyNDli
-    MmQxODE2ZmNhM2EwYWQyZWNlZTYwOWYwOWRlMTlkMjlhYzQ5YzBmOWVmNjI1
-    OGM5YzBjOTMwODg0YjEyYzY3YWU1NDY4OWRhOGIwYTY3MjhmYWY=
+    M2M5MDVjNGU4NWU3MTcxYzljOTJmNTVlMGI5NzY5ZTliYzBmODIxZjIzNTE3
+    NGVlZWU3MmNkNDIwYzYxNDVhMzM1NmVlZmFkZGNkZmYwM2Y2NzY0OThhMTBm
+    NjYzMWM0NDAyNDMxN2ZmNzY0ZWFhNmYwN2M5NWIwNmE3MDdjNWE=

data/.travis.yml

@@ -7,8 +7,8 @@ rvm:
   - 1.9.3
 
 gemfile:
-  - gemfiles/rails31.gemfile
   - gemfiles/rails32.gemfile
+  - gemfiles/rails4.gemfile
 
 notifications:
   recipients:
@@ -19,3 +19,5 @@ matrix:
   include:
     - rvm: 2.0.0
       gemfile: gemfiles/rails32.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/rails4.gemfile

data/Appraisals

@@ -1,9 +1,9 @@
-appraise "rails31" do
-  gem "activerecord", "~> 3.1.3"
-end
-
 appraise "rails32" do
   gem "activerecord", "~> 3.2.0"
 end
 
+appraise "rails4" do
+  gem "activerecord", "~> 4.0.0"
+end
+
 # vim: ft=ruby

data/README.mkdn

@@ -5,7 +5,7 @@
 Octopus is a better way to do Database Sharding in ActiveRecord. Sharding allows multiple databases in the same rails application. While there are several projects that implement Sharding (e.g. DbCharmer, DataFabric, MultiDb), each project has its own limitations. The main goal of octopus project is to provide a better way of doing Database Sharding.
 
 ## Feature list:
-The api is designed to be simple as possible. Octopus focuses on the end user, giving the power of multiple databases but with reliable code and flexibility. Octopus is compatible with Rails 3.
+The api is designed to be simple as possible. Octopus focuses on the end user, giving the power of multiple databases but with reliable code and flexibility. Octopus is compatible with Rails 3.2 and Rails 4.
 
 Octopus supports:
 
@@ -122,14 +122,6 @@ If you want to send a specified action, or all actions from a controller, to a s
  To see the complete list of features and syntax, please check out our <a href="http://wiki.github.com/tchandy/octopus/"> Wiki</a>
 Want to see sample rails applications using octopus features? please check it out: <a href="http://github.com/tchandy/octopus_sharding_example">Sharding Example</a> and <a href="http://github.com/tchandy/octopus_replication_example">Replication Example</a>. Also, we have an example that shows how to use Octopus without Rails: <a href="http://github.com/tchandy/octopus_sinatra"> Octopus + Sinatra Example</a>.
 
-
-## Important!
-Occasionally, an application might lose a connection to a database; when this happens, ActiveRecord will raise an exception. Add the following line to your application configuration if you are experiencing this issue:
-
-    verify_connection: true
-
-This will tell Octopus to verify the connection before sending the query.
-
 ## Mixing Octopus with the Rails multiple database model
 If you want to set a custom connection to a specific model, use the syntax `octopus_establish_connection` syntax:
 
@@ -138,23 +130,6 @@ If you want to set a custom connection to a specific model, use the syntax `octo
       octopus_establish_connection(:adapter => "mysql", :database => "octopus_shard2")
     end
 
-## Set table names
-If you want to use specific table names, use the correct syntax for your version of Rails.
-
-### Rails <= 3.1
-
-    class Bacon < ActiveRecord::Base
-      set_table_name("yummy")
-    end
-
-### Rails >= 3.2
-
-    class Bacon < ActiveRecord::Base
-      self.table_name = "yummy"
-    end
-
-Unfortunately the `self.table_name=` syntax isn't supported on versions of Rails <= 3.1.
-
 ## Contributing with Octopus
 Contributors are welcome! To run the test suite, you need mysql, postgresql and sqlite3 installed. This is what you need to setup your Octopus development environment:
 
@@ -165,7 +140,7 @@ Contributors are welcome! To run the test suite, you need mysql, postgresql and
     bundle exec rake appraisal:install
     bundle exec rake spec
 
-This command will run the spec suite for all rails versions supported (Rails 3.0, Rails 3.1 and Rails 3.2).
+This command will run the spec suite for all rails versions supported.
 To run our integrations tests inside sample_app, you need to following commands:
 
     cd sample_app

data/Rakefile

@@ -57,7 +57,7 @@ namespace :db do
     require "#{File.dirname(__FILE__)}/spec/support/database_connection"
 
     shard_symbols = [:master, :brazil, :canada, :russia, :alone_shard, :postgresql_shard, :sqlite_shard]
-    shard_symbols << :protocol_shard if Octopus.rails32?
+    shard_symbols << :protocol_shard
     shard_symbols.each do |shard_symbol|
       # Rails 3.1 needs to do some introspection around the base class, which requires
       # the model be a descendent of ActiveRecord::Base.

data/ar-octopus.gemspec

@@ -21,8 +21,9 @@ Gem::Specification.new do |s|
                            "Octopus now stores schema version information in each shard and migrations will not " \
                            "work properly unless this task is invoked."
 
-  s.add_dependency 'activerecord', '>= 3.1.0', '< 4.0'
-  s.add_dependency 'activesupport', '>= 3.1.0', '< 4.0'
+  s.add_dependency 'activerecord', '>= 3.2.0'
+  s.add_dependency 'activesupport', '>= 3.2.0'
+
   s.add_development_dependency 'rake', '>= 0.8.7'
   s.add_development_dependency 'rspec', '>= 2.0.0'
   s.add_development_dependency 'mysql2', '> 0.3'

data/gemfiles/{rails31.gemfile → rails4.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 3.1.3"
+gem "activerecord", "~> 4.0.0"
 
 gemspec :path=>"../"

data/lib/octopus.rb

@@ -18,7 +18,7 @@ module Octopus
     @config ||= begin
       file_name = Octopus.directory() + "/config/shards.yml"
 
-      if File.exists?(file_name)
+      if File.exists?(file_name) || File.symlink?(file_name)
         config ||= HashWithIndifferentAccess.new(YAML.load(ERB.new(File.read(file_name)).result))[Octopus.env()]
       else
         config ||= HashWithIndifferentAccess.new
@@ -64,12 +64,12 @@ module Octopus
     @environments ||= config['environments'] || ['production']
   end
 
-  def self.rails31?
-    ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 1
+  def self.rails3?
+    ActiveRecord::VERSION::MAJOR <= 3
   end
 
-  def self.rails32?
-    ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 2
+  def self.rails4?
+    ActiveRecord::VERSION::MAJOR >= 4
   end
 
   def self.rails?
@@ -107,9 +107,6 @@ if defined?(::Rails)
   require "octopus/railtie"
 end
 
-if Octopus.rails32?
-  require "octopus/rails3.2/persistence"
-end
 
 require "octopus/proxy"
 require "octopus/scope_proxy"

data/lib/octopus/association.rb

@@ -6,23 +6,46 @@ module Octopus::Association
   module InstanceMethods
     def set_connection_on_association(record)
       return unless ::Octopus.enabled?
-      return if !self.connection.respond_to?(:current_shard) || !self.respond_to?(:current_shard)
+      return if !self.class.connection.respond_to?(:current_shard) || !self.respond_to?(:current_shard)
       if !record.current_shard.nil? && !self.current_shard.nil? && record.current_shard != self.current_shard
         raise "Association Error: Records are from different shards"
       end
 
-      record.current_shard = self.connection.current_shard = self.current_shard if should_set_current_shard?
+      record.current_shard = self.class.connection.current_shard = self.current_shard if should_set_current_shard?
     end
   end
 
-  def has_many(association_id, options = {}, &extension)
-    default_octopus_opts(options)
-    super
+  if Octopus.rails4?
+    def has_many(association_id, scope=nil, options={}, &extension)
+      if options == {} && scope.is_a?(Hash)
+        default_octopus_opts(scope)
+      else
+        default_octopus_opts(options)
+      end
+      super
+    end
+  else
+    def has_many(association_id, options={}, &extension)
+      default_octopus_opts(options)
+      super
+    end
   end
 
-  def has_and_belongs_to_many(association_id, options = {}, &extension)
-    default_octopus_opts(options)
-    super
+
+  if Octopus.rails4?
+    def has_and_belongs_to_many(association_id, scope=nil, options={}, &extension)
+      if options == {} && scope.is_a?(Hash)
+        default_octopus_opts(scope)
+      else
+        default_octopus_opts(options)
+      end
+      super
+    end
+  else
+    def has_and_belongs_to_many(association_id, options={}, &extension)
+      default_octopus_opts(options)
+      super
+    end
   end
 
   def default_octopus_opts(options)

data/lib/octopus/association_collection.rb

@@ -1,16 +1,14 @@
 module Octopus::AssociationCollection
 
   def self.included(base)
-    if Octopus.rails31? || Octopus.rails32?
-      base.instance_eval do
-        alias_method_chain :reader, :octopus
-        alias_method_chain :writer, :octopus
-        alias_method_chain :ids_reader, :octopus
-        alias_method_chain :ids_writer, :octopus
-        alias_method_chain :create, :octopus
-        alias_method_chain :create!, :octopus
-        alias_method_chain :build, :octopus
-      end
+    base.instance_eval do
+      alias_method_chain :reader, :octopus
+      alias_method_chain :writer, :octopus
+      alias_method_chain :ids_reader, :octopus
+      alias_method_chain :ids_writer, :octopus
+      alias_method_chain :create, :octopus
+      alias_method_chain :create!, :octopus
+      alias_method_chain :build, :octopus
     end
   end
 
@@ -62,8 +60,4 @@ module Octopus::AssociationCollection
   end
 end
 
-if Octopus.rails31? || Octopus.rails32?
-  ActiveRecord::Associations::CollectionAssociation.send(:include, Octopus::AssociationCollection)
-else
-  ActiveRecord::Associations::AssociationCollection.send(:include, Octopus::AssociationCollection)
-end
+ActiveRecord::Associations::CollectionAssociation.send(:include, Octopus::AssociationCollection)

data/lib/octopus/migration.rb

@@ -13,27 +13,16 @@ module Octopus::Migration
     end
   end
 
-  include InstanceOrClassMethods if Octopus.rails31? || Octopus.rails32?
+  include InstanceOrClassMethods
 
   def self.included(base)
     base.send(:extend, ClassMethods)
 
-    if Octopus.rails31? || Octopus.rails32?
-      base.alias_method_chain :announce, :octopus
-    else
-      base.class_eval do
-        class << self
-          alias_method_chain :announce, :octopus
-        end
-      end
-    end
-
+    base.alias_method_chain :announce, :octopus
     base.class_attribute :current_shard, :current_group, :instance_reader => false, :instance_writer => false
   end
 
   module ClassMethods
-    include InstanceOrClassMethods unless Octopus.rails31? || Octopus.rails32?
-
     def using(*args)
       return self unless connection.is_a?(Octopus::Proxy)
 
@@ -147,11 +136,7 @@ end
 
 module Octopus::MigrationProxy
   def shards
-    if Octopus.rails31? || Octopus.rails32?
-      migration.class.shards
-    else
-      migration.shards
-    end
+    migration.class.shards
   end
 end
 

data/lib/octopus/model.rb

@@ -144,13 +144,13 @@ module Octopus::Model
         attr_accessor :custom_octopus_connection
         attr_accessor :custom_octopus_table_name
 
-        alias_method_chain(:set_table_name, :octopus)
+        if Octopus.rails3?
+          alias_method_chain(:set_table_name, :octopus)
+        end
 
-        if Octopus.rails32?
-          def table_name=(value = nil)
-            self.custom_octopus_table_name = true
-            super
-          end
+        def table_name=(value = nil)
+          self.custom_octopus_table_name = true
+          super
         end
       end
     end

data/lib/octopus/proxy.rb

@@ -15,12 +15,6 @@ class Octopus::Proxy
     @shards[:master] = ActiveRecord::Base.connection_pool_without_octopus()
     @config = ActiveRecord::Base.connection_pool_without_octopus.connection.instance_variable_get(:@config)
 
-    if !config.nil? && config.has_key?("verify_connection")
-      @verify_connection = config["verify_connection"]
-    else
-      @verify_connection = false
-    end
-
     if !config.nil?
       @entire_sharded = config['entire_sharded']
       shards_config = config[Octopus.rails_env()]
@@ -29,7 +23,7 @@ class Octopus::Proxy
     shards_config ||= []
 
     shards_config.each do |key, value|
-      if value.is_a?(String) && Octopus.rails32?
+      if value.is_a?(String) 
         value = resolve_string_connection(value).merge(:octopus_shard => key)
         initialize_adapter(value['adapter'])
         @shards[key.to_sym] = connection_pool_for(value, "#{value['adapter']}_connection")
@@ -145,14 +139,11 @@ class Octopus::Proxy
   # connection pool.  Previously, that would work since the pool would just
   # reconnect, but in Rails 3.1 the flag prevents this.  
   def safe_connection(connection_pool)
-    if Octopus.rails31? || Octopus.rails32?
-      connection_pool.automatic_reconnect ||= true
-    end
+    connection_pool.automatic_reconnect ||= true
     connection_pool.connection()
   end
 
   def select_connection
-    @shards[shard_name].verify_active_connections! if @verify_connection
     safe_connection(@shards[shard_name])
   end
 
@@ -244,8 +235,15 @@ class Octopus::Proxy
   end
 
   protected
+
   def connection_pool_for(adapter, config)
-    ActiveRecord::ConnectionAdapters::ConnectionPool.new(ActiveRecord::Base::ConnectionSpecification.new(adapter.dup, config))
+    if Octopus.rails4?
+      arg = ActiveRecord::ConnectionAdapters::ConnectionSpecification.new(adapter.dup, config)
+    else
+      arg = ActiveRecord::Base::ConnectionSpecification.new(adapter.dup, config)
+    end
+
+    ActiveRecord::ConnectionAdapters::ConnectionPool.new(arg)
   end
 
   def initialize_adapter(adapter)
@@ -258,7 +256,12 @@ class Octopus::Proxy
   end
 
   def resolve_string_connection(spec)
-    ActiveRecord::Base::ConnectionSpecification::Resolver.new(spec, {}).spec.config.stringify_keys
+    if Octopus.rails4?
+      resolver = ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new(spec, {})
+    else
+      resolver = ActiveRecord::Base::ConnectionSpecification::Resolver.new(spec, {})
+    end
+    resolver.spec.config.stringify_keys
   end
 
   def should_clean_connection?(method)

data/lib/octopus/rails3/abstract_adapter.rb

@@ -3,7 +3,12 @@ module Octopus
   module AbstractAdapter
     module OctopusShard
 
-      class InstrumenterDecorator < ActiveSupport::BasicObject
+      parent = ActiveSupport::BasicObject
+      if Octopus.rails4?
+        parent = ActiveSupport::ProxyObject
+      end
+
+      class InstrumenterDecorator < parent
         def initialize(adapter, instrumenter)
           @adapter = adapter
           @instrumenter = instrumenter

data/lib/octopus/rails3/persistence.rb

@@ -35,6 +35,11 @@ module Octopus
         reload_connection()
         super
       end
+
+      def update_column(*args)
+        reload_connection()
+        super
+      end
     end
   end
 end

data/lib/octopus/scope_proxy.rb

@@ -37,6 +37,10 @@ class Octopus::ScopeProxy
     result
   end
 
+  def as_json(options = nil)
+    method_missing(:as_json, options)
+  end
+
   # Delegates to method_missing (instead of @klass) so that User.using(:blah).where(:name => "Mike")
   # gets run in the correct shard context when #== is evaluated.
   def ==(*args)

data/lib/octopus/version.rb

@@ -1,3 +1,3 @@
 module Octopus
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

data/lib/tasks/octopus.rake

@@ -6,11 +6,7 @@ namespace :octopus do
     connection = ActiveRecord::Base.connection
 
     current_version  = ActiveRecord::Migrator.current_version
-    migrations_paths = if Octopus.rails31? || Octopus.rails32?
-                         ActiveRecord::Migrator.migrations_paths
-                       else
-                         ActiveRecord::Migrator.migrations_path
-                       end
+    migrations_paths = ActiveRecord::Migrator.migrations_paths
 
     connection.send_queries_to_multiple_shards(connection.shard_names) do
       ActiveRecord::Schema.initialize_schema_migrations_table

data/spec/config/shards.yml

@@ -102,7 +102,6 @@ production_fully_replicated:
 
 octopus_rails:
   replicated: true
-  verify_connection: true
   environments:
     - staging
     - production

data/spec/octopus/association_spec.rb

@@ -184,9 +184,9 @@ describe Octopus::Association, :shards => [:brazil, :master, :canada] do
 
       it "find" do
         role = @permission_brazil_2.roles.create(:name => "Builded Role")
-        @permission_brazil_2.roles.find(:first).should == role
+        @permission_brazil_2.roles.first.should == role
         @permission_brazil_2.roles.destroy_all
-        @permission_brazil_2.roles.find(:first).should be_nil
+        @permission_brazil_2.roles.first.should be_nil
       end
 
       it "exists?" do
@@ -337,9 +337,9 @@ describe Octopus::Association, :shards => [:brazil, :master, :canada] do
 
       it "find" do
         role = @new_brazil_programmer.projects.create(:name => "New VB App :-/")
-        @new_brazil_programmer.projects.find(:first).should == role
+        @new_brazil_programmer.projects.first.should == role
         @new_brazil_programmer.projects.destroy_all
-        @new_brazil_programmer.projects.find(:first).should be_nil
+        @new_brazil_programmer.projects.first.should be_nil
       end
 
       it "exists?" do
@@ -497,9 +497,9 @@ describe Octopus::Association, :shards => [:brazil, :master, :canada] do
       end
 
       it "find" do
-        @brazil_client.items.find(:first).should == @item_brazil
+        @brazil_client.items.first.should == @item_brazil
         @brazil_client.items.destroy_all
-        @brazil_client.items.find(:first).should be_nil
+        @brazil_client.items.first.should be_nil
       end
 
       it "exists?" do
@@ -633,9 +633,9 @@ describe Octopus::Association, :shards => [:brazil, :master, :canada] do
       end
 
       it "find" do
-        @brazil_client.comments.find(:first).should == @comment_brazil
+        @brazil_client.comments.first.should == @comment_brazil
         @brazil_client.comments.destroy_all
-        @brazil_client.comments.find(:first).should be_nil
+        @brazil_client.comments.first.should be_nil
       end
 
       it "exists?" do

data/spec/octopus/migration_spec.rb

@@ -32,27 +32,27 @@ describe Octopus::Migration do
 
   it "should run once per shard" do
     OctopusHelper.migrating_to_version 5 do
-      User.using(:canada).find(:all, {:conditions => {:name => "MultipleGroup"}}).size.should == 1
-      User.using(:brazil).find(:all, {:conditions => {:name => "MultipleGroup"}}).size.should == 1
-      User.using(:russia).find(:all, {:conditions => {:name => "MultipleGroup"}}).size.should == 1
+      User.using(:canada).where(:name => 'MultipleGroup').size.should == 1
+      User.using(:brazil).where(:name => 'MultipleGroup').size.should == 1
+      User.using(:russia).where(:name => 'MultipleGroup').size.should == 1
     end
   end
 
   it "should create users inside block" do
     OctopusHelper.migrating_to_version 12 do
-      User.using(:brazil).find(:all, :conditions => {:name => "UsingBlock1"}).size.should == 1
-      User.using(:brazil).find(:all, :conditions => {:name => "UsingBlock2"}).size.should == 1
-      User.using(:canada).find(:all, :conditions => {:name => "UsingCanada"}).size.should == 1
-      User.using(:canada).find(:all, :conditions => {:name => "UsingCanada2"}).size.should == 1
+      User.using(:brazil).where(:name => 'UsingBlock1').size.should == 1
+      User.using(:brazil).where(:name => 'UsingBlock2').size.should == 1
+      User.using(:canada).where(:name => 'UsingCanada').size.should == 1
+      User.using(:canada).where(:name => 'UsingCanada2').size.should == 1
     end
   end
 
   it "should send the query to the correct shard" do
     OctopusHelper.migrating_to_version 13 do
-      User.using(:brazil).find(:all, :conditions => {:name => "Brazil"}).size.should == 1
-      User.using(:brazil).find(:all, :conditions => {:name => "Canada"}).size.should == 0
-      User.using(:canada).find(:all, :conditions => {:name => "Brazil"}).size.should == 0
-      User.using(:canada).find(:all, :conditions => {:name => "Canada"}).size.should == 1
+      User.using(:brazil).where(:name => 'Brazil').size.should == 1
+      User.using(:brazil).where(:name => 'Canada').size.should == 0
+      User.using(:canada).where(:name => 'Brazil').size.should == 0
+      User.using(:canada).where(:name => 'Canada').size.should == 1
     end
   end
 

data/spec/octopus/model_spec.rb

@@ -237,17 +237,14 @@ describe Octopus::Model do
         User.using(:brazil).find_by_name("Mike").should == u
       end
 
-      if Octopus.rails31? || Octopus.rails32?
-        # Rails <= 3.0 doesn't support equality checks on non-persisted objects
-        it "should check current_shard when determining equality" do
-          canada1.should_not == brazil1
-          canada1.should == canada1_dup
-        end
+      it "should check current_shard when determining equality" do
+        canada1.should_not == brazil1
+        canada1.should == canada1_dup
+      end
 
-        it "delegates equality check on scopes" do
-          u = User.using(:brazil).create!(:name => "Mike")
-          User.using(:brazil).where(:name => "Mike").should == [u]
-        end
+      it "delegates equality check on scopes" do
+        u = User.using(:brazil).create!(:name => "Mike")
+        User.using(:brazil).where(:name => "Mike").should == [u]
       end
     end
   end
@@ -375,23 +372,21 @@ describe Octopus::Model do
       end
     end
 
-    if Octopus.rails32?
-      describe "#pluck" do
-        before { User.using(:brazil).create!(:name => "User1") }
+    describe "#pluck" do
+      before { User.using(:brazil).create!(:name => "User1") }
 
-        it "should works from scope proxy" do
-          names = User.using(:brazil).pluck(:name)
-          names.should eq(["User1"])
-          User.using(:master).pluck(:name).should eq([])
-        end
+      it "should works from scope proxy" do
+        names = User.using(:brazil).pluck(:name)
+        names.should eq(["User1"])
+        User.using(:master).pluck(:name).should eq([])
       end
+    end
 
-      it "update_column" do
-        @user = User.using(:brazil).create!(:name => "User1")
-        @user2 = User.using(:brazil).find(@user.id)
-        @user2.update_column(:name, "Joaquim Shard Brazil")
-        User.using(:brazil).find_by_name("Joaquim Shard Brazil").should_not be_nil
-      end
+    it "update_column" do
+      @user = User.using(:brazil).create!(:name => "User1")
+      @user2 = User.using(:brazil).find(@user.id)
+      @user2.update_column(:name, "Joaquim Shard Brazil")
+      User.using(:brazil).find_by_name("Joaquim Shard Brazil").should_not be_nil
     end
 
     it "update_attributes" do
@@ -419,6 +414,17 @@ describe Octopus::Model do
       User.using(:brazil).find_by_name("Joaquim").should_not be_nil
     end
 
+    it "as_json" do
+      ActiveRecord::Base.include_root_in_json = false 
+
+      Octopus.using(:brazil) do
+        User.create!(:name => "User1")
+      end
+
+      user = User.using(:brazil).where(:name => "User1").first
+      user.as_json(:except => [:created_at, :updated_at, :id]).should eq({"admin"=>nil, "name"=>"User1", "number"=>nil})
+    end
+
     it "transaction" do
       u = User.create!(:name => "Thiago")
 
@@ -482,11 +488,9 @@ describe Octopus::Model do
     end
   end
 
-  if Octopus.rails32?
-    describe "when using table_name=" do
-      it 'should work correctly' do
-        Ham.using(:brazil).create!(:name => "YUMMMYYYY")
-      end
+  describe "when using table_name=" do
+    it 'should work correctly' do
+      Ham.using(:brazil).create!(:name => "YUMMMYYYY")
     end
   end
 

data/spec/octopus/proxy_spec.rb

@@ -9,7 +9,7 @@ describe Octopus::Proxy do
       proxy.instance_variable_get(:@shards).should include("canada", "brazil", "master", "sqlite_shard", "russia", "alone_shard",
                                                            "aug2009", "postgresql_shard", "aug2010", "aug2011")
 
-      proxy.instance_variable_get(:@shards).should include("protocol_shard") if Octopus.rails32?
+      proxy.instance_variable_get(:@shards).should include("protocol_shard")
 
       proxy.has_group?("country_shards").should be_true
       proxy.shards_for_group("country_shards").should include(:canada, :brazil, :russia)
@@ -26,10 +26,6 @@ describe Octopus::Proxy do
       proxy.instance_variable_get(:@replicated).should be_false
     end
 
-    it "should not verify connections for default" do
-      proxy.instance_variable_get(:@verify_connection).should be_false
-    end
-
     it "should work with thiking sphinx" do
       config = proxy.instance_variable_get(:@config)
       config[:adapter].should == "mysql2"
@@ -140,7 +136,6 @@ describe Octopus::Proxy do
       Octopus.config()
 
       proxy.instance_variable_get(:@replicated).should be_true
-      proxy.instance_variable_get(:@verify_connection).should be_true
       Octopus.environments.should == ["staging", "production"]
     end
 
@@ -239,34 +234,32 @@ describe Octopus::Proxy do
     end
   end
 
-  if !Octopus.rails31?
-    describe "saving multiple sharded objects at once" do
-      before :each do
-        @p = MmorpgPlayer.using(:alone_shard).create!(:player_name => 'Thiago')
-      end
+  describe "saving multiple sharded objects at once" do
+    before :each do
+      @p = MmorpgPlayer.using(:alone_shard).create!(:player_name => 'Thiago')
+    end
 
-      subject { @p.save! }
+    subject { @p.save! }
 
-      context "when the objects are created with #new and saved one at a time" do
-        before :each do
-          @p.weapons.create!(:name => 'battleaxe', :hand => 'right')
-          @p.skills.create!(:name => 'smiting', :weapon => @p.weapons[0])
-        end
+    context "when the objects are created with #new and saved one at a time" do
+      before :each do
+        @p.weapons.create!(:name => 'battleaxe', :hand => 'right')
+        @p.skills.create!(:name => 'smiting', :weapon => @p.weapons[0])
+      end
 
-        it "should save all associated objects on the correct shard" do
-          expect { subject }.to_not raise_error
-        end
+      it "should save all associated objects on the correct shard" do
+        expect { subject }.to_not raise_error
       end
+    end
 
-      context "when the objects are created with #new and saved at the same time" do
-        before :each do
-          @p.weapons.new(:name => 'battleaxe', :hand => 'right')
-          @p.skills.new(:name => 'smiting', :weapon => @p.weapons[0])
-        end
+    context "when the objects are created with #new and saved at the same time" do
+      before :each do
+        @p.weapons.new(:name => 'battleaxe', :hand => 'right')
+        @p.skills.new(:name => 'smiting', :weapon => @p.weapons[0])
+      end
 
-        it "should save all associated objects on the correct shard" do
-          expect { subject }.to_not raise_error
-        end
+      it "should save all associated objects on the correct shard" do
+        expect { subject }.to_not raise_error
       end
     end
   end

data/spec/octopus/replication_spec.rb

@@ -111,7 +111,7 @@ describe "when the database is replicated and the entire application is replicat
       Cat.create!(:name => "Slave Cat")
       Cat.connection.current_shard.should eql(:master)
       begin
-        Cat.find(:all, :conditions => 'rubbish = true')
+        Cat.where(:rubbish => true)
       rescue
       end
       Cat.connection.current_shard.should eql(:master)

data/spec/support/database_models.rb

@@ -4,11 +4,7 @@ class BlankModel < ActiveRecord::Base; end;
 
 #The user class is just sharded, not replicated
 class User < ActiveRecord::Base
-  if Octopus.rails32? || Octopus.rails31?
-    scope :thiago, {:conditions => {:name => "Thiago"}}
-  else
-    named_scope :thiago, {:conditions => {:name => "Thiago"}}
-  end
+  scope :thiago, lambda { where(:name => 'Thiago') }
 
   def awesome_queries
     Octopus.using(:canada) do
@@ -83,17 +79,15 @@ end
 
 
 class Bacon < ActiveRecord::Base
-  set_table_name "yummy"
+  self.table_name = 'yummy'
 end
 
 class Cheese < ActiveRecord::Base
-  set_table_name { "yummy" }
+  self.table_name = 'yummy' 
 end
 
-if Octopus.rails32?
-  class Ham < ActiveRecord::Base
-    self.table_name = "yummy"
-  end
+class Ham < ActiveRecord::Base
+  self.table_name = 'yummy'
 end
 
 #This class sets its own connection

data/spec/support/shared_contexts.rb

@@ -11,11 +11,8 @@ shared_context "with query cache enabled" do
   end
 
   around(:each) do |example|
-    # TODO - Support Rails 3.0
-    if Octopus.rails31? || Octopus.rails32?
-      active_support_subscribed(counter.to_proc, 'sql.active_record') do 
-        example.run
-      end
+    active_support_subscribed(counter.to_proc, 'sql.active_record') do 
+      example.run
     end
   end
 end

data/spec/tasks/octopus.rake_spec.rb

@@ -14,11 +14,7 @@ describe "octopus.rake" do
       Rake::Task["octopus:copy_schema_versions"].reenable
 
       path = File.expand_path("../../migrations", __FILE__)
-      if Octopus.rails31? || Octopus.rails32?
-        ActiveRecord::Migrator.migrations_paths = [path]
-      else
-        ActiveRecord::Migrator.stub(:migrations_path => path)
-      end
+      ActiveRecord::Migrator.migrations_paths = [path]
     end
 
     it "assumes each shard migrated to the current master version" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar-octopus
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Thiago Pradi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-06 00:00:00.000000000 Z
+date: 2013-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -18,40 +18,28 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -171,8 +159,8 @@ files:
 - Rakefile
 - TODO.txt
 - ar-octopus.gemspec
-- gemfiles/rails31.gemfile
 - gemfiles/rails32.gemfile
+- gemfiles/rails4.gemfile
 - init.rb
 - lib/ar-octopus.rb
 - lib/octopus.rb
@@ -182,7 +170,6 @@ files:
 - lib/octopus/migration.rb
 - lib/octopus/model.rb
 - lib/octopus/proxy.rb
-- lib/octopus/rails3.2/persistence.rb
 - lib/octopus/rails3/abstract_adapter.rb
 - lib/octopus/rails3/log_subscriber.rb
 - lib/octopus/rails3/persistence.rb

data/lib/octopus/rails3.2/persistence.rb

@@ -1,12 +0,0 @@
-module Octopus
-  module Rails32
-    module Persistence
-      def update_column(*args)
-        reload_connection()
-        super
-      end
-    end
-  end
-end
-
-ActiveRecord::Base.send(:include, Octopus::Rails32::Persistence)