ar-octopus 0.1.1 → 0.1.2

data/Rakefile

@@ -37,7 +37,7 @@ begin
     gem.add_development_dependency "jeweler", ">= 1.4"
     gem.add_development_dependency "actionpack", ">= 2.3"
     gem.add_dependency('activerecord', '>= 2.3')
-    gem.version = "0.1.1"
+    gem.version = "0.1.2"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/ar-octopus.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ar-octopus}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thiago Pradi", "Mike Perham"]
-  s.date = %q{2010-09-04}
+  s.date = %q{2010-10-02}
   s.description = %q{This gem allows you to use sharded databases with ActiveRecord. this also provides a interface for replication and for running migrations with multiples shards.}
   s.email = %q{tchandy@gmail.com}
   s.extra_rdoc_files = [

data/lib/octopus.rb

@@ -1,4 +1,5 @@
 require "yaml"
+require "erb"
 
 module Octopus
   def self.env()
@@ -10,7 +11,7 @@ module Octopus
   end
 
   def self.config()
-    @config ||= HashWithIndifferentAccess.new(YAML.load_file(Octopus.directory() + "/config/shards.yml"))[Octopus.env()]
+    @config ||= HashWithIndifferentAccess.new(YAML.load(ERB.new(File.open(Octopus.directory() + "/config/shards.yml").read()).result))[Octopus.env()]
 
     if @config && @config['enviroments']
       self.enviroments = @config['enviroments']

data/lib/octopus/proxy.rb

@@ -1,5 +1,5 @@
 class Octopus::Proxy
-  attr_accessor :current_model, :current_shard, :current_group, :block, :using_enabled, :last_current_shard
+  attr_accessor :current_model, :current_shard, :current_group, :block, :using_enabled, :last_current_shard, :config
 
   def initialize(config)
     initialize_shards(config)
@@ -10,6 +10,7 @@ class Octopus::Proxy
     @shards = {}
     @groups = {}
     @shards[:master] = ActiveRecord::Base.connection_pool()
+    @config = ActiveRecord::Base.connection_pool.connection.instance_variable_get(:@config)
     @current_shard = :master
     
     if !config.nil? && config.has_key?("verify_connection")

data/spec/config/shards.yml

@@ -1,9 +1,12 @@
+mysql: &mysql
+  adapter: <%= 'mysql' %>
+  host: localhost
+
 octopus:
   shards:
     alone_shard:
-      adapter: mysql
-      host: localhost
       database: octopus_shard5
+      <<: *mysql
     
     postgresql_shard:
       adapter: postgresql
@@ -18,46 +21,38 @@ octopus:
     
     history_shards:
       aug2009:
-        adapter: mysql
-        host: localhost
         database: octopus_shard2
+        <<: *mysql
       aug2010:
-        adapter: mysql
-        host: localhost
         database: octopus_shard3
+        <<: *mysql
       aug2011:
-        adapter: mysql
-        host: localhost
         database: octopus_shard4
+        <<: *mysql
     
     country_shards:
       canada:
-        adapter: mysql
-        host: localhost
         database: octopus_shard2
+        <<: *mysql
       brazil:
-        adapter: mysql
-        host: localhost
         database: octopus_shard3
+        <<: *mysql
       russia:
-        adapter: mysql
-        host: localhost
         database: octopus_shard4
+        <<: *mysql
         
         
 production_raise_error:
   shards:
     history_shards:
       duplicated_shard_name:
-        adapter: mysql
-        host: localhost
         database: octopus_shard5
+        <<: *mysql
     
     country_shards:
       duplicated_shard_name:
-        adapter: mysql
-        host: localhost
         database: octopus_shard4
+        <<: *mysql
         
 production_replicated:
   replicated: true
@@ -65,42 +60,34 @@ production_replicated:
   
   shards:
     slave1:
-      adapter: mysql
-      host: localhost
       database: octopus_shard2
+      <<: *mysql
     slave2:
-      adapter: mysql
-      host: localhost
       database: octopus_shard3
+      <<: *mysql
     slave3:
-      adapter: mysql
-      host: localhost
       database: octopus_shard4
+      <<: *mysql
     slave4:
-      adapter: mysql
-      host: localhost
       database: octopus_shard5
+      <<: *mysql
 
 
 production_fully_replicated:
   replicated: true
   shards:
     slave1:
-      adapter: mysql
-      host: localhost
       database: octopus_shard2
+      <<: *mysql
     slave2:
-      adapter: mysql
-      host: localhost
       database: octopus_shard3
+      <<: *mysql
     slave3:
-      adapter: mysql
-      host: localhost
       database: octopus_shard4
+      <<: *mysql
     slave4:
-      adapter: mysql
-      host: localhost
       database: octopus_shard5
+      <<: *mysql
       
 octopus_rails:
   replicated: true
@@ -111,44 +98,34 @@ octopus_rails:
 
   staging:
     slave1:
-      adapter: mysql
-      host: localhost
       database: octopus_shard2
+      <<: *mysql
     slave2:
-      adapter: mysql
-      host: localhost
       database: octopus_shard3
+      <<: *mysql
 
   production:
     slave3:
-      adapter: mysql
-      host: localhost
       database: octopus_shard4
+      <<: *mysql
     slave4:
-      adapter: mysql
-      host: localhost
       database: octopus_shard5
+      <<: *mysql
 
 not_entire_sharded:
   entire_sharded: false
   shards:
     europe:
-      adapter: mysql
-      host: localhost
       database: octopus_shard2
+      <<: *mysql
     canada:
-      adapter: mysql
-      host: localhost
       database: octopus_shard3
+      <<: *mysql
     brazil:
-      adapter: mysql
-      host: localhost
       database: octopus_shard4
+      <<: *mysql
     russia:
-      adapter: mysql
-      host: localhost
       database: octopus_shard5
+      <<: *mysql
   
       
-      
-  

data/spec/octopus/proxy_spec.rb

@@ -20,6 +20,10 @@ describe Octopus::Proxy do
     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
+      proxy.instance_variable_get(:@config).should == {:adapter=>"mysql", :password=>"", :database=>"octopus_shard1", :username=>"root"}
+    end
 
     describe "should raise error if you have duplicated shard names" do
       before(:each) do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ar-octopus
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Thiago Pradi
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-04 00:00:00 -03:00
+date: 2010-10-02 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency