ar-octopus 0.5.0 → 0.6.0

data/Appraisals

@@ -1,10 +1,6 @@
-appraise "rails2" do
-  gem "activerecord", "~> 2.3"
-  gem "actionpack",   "~> 2.3"
-end
-
 appraise "rails30" do
   gem "activerecord", "~> 3.0.11"
+  gem 'mysql2', '< 0.3'
 end
 
 appraise "rails31" do

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in ar-octopus.gemspec
 gemspec

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 focused on Rails 3, but is compatible with Rails 2.x.
+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.
 
 Octopus supports:
 
@@ -25,27 +25,11 @@ When using replication, all writes queries will be sent to master, and read quer
 
 ## Install
 
-### Rails 2.x
-
-Install  the octopus gem:
-
-    sudo gem install ar-octopus
-
-Add this line to enviroment.rb:
-
-    config.gem 'ar-octopus', :lib => "octopus"
-
-### Rails 3.x
-
 Add this line to Gemfile:
 
     gem 'ar-octopus', :require => 'octopus'
 
-**Note**: The `ar-octopus` gem build is out of date. Until a new build is created, we recommend using the gem from this repo by placing `gem "ar-octopus", github: "tchandy/octopus", require: "octopus"` in your Gemfile instead of the above line. Alternatively you can [create your own fork](https://github.com/tchandy/octopus/fork_select) (for added stability against changes to master) and reference that fork from your Gemfile: `gem "ar-octopus", github: "<fork owner>/octopus", require: "octopus"`.
-
-Run a bundle install:
-
-    bundle install
+Currently, Octopus doesn't support Rails 2. If you need support for rails 2, please use the version 0.5.0.
 
 ## Upgrading
 
@@ -63,10 +47,6 @@ master database to each of the shards:
 Once the task completes migrations will operate normally and schema information will be stored in each shard database
 going forward.
 
-In order to run this task in Rails 2.3, you'll need to tell Rails to load Octopus' rake tasks by adding this to your `Rakefile`:
-
-    Dir["#{Gem.searcher.find('ar-octopus').full_gem_path}/lib/tasks/**/*.rake"].each { |ext| load ext }
-
 ## How to use Octopus?
 
 First, you need to create a config file, shards.yml, inside your config/ directory. to see the syntax and how this file should look, please checkout <a href="http://wiki.github.com/tchandy/octopus/config-file">this page on wiki</a>.
@@ -185,7 +165,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 2.3, Rails 3.0 and Rails 3.1).
+This command will run the spec suite for all rails versions supported (Rails 3.0, Rails 3.1 and Rails 3.2).
 To run our integrations tests inside sample_app, you need to following commands:
 
     cd sample_app

data/Rakefile

@@ -18,7 +18,7 @@ namespace :db do
     }
 
     mysql_spec = {
-      :adapter  => 'mysql',
+      :adapter  => 'mysql2',
       :host     => 'localhost',
       :username => (ENV['MYSQL_USER'] || "root"),
       :encoding => 'utf8'

data/ar-octopus.gemspec

@@ -21,11 +21,11 @@ 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', '>= 2.3.0'
-  s.add_dependency 'activesupport', '>= 2.3.0'
+  s.add_dependency 'activerecord', '>= 3.0.0', '< 4.0'
+  s.add_dependency 'activesupport', '>= 3.0.0', '< 4.0'
   s.add_development_dependency 'rake', '>= 0.8.7'
   s.add_development_dependency 'rspec', '>= 2.0.0'
-  s.add_development_dependency 'mysql', '2.8.1'
+  s.add_development_dependency 'mysql2', '> 0.3'
   s.add_development_dependency 'pg', '>= 0.11.0'
   s.add_development_dependency 'sqlite3', '>= 1.3.4'
   s.add_development_dependency 'pry'

data/lib/octopus.rb

@@ -64,14 +64,6 @@ module Octopus
     @environments ||= config['environments'] || ['production']
   end
 
-  def self.rails2?
-    ActiveRecord::VERSION::MAJOR == 2
-  end
-
-  def self.rails3?
-    ActiveRecord::VERSION::MAJOR == 3
-  end
-
   def self.rails30?
     ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 0
   end
@@ -110,23 +102,14 @@ require "octopus/migration"
 require "octopus/association_collection"
 require "octopus/has_and_belongs_to_many_association"
 require "octopus/association"
-
-if Octopus.rails2?
-  require "octopus/rails2/association"
-  require "octopus/rails2/persistence"
-  require "octopus/rails2/scope"
-end
-
-if Octopus.rails3?
-  require "octopus/rails3/persistence"
-  require "octopus/rails3/log_subscriber"
-  require "octopus/rails3/abstract_adapter"
-  require "octopus/railtie"
-end
+require "octopus/rails3/persistence"
+require "octopus/rails3/log_subscriber"
+require "octopus/rails3/abstract_adapter"
+require "octopus/railtie"
 
 if Octopus.rails30?
-  require "octopus/rails2/association"
-  require "octopus/rails3/arel"
+  require "octopus/rails3.0/arel"
+  require "octopus/rails3.0/association"
 end
 
 if Octopus.rails31? || Octopus.rails32?
@@ -139,4 +122,3 @@ end
 
 require "octopus/proxy"
 require "octopus/scope_proxy"
-require "octopus/logger"

data/lib/octopus/migration.rb

@@ -1,11 +1,6 @@
 require "set"
 require "active_support/core_ext/module/aliasing"
-
-if Octopus.rails2?
-  require "active_support/core_ext/array/wrapper"
-else
-  require "active_support/core_ext/array/wrap"
-end
+require "active_support/core_ext/array/wrap"
 
 module Octopus::Migration
   module InstanceOrClassMethods

data/lib/octopus/model.rb

@@ -16,10 +16,8 @@ module Octopus::Model
         self.reset_table_name()
       end
 
-      if Octopus.rails3?
-        self.reset_column_information
-        self.instance_variable_set(:@quoted_table_name, nil)
-      end
+      self.reset_column_information
+      self.instance_variable_set(:@quoted_table_name, nil)
     end
 
     def using(shard)
@@ -45,13 +43,7 @@ module Octopus::Model
         end
       end
 
-      if Octopus.rails3?
-        after_initialize :set_current_shard
-      else
-        def after_initialize
-          set_current_shard()
-        end
-      end
+      after_initialize :set_current_shard
     end
 
     def hijack_connection()
@@ -170,5 +162,3 @@ module Octopus::Model
 end
 
 ActiveRecord::Base.extend(Octopus::Model)
-
-class OctopusModel < ActiveRecord::Base; end;

data/lib/octopus/{rails2 → rails3.0}/association.rb

@@ -1,5 +1,5 @@
 module Octopus
-  module Rails2
+  module Rails3
     module Association
       def association_accessor_methods(reflection, association_proxy_class)
         super
@@ -83,4 +83,4 @@ module Octopus
   end
 end
 
-ActiveRecord::Base.extend(Octopus::Rails2::Association)
+ActiveRecord::Base.extend(Octopus::Rails3::Association)

data/lib/octopus/version.rb

@@ -1,3 +1,3 @@
 module Octopus
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

data/spec/config/shards.yml

@@ -1,5 +1,5 @@
 mysql: &mysql
-  adapter: mysql
+  adapter: mysql2
   username: <%= ENV['MYSQL_USER'] || 'root' %>
   host: localhost
 
@@ -15,6 +15,7 @@ octopus:
       password:
       database: octopus_shard_1
       encoding: unicode
+      host: localhost
 
     sqlite_shard:
       adapter: sqlite3

data/spec/octopus/association_spec.rb

@@ -47,15 +47,13 @@ describe Octopus::Association, :shards => [:brazil, :master, :canada] do
       k.computer.should == c
     end
 
-    if Octopus.rails3?
-      it "should include models" do
-        c = Computer.using(:brazil).create!(:name => "Computer Brazil")
-        k = c.create_keyboard(:name => "Building keyboard")
-        c.save()
-        k.save()
+    it "should include models" do
+      c = Computer.using(:brazil).create!(:name => "Computer Brazil")
+      k = c.create_keyboard(:name => "Building keyboard")
+      c.save()
+      k.save()
 
-        Computer.includes(:keyboard).find(c.id).should == c
-      end
+      Computer.includes(:keyboard).find(c.id).should == c
     end
   end
 
@@ -110,11 +108,9 @@ describe Octopus::Association, :shards => [:brazil, :master, :canada] do
         @permission_brazil_2.roles.to_set.should == [@role].to_set
       end
 
-      if !Octopus.rails3?
-        it "update_attribute" do
-          @permission_brazil_2.update_attribute(:role_ids, [@role.id])
-          @permission_brazil_2.roles.to_set.should == [@role].to_set
-        end
+      it "update_attribute" do
+        @permission_brazil_2.update_attribute(:role_ids, [@role.id])
+        @permission_brazil_2.roles.to_set.should == [@role].to_set
       end
 
       it "<<" do
@@ -265,11 +261,9 @@ describe Octopus::Association, :shards => [:brazil, :master, :canada] do
         @new_brazil_programmer.projects.to_set.should == [@project].to_set
       end
 
-      if !Octopus.rails3?
-        it "update_attribute" do
-          @new_brazil_programmer.update_attribute(:project_ids, [@project.id])
-          @new_brazil_programmer.projects.to_set.should == [@project].to_set
-        end
+      it "update_attribute" do
+        @new_brazil_programmer.update_attribute(:project_ids, [@project.id])
+        @new_brazil_programmer.projects.to_set.should == [@project].to_set
       end
 
       it "<<" do
@@ -430,11 +424,9 @@ describe Octopus::Association, :shards => [:brazil, :master, :canada] do
         @brazil_client.items.to_set.should == [@item_brazil, @item_brazil_2].to_set
       end
 
-      if !Octopus.rails3?
-        it "update_attribute" do
-          @brazil_client.update_attribute(:item_ids, [@item_brazil_2.id, @item_brazil.id])
-          @brazil_client.items.to_set.should == [@item_brazil, @item_brazil_2].to_set
-        end
+      it "update_attribute" do
+        @brazil_client.update_attribute(:item_ids, [@item_brazil_2.id, @item_brazil.id])
+        @brazil_client.items.to_set.should == [@item_brazil, @item_brazil_2].to_set
       end
 
       it "<<" do
@@ -568,11 +560,9 @@ describe Octopus::Association, :shards => [:brazil, :master, :canada] do
         @brazil_client.comments.to_set.should == [@comment_brazil, @comment_brazil_2].to_set
       end
 
-      if !Octopus.rails3?
-        it "update_attribute" do
-          @brazil_client.update_attribute(:comment_ids, [@comment_brazil_2.id, @comment_brazil.id])
-          @brazil_client.comments.to_set.should == [@comment_brazil, @comment_brazil_2].to_set
-        end
+      it "update_attribute" do
+        @brazil_client.update_attribute(:comment_ids, [@comment_brazil_2.id, @comment_brazil.id])
+        @brazil_client.comments.to_set.should == [@comment_brazil, @comment_brazil_2].to_set
       end
 
       it "<<" do

data/spec/octopus/log_subscriber_spec.rb

@@ -1,22 +1,19 @@
 require "spec_helper"
 
-if Octopus.rails3?
-  describe Octopus::LogSubscriber, :shards => [:canada] do
-
-    before :each do
-      @out = StringIO.new
-      @log = Logger.new(@out)
-      ActiveRecord::Base.logger = @log
-      ActiveRecord::Base.logger.level = Logger::DEBUG
-    end
+describe Octopus::LogSubscriber, :shards => [:canada] do
+  before :each do
+    @out = StringIO.new
+    @log = Logger.new(@out)
+    ActiveRecord::Base.logger = @log
+    ActiveRecord::Base.logger.level = Logger::DEBUG
+  end
 
-    after :each do
-      ActiveRecord::Base.logger = nil
-    end
+  after :each do
+    ActiveRecord::Base.logger = nil
+  end
 
-    it "should add to the default logger the shard name the query was sent to" do
-      User.using(:canada).create!(:name => "test")
-      @out.string.should =~ /Shard: canada/
-    end
+  it "should add to the default logger the shard name the query was sent to" do
+    User.using(:canada).create!(:name => "test")
+    @out.string.should =~ /Shard: canada/
   end
 end

data/spec/octopus/model_spec.rb

@@ -256,7 +256,7 @@ describe Octopus::Model do
     it "should update the Arel Engine" do
       if ActiveRecord::VERSION::STRING > '2.4.0'
         User.using(:postgresql_shard).arel_engine.connection.adapter_name.should == "PostgreSQL"
-        User.using(:alone_shard).arel_engine.connection.adapter_name.should == "MySQL"
+        User.using(:alone_shard).arel_engine.connection.adapter_name.should == "Mysql2"
       end
     end
 
@@ -338,44 +338,41 @@ describe Octopus::Model do
       User.using(:master).maximum(:number).should == 12
     end
 
-    if Octopus.rails3?
-      describe "any?" do
-        before { User.using(:brazil).create!(:name => "User1") }
-
-        it "works when true" do
-          scope = User.using(:brazil).where(:name => "User1")
-          scope.any?.should be_true
-        end
+    describe "any?" do
+      before { User.using(:brazil).create!(:name => "User1") }
 
-        it "works when false" do
-          scope = User.using(:brazil).where(:name => "User2")
-          scope.any?.should be_false
-        end
+      it "works when true" do
+        scope = User.using(:brazil).where(:name => "User1")
+        scope.any?.should be_true
       end
 
-      it "exists?" do
-        @user = User.using(:brazil).create!(:name => "User1")
-
-        User.using(:brazil).where(:name => "User1").exists?.should be_true
-        User.using(:brazil).where(:name => "User2").exists?.should be_false
+      it "works when false" do
+        scope = User.using(:brazil).where(:name => "User2")
+        scope.any?.should be_false
       end
+    end
 
-      describe "touch" do
-        it "updates updated_at by default" do
-          @user = User.using(:brazil).create!(:name => "User1")
-          User.using(:brazil).update_all({:updated_at => Time.now - 3.months}, {:id => @user.id})
-          @user.touch
-          @user.reload.updated_at.to_date.should eq(Date.today)
-        end
+    it "exists?" do
+      @user = User.using(:brazil).create!(:name => "User1")
 
-        it "updates passed in attribute name" do
-          @user = User.using(:brazil).create!(:name => "User1")
-          User.using(:brazil).update_all({:created_at => Time.now - 3.months}, {:id => @user.id})
-          @user.touch(:created_at)
-          @user.reload.created_at.to_date.should eq(Date.today)
-        end
+      User.using(:brazil).where(:name => "User1").exists?.should be_true
+      User.using(:brazil).where(:name => "User2").exists?.should be_false
+    end
+
+    describe "touch" do
+      it "updates updated_at by default" do
+        @user = User.using(:brazil).create!(:name => "User1")
+        User.using(:brazil).update_all({:updated_at => Time.now - 3.months}, {:id => @user.id})
+        @user.touch
+        @user.reload.updated_at.to_date.should eq(Date.today)
       end
 
+      it "updates passed in attribute name" do
+        @user = User.using(:brazil).create!(:name => "User1")
+        User.using(:brazil).update_all({:created_at => Time.now - 3.months}, {:id => @user.id})
+        @user.touch(:created_at)
+        @user.reload.created_at.to_date.should eq(Date.today)
+      end
     end
 
     if Octopus.rails32?
@@ -526,10 +523,8 @@ describe Octopus::Model do
     end
 
     it "should work using the rails 3.x syntax" do
-      if Octopus.rails3?
-        items = Item.using(:canada).joins(:client).where("clients.id = #{@client2.id}").all
-        items.should == [@item1, @item2]
-      end
+      items = Item.using(:canada).joins(:client).where("clients.id = #{@client2.id}").all
+      items.should == [@item1, @item2]
     end
 
     it "should work for include also, rails 2.x syntax" do
@@ -538,10 +533,8 @@ describe Octopus::Model do
     end
 
     it "should work for include also, rails 3.x syntax" do
-      if Octopus.rails3?
-        items = Item.using(:canada).includes(:client).where("clients.id = #{@client2.id}").all
-        items.should == [@item1, @item2]
-      end
+      items = Item.using(:canada).includes(:client).where("clients.id = #{@client2.id}").all
+      items.should == [@item1, @item2]
     end
 
     it "should work for multiple includes, with rails 2.x syntax" do

data/spec/octopus/octopus_spec.rb

@@ -41,7 +41,7 @@ describe Octopus, :shards => [] do
       lambda { User.using(:crazy_shard).create!(:name => "Joaquim") }.should raise_error
 
       Octopus.setup do |config|
-        config.shards = {:crazy_shard => {:adapter => "mysql", :database => "octopus_shard_5", :username => "root", :password => ""}}
+        config.shards = {:crazy_shard => {:adapter => "mysql2", :database => "octopus_shard_5", :username => "root", :password => ""}}
       end
 
       lambda { User.using(:crazy_shard).create!(:name => "Joaquim")  }.should_not raise_error

data/spec/octopus/proxy_spec.rb

@@ -32,7 +32,7 @@ describe Octopus::Proxy do
 
     it "should work with thiking sphinx" do
       config = proxy.instance_variable_get(:@config)
-      config[:adapter].should == "mysql"
+      config[:adapter].should == "mysql2"
       config[:database].should == "octopus_shard_1"
       config[:username].should == "root"
     end
@@ -40,7 +40,7 @@ describe Octopus::Proxy do
     it 'should create a set with all adapters, to ensure that is needed to clean the table name.' do
       adapters = proxy.instance_variable_get(:@adapters)
       adapters.should be_kind_of(Set)
-      adapters.to_a.should =~ ["sqlite3", "mysql", "postgresql"]
+      adapters.to_a.should =~ ["sqlite3", "mysql2", "postgresql"]
     end
 
     it 'should respond correctly to respond_to?(:pk_and_sequence_for)' do

data/spec/octopus/scope_proxy_spec.rb

@@ -2,15 +2,13 @@ require "spec_helper"
 
 describe Octopus::ScopeProxy do
   it "should allow nested queries" do
-    if Octopus.rails3?
-      @user1 = User.using(:brazil).create!(:name => "Thiago P", :number => 3)
-      @user2 = User.using(:brazil).create!(:name => "Thiago", :number => 1)
-      @user3 = User.using(:brazil).create!(:name => "Thiago", :number => 2)
+    @user1 = User.using(:brazil).create!(:name => "Thiago P", :number => 3)
+    @user2 = User.using(:brazil).create!(:name => "Thiago", :number => 1)
+    @user3 = User.using(:brazil).create!(:name => "Thiago", :number => 2)
 
-      User.using(:brazil).where(:name => "Thiago").where(:number => 4).order(:number).all.should == []
-      User.using(:brazil).where(:name => "Thiago").using(:canada).where(:number => 2).using(:brazil).order(:number).all.should == [@user3]
-      User.using(:brazil).where(:name => "Thiago").using(:canada).where(:number => 4).using(:brazil).order(:number).all.should == []
-    end
+    User.using(:brazil).where(:name => "Thiago").where(:number => 4).order(:number).all.should == []
+    User.using(:brazil).where(:name => "Thiago").using(:canada).where(:number => 2).using(:brazil).order(:number).all.should == [@user3]
+    User.using(:brazil).where(:name => "Thiago").using(:canada).where(:number => 4).using(:brazil).order(:number).all.should == []
   end
 
   it "should raise a exception when trying to send a query to a shard that don't exists" do

data/spec/support/database_connection.rb

@@ -1,2 +1,4 @@
-ActiveRecord::Base.establish_connection(:adapter => "mysql", :database => "octopus_shard_1", :username => "root", :password => "")
+require "logger"
+
+ActiveRecord::Base.establish_connection(:adapter => "mysql2", :database => "octopus_shard_1", :username => "root", :password => "")
 ActiveRecord::Base.logger = Logger.new(File.open('database.log', 'a'))

data/spec/support/database_models.rb

@@ -31,7 +31,7 @@ end
 
 #This class sets its own connection
 class CustomConnection < ActiveRecord::Base
-  octopus_establish_connection(:adapter => "mysql", :database => "octopus_shard_2", :username => "root", :password => "")
+  octopus_establish_connection(:adapter => "mysql2", :database => "octopus_shard_2", :username => "root", :password => "")
 end
 
 #This items belongs to a client

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar-octopus
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -20,7 +20,10 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 3.0.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,7 +31,10 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 3.0.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -36,7 +42,10 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 3.0.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,7 +53,10 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 3.0.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -78,21 +90,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: mysql
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>'
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>'
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -183,17 +195,14 @@ files:
 - lib/octopus/association.rb
 - lib/octopus/association_collection.rb
 - lib/octopus/has_and_belongs_to_many_association.rb
-- lib/octopus/logger.rb
 - lib/octopus/migration.rb
 - lib/octopus/model.rb
 - lib/octopus/proxy.rb
-- lib/octopus/rails2/association.rb
-- lib/octopus/rails2/persistence.rb
-- lib/octopus/rails2/scope.rb
+- lib/octopus/rails3.0/arel.rb
+- lib/octopus/rails3.0/association.rb
 - lib/octopus/rails3.1/singular_association.rb
 - lib/octopus/rails3.2/persistence.rb
 - lib/octopus/rails3/abstract_adapter.rb
-- lib/octopus/rails3/arel.rb
 - lib/octopus/rails3/log_subscriber.rb
 - lib/octopus/rails3/persistence.rb
 - lib/octopus/railtie.rb
@@ -283,7 +292,6 @@ files:
 - spec/migrations/9_raise_exception_with_multiple_invalid_group_names.rb
 - spec/octopus/association_spec.rb
 - spec/octopus/log_subscriber_spec.rb
-- spec/octopus/logger_spec.rb
 - spec/octopus/migration_spec.rb
 - spec/octopus/model_spec.rb
 - spec/octopus/octopus_spec.rb
@@ -318,7 +326,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1814625454077145936
+      hash: 4146827815938397379
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -327,7 +335,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1814625454077145936
+      hash: 4146827815938397379
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -352,7 +360,6 @@ test_files:
 - spec/migrations/9_raise_exception_with_multiple_invalid_group_names.rb
 - spec/octopus/association_spec.rb
 - spec/octopus/log_subscriber_spec.rb
-- spec/octopus/logger_spec.rb
 - spec/octopus/migration_spec.rb
 - spec/octopus/model_spec.rb
 - spec/octopus/octopus_spec.rb

data/lib/octopus/logger.rb

@@ -1,19 +0,0 @@
-require "logger"
-
-class Octopus::Logger < Logger
-  def initialize(logdev, shift_age = 0, shift_size = 1048576)
-    ActiveSupport::Deprecation.warn "Octopus::Logger is deprecated and will be removed in Octopus 0.6.x", caller
-    super
-  end
-
-  def format_message(severity, timestamp, progname, msg)
-    str = super
-
-    if ActiveRecord::Base.connection.respond_to?(:current_shard)
-      str += "Shard: #{ActiveRecord::Base.connection.current_shard} -"
-    end
-
-    str
-  end
-end
-

data/lib/octopus/rails2/persistence.rb

@@ -1,39 +0,0 @@
-module Octopus
-  module Rails2
-    module Persistence
-      def self.included(base)
-        base.instance_eval do
-          alias_method_chain :destroy, :octopus
-          alias_method_chain :delete, :octopus
-          alias_method_chain :reload, :octopus
-        end
-      end
-
-      def delete_with_octopus()
-        if should_set_current_shard?
-          Octopus.using(self.current_shard) { delete_without_octopus() }
-        else
-          delete_without_octopus()
-        end
-      end
-
-      def destroy_with_octopus()
-        if should_set_current_shard?
-          Octopus.using(self.current_shard) { destroy_without_octopus() }
-        else
-          destroy_without_octopus()
-        end
-      end
-
-      def reload_with_octopus(options = nil)
-        if should_set_current_shard?
-          Octopus.using(self.current_shard) { reload_without_octopus(options) }
-        else
-          reload_without_octopus(options)
-        end
-      end
-    end
-  end
-end
-
-ActiveRecord::Base.send(:include, Octopus::Rails2::Persistence)

data/lib/octopus/rails2/scope.rb

@@ -1,17 +0,0 @@
-module Octopus
-  module Rails2
-    module Scope
-      def self.included(base)
-        base.instance_eval do
-          alias_method_chain :proxy_found, :octopus
-        end
-      end
-
-      def proxy_found_with_octopus
-        load_found
-      end
-    end
-  end
-end
-
-ActiveRecord::NamedScope::Scope.send(:include, Octopus::Rails2::Scope)

data/spec/octopus/logger_spec.rb

@@ -1,32 +0,0 @@
-require "spec_helper"
-
-describe Octopus::Logger, :shards => [:canada] do
-  before :each do
-    @out = StringIO.new
-    @log = Octopus::Logger.new(@out)
-    ActiveRecord::Base.logger = @log
-  end
-
-  after :each do
-    ActiveRecord::Base.logger = nil
-  end
-
-  if Octopus.rails3?
-    it "should add to the default logger what shard the query was sent" do
-      User.using(:canada).create!(:name => "test")
-      @out.string.should =~ /Shard: canada/
-    end
-  end
-
-  it "should be deprecated" do
-    @last_message = nil
-    ActiveSupport::Deprecation.behavior = Proc.new { |message| @last_message = message }
-    @log = Octopus::Logger.new(@out)
-
-    if @last_message.is_a?(Array)
-      @last_message.first.should =~ /DEPRECATION WARNING: Octopus::Logger is deprecated and will be removed in Octopus 0\.6\.x\./
-    else
-      @last_message.should =~ /DEPRECATION WARNING: Octopus::Logger is deprecated and will be removed in Octopus 0\.6\.x\./
-    end
-  end
-end