sequel 4.42.0 → 4.42.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 950d9818b7e057e8728dde0e8bc5460dc3a91679
-  data.tar.gz: e0cec40c01a7eeb1a6ca8d6d993155a74b032f9d
+  metadata.gz: 1d84f8a9b0d5ee524d044add19f1c9adca2c642a
+  data.tar.gz: 5139deab1c3ddfc8e6a9482f8f711d86f35ab261
 SHA512:
-  metadata.gz: e0bda9bf194bd56954f1647775b8de2d6ed2ace58691c32cf58f2d11717980492dbd0f2dad3f4a13ee2cc45eaa033e2b18456b556b9166a24163e1f7eb8fd41d
-  data.tar.gz: 5c8f48cee321a25826ac480fa09c82289f105d5ff793fee90a58c47f9b91ae4daf2ccd0dbd516391c45fff54ee3036726a9cb0fd22a7d832d77a86e98ddd866f
+  metadata.gz: 12202167088c4caef4db81fc6fa6ed35d2104dc993f1be93d45984b887ba9b698395e576be6537457f2cf8123abed75c85175fa1193e5ef7d3c313584908be06
+  data.tar.gz: 9a4d6933538023d4d7b0ea38c18b317557e01a1c2df0391e9a06a8732ac1d9a1f7525e82fe338ff57052c93973a8f979c757c2bcc1730df9f22ad3f28abad665

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 4.42.1 (2017-01-12)
+
+* Make dataset_module inherited to subclasses when using the single_table_inheritance plugin (jeremyevans) (#1284)
+
 === 4.42.0 (2017-01-01)
 
 * Handle eager load callbacks correctly for one_to_one associations with orders or offsets when window functions are not supported (jeremyevans)

data/lib/sequel/plugins/single_table_inheritance.rb

@@ -185,6 +185,13 @@ module Sequel
 
         private
 
+        # Extend the sti dataset with the module when extending the main
+        # dataset.
+        def dataset_extend(mod, opts=OPTS)
+          @sti_dataset = @sti_dataset.with_extend(mod)
+          super
+        end
+
         # If calling set_dataset manually, make sure to set the dataset
         # row proc to one that handles inheritance correctly.
         def set_dataset_row_proc(ds)

data/lib/sequel/version.rb

@@ -8,7 +8,7 @@ module Sequel
   MINOR = 42
   # The tiny version of Sequel.  Usually 0, only bumped for bugfix
   # releases that fix regressions from previous versions.
-  TINY  = 0
+  TINY  = 1
   
   # The version of Sequel you are using, as a string (e.g. "2.11.0")
   VERSION = [MAJOR, MINOR, TINY].join('.').freeze

data/spec/extensions/single_table_inheritance_spec.rb

@@ -58,6 +58,26 @@ describe Sequel::Model, "single table inheritance plugin" do
     StiTest.all.collect{|x| x.class}.must_equal [StiTest]
   end
 
+  it "should inherit dataset_modules correctly in subclass" do
+    StiTest.dataset_module{def foo; 1; end}
+    Object.send(:remove_const, :StiTestSub1)
+    Object.send(:remove_const, :StiTestSub2)
+    class ::StiTestSub1 < StiTest; end 
+    StiTestSub1.dataset_module{def bar; 2; end}
+    class ::StiTestSub2 < StiTestSub1; end 
+    StiTestSub2.dataset_module{def baz; 3; end}
+
+    StiTest.dataset.foo.must_equal 1
+    proc{StiTest.dataset.bar}.must_raise NoMethodError
+    proc{StiTest.dataset.baz}.must_raise NoMethodError
+    StiTestSub1.dataset.foo.must_equal 1
+    StiTestSub1.dataset.bar.must_equal 2
+    proc{StiTestSub1.dataset.baz}.must_raise NoMethodError
+    StiTestSub2.dataset.foo.must_equal 1
+    StiTestSub2.dataset.bar.must_equal 2
+    StiTestSub2.dataset.baz.must_equal 3
+  end
+
   it "should fallback to the main class if the sti_key field is empty or nil without calling constantize" do
     called = false
     StiTest.meta_def(:constantize) do |s|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 4.42.0
+  version: 4.42.1
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-01 00:00:00.000000000 Z
+date: 2017-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest