sengiri 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cf2b0a2d6136b98587fdc922d0af979bc5615dc
-  data.tar.gz: 11669c7daa1637126d51e6688d399bd4b9dc1e74
+  metadata.gz: 67662e531d8b2b6162bc5c40345d2a2c8483cb86
+  data.tar.gz: 33fd768534533e6fee349213b71cac79dd3aa523
 SHA512:
-  metadata.gz: 13d32f1573dfa4cd9ca730a4c1007af735996f1290416dba0233b6ad1f67cbeee604e63a9b64bfa34adf169fdb4d0b0ace2f9a46610ad6ebc290b9ce80e6ff8e
-  data.tar.gz: 3bb32d54a802c7ba3f7d76cb5c7c16291af7969496322dffec9fed8935bf7d906cae272f11d8854e07536e7b1cf8dfbac4823b34c329a14594136493af6f5f25
+  metadata.gz: af81bf63aab412b0ead03aa961f4c3885013ac2b3a4d65dc43c04832c2d8b12e7ea5fe16dbee40a12f53ed141f78a688e0d549bbaf9f25c36a7460b7fd2d42e5
+  data.tar.gz: 25de11297f6a2e58bf254363b6d36288f3e58dd096d8eff47522934273234fbec666d165b708a3568a5663aced39a3264ca8018d14d53a7956db130f7864c32d

data/README.md

@@ -4,10 +4,13 @@ Flexible sharding access for Ruby on Rails with ActiveRecord
 
 ## Sharding model generator
 
+```
     rails g sengiri:model mygroup user name:string
+```
 
 ## database.yml
 
+```ruby
     mysql: &mysql
       adapter: mysql2
       encoding: utf8
@@ -17,60 +20,86 @@ Flexible sharding access for Ruby on Rails with ActiveRecord
       password:
       host: localhost
     
-    mygroup_shards_first: # define shard as 'first'
+    mygroup_shard_first: # define shard as 'first'
       <<: *mysql
       database: mygroup_1
       host: hosta
-    mygroup_shards_second: # define shard as 'second'
+    mygroup_shard_second: # define shard as 'second'
       <<: *mysql
       database: mygroup_2
       host: hostb
-    mygroup_shards_third: # define shard as 'third'
+    mygroup_shard_third: # define shard as 'third'
       <<: *mysql
       database: mygroup_3
       host: hostc
     .
     .
     .
+```
 
 ## Sharding migration
 
+ActiveRecord task is available on every shard.
+
+```ruby
     rake sengiri:mygroup:db:create
     rake sengiri:mygroup:db:migrate
-
+    rake sengiri:mygroup:db:rollback
+    ...
+```
     
 ## Sharding access
 
+On a shard, ActiveRecord class is given.
+
+```ruby
     User.shard('second') do |shard|
-      shard.all.limit(10) # query on db 'mygroup_1'
+      shard.all.limit(10)   # query on db 'mygroup_2'
+      shard.find(1)         # query on db 'mygroup_2'
     end
+```
 
+Every shard.
 
+```ruby
     User.shards do |shard|
-      shard.all.limit(10) # query on all db 'mygroup_1', 'mygroup_2', 'mygroup_3'
+      shard.all.limit(10) # query on all shards 'mygroup_1', 'mygroup_2', 'mygroup_3'
     end
+```
+
+All records from all shards.
+
+```ruby
+    all_records = User.all.broadcast
+```
 
 ## Transaction
 
+In a shard transaction.
+
+```ruby
     User.shard('second').transaction do
       # in mygroup_2 transaction
     end
+```
 
+In all shards transaction.
 
+```ruby
     User.transaction do
       # in mygroup_1, mygroup_2 and mygroup_3 transaction
     end
+```
 
+This is same as below
 
-    # This is same as below
-
-
+```ruby
     User.shard('first').transaction do
       User.shard('second').transaction do
         User.shard('third').transaction do
         end
       end
     end
-
+```
 
 This project rocks and uses MIT-LICENSE.

data/lib/sengiri.rb

@@ -9,7 +9,7 @@ module ActiveRecord
     def broadcast
       records = []
       klass.shard_names.each do |shard_name|
-        records += shard(shard_name).find_by_sql(arel.to_sql)
+        records += shard(shard_name).find_by_sql(to_sql)
       end
       @records = records
       @records

data/lib/sengiri/model/base.rb

@@ -17,6 +17,11 @@ module Sengiri
         self.class.instance_variable_get :@shard_name
       end
 
+      def narrowcast(association)
+        foreign_key = self.class.table_name.singularize.foreign_key
+        association.to_s.classify.constantize.shard(shard_name).where(foreign_key => id)
+      end
+
       class << self
         def shard_name         ; @shard_name          end
         def sharding_group_name; @sharding_group_name end
@@ -26,17 +31,23 @@ module Sengiri
           []
         end
 
-        def sharding_group(name, confs=nil)
+        def sharding_group(name, confs: nil, suffix: nil)
           @dbconfs = confs if confs
           @sharding_group_name = name
           @shard_class_hash = {}
+          @sharding_database_suffix = if suffix.present? then "_#{suffix}" else nil end
           first = true
+          raise "Databases are not found" if shard_names.blank?
           shard_names.each do |s|
             klass = Class.new(self)
-            Object.const_set self.name + s, klass
+            module_name = self.name.deconstantize
+            module_name = "Object" if module_name.blank?
+            module_name.constantize.const_set self.name.demodulize + s, klass
             klass.instance_variable_set :@shard_name, s
             klass.instance_variable_set :@dbconfs,    dbconfs
             klass.instance_variable_set :@sharding_group_name, name
+            klass.instance_variable_set :@sharding_database_suffix, @sharding_database_suffix
+
             #
             # first shard shares connection with base class
             #
@@ -55,7 +66,11 @@ module Sengiri
 
         def dbconfs
           if defined? Rails
-            @dbconfs ||= Rails.application.config.database_configuration.select {|name| /^#{@sharding_group_name}/ =~ name }
+            @dbconfs ||= Rails.application.config.database_configuration.select {|name|
+              /^#{@sharding_group_name}/ =~ name
+            }.select {|name|
+              /#{env}#{@sharding_database_suffix}$/ =~ name
+            }
 
           end
           @dbconfs
@@ -63,7 +78,7 @@ module Sengiri
 
         def shard_names
           @shard_names ||= dbconfs.map do |k,v|
-            k.gsub("#{@sharding_group_name}_shards_", '')
+            k.gsub("#{@sharding_group_name}_shard_", '').gsub(/_#{env}#{@sharding_database_suffix}$/, '')
           end
           @shard_names
         end
@@ -98,9 +113,70 @@ module Sengiri
           end
         end
 
+        def env
+          ENV["SENGIRI_ENV"] ||= ENV["RAILS_ENV"] || 'development'
+        end
+
         def establish_shard_connection(name)
-          establish_connection dbconfs["#{@sharding_group_name}_shards_#{name}"]
+          establish_connection dbconfs["#{@sharding_group_name}_shard_#{name}_#{env}#{@sharding_database_suffix}"]
+        end
+
+        def has_many_with_sharding(name, scope = nil, options = {}, &extension)
+          class_name, scope, options = *prepare_association(name, scope, options)
+          shard_classes.each do |klass|
+            new_options = options.merge({
+              class_name: class_name.to_s.classify + klass.shard_name,
+              foreign_key: options[:foreign_key] || self.to_s.foreign_key
+            })
+            klass.has_many_without_sharding(name, scope, new_options, extension) if block_given?
+            klass.has_many_without_sharding(name, scope, new_options) unless block_given?
+          end
+          has_many_without_sharding(name, scope, options, extension) if block_given?
+          has_many_without_sharding(name, scope, options) unless block_given?
+        end
+
+        def has_one_with_sharding(name, scope = nil, options = {})
+          class_name, scope, options = *prepare_association(name, scope, options)
+          shard_classes.each do |klass|
+            new_options = options.merge({
+              class_name: class_name.to_s.classify + klass.shard_name,
+              foreign_key: options[:foreign_key] || self.to_s.foreign_key
+            })
+            klass.has_one_without_sharding(name, scope, new_options)
+          end
+          has_one_without_sharding(name, scope, options)
         end
+
+        def belongs_to_with_sharding(name, scope = nil, options = {})
+          class_name, scope, options = *prepare_association(name, scope, options)
+          shard_classes.each do |klass|
+            new_options = options.merge({
+              class_name: class_name.to_s.classify + klass.shard_name,
+              foreign_key: options[:foreign_key] || name.to_s.foreign_key
+            })
+            klass.belongs_to_without_sharding(name, scope, new_options)
+          end
+          belongs_to_without_sharding(name, scope, options)
+        end
+
+        def constantize(name)
+          name.to_s.singularize.classify.constantize
+        end
+
+        def prepare_association(name, scope, options)
+          if scope.is_a?(Hash)
+            options = scope
+            scope   = nil
+          end
+          class_name = options[:class_name] || name
+          constantize(class_name)
+          [class_name, scope, options]
+        end
+
+        alias_method_chain :has_many, :sharding
+        alias_method_chain :has_one, :sharding
+        alias_method_chain :belongs_to, :sharding
+
       end
     end
   end

data/lib/sengiri/railties/sharding.rake

@@ -1,6 +1,12 @@
 require 'active_record'
 
 shard = ENV['SHARD']
+rails_env = ENV['RAILS_ENV']
+if rails_env
+  rails_env_list = [rails_env]
+else
+  rails_env_list = ['development', 'test']
+end
 
 namespace :sengiri do
   db_ns = namespace :db do
@@ -12,9 +18,15 @@ namespace :sengiri do
 
     namespace :db do
 
-      dbconfs = Rails.application.config.database_configuration.select {|name| /^#{shard}/ =~ name }
+      dbconfs = Rails.application.config.database_configuration.select {|name|
+        /^#{shard}/ =~ name
+      }.select {|name|
+        rails_env_list.select {|env|
+          /_#{env}$/ =~ name
+        }.present?
+      }
       switch_db_config = lambda do
-        puts "now on '#{shard}' sharding"
+        puts "now on '#{shard}' shard."
 
         shard_group_dir = "db/sengiri/#{shard}"
         ActiveRecord::Base.configurations = dbconfs

data/lib/sengiri/version.rb

@@ -1,3 +1,3 @@
 module Sengiri
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: sengiri
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - mewlist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2015-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Database sharding for Ruby on Rails. Supports sharding migration, access
@@ -60,8 +60,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- db/sengiri_shards_1.sqlite3
-- db/sengiri_shards_2.sqlite3
+- MIT-LICENSE
+- README.md
+- Rakefile
+- lib/sengiri.rb
 - lib/sengiri/generators/migration_generator.rb
 - lib/sengiri/generators/model_generator.rb
 - lib/sengiri/generators/sharding_generator.rb
@@ -73,11 +75,7 @@ files:
 - lib/sengiri/railtie.rb
 - lib/sengiri/railties/sharding.rake
 - lib/sengiri/version.rb
-- lib/sengiri.rb
 - lib/tasks/sengiri.rake
-- MIT-LICENSE
-- Rakefile
-- README.md
 homepage: https://github.com/mewlist
 licenses: []
 metadata: {}
@@ -87,17 +85,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Database sharding for Ruby on Rails