sequel-schema-sharding 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79817106f53c0313457b3c96c2649464ceaacf1c
-  data.tar.gz: 8204398f805ebb0830c8b464e41bd8f4b4e8cbd6
+  metadata.gz: b98c0f0746590cbb1e82cb9168174082c30360b8
+  data.tar.gz: f8d580760294f88b947ee43625b3a37d63e9de9b
 SHA512:
-  metadata.gz: c6bd3459507fd8aac45fc48e33578447c9d2e3c28de921085b92d2566fbdbbf1bfbe15e800ed77d5098e7278cc09292f65e48b2b50b7cbec83a05504ad4983f8
-  data.tar.gz: 86aaa77bd21f851c996a38f1f254910f407457b62b113a4c804d87387b28a39fda55f54e80ccb53c07e7b6a9dc1950b922b6f2b1193fd3cd1f6204ebfa133bbf
+  metadata.gz: caa856b979c083ece5e0a44686bbf26a06fc8e5f1fd827dfb0665db2ab47b2e9bc453a1a812b70149b4ea4e847e93a405f3a67133842ef9048bfd22d2de72b8e
+  data.tar.gz: 310c68f1f3688d2c427e8e88a279a2f5c945846e29582eb31f877227765cc2adfda08ccb9e1bf13bd6d23811245dab40d88623016bd820b204594bd311ec8dcd

data/lib/sequel/schema-sharding/dtrace_provider.rb

@@ -10,7 +10,7 @@ module Sequel
       end
 
       def read_only_shard_for
-        @read_only_probe ||= provider.probe(:model, :read_only_shard_for, :string)
+        @read_only_probe ||= provider.probe(:model, :read_only_shard_for, :string, :integer)
       end
 
       def replica_hash_for
@@ -18,7 +18,7 @@ module Sequel
       end
 
       def shard_for
-        @shard_for_probe ||= provider.probe(:model, :shard_for, :string)
+        @shard_for_probe ||= provider.probe(:model, :shard_for, :string, :integer)
       end
 
       def self.provider

data/lib/sequel/schema-sharding/model.rb

@@ -49,19 +49,21 @@ module Sequel
         # Return a valid Sequel::Dataset that is tied to the shard table and connection for the id and will load values
         # run by the query into the model.
         def shard_for(id)
-          Sequel::SchemaSharding::DTraceProvider.provider.shard_for.fire(id.to_s) if Sequel::SchemaSharding::DTraceProvider.provider.shard_for.enabled?
           result = self.result_for(id)
           ds = result.connection[schema_and_table(result)]
           ds.row_proc = self
           dataset_method_modules.each { |m| ds.instance_eval { extend(m) } }
           ds.shard_number = result.shard_number
           ds.model = self
-          ds
+          ds.tap do |d|
+            Sequel::SchemaSharding::DTraceProvider.provider.shard_for.fire(id.to_s, d.shard_number) if Sequel::SchemaSharding::DTraceProvider.provider.shard_for.enabled?
+          end
         end
 
         def read_only_shard_for(id)
-          Sequel::SchemaSharding::DTraceProvider.provider.read_only_shard_for.fire(id.to_s) if Sequel::SchemaSharding::DTraceProvider.provider.read_only_shard_for.enabled?
-          shard_for(id).server(:read_only)
+          shard_for(id).server(:read_only).tap do |d|
+            Sequel::SchemaSharding::DTraceProvider.provider.read_only_shard_for.fire(id.to_s, d.shard_number) if Sequel::SchemaSharding::DTraceProvider.provider.read_only_shard_for.enabled?
+          end
         end
 
         # The result of a lookup for the given id. See Sequel::SchemaSharding::Finder::Result

data/lib/sequel/schema-sharding/version.rb

@@ -1,5 +1,5 @@
 module Sequel
   module SchemaSharding
-    VERSION = "0.13.1"
+    VERSION = "0.13.2"
   end
 end

data/spec/schema-sharding/dtrace_provider_spec.rb

@@ -43,7 +43,7 @@ describe Sequel::SchemaSharding::DTraceProvider do
       end
 
       it 'takes a string argument' do
-        expect(provider.read_only_shard_for.arguments).to eq([:string])
+        expect(provider.read_only_shard_for.arguments).to eq([:string, :integer])
       end
     end
 
@@ -61,7 +61,7 @@ describe Sequel::SchemaSharding::DTraceProvider do
       end
 
       it 'takes a string argument' do
-        expect(provider.read_only_shard_for.arguments).to eq([:string])
+        expect(provider.read_only_shard_for.arguments).to eq([:string, :integer])
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel-schema-sharding
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Paul Henry
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Create horizontally sharded Sequel models with Postgres