ar-octopus 0.6.0 → 0.6.1

data/sample_app/lib/tasks/cucumber.rake

@@ -14,19 +14,19 @@ begin
   require 'cucumber/rake/task'
 
   namespace :cucumber do
-    Cucumber::Rake::Task.new({:ok => 'db:test:prepare'}, 'Run features that should pass') do |t|
+    Cucumber::Rake::Task.new({:ok => 'test:prepare'}, 'Run features that should pass') do |t|
       t.binary = vendored_cucumber_bin # If nil, the gem's binary is used.
       t.fork = true # You may get faster startup if you set this to false
       t.profile = 'default'
     end
 
-    Cucumber::Rake::Task.new({:wip => 'db:test:prepare'}, 'Run features that are being worked on') do |t|
+    Cucumber::Rake::Task.new({:wip => 'test:prepare'}, 'Run features that are being worked on') do |t|
       t.binary = vendored_cucumber_bin
       t.fork = true # You may get faster startup if you set this to false
       t.profile = 'wip'
     end
 
-    Cucumber::Rake::Task.new({:rerun => 'db:test:prepare'}, 'Record failing features and run only them if any exist') do |t|
+    Cucumber::Rake::Task.new({:rerun => 'test:prepare'}, 'Record failing features and run only them if any exist') do |t|
       t.binary = vendored_cucumber_bin
       t.fork = true # You may get faster startup if you set this to false
       t.profile = 'rerun'
@@ -34,6 +34,12 @@ begin
 
     desc 'Run all features'
     task :all => [:ok, :wip]
+
+    task :statsetup do
+      require 'rails/code_statistics'
+      ::STATS_DIRECTORIES << %w(Cucumber\ features features) if File.exist?('features')
+      ::CodeStatistics::TEST_TYPES << "Cucumber features" if File.exist?('features')
+    end
   end
   desc 'Alias for cucumber:ok'
   task :cucumber => 'cucumber:ok'
@@ -43,6 +49,12 @@ begin
   task :features => :cucumber do
     STDERR.puts "*** The 'features' task is deprecated. See rake -T cucumber ***"
   end
+
+  # In case we don't have the generic Rails test:prepare hook, append a no-op task that we can depend upon.
+  task 'test:prepare' do
+  end
+
+  task :stats => 'cucumber:statsetup'
 rescue LoadError
   desc 'cucumber rake task not available (cucumber not installed)'
   task :cucumber do

data/spec/octopus/association_spec.rb

@@ -57,7 +57,7 @@ describe Octopus::Association, :shards => [:brazil, :master, :canada] do
     end
   end
 
-  describe "when you have a N x N reliationship" do
+  describe "when you have a N x N relationship" do
     before(:each) do
       @brazil_role = Role.using(:brazil).create!(:name => "Brazil Role")
       @master_role = Role.create!(:name => "Master Role")

data/spec/octopus/octopus_spec.rb

@@ -8,7 +8,7 @@ describe Octopus, :shards => [] do
 
     describe "when config file doesn't exist" do
       before(:each) do
-        Octopus.stub!(:directory).and_return('/tmp')
+        Octopus.stub(:directory).and_return('/tmp')
         Octopus.instance_variable_set(:@config, nil)
       end
 
@@ -68,7 +68,7 @@ describe Octopus, :shards => [] do
 
   describe "#enabled?" do
     before do
-      Rails = mock()
+      Rails = double()
     end
 
     after do
@@ -76,13 +76,13 @@ describe Octopus, :shards => [] do
     end
 
     it "should be if octopus is configured and should hook into current environment" do
-      Rails.stub!(:env).and_return('production')
+      Rails.stub(:env).and_return('production')
 
       Octopus.should be_enabled
     end
 
     it "should not be if octopus should not hook into current environment" do
-      Rails.stub!(:env).and_return('staging')
+      Rails.stub(:env).and_return('staging')
 
       Octopus.should_not be_enabled
     end

data/spec/octopus/proxy_spec.rb

@@ -56,9 +56,10 @@ describe Octopus::Proxy do
       after(:all)  { OctopusHelper.set_octopus_env("octopus")       }
 
       it 'should not fail with missing adapter second time round' do
+        pending "This test was actually failing because of a typo in the error message."
         Thread.current["octopus.current_shard"] = :modify_config_read
 
-        lambda { Octopus::Proxy.new(Octopus.config()) }.should_not raise_error("Please install the  adapter: `gem install activerecord--adapter` (cannot load such file -- active_record/connection_adapters/_adapter)")
+        lambda { Octopus::Proxy.new(Octopus.config()) }.should_not raise_error
 
         Thread.current["octopus.current_shard"] = nil
       end
@@ -121,7 +122,7 @@ describe Octopus::Proxy do
 
   describe "when you have a rails application" do
     before(:each) do
-      Rails = mock()
+      Rails = double()
       OctopusHelper.set_octopus_env("octopus_rails")
     end
 
@@ -133,7 +134,7 @@ describe Octopus::Proxy do
     end
 
     it "should initialize correctly octopus common variables for the environments" do
-      Rails.stub!(:env).and_return('staging')
+      Rails.stub(:env).and_return('staging')
       Octopus.instance_variable_set(:@rails_env, nil)
       Octopus.instance_variable_set(:@environments, nil)
       Octopus.config()
@@ -144,7 +145,7 @@ describe Octopus::Proxy do
     end
 
     it "should initialize correctly the shards for the staging environment" do
-      Rails.stub!(:env).and_return('staging')
+      Rails.stub(:env).and_return('staging')
       Octopus.instance_variable_set(:@rails_env, nil)
       Octopus.instance_variable_set(:@environments, nil)
       Octopus.config()
@@ -153,7 +154,7 @@ describe Octopus::Proxy do
     end
 
     it "should initialize correctly the shard octopus_shard value for logging" do
-      Rails.stub!(:env).and_return('staging')
+      Rails.stub(:env).and_return('staging')
       Octopus.instance_variable_set(:@rails_env, nil)
       Octopus.instance_variable_set(:@environments, nil)
       Octopus.config()
@@ -162,7 +163,7 @@ describe Octopus::Proxy do
     end
 
     it "should initialize correctly the shards for the production environment" do
-      Rails.stub!(:env).and_return('production')
+      Rails.stub(:env).and_return('production')
       Octopus.instance_variable_set(:@rails_env, nil)
       Octopus.instance_variable_set(:@environments, nil)
       Octopus.config()
@@ -172,7 +173,7 @@ describe Octopus::Proxy do
 
     describe "using the master connection", :shards => [:russia, :master]  do
       before(:each) do
-        Rails.stub!(:env).and_return('development')
+        Rails.stub(:env).and_return('development')
       end
 
       it "should use the master connection" do
@@ -237,4 +238,36 @@ describe Octopus::Proxy do
       end
     end
   end
+
+  if !Octopus.rails30? and !Octopus.rails31?
+    describe "saving multiple sharded objects at once" do
+      before :each do
+        @p = MmorpgPlayer.using(:alone_shard).create!(:player_name => 'Thiago')
+      end
+
+      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
+
+        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
+
+        it "should save all associated objects on the correct shard" do
+          expect { subject }.to_not raise_error
+        end
+      end
+    end
+  end
 end

data/spec/octopus/replication_spec.rb

@@ -45,7 +45,7 @@ end
 
 describe "when the database is replicated and the entire application is replicated" do
   before(:each) do
-    Octopus.stub!(:env).and_return("production_fully_replicated")
+    Octopus.stub(:env).and_return("production_fully_replicated")
     OctopusHelper.clean_connection_proxy()
   end
 

data/spec/octopus/sharded_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "when the database is not entire sharded" do
   before(:each) do
-    Octopus.stub!(:env).and_return("not_entire_sharded")
+    Octopus.stub(:env).and_return("not_entire_sharded")
     OctopusHelper.clean_connection_proxy()
   end
 

data/spec/spec_helper.rb

@@ -14,5 +14,3 @@ RSpec.configure do |config|
     OctopusHelper.clean_all_shards(example.metadata[:shards])
   end
 end
-
-$: << File.expand_path(File.join(File.dirname(__FILE__), "support"))

data/spec/support/database_models.rb

@@ -100,3 +100,24 @@ end
 class Advert < ActiveRecord::Base
   establish_connection(:adapter => "postgresql", :database => "octopus_shard_1", :username => ENV["POSTGRES_USER"] || "postgres", :password => "")
 end
+
+class MmorpgPlayer < ActiveRecord::Base
+  has_many :weapons
+  has_many :skills
+end
+
+class Weapon < ActiveRecord::Base
+  belongs_to :mmorpg_player, :inverse_of => :weapons
+  validates  :hand, :uniqueness => { :scope => :mmorpg_player_id }
+  validates_presence_of :mmorpg_player
+  has_many   :skills
+end
+
+class Skill < ActiveRecord::Base
+  belongs_to :weapon, :inverse_of => :skills
+  belongs_to :mmorpg_player, :inverse_of => :skills
+
+  validates_presence_of :weapon
+  validates_presence_of :mmorpg_player
+  validates :name, :uniqueness => { :scope => :mmorpg_player_id }
+end

data/spec/support/octopus_helper.rb

@@ -8,6 +8,12 @@ module OctopusHelper
       ['schema_migrations', 'users', 'clients', 'cats', 'items', 'keyboards', 'computers', 'permissions_roles', 'roles', 'permissions', 'assignments', 'projects', 'programmers', "yummy", 'adverts'].each do |tables|
         BlankModel.using(shard_symbol).connection.execute("DELETE FROM #{tables}")
       end
+
+      if shard_symbol == 'alone_shard'
+        ['mmorpg_players', 'weapons', 'skills'].each do |table|
+          BlankModel.using(shard_symbol).connection.execute("DELETE FROM #{table}")
+        end
+      end
     end
   end
 
@@ -45,6 +51,6 @@ module OctopusHelper
 
   def self.set_octopus_env(env)
     Octopus.instance_variable_set(:@config, nil)
-    Octopus.stub!(:env).and_return(env)
+    Octopus.stub(:env).and_return(env)
   end
 end

metadata

@@ -1,185 +1,191 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: ar-octopus
-version: !ruby/object:Gem::Version
-  version: 0.6.0
+version: !ruby/object:Gem::Version 
+  hash: 5
   prerelease: 
+  segments: 
+  - 0
+  - 6
+  - 1
+  version: 0.6.1
 platform: ruby
-authors:
+authors: 
 - Thiago Pradi
 - Mike Perham
 - Gabriel Sobrinho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-07 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-09-30 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activerecord
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
     - - <
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 4
+        - 0
+        version: "4.0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
+  type: :runtime
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
     - - <
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 4
+        - 0
+        version: "4.0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
+  type: :runtime
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
         version: 0.8.7
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.8.7
-- !ruby/object:Gem::Dependency
+  type: :development
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
         version: 2.0.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-- !ruby/object:Gem::Dependency
+  type: :development
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
   name: mysql2
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>'
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :development
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 0
+        - 3
+        version: "0.3"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>'
-      - !ruby/object:Gem::Version
-        version: '0.3'
-- !ruby/object:Gem::Dependency
+  type: :development
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
   name: pg
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 51
+        segments: 
+        - 0
+        - 11
+        - 0
         version: 0.11.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.11.0
-- !ruby/object:Gem::Dependency
+  type: :development
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
   name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 3
+        - 4
         version: 1.3.4
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.3.4
-- !ruby/object:Gem::Dependency
+  type: :development
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
   name: pry
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  type: :development
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
   name: appraisal
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 3
+        - 8
         version: 0.3.8
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.3.8
-description: This gem allows you to use sharded databases with ActiveRecord. This
-  also provides a interface for replication and for running migrations with multiples
-  shards.
-email:
+  type: :development
+  requirement: *id009
+description: This gem allows you to use sharded databases with ActiveRecord. This also provides a interface for replication and for running migrations with multiples shards.
+email: 
 - tchandy@gmail.com
 - mperham@gmail.com
 - gabriel.sobrinho@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
 - .travis.yml
@@ -189,6 +195,9 @@ files:
 - Rakefile
 - TODO.txt
 - ar-octopus.gemspec
+- gemfiles/rails30.gemfile
+- gemfiles/rails31.gemfile
+- gemfiles/rails32.gemfile
 - init.rb
 - lib/ar-octopus.rb
 - lib/octopus.rb
@@ -215,9 +224,15 @@ files:
 - sample_app/Gemfile
 - sample_app/Gemfile.lock
 - sample_app/README
+- sample_app/README.rdoc
 - sample_app/Rakefile
+- sample_app/app/assets/images/rails.png
+- sample_app/app/assets/javascripts/application.js
+- sample_app/app/assets/stylesheets/application.css
 - sample_app/app/controllers/application_controller.rb
 - sample_app/app/helpers/application_helper.rb
+- sample_app/app/mailers/.gitkeep
+- sample_app/app/models/.gitkeep
 - sample_app/app/models/item.rb
 - sample_app/app/models/user.rb
 - sample_app/app/views/layouts/application.html.erb
@@ -236,6 +251,7 @@ files:
 - sample_app/config/initializers/mime_types.rb
 - sample_app/config/initializers/secret_token.rb
 - sample_app/config/initializers/session_store.rb
+- sample_app/config/initializers/wrap_parameters.rb
 - sample_app/config/locales/en.yml
 - sample_app/config/routes.rb
 - sample_app/config/shards.yml
@@ -249,10 +265,13 @@ files:
 - sample_app/features/seed.feature
 - sample_app/features/step_definitions/seeds_steps.rb
 - sample_app/features/step_definitions/web_steps.rb
+- sample_app/features/support/database.rb
 - sample_app/features/support/env.rb
 - sample_app/features/support/paths.rb
+- sample_app/lib/assets/.gitkeep
 - sample_app/lib/tasks/.gitkeep
 - sample_app/lib/tasks/cucumber.rake
+- sample_app/log/.gitkeep
 - sample_app/public/404.html
 - sample_app/public/422.html
 - sample_app/public/500.html
@@ -272,8 +291,8 @@ files:
 - sample_app/spec/models/item_spec.rb
 - sample_app/spec/models/user_spec.rb
 - sample_app/spec/spec_helper.rb
-- sample_app/test/performance/browsing_test.rb
-- sample_app/test/test_helper.rb
+- sample_app/vendor/assets/javascripts/.gitkeep
+- sample_app/vendor/assets/stylesheets/.gitkeep
 - sample_app/vendor/plugins/.gitkeep
 - spec/config/shards.yml
 - spec/migrations/10_create_users_using_replication.rb
@@ -307,42 +326,42 @@ files:
 - spec/tasks/octopus.rake_spec.rb
 homepage: https://github.com/tchandy/octopus
 licenses: []
-post_install_message: ! 'Important: If you are upgrading from < Octopus 0.5.0 you
-  need to run:
 
+post_install_message: |-
+  Important: If you are upgrading from < Octopus 0.5.0 you need to run:
   $ rake octopus:copy_schema_versions
-
-
-  Octopus now stores schema version information in each shard and migrations will
-  not work properly unless this task is invoked.'
+  
+  Octopus now stores schema version information in each shard and migrations will not work properly unless this task is invoked.
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 4146827815938397379
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 4146827815938397379
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Easy Database Sharding for ActiveRecord
-test_files:
+test_files: 
 - spec/config/shards.yml
 - spec/migrations/10_create_users_using_replication.rb
 - spec/migrations/11_add_field_in_all_slaves.rb