xbar 0.4.0 → 0.4.1

data/README.mkdn

@@ -153,6 +153,31 @@ automatically:
     @user.save
 ```
 
+Another variant of `using` is `using_any`.  It many be invoked as
+
+```ruby
+	# When the model is replicated, allow the find to take
+	# place on a slave.
+    User.using_any.find(...)
+	
+	# When the model is replicated, allow the find to take place on
+	# any slave of the Canada shard.
+	User.using(:canada).find(...)
+	
+	# This is essentially the same as the above.
+	XBar.using(:canada) do
+		User.using_any.find(...)
+	end	
+	
+	# The find will still take place on any slave of the Canada shard.
+	XBar.using(:brazil) do
+		User.using_any(:canada).find(...)
+	end
+```
+
+The `using_any` construction only is valid for the immediately
+following database 'select' type operation. 
+
 ### Migrations
 
 In migrations, you also have access to the using method. The syntax is

data/gemfiles/rails32.gemfile.lock

@@ -1,5 +1,5 @@
 PATH
-  remote: /opt/projects/xbar
+  remote: /Volumes/Opt/projects/xbar
   specs:
     xbar (0.4.0)
       activerecord

data/lib/xbar/model.rb

@@ -126,6 +126,15 @@ module XBar::Model
       return XBar::ScopeProxy.new(shard_name, self)
     end
 
+    def using_any(shard_name = nil)
+      connection_proxy.slave_read_allowed = true
+      if shard_name
+        using(shard_name)
+      else
+        self
+      end
+    end
+
     def unreplicated_model
       if XBar.rails32?
         self._unreplicated = true

data/lib/xbar/proxy.rb

@@ -18,6 +18,8 @@ class XBar::Proxy
   attr_reader :current_model, :current_shard
   
   attr_reader :shard_list
+
+  attr_accessor :slave_read_allowed
  
   def initialize
     puts "Initializing new proxy."

data/lib/xbar/shard.rb

@@ -24,10 +24,11 @@ module XBar
       if XBar.debug
         puts("Shard##{BLUE_TEXT}run_queries#{RESET_COLORS}: " + 
           "method = #{RED_TEXT}#{method}#{RESET_COLORS}, " +
-          "shard= #{shard_name}, " +
+          "shard= #{shard_name}, slave_read=#{!!proxy.slave_read_allowed}, " +
           "block_scope = #{in_block_scope?}")
       end
-      if method.to_s =~ /select/ && !in_block_scope? # XXX needed???, eventual flag??
+      if slave_read_allowed(method)
+        proxy.slave_read_allowed = false # just once
         # OK to send the query to a slave
         run_queries_on_slave(method, *args, &block)
       else
@@ -76,9 +77,14 @@ module XBar
       prepare_connection_pool(replica)
       replica.connection.send(method, *args, &block)
     end
+
+    def slave_read_allowed(method)
+      method.to_s =~ /select/ && !current_model.unreplicated_model? &&
+        (proxy.slave_read_allowed || !in_block_scope?)
+    end
     
     def run_queries_on_slave(method, *args, &block)
-      if current_model.unreplicated_model? || @slaves.empty?
+      if @slaves.empty?
         replica = @master
       else
         if XBar.debug

data/lib/xbar/version.rb

@@ -1,3 +1,3 @@
 module XBar
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/run

@@ -24,4 +24,4 @@ fi
 
 echo $TEST
 
-bundle exec ${RUBY} ${RSPEC} -fd -c ${TEST}
+bundle exec ${RUBY} ${RSPEC} -fd -b -c ${TEST}

data/spec/config/default.json

@@ -28,7 +28,7 @@
 
     "environments": {
         "test": {
-						"any_option": true,
+            "any_option": true,
             "shards": {
                 "master": "mysql_m",
                 
@@ -42,10 +42,12 @@
                 "moscow": "moscow_s",
                                                               
                 "__COMMENT": "Postgres unreplicated shard (for now)",
-		"__COMMENT": "One server has three different databases.",
+                "__COMMENT": "One server has three different databases.",
                 "russia": ["russia_1", "russia_2", "russia_3"],
 
                 "__COMMENT": "Convenience to get at the shard replicas as shards.",
+                "__COMMENT": "Some tests assume that the Russia environment is",
+                "__COMMENT": "not really replicated.",
                 "russia_east": "russia_1",
                 "russia_central": "russia_2",
                 "russia_west": "russia_3",
@@ -65,14 +67,14 @@
                 "china": ["china_1", "china_2"],
                                                                 
                 "__COMMENT": "Convenience to get at the shard replicas as shards.",
-		"__COMMENT": "Two different servers have the same-named database.",
+                "__COMMENT": "Two different servers have the same-named database.",
                 "china_east": "china_1",
                 "china_west": "china_2"
             }
         },
         "development": {
-			      "verify_connection": true,
-				    "favorite_color": "blue",
+            "verify_connection": true,
+            "favorite_color": "blue",
             "shards": {
                 "master": "mysql_m",
 
@@ -86,7 +88,7 @@
                 "moscow": "moscow_s",
 
                 "__COMMENT": "Postgres unreplicated shard (for now)",
-		            "__COMMENT": "One server has three different databases.",
+                "__COMMENT": "One server has three different databases.",
                 "russia": ["russia_1", "russia_2", "russia_3"],
 
                 "__COMMENT": "Convenience to get at the shard replicas as shards.",
@@ -109,7 +111,7 @@
                 "china": ["china_1", "china_2"],
 
                 "__COMMENT": "Convenience to get at the shard replicas as shards.",
-		"__COMMENT": "Two different servers have the same-named database.",
+                "__COMMENT": "Two different servers have the same-named database.",
                 "china_east": "china_1",
                 "china_west": "china_2"
             }
@@ -128,7 +130,7 @@
                 "moscow": "moscow_s",
                                                               
                 "__COMMENT": "Postgres unreplicated shard (for now)",
-		"__COMMENT": "One server has three different databases.",
+                "__COMMENT": "One server has three different databases.",
                 "russia": ["russia_1", "russia_2", "russia_3"],
 
                 "__COMMENT": "Convenience to get at the shard replicas as shards.",
@@ -151,10 +153,19 @@
                 "china": ["china_1", "china_2"],
                                                                 
                 "__COMMENT": "Convenience to get at the shard replicas as shards.",
-		"__COMMENT": "Two different servers have the same-named database.",
+                "__COMMENT": "Two different servers have the same-named database.",
                 "china_east": "china_1",
                 "china_west": "china_2"
             }
+        },
+        "local_test": {
+            "shards": {
+                "master": "paris_s",
+                "russia": ["russia_1", "russia_2", "russia_3"],
+                "russia_east": "russia_1",
+                "russia_central": "russia_2",
+                "russia_west": "russia_3"
+            }
         }
     }
 }

data/spec/support/xbar_helper.rb

@@ -31,6 +31,8 @@ ensure
   XBar::Mapper.reset(xbar_env: 'default', app_env: prev_env)
 end
 
+alias :using_app_environment :using_environment
+
 def set_xbar_env(xbar_env, app_env = nil)
   opts = {xbar_env: xbar_env.to_s, :clear_cache => true}
   if app_env && !defined?(Rails)

data/spec/xbar/replication_spec.rb

@@ -1,8 +1,11 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "when the database is replicated" do
-  it "should send all writes/reads queries to master when you have a non replicated model" do
-    using_environment :production_replicated do
+  before(:each) do
+    set_xbar_env('default', 'local_test')
+  end
+  it "should send all writes/reads queries go to master by default" do
+    XBar.using(:russia) do
       u = User.create!(:name => "Replicated")
       User.count.should == 1
       User.find(u).should == u
@@ -10,64 +13,56 @@ describe "when the database is replicated" do
   end
 
   it "should send all writes queries to master" do
-    using_environment :production_replicated do
-      Cat.create!(:name => "Slave Cat")
-      # The next line will break if the database really is replicated.
-      # This test is assuming that no external mechanism is actually
-      # propagating the writes.
-      Cat.find_by_name("Slave Cat").should be_nil # will read from slave
-      Client.create!(:name => "Slave Client")
-      Client.find_by_name("Slave Client").should_not be_nil # will read from master
-    end
+ 
+    # The Cat model is assumed replicated, so reads via that model
+    # with 'using_any' will go to the slave.  Since the Russia shards
+    # are not really replicated, the "Slave Cat" will not be found.
+    Cat.using(:russia).create!(name: "Slave Cat")
+    Cat.using_any(:russia).find_by_name("Slave Cat").should be_nil
+
+    # The client model is declared to be unreplicated, so reads via that
+    # model will go to the master, even when we specify 'using_any'.
+    Client.using(:russia).create!(:name => "Slave Client")
+    Client.using_any(:russia).find_by_name("Slave Client").should_not be_nil
   end
 
-  it "should allow to create multiple models on the master" do
-    using_environment :production_replicated do
+  it "should allow creation of multiple models on the shard master" do
+    XBar.using(:russia) do
       Cat.create!([{:name => "Slave Cat 1"}, {:name => "Slave Cat 2"}])
-      Cat.find_by_name("Slave Cat 1").should be_nil
-      Cat.find_by_name("Slave Cat 2").should be_nil
-      Cat.using(:master).find_by_name("Slave Cat 1").should_not be_nil # MBS
-      Cat.using(:master).find_by_name("Slave Cat 2").should_not be_nil # MBS
+      Cat.using_any.find_by_name("Slave Cat 1").should be_nil # reads from russia_2
+      Cat.using_any.find_by_name("Slave Cat 2").should be_nil # reads from russia_3
+      Cat.find_by_name("Slave Cat 1").should_not be_nil # reads from master
+      Cat.find_by_name("Slave Cat 2").should_not be_nil # reads from master
     end
   end
 
-  it "should allow #using syntax to send queries to master" do
-    Cat.create!(:name => "Master Cat")
-
-    using_environment :production_fully_replicated do
-      Cat.using(:master).find_by_name("Master Cat").should_not be_nil
+  it "should allow using syntax to send queries to the shard master" do
+    XBar.using(:russia) do
+     Cat.create!(:name => "Master Cat")
+     Cat.using(:russia_east).find_by_name("Master Cat").should_not be_nil
     end
   end
 
   it "should send the count query to a slave" do
-    pending()
-    # using_environment :production_replicated do
-    #       Cat.create!(:name => "Slave Cat")
-    #       Cat.count.should == 0
-    #     end
-  end
-end
-
-
-describe "when the database is replicated and the entire application is replicated" do
-  before(:each) do
-    XBar.stub!(:env).and_return("production_fully_replicated")
-    clean_connection_proxy()
+    XBar.using(:russia) do 
+      Cat.create!(:name => "Slave Cat")
+      Cat.using_any.count.should == 0
+      Cat.using(:russia_east).count.should == 1 # the shard master
+    end
   end
 
   it "should send all writes queries to master" do
-    using_environment :production_fully_replicated do
+    XBar.using(:russia) do
       Cat.create!(:name => "Slave Cat")
-      Cat.find_by_name("Slave Cat").should be_nil
+      Cat.using_any.find_by_name("Slave Cat").should be_nil
       Client.create!(:name => "Slave Client")
-      Client.find_by_name("Slave Client").should be_nil
+      Client.using_any.find_by_name("Slave Client").should_not be_nil
     end
   end
 
   it "should work with validate_uniquess_of" do
-    Keyboard.create!(:name => "thiago")
-
-    using_environment :production_fully_replicated do
+    XBar.using(:russia) do
+      Keyboard.create!(:name => "thiago")
       k = Keyboard.new(:name => "thiago")
       k.save.should be_false
       if XBar.rails31?
@@ -78,17 +73,19 @@ describe "when the database is replicated and the entire application is replicat
     end
   end
 
-  it "should reset current shard if slave throws an exception" do
-
-    using_environment :production_fully_replicated do
+  it "should reset slave read allowed if slave throws an exception" do
+    XBar.using(:russia) do
       Cat.create!(:name => "Slave Cat")
-      Cat.connection.current_shard.should eql(:master)
+      Cat.connection.current_shard.should eql(:russia)
       begin
-        Cat.find(:all, :conditions => 'rubbish = true')
+        Cat.using_any.find(:all, :conditions => 'rubbish = true')
       rescue
       end
-      Cat.connection.current_shard.should eql(:master)
+      Cat.connection.current_shard.should eql(:russia)
+      Cat.connection.slave_read_allowed.should_not be_true
     end
   end
+
 end
 
+  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xbar
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-07 00:00:00.000000000 Z
+date: 2012-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70299244954380 !ruby/object:Gem::Requirement
+  requirement: &70184876580280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70299244954380
+  version_requirements: *70184876580280
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70299244952740 !ruby/object:Gem::Requirement
+  requirement: &70184876579860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70299244952740
+  version_requirements: *70184876579860
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70299244951780 !ruby/object:Gem::Requirement
+  requirement: &70184876579440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70299244951780
+  version_requirements: *70184876579440
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70299244965880 !ruby/object:Gem::Requirement
+  requirement: &70184876579000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70299244965880
+  version_requirements: *70184876579000
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70299244961660 !ruby/object:Gem::Requirement
+  requirement: &70184876578580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70299244961660
+  version_requirements: *70184876578580
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70299244971220 !ruby/object:Gem::Requirement
+  requirement: &70184876506720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70299244971220
+  version_requirements: *70184876506720
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70299244983260 !ruby/object:Gem::Requirement
+  requirement: &70184876506180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -87,10 +87,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70299244983260
+  version_requirements: *70184876506180
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70299244979900 !ruby/object:Gem::Requirement
+  requirement: &70184876505720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70299244979900
+  version_requirements: *70184876505720
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &70299244977220 !ruby/object:Gem::Requirement
+  requirement: &70184876505260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70299244977220
+  version_requirements: *70184876505260
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70299244991040 !ruby/object:Gem::Requirement
+  requirement: &70184876504820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70299244991040
+  version_requirements: *70184876504820
 - !ruby/object:Gem::Dependency
   name: syntax
-  requirement: &70299244989980 !ruby/object:Gem::Requirement
+  requirement: &70184876504380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70299244989980
+  version_requirements: *70184876504380
 description: Supports MongoDB style sharding and mirroring
 email:
 - lydianblues@gmail.com
@@ -183,14 +183,7 @@ files:
 - spec/config/default.json
 - spec/config/duplicate_shard.json
 - spec/config/missing_key.json
-- spec/config/new_shards.json
 - spec/config/no_master_shard.json
-- spec/config/not_entire_sharded.json
-- spec/config/octopus.json
-- spec/config/octopus_rails.json
-- spec/config/production_fully_replicated.json
-- spec/config/production_raise_error.json
-- spec/config/simple.json
 - spec/config/single_adapter.json
 - spec/console.rb
 - spec/migrations/10_create_users_using_replication.rb
@@ -234,7 +227,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1412410971893777561
+      hash: 2639363329198087997
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -243,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1412410971893777561
+      hash: 2639363329198087997
 requirements: []
 rubyforge_project: xbar
 rubygems_version: 1.8.15
@@ -256,14 +249,7 @@ test_files:
 - spec/config/default.json
 - spec/config/duplicate_shard.json
 - spec/config/missing_key.json
-- spec/config/new_shards.json
 - spec/config/no_master_shard.json
-- spec/config/not_entire_sharded.json
-- spec/config/octopus.json
-- spec/config/octopus_rails.json
-- spec/config/production_fully_replicated.json
-- spec/config/production_raise_error.json
-- spec/config/simple.json
 - spec/config/single_adapter.json
 - spec/console.rb
 - spec/migrations/10_create_users_using_replication.rb

data/spec/config/new_shards.json

@@ -1,29 +0,0 @@
-{
-  "connections": {
-     "p1": "postgres://user:password@alpha.server.com:5432/mydatabase?encoding=unicode&pool=5",
-     "p2": "postgres://user:password@beta.server.com:5432/mydatabase?encoding=unicode&pool=5",   
-     "m1": "mysql://user:password@alpha.server.com:3306/mydatabase?pool=10",     
-     "m2": "postgres://user:password@beta.server.com:3306/mydatabase?pool=10",
-     "m3": {"database": "xbar_shard5", "adapter": "mysql2", "host": "localhost" }
-  }, 
-  "environments": {
-    "development": {
-      "shards": [
-        {"name": "shard_one", "connections": ["p1", "p2"]},
-        {"name": "shard_one", "connections": ["p1", "p2"]}
-      ] 
-    },
-		"test": {
-      "shards": [
-        {"name": "shard_one", "connections": ["p1", "p2"]},
-        {"name": "shard_one", "connections": ["p1", "p2"]}
-      ]
-    },
-    "production": {
-      "shards": [
-        {"name": "shard_one", "connections": ["p1", "p2"]},
-        {"name": "shard_one", "connections": ["p1", "p2"]}
-      ]
-    }
-  }
-}

data/spec/config/not_entire_sharded.json

@@ -1,23 +0,0 @@
-{
-	"__COMMENT": "Not Entire Sharded",
-	
-	"entire_sharded": false,
-		
-	"connections": {
-    "europe": {"database": "xbar_shard2", "adapter": "mysql2", "host": "localhost"},
-    "canada": {"database": "xbar_shard3", "adapter": "mysql2", "host": "localhost"},
-    "brazil": {"database": "xbar_shard4", "adapter": "mysql2", "host": "localhost"},
-    "russia": {"database": "xbar_shard5", "adapter": "mysql2", "host": "localhost"}
-	},
-
-	"environments": {
-		"shards": {
-		  "shards": {
-		    "europe": "europe",
-		    "canada": "canada",
-		    "brazil": "brazil",
-		    "russia": "russia"
-		  }
-		}
-	}
-}

data/spec/config/octopus.json

@@ -1,27 +0,0 @@
-{
-    "__COMMENT": "Shards for the XBar meta-environment.",
-    
-    "connections": {
-        "alone_shard": "mysql2://localhost/xbar_shard5",
-        "aug2009": {"database": "xbar_shard2", "adapter": "mysql2", "host": "localhost"},
-        "aug2010": {"database": "xbar_shard3", "adapter": "mysql2", "host": "localhost"},
-        "aug2011": {"database": "xbar_shard4", "adapter": "mysql2", "host": "localhost"},
-        "postgresql_shard": {"adapter": "postgresql", "username": "postgres", "password": null, 
-          "database": "xbar_shard1", "encoding": "unicode"},
-            "sqlite_shard": { "adapter": "sqlite3", "database": "/tmp/database.sqlite3"},
-            "canada": "mysql2://localhost/xbar_shard2",
-        "brazil": {"database": "xbar_shard3", "adapter": "mysql2", "host": "localhost"},
-        "russia": {"database": "xbar_shard4", "adapter": "mysql2", "host": "localhost"}
-    },
-    "environments": {
-        "shards": {
-            "shards": {
-                "alone_shard": "alone_shard",
-                "postgresql_shard": "postgresql_shard",
-                "sqlite_shard": "sqlite_shard",
-                "history_shard": ["aug2009", "aug2010", "aug2011"],
-                "country_shard": ["canada", "brazil", "russia"]
-            }    
-        }
-    }
-}

data/spec/config/octopus_rails.json

@@ -1,25 +0,0 @@
-{
-	"__COMMENT": "XBar Rails Mapperuration",
-	"replicated": true,
-  "verify_connection": true,
-	"connections": {
-		"slave1": {"database": "xbar_shard2", "adapter": "mysql2", "host": "localhost"},
-    "slave2": {"database": "xbar_shard3", "adapter": "mysql2", "host": "localhost"},
-    "slave3": {"database": "xbar_shard4", "adapter": "mysql2", "host": "localhost"},
-    "slave4": {"database": "xbar_shard5", "adapter": "mysql2", "host": "localhost"}
-	},
-	"environments": {			  
-		"staging": {
-		  "shards": {
-		    "slave1": "slave1",
-		    "slave2": "slave2"
-		  }
-		},
-		"production": {
-			"shards": {
-		    "slave3": "slave3",
-		    "slave4": "slave4"
-		  }
-		}
-	}
-}

data/spec/config/production_fully_replicated.json

@@ -1,21 +0,0 @@
-{
-	"__COMMENT": "Production Fully Replicated",
-	"replicated": true,
-	"connections": {
-    "slave1": {"database": "xbar_shard2", "adapter": "mysql2", "host": "localhost"},
-    "slave2": {"database": "xbar_shard3", "adapter": "mysql2", "host": "localhost"},
-    "slave3": {"database": "xbar_shard4", "adapter": "mysql2", "host": "localhost"},
-    "slave4": {"database": "xbar_shard5", "adapter": "mysql2", "host": "localhost"}
-	},
-
-	"environments": {
-		"shards": {
-		  "shards": {
-		    "slave1": "slave1",
-		    "slave2": "slave2",
-		    "slave3": "slave3",
-		    "slave4": "slave4"
-		  }
-		}
-	}
-}

data/spec/config/production_raise_error.json

@@ -1,17 +0,0 @@
-{
-	"__COMMENT": "Production Raise Error",
-	
-	"connections": {
-    "duplicated_shard_name": {"database": "xbar_shard5", "adapter": "mysql2", "host": "localhost"},
-    "duplicated_shard_name": {"database": "xbar_shard4", "adapter": "mysql2", "host": "localhost"}
-	},
-		
-	"environments": {
-    "shards": {
-      "shards": {
-        "history_shard": "duplicated_shard_name",
-        "country_shard": "duplicated_shard_name"
-			}
-    }
-  }
-}

data/spec/config/simple.json

@@ -1,22 +0,0 @@
-{
-    "__COMMENT": "Simple SQLite French Environment",
-
-    "connections": {
-        "paris_m": { "adapter": "sqlite3", "database": "/tmp/paris.sqlite3"},
-	"france_1": { "adapter": "sqlite3", "database": "/tmp/france_1.sqlite3"},
-	"france_2": { "adapter": "sqlite3", "database": "/tmp/france_2.sqlite3"},
-	"france_3": { "adapter": "sqlite3", "database": "/tmp/france_3.sqlite3"}
-    },
-
-    "environments": {
-        "test": {
-            "shards": {
-                "master": "paris_m",
-                "france": ["france_1", "france_2", "france_3"],
-                "france_nord": "france_1",
-		"france_central": "france_2",
-                "france_sud": "france_3"
-            }
-        }
-    }
-}