activerecord-sharding 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b2713a535cf9f95e2904a4840a0b79481eb3839
-  data.tar.gz: 6dbda049b7d70c553b26d5b242c7b5ff58666070
+  metadata.gz: 8b1c1c0941e4e769d5689da33ed7d59408829357
+  data.tar.gz: 6b936f7d049b8f3df778f1ed34b90670001c67ca
 SHA512:
-  metadata.gz: 9fbfdfea19ab12464e7ed5756434adb7ec025f00a5f9084ac5e195361d360f178869ffa146afe7701e169f1583fb30ee6701db1dd1f14d7641cd8b5298bed498
-  data.tar.gz: 5f109afa415f5eadbda3fcb3275c61d157c4a5b2901d63958774c96191c0bddc1fac2018301092d4dcae6a26dbe9a0a430b5f06ce57bc8049417e6ef49c0d320
+  metadata.gz: 9a6c7d5d9c02a929e6d4304270fd2c4138ae327bc977d089f857b5b2f43493bd5786a3b64d72564252e80cf15d25548f54427bfbb9ee41b6074b1c1fa538deda
+  data.tar.gz: f77ac90250d835bdfba156867ad14e118fd7b3ee806a5f805505b79e2d42ce023a92a505a0925acdc9b056ef16cbbe12c516db245eac32e461371dba1f408c93

data/.ruby-version

@@ -1 +1 @@
-2.2.3
+2.3.0

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 install: bundle install --jobs=3 --retry=3
 rvm:
+  - 2.3.0
   - 2.2.4
   - 2.1.8
   - 2.0.0-p648
@@ -8,7 +9,14 @@ gemfile:
   - Gemfile
   - ar41.gemfile
   - ar416.gemfile
+  - ar50.gemfile
 services:
   - mysql
 script:
   - bundle exec rake spec
+matrix:
+  exclude:
+    - rvm: 2.1.8
+      gemfile: ar50.gemfile
+    - rvm: 2.0.0-p648
+      gemfile: ar50.gemfile

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Change Log
 
+## [v0.3.0](https://github.com/hirocaster/activerecord-sharding/tree/v0.3.0) (2016-02-03)
+[Full Changelog](https://github.com/hirocaster/activerecord-sharding/compare/v0.2.0...v0.3.0)
+
+**Merged pull requests:**
+
+- Add parallel query to all shards [\#20](https://github.com/hirocaster/activerecord-sharding/pull/20) ([hirocaster](https://github.com/hirocaster))
+
+## [v0.2.0](https://github.com/hirocaster/activerecord-sharding/tree/v0.2.0) (2016-01-15)
+[Full Changelog](https://github.com/hirocaster/activerecord-sharding/compare/v0.1.0...v0.2.0)
+
+**Merged pull requests:**
+
+- Add offset error [\#19](https://github.com/hirocaster/activerecord-sharding/pull/19) ([hirocaster](https://github.com/hirocaster))
+- add default args 'offset' at next\_sequence\_id method [\#18](https://github.com/hirocaster/activerecord-sharding/pull/18) ([myoan](https://github.com/myoan))
+- Version up ruby 2.2.4 [\#17](https://github.com/hirocaster/activerecord-sharding/pull/17) ([hirocaster](https://github.com/hirocaster))
+- Add MissingPrimaryKey Error [\#16](https://github.com/hirocaster/activerecord-sharding/pull/16) ([hirocaster](https://github.com/hirocaster))
+- Out put sequencer class name to log [\#15](https://github.com/hirocaster/activerecord-sharding/pull/15) ([hirocaster](https://github.com/hirocaster))
+- Add transaction spec [\#14](https://github.com/hirocaster/activerecord-sharding/pull/14) ([hirocaster](https://github.com/hirocaster))
+- Put transaction block [\#13](https://github.com/hirocaster/activerecord-sharding/pull/13) ([hirocaster](https://github.com/hirocaster))
+- Add count\_up\_sequence\_id method [\#12](https://github.com/hirocaster/activerecord-sharding/pull/12) ([hirocaster](https://github.com/hirocaster))
+- Fix duplicate sequencer record [\#11](https://github.com/hirocaster/activerecord-sharding/pull/11) ([hirocaster](https://github.com/hirocaster))
+- Add multi activerecord version tests [\#9](https://github.com/hirocaster/activerecord-sharding/pull/9) ([hirocaster](https://github.com/hirocaster))
+- Fix coveraills badge [\#8](https://github.com/hirocaster/activerecord-sharding/pull/8) ([hirocaster](https://github.com/hirocaster))
+
 ## [v0.1.0](https://github.com/hirocaster/activerecord-sharding/tree/v0.1.0) (2015-08-27)
 **Merged pull requests:**
 

data/ar50.gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "activerecord", ">= 5.0.0.beta3"
+
+# Specify your gem's dependencies in active_record_sharding.gemspec
+gemspec

data/lib/active_record/sharding/cluster_config.rb

@@ -16,12 +16,12 @@ module ActiveRecord
         @connection_registry[modulo_key]
       end
 
-      def registerd_connection_count
+      def registered_connection_count
         @connection_registry.count
       end
 
       def validate_config!
-        raise "Nothing registerd connections." if registerd_connection_count == 0
+        raise "Nothing registered connections." if registered_connection_count == 0
       end
 
       def connections

data/lib/active_record/sharding/errors.rb

@@ -8,5 +8,11 @@ module ActiveRecord
 
     class MissingPrimaryKey < Error
     end
+
+    class InvalidSequenceId < Error
+    end
+
+    class InvalidPrimaryKey < Error
+    end
   end
 end

data/lib/active_record/sharding/model.rb

@@ -73,6 +73,7 @@ module ActiveRecord
 
         def validate_id!
           raise ActiveRecord::Sharding::MissingPrimaryKey if attributes[self.class.primary_key].nil?
+          raise ActiveRecord::Sharding::InvalidPrimaryKey if attributes[self.class.primary_key].zero?
         end
     end
   end

data/lib/active_record/sharding/modulo_router.rb

@@ -6,7 +6,7 @@ module ActiveRecord
       end
 
       def route(id)
-        modulo_key = id % @cluster_config.registerd_connection_count
+        modulo_key = id % @cluster_config.registered_connection_count
         @cluster_config.fetch modulo_key
       end
     end

data/lib/active_record/sharding/sequencer.rb

@@ -32,7 +32,9 @@ module ActiveRecord
 
         def next_sequence_id(offset = 1)
           raise NegativeNumberOffsetError if offset < 1
-          execute_sql "id +#{offset}"
+          sequence_id = execute_sql "id +#{offset}"
+          raise ActiveRecord::Sharding::InvalidSequenceId if sequence_id.zero?
+          sequence_id
         end
 
         def execute_sql(last_insert_id_args)

data/lib/active_record/sharding/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Sharding
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/spec/active_record/sharding/cluster_config_spec.rb

@@ -16,9 +16,9 @@ describe ActiveRecord::Sharding::ClusterConfig do
       config.register_connection :db_connection_003
     end
 
-    describe '#registerd_connection_count' do
-      it "returns registerd total connection count" do
-        expect(config.registerd_connection_count).to eq 3
+    describe '#registered_connection_count' do
+      it "returns registered total connection count" do
+        expect(config.registered_connection_count).to eq 3
       end
     end
 
@@ -34,7 +34,7 @@ describe ActiveRecord::Sharding::ClusterConfig do
   describe '#validate_config!' do
     context "Nothing register connection" do
       it "returns raise" do
-        expect { config.validate_config! }.to raise_error "Nothing registerd connections."
+        expect { config.validate_config! }.to raise_error "Nothing registered connections."
       end
     end
   end

data/spec/active_record/sharding/model_spec.rb

@@ -42,6 +42,10 @@ describe ActiveRecord::Sharding::Model do
       expect(alice.class.name).to match(/User::ShardFor/)
     end
 
+    it "raise InvalidPrimaryKey" do
+      expect { model.put! id: 0, name: "invalid_id" }.to raise_error ActiveRecord::Sharding::InvalidPrimaryKey
+    end
+
     context "in transaction" do
       it "when rollback" do
         before_record_count = model.all_shards.map(&:count).reduce(:+)

data/spec/active_record/sharding/sequencer_spec.rb

@@ -10,6 +10,26 @@ describe ActiveRecord::Sharding::Model do
     end
   end
 
+  let(:sequencer_args) do
+    { sequencer_name: "user" }
+  end
+
+  context "forget insert sequencer record" do
+    before do
+      ActiveRecord::Sharding::DatabaseTasks.drop_sequencer_database sequencer_args
+      ActiveRecord::Sharding::DatabaseTasks.create_sequencer_database sequencer_args
+      ActiveRecord::Sharding::DatabaseTasks.create_table_sequencer_database sequencer_args
+    end
+
+    after do
+      ActiveRecord::Sharding::DatabaseTasks.insert_initial_record_sequencer_database sequencer_args # forget this in setup
+    end
+
+    it "raise ActiveRecord::Sharding::InvalidSequenceId" do
+      expect { model.next_sequence_id }.to raise_error ActiveRecord::Sharding::InvalidSequenceId
+    end
+  end
+
   describe '#current_sequence_id' do
     it "returns current sequence id" do
       current_id = model.current_sequence_id

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sharding
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - hirocaster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: expeditor
@@ -187,6 +187,7 @@ files:
 - activerecord-sharding.gemspec
 - ar41.gemfile
 - ar416.gemfile
+- ar50.gemfile
 - bin/benchmark_sequencer.rb
 - bin/console
 - bin/setup
@@ -240,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Sharding library for ActiveRecord(MySQL)