sequel 3.12.1 → 3.13.0

data/spec/core/dataset_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 context "Dataset" do
   before do
@@ -465,6 +465,7 @@ context "Dataset#where" do
     @dataset.filter([:id1, :id2] => @d1.select(:id1, :id2)).sql.should == "SELECT * FROM test WHERE ((id1, id2) IN (SELECT id1, id2 FROM test WHERE (region = 'Asia')))"
     @dataset.filter([:id1, :id2] => []).sql.should == "SELECT * FROM test WHERE ((id1 != id1) AND (id2 != id2))"
     @dataset.filter([:id1, :id2] => [[1, 2], [3,4]].sql_array).sql.should == "SELECT * FROM test WHERE ((id1, id2) IN ((1, 2), (3, 4)))"
+    @dataset.filter([:id1, :id2] => [[1, 2], [3,4]]).sql.should == "SELECT * FROM test WHERE ((id1, id2) IN ((1, 2), (3, 4)))"
 
     @dataset.exclude(:id => @d1.select(:id)).sql.should == "SELECT * FROM test WHERE (id NOT IN (SELECT id FROM test WHERE (region = 'Asia')))"
     @dataset.exclude(:id => []).sql.should == "SELECT * FROM test WHERE (1 = 1)"
@@ -472,6 +473,7 @@ context "Dataset#where" do
     @dataset.exclude([:id1, :id2] => @d1.select(:id1, :id2)).sql.should == "SELECT * FROM test WHERE ((id1, id2) NOT IN (SELECT id1, id2 FROM test WHERE (region = 'Asia')))"
     @dataset.exclude([:id1, :id2] => []).sql.should == "SELECT * FROM test WHERE (1 = 1)"
     @dataset.exclude([:id1, :id2] => [[1, 2], [3,4]].sql_array).sql.should == "SELECT * FROM test WHERE ((id1, id2) NOT IN ((1, 2), (3, 4)))"
+    @dataset.exclude([:id1, :id2] => [[1, 2], [3,4]]).sql.should == "SELECT * FROM test WHERE ((id1, id2) NOT IN ((1, 2), (3, 4)))"
   end
 
   specify "should handle IN/NOT IN queries with multiple columns and an array where the database doesn't support it" do
@@ -1204,6 +1206,11 @@ context "Dataset#order" do
       'SELECT * FROM test ORDER BY name, price DESC'
   end
   
+  specify "should accept :nulls options for asc and desc" do
+    @dataset.order(:name.asc(:nulls=>:last), :price.desc(:nulls=>:first)).sql.should ==
+      'SELECT * FROM test ORDER BY name ASC NULLS LAST, price DESC NULLS FIRST'
+  end
+  
   specify "should overrun a previous ordering" do
     @dataset.order(:name).order(:stamp).sql.should ==
       'SELECT * FROM test ORDER BY stamp'
@@ -1385,6 +1392,11 @@ context "Dataset#reverse_order" do
       'SELECT * FROM test ORDER BY name DESC, price ASC'
   end
 
+  specify "should handles NULLS ordering correctly when reversing" do
+    @dataset.reverse_order(:name.asc(:nulls=>:first), :price.desc(:nulls=>:last)).sql.should ==
+      'SELECT * FROM test ORDER BY name DESC NULLS LAST, price ASC NULLS FIRST'
+  end
+
   specify "should reverse a previous ordering if no arguments are given" do
     @dataset.order(:name).reverse_order.sql.should ==
       'SELECT * FROM test ORDER BY name DESC'
@@ -2185,12 +2197,12 @@ end
 context "Dataset#range" do
   before do
     c = Class.new(Sequel::Dataset) do
-      @@sql = nil
+      class_variable_set(:@@sql, nil)
       
-      def last_sql; @@sql; end
+      def last_sql; self.class.send(:class_variable_get, :@@sql); end
       
       def fetch_rows(sql)
-        @@sql = sql
+        self.class.send(:class_variable_set, :@@sql, sql)
         yield(:v1 => 1, :v2 => 10)
       end
     end
@@ -2218,12 +2230,12 @@ end
 context "Dataset#interval" do
   before do
     c = Class.new(Sequel::Dataset) do
-      @@sql = nil
+      class_variable_set(:@@sql, nil)
       
-      def last_sql; @@sql; end
+      def last_sql; self.class.send(:class_variable_get, :@@sql); end
       
       def fetch_rows(sql)
-        @@sql = sql
+        self.class.send(:class_variable_set, :@@sql, sql)
         yield(:v => 1234)
       end
     end
@@ -2428,14 +2440,14 @@ end
 context "Dataset#[]" do
   before do
     @c = Class.new(Sequel::Dataset) do
-      @@last_dataset = nil
+      class_variable_set(:@@last_dataset, nil)
       
       def self.last_dataset
-        @@last_dataset
+        class_variable_get(:@@last_dataset)
       end
 
       def single_record
-        @@last_dataset = opts ? clone(opts) : self
+        self.class.send(:class_variable_set, :@@last_dataset, opts ? clone(opts) : self)
         {1 => 2, 3 => 4}
       end
     end
@@ -3443,8 +3455,8 @@ context "Sequel::Dataset#qualify_to_first_source" do
     @ds.filter{(a+b)<(c-3)}.qualify_to_first_source.sql.should == 'SELECT t.* FROM t WHERE ((t.a + t.b) < (t.c - 3))'
   end
 
-  specify "should handle SQL::SQLArrays" do
-    @ds.filter(:a=>[:b, :c].sql_array).qualify_to_first_source.sql.should == 'SELECT t.* FROM t WHERE (t.a IN (t.b, t.c))'
+  specify "should handle SQL::ValueLists" do
+    @ds.filter(:a=>[:b, :c].sql_value_list).qualify_to_first_source.sql.should == 'SELECT t.* FROM t WHERE (t.a IN (t.b, t.c))'
   end
 
   specify "should handle SQL::Subscripts" do

data/spec/core/expression_filters_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
 Regexp.send(:include, Sequel::SQL::StringMethods)
 String.send(:include, Sequel::SQL::StringMethods)
@@ -556,6 +556,10 @@ context Sequel::SQL::VirtualRow do
     @d.l{rank(:over, :frame=>:rows){}}.should == 'rank() OVER (ROWS UNBOUNDED PRECEDING)'
   end
 
+  it "should support :frame=>'some string' option for window function calls" do
+    @d.l{rank(:over, :frame=>'RANGE BETWEEN 3 PRECEDING AND CURRENT ROW'){}}.should == 'rank() OVER (RANGE BETWEEN 3 PRECEDING AND CURRENT ROW)'
+  end
+
   it "should raise an error if an invalid :frame option is used" do
     proc{@d.l{rank(:over, :frame=>:blah){}}}.should raise_error(Sequel::Error)
   end

data/spec/core/object_graph_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
 describe Sequel::Dataset, " graphing" do
   before do

data/spec/core/schema_generator_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
 describe Sequel::Schema::Generator do
   before do

data/spec/core/schema_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
 context "DB#create_table" do
   before do

data/spec/core/spec_helper.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 unless Object.const_defined?('Sequel')
-  $:.unshift(File.join(File.dirname(__FILE__), "../../lib/"))
+  $:.unshift(File.join(File.dirname(File.expand_path(__FILE__)), "../../lib/"))
   require 'sequel/core'
 end
 

data/spec/core/version_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
 context "Sequel.version" do
   specify "should be in the form X.Y.Z with all being numbers" do

data/spec/extensions/active_model_spec.rb

@@ -1,76 +1,91 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
-if RUBY_PLATFORM !~ /(win|w)32|java$/
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+
+begin
+  require 'active_model'
+  require 'test/unit'
+  if Test::Unit.respond_to?(:run=)
+    Test::Unit.run = false
+    require 'test/unit/testresult'
+  elsif defined?(MiniTest::Unit)
+    class << MiniTest::Unit
+      def autorun; end
+    end
+  end
+rescue LoadError => e
+  skip_warn "active_model plugin: can't load active_model (#{e.class}: #{e})"
+else
 describe "ActiveModel plugin" do
   specify "should be compliant to the ActiveModel spec" do
-    s = ''
-    IO.popen('-') do |f|
-      if f
-        s = f.read
-      else
-        begin
-          require 'rubygems'
-          require 'active_model'
-        rescue LoadError
-          puts "0 failures, 0 errors, skipping tests"
-        else
-          require 'test/unit'
-          require "test/unit/ui/console/testrunner"
-          class AMLintTest < Test::Unit::TestCase
-            def setup
-              @c = Class.new(Sequel::Model) do
-                set_primary_key :id
-                columns :id, :id2
-                def delete; end
-              end
-              @c.plugin :active_model
-              @m = @model = @c.new
-              @o = @c.load({})
-            end
-            include ActiveModel::Lint::Tests
+    tc = Class.new(Test::Unit::TestCase)
+    tc.class_eval do
+      define_method(:setup) do
+        class ::AMLintTest < Sequel::Model
+          set_primary_key :id
+          columns :id, :id2
+          def delete; end
+        end
+        @c = AMLintTest
+        @c.plugin :active_model
+        @m = @model = @c.new
+        @o = @c.load({})
+        super()
+      end
+      def teardown
+        super
+        Object.send(:remove_const, :AMLintTest)
+      end
+      include ActiveModel::Lint::Tests
 
-            # Should return self, not a proxy object
-            def test__to_model
-              assert_equal @m.to_model.object_id.should, @m.object_id
-            end
-            
-            def test__to_key
-              assert_equal nil, @m.to_key
-              @o.id = 1
-              assert_equal [1], @o.to_key
-              @c.set_primary_key [:id2, :id]
-              @o.id2 = 2
-              assert_equal [2, 1], @o.to_key
-              @o.destroy
-              assert_equal nil, @o.to_key
-            end
-            
-            def test__to_param
-              assert_equal nil, @m.to_param
-              @o.id = 1
-              assert_equal '1', @o.to_param
-              @c.set_primary_key [:id2, :id]
-              @o.id2 = 2
-              assert_equal '2-1', @o.to_param
-              @o.meta_def(:to_param_joiner){'|'}
-              assert_equal '2|1', @o.to_param
-              @o.destroy
-              assert_equal nil, @o.to_param
-            end
+      # Should return self, not a proxy object
+      def test__to_model
+        assert_equal @m.to_model.object_id.should, @m.object_id
+      end
+      
+      def test__to_key
+        assert_equal nil, @m.to_key
+        @o.id = 1
+        assert_equal [1], @o.to_key
+        @c.set_primary_key [:id2, :id]
+        @o.id2 = 2
+        assert_equal [2, 1], @o.to_key
+        @o.destroy
+        assert_equal nil, @o.to_key
+      end
+      
+      def test__to_param
+        assert_equal nil, @m.to_param
+        @o.id = 1
+        assert_equal '1', @o.to_param
+        @c.set_primary_key [:id2, :id]
+        @o.id2 = 2
+        assert_equal '2-1', @o.to_param
+        @o.meta_def(:to_param_joiner){'|'}
+        assert_equal '2|1', @o.to_param
+        @o.destroy
+        assert_equal nil, @o.to_param
+      end
 
-            def test__persisted?
-              assert_equal false, @m.persisted?
-              assert_equal true, @o.persisted?
-              @m.destroy
-              @o.destroy
-              assert_equal false, @m.persisted?
-              assert_equal false, @o.persisted?
-            end
-          end
-          Test::Unit::UI::Console::TestRunner.run(AMLintTest)
-        end
+      def test__persisted?
+        assert_equal false, @m.persisted?
+        assert_equal true, @o.persisted?
+        @m.destroy
+        @o.destroy
+        assert_equal false, @m.persisted?
+        assert_equal false, @o.persisted?
+      end
+    end
+    if defined?(MiniTest::Unit)
+      tc.instance_methods.map{|x| x.to_s}.reject{|n| n !~ /\Atest_/}.each do |m|
+        i = tc.new(m)
+        i.setup
+        i.send(m)
+        i.teardown
       end
+    else
+      res = ::Test::Unit::TestResult.new
+      tc.suite.run(res){}
+      res.failure_count.should == 0
     end
-    s.should =~ /0 failures, 0 errors/
   end
 end 
 end

data/spec/extensions/association_dependencies_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "AssociationDependencies plugin" do
   before do

data/spec/extensions/association_pks_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "Sequel::Plugins::AssociationPks" do
   before do

data/spec/extensions/association_proxies_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "Sequel::Plugins::AssociationProxies" do
   before do

data/spec/extensions/blank_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
 context "Object#blank?" do
   specify "it should be true if the object responds true to empty?" do

data/spec/extensions/boolean_readers_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe Sequel::Model, "BooleanReaders plugin" do
   before do

data/spec/extensions/caching_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe Sequel::Model, "caching" do
   before do

data/spec/extensions/class_table_inheritance_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "class_table_inheritance plugin" do
   before do
@@ -88,7 +88,8 @@ describe "class_table_inheritance plugin" do
   
   it "should return rows with the current class if cti_key is nil" do
     Employee.plugin(:class_table_inheritance)
-    def @ds.fetch_rows(sql)
+    ds = Employee.dataset
+    def ds.fetch_rows(sql)
       yield({:kind=>'Employee'})
       yield({:kind=>'Manager'})
       yield({:kind=>'Executive'})

data/spec/extensions/composition_spec.rb

@@ -1,9 +1,6 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
-require 'yaml'
-require 'json'
-
-describe "Serialization plugin" do
+describe "Composition plugin" do
   before do
     @c = Class.new(Sequel::Model(:items))
     @c.plugin :composition

data/spec/extensions/force_encoding_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 if RUBY_VERSION >= '1.9.0'
 describe "force_encoding plugin" do
   before do
@@ -114,4 +114,6 @@ describe "force_encoding plugin" do
     end
   end
 end 
+else
+  skip_warn "force_encoding plugin: only works on ruby 1.9"
 end

data/spec/extensions/hook_class_methods_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "Model hooks" do
   before do

data/spec/extensions/identity_map_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "Sequel::Plugins::IdentityMap" do
   before do

data/spec/extensions/inflector_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
 describe String do
   it "#camelize and #camelcase should transform the word to CamelCase" do

data/spec/extensions/instance_filters_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "instance_filters plugin" do
   before do

data/spec/extensions/instance_hooks_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "InstanceHooks plugin" do
   def r(x)

data/spec/extensions/json_serializer_spec.rb

@@ -0,0 +1,154 @@
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+
+begin
+  require 'json'
+rescue LoadError => e
+  skip_warn "json_serializer plugin: can't load json (#{e.class}: #{e})"
+else
+describe "Sequel::Plugins::JsonSerializer" do
+  before do
+    class ::Artist < Sequel::Model
+      plugin :json_serializer
+      columns :id, :name
+      one_to_many :albums
+    end
+    class ::Album < Sequel::Model
+      attr_accessor :blah
+      plugin :json_serializer
+      columns :id, :name, :artist_id
+      many_to_one :artist
+    end
+    @artist = Artist.load(:id=>2, :name=>'YJM')
+    @artist.associations[:albums] = []
+    @album = Album.load(:id=>1, :name=>'RF')
+    @album.artist = @artist
+    @album.blah = 'Blah'
+  end
+  after do
+    Object.send(:remove_const, :Artist)
+    Object.send(:remove_const, :Album)
+  end
+
+  it "should round trip successfully" do
+    JSON.parse(@artist.to_json).should == @artist
+    JSON.parse(@album.to_json).should == @album
+  end
+
+  it "should handle the :only option" do
+    JSON.parse(@artist.to_json(:only=>:name)).should == Artist.load(:name=>@artist.name)
+    JSON.parse(@album.to_json(:only=>[:id, :name])).should == Album.load(:id=>@album.id, :name=>@album.name)
+  end
+
+  it "should handle the :except option" do
+    JSON.parse(@artist.to_json(:except=>:id)).should == Artist.load(:name=>@artist.name)
+    JSON.parse(@album.to_json(:except=>[:id, :artist_id])).should == Album.load(:name=>@album.name)
+  end
+
+  it "should handle the :include option for associations" do
+    JSON.parse(@artist.to_json(:include=>:albums)).albums.should == [@album]
+    JSON.parse(@album.to_json(:include=>:artist)).artist.should == @artist
+  end
+
+  it "should handle the :include option for arbitrary attributes" do
+    JSON.parse(@album.to_json(:include=>:blah)).blah.should == @album.blah
+  end
+
+  it "should handle multiple inclusions using an array for the :include option" do
+    a = JSON.parse(@album.to_json(:include=>[:blah, :artist]))
+    a.blah.should == @album.blah
+    a.artist.should == @artist
+  end
+
+  it "should handle cascading using a hash for the :include option" do
+    JSON.parse(@artist.to_json(:include=>{:albums=>{:include=>:artist}})).albums.map{|a| a.artist}.should == [@artist]
+    JSON.parse(@album.to_json(:include=>{:artist=>{:include=>:albums}})).artist.albums.should == [@album]
+
+    JSON.parse(@artist.to_json(:include=>{:albums=>{:only=>:name}})).albums.should == [Album.load(:name=>@album.name)]
+    JSON.parse(@album.to_json(:include=>{:artist=>{:except=>:name}})).artist.should == Artist.load(:id=>@artist.id)
+
+    JSON.parse(@artist.to_json(:include=>{:albums=>{:include=>{:artist=>{:include=>:albums}}}})).albums.map{|a| a.artist.albums}.should == [[@album]]
+    JSON.parse(@album.to_json(:include=>{:artist=>{:include=>{:albums=>{:only=>:name}}}})).artist.albums.should == [Album.load(:name=>@album.name)]
+  end
+
+  it "should handle the :include option cascading with an empty hash" do
+    JSON.parse(@album.to_json(:include=>{:artist=>{}})).artist.should == @artist
+    JSON.parse(@album.to_json(:include=>{:blah=>{}})).blah.should == @album.blah
+  end
+
+  it "should accept a :naked option to not include the JSON.create_id, so parsing yields a plain hash" do
+    JSON.parse(@album.to_json(:naked=>true)).should == @album.values.inject({}){|h, (k, v)| h[k.to_s] = v; h}
+  end
+
+  it "should support #from_json to set column values" do
+    @artist.from_json('{"name": "AS"}')
+    @artist.name.should == 'AS'
+    @artist.id.should == 2
+  end
+
+  it "should raise an exception for json keys that aren't associations, columns, or setter methods" do
+    Album.send(:undef_method, :blah=)
+    proc{JSON.parse(@album.to_json(:include=>:blah))}.should raise_error(Sequel::Error)
+  end
+
+  it "should support a to_json class and dataset method" do
+    album = @album
+    Album.dataset.meta_def(:all){[album]}
+    JSON.parse(Album.to_json).should == [@album]
+    JSON.parse(Album.to_json(:include=>:artist)).map{|x| x.artist}.should == [@artist]
+    JSON.parse(Album.dataset.to_json(:only=>:name)).should == [Album.load(:name=>@album.name)]
+  end
+
+  it "should have dataset to_json method work with naked datasets" do
+    album = @album
+    ds = Album.dataset.naked
+    ds.meta_def(:all){[album.values]}
+    JSON.parse(ds.to_json).should == [@album.values.inject({}){|h, (k, v)| h[k.to_s] = v; h}]
+  end
+
+  it "should propagate class default options to instance to_json output" do
+    class ::Album2 < Sequel::Model
+      attr_accessor :blah
+      plugin :json_serializer, :naked => true, :except => :id
+      columns :id, :name, :artist_id
+      many_to_one :artist
+    end
+    @album2 = Album2.load(:id=>2, :name=>'JK')
+    @album2.artist = @artist
+    @album2.blah = 'Gak'
+    JSON.parse(@album2.to_json).should == @album2.values.reject{|k,v| k.to_s == 'id'}.inject({}){|h, (k, v)| h[k.to_s] = v; h}
+    JSON.parse(@album2.to_json(:only => :name)).should == @album2.values.reject{|k,v| k.to_s != 'name'}.inject({}){|h, (k, v)| h[k.to_s] = v; h}
+    JSON.parse(@album2.to_json(:except => :artist_id)).should == @album2.values.reject{|k,v| k.to_s == 'artist_id'}.inject({}){|h, (k, v)| h[k.to_s] = v; h}
+  end
+  
+  it "should handle the :root option to qualify single records" do
+    @album.to_json(:root=>true, :except => [:name, :artist_id]).to_s.should == '{"album":{"id":1}}'
+    @album.to_json(:root=>true, :only => :name).to_s.should == '{"album":{"name":"RF"}}'
+  end
+  
+  it "should handle the :root option to qualify a dataset of records" do
+    album = @album
+    Album.dataset.meta_def(:all){[album, album]}
+    Album.dataset.to_json(:root=>true, :only => :id).to_s.should == '{"albums":[{"album":{"id":1}},{"album":{"id":1}}]}'
+  end
+
+  it "should store the default options in json_serializer_opts" do
+    Album.json_serializer_opts.should == {}
+    c = Class.new(Album)
+    c.plugin :json_serializer, :naked=>true
+    c.json_serializer_opts.should == {:naked=>true}
+  end
+
+  it "should work correctly when subclassing" do
+    class ::Artist2 < Artist
+      plugin :json_serializer, :only=>:name
+    end
+    JSON.parse(Artist2.load(:id=>2, :name=>'YYY').to_json).should == Artist2.load(:name=>'YYY')
+    class ::Artist3 < Artist2
+      plugin :json_serializer, :naked=>:true
+    end
+    JSON.parse(Artist3.load(:id=>2, :name=>'YYY').to_json).should == {"name"=>'YYY'}
+    Object.send(:remove_const, :Artist2)
+    Object.send(:remove_const, :Artist3)
+  end
+end
+end