Fix class variable issues with anonymous classes in specs to remove w…

…arnings on 1.9.2
jeremyevans · Jun 15, 2010 · 455eed5 · 455eed5
1 parent 2cc0605
commit 455eed5
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 50 deletions.
diff --git a/spec/adapters/firebird_spec.rb b/spec/adapters/firebird_spec.rb
@@ -13,7 +13,7 @@ def FIREBIRD_DB.sqls
 def logger.method_missing(m, msg)
   FIREBIRD_DB.sqls.push(msg)
 end
-FIREBIRD_DB.logger = logger
+FIREBIRD_DB.loggers = [logger]
 
 FIREBIRD_DB.create_table! :test do
   varchar :name,  :size => 50

diff --git a/spec/adapters/mysql_spec.rb b/spec/adapters/mysql_spec.rb
@@ -25,7 +25,7 @@ def MYSQL_DB.sqls
 def logger.method_missing(m, msg)
   MYSQL_DB.sqls << msg
 end
-MYSQL_DB.logger = logger
+MYSQL_DB.loggers = [logger]
 MYSQL_DB.drop_table(:items) rescue nil
 MYSQL_DB.drop_table(:dolls) rescue nil
 MYSQL_DB.drop_table(:booltest) rescue nil

diff --git a/spec/adapters/postgres_spec.rb b/spec/adapters/postgres_spec.rb
@@ -13,7 +13,7 @@ def POSTGRES_DB.sqls
 def logger.method_missing(m, msg)
   POSTGRES_DB.sqls << msg
 end
-POSTGRES_DB.logger = logger
+POSTGRES_DB.loggers = [logger]
 
 #POSTGRES_DB.instance_variable_set(:@server_version, 80100)
 POSTGRES_DB.create_table! :test do

diff --git a/spec/core/dataset_spec.rb b/spec/core/dataset_spec.rb
@@ -2185,12 +2185,12 @@ def fetch_rows(sql)
 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 +2218,12 @@ def fetch_rows(sql)
 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 +2428,14 @@ def each(&block)
 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

diff --git a/spec/extensions/many_through_many_spec.rb b/spec/extensions/many_through_many_spec.rb
@@ -245,9 +245,9 @@ class ::Album < Sequel::Model
     h = []
     @c1.many_through_many :tags, [[:albums_artists, :artist_id, :album_id], [:albums, :id, :id], [:albums_tags, :album_id, :tag_id]], :after_load=>:al
     @c1.class_eval do
-      @@blah = h
+      class_variable_set(:@@blah, h)
       def al(v)
-        v.each{|x| @@blah << x.pk * 20}
+        v.each{|x| self.class.send(:class_variable_get, :@@blah) << x.pk * 20}
       end
     end
     @c2.class_eval do

diff --git a/spec/model/associations_spec.rb b/spec/model/associations_spec.rb
@@ -500,15 +500,15 @@ def p._parent=(x)
     h = []
     @c2.many_to_one :parent, :class => @c2, :before_set=>[proc{|x,y| h << x.pk; h << (y ? -y.pk : :y)}, :blah], :after_set=>proc{h << 3}
     @c2.class_eval do
-      @@blah = h
+      class_variable_set(:@@blah, h)
       def []=(a, v)
-        a == :parent_id ? (@@blah << (v ? 4 : 5)) : super
+        a == :parent_id ? (self.class.send(:class_variable_get, :@@blah) << (v ? 4 : 5)) : super
       end
       def blah(x)
-        @@blah << (x ? x.pk : :x)
+        self.class.send(:class_variable_get, :@@blah) << (x ? x.pk : :x)
       end
       def blahr(x)
-        @@blah << 6
+        self.class.send(:class_variable_get, :@@blah) << 6
       end
     end
     p = @c2.load(:id=>10)
@@ -524,9 +524,9 @@ def blahr(x)
     h = []
     @c2.many_to_one :parent, :class => @c2, :after_load=>[proc{|x,y| h << [x.pk, y.pk]}, :al]
     @c2.class_eval do
-      @@blah = h
+      class_variable_set(:@@blah, h)
       def al(v)
-        @@blah << v.pk
+        self.class.send(:class_variable_get, :@@blah) << v.pk
       end
       def @dataset.fetch_rows(sql)
         yield({:id=>20})
@@ -568,15 +568,15 @@ def @dataset.fetch_rows(sql)
     h = []
     @c2.many_to_one :parent, :class => @c2, :before_set=>:bs, :after_set=>:as
     @c2.class_eval do
-      @@blah = h
+      class_variable_set(:@@blah, h)
       def []=(a, v)
-        a == :parent_id ? (@@blah << 5) : super
+        a == :parent_id ? (self.class.send(:class_variable_get, :@@blah) << 5) : super
       end
       def bs(x)
-        @@blah << x.pk
+        self.class.send(:class_variable_get, :@@blah) << x.pk
       end
       def as(x)
-        @@blah << x.pk * 2
+        self.class.send(:class_variable_get, :@@blah) << x.pk * 2
       end
     end
     p.parent = c
@@ -983,12 +983,12 @@ def p._parent=(x)
     h = []
     @c2.one_to_one :parent, :class => @c2, :before_set=>[proc{|x,y| h << x.pk; h << (y ? -y.pk : :y)}, :blah], :after_set=>proc{h << 3}
     @c2.class_eval do
-      @@blah = h
+      class_variable_set(:@@blah, h)
       def blah(x)
-        @@blah << (x ? x.pk : :x)
+        self.class.send(:class_variable_get, :@@blah) << (x ? x.pk : :x)
       end
       def blahr(x)
-        @@blah << 6
+        self.class.send(:class_variable_get, :@@blah) << 6
       end
     end
     p = @c2.load(:id=>10)
@@ -1004,9 +1004,9 @@ def blahr(x)
     h = []
     @c2.one_to_one :parent, :class => @c2, :after_load=>[proc{|x,y| h << [x.pk, y.pk]}, :al]
     @c2.class_eval do
-      @@blah = h
+      class_variable_set(:@@blah, h)
       def al(v)
-        @@blah << v.pk
+        self.class.send(:class_variable_get, :@@blah) << v.pk
       end
       def @dataset.fetch_rows(sql)
         yield({:id=>20})
@@ -1048,15 +1048,15 @@ def @dataset.fetch_rows(sql)
     h = []
     @c2.one_to_one :parent, :class => @c2, :before_set=>:bs, :after_set=>:as
     @c2.class_eval do
-      @@blah = h
+      class_variable_set(:@@blah, h)
       def []=(a, v)
-        a == :node_id ? (@@blah << 5) : super
+        a == :node_id ? (self.class.send(:class_variable_get, :@@blah) << 5) : super
       end
       def bs(x)
-        @@blah << x.pk
+        self.class.send(:class_variable_get, :@@blah) << x.pk
       end
       def as(x)
-        @@blah << x.pk * 2
+        self.class.send(:class_variable_get, :@@blah) << x.pk * 2
       end
     end
     p.parent = c
@@ -1739,18 +1739,18 @@ def p._remove_all_attributes
     h = []
     @c2.one_to_many :attributes, :class => @c1, :before_add=>[proc{|x,y| h << x.pk; h << -y.pk}, :blah], :after_add=>proc{h << 3}, :before_remove=>:blah, :after_remove=>[:blahr]
     @c2.class_eval do
-      @@blah = h
+      class_variable_set(:@@blah, h)
       def _add_attribute(v)
-        @@blah << 4
+        self.class.send(:class_variable_get, :@@blah) << 4
       end
       def _remove_attribute(v)
-        @@blah << 5
+        self.class.send(:class_variable_get, :@@blah) << 5
       end
       def blah(x)
-        @@blah << x.pk
+        self.class.send(:class_variable_get, :@@blah) << x.pk
       end
       def blahr(x)
-        @@blah << 6
+        self.class.send(:class_variable_get, :@@blah) << 6
       end
     end
     p = @c2.load(:id=>10)
@@ -1766,9 +1766,9 @@ def blahr(x)
     h = []
     @c2.one_to_many :attributes, :class => @c1, :after_load=>[proc{|x,y| h << [x.pk, y.collect{|z|z.pk}]}, :al]
     @c2.class_eval do
-      @@blah = h
+      class_variable_set(:@@blah, h)
       def al(v)
-        v.each{|x| @@blah << x.pk}
+        v.each{|x| self.class.send(:class_variable_get, :@@blah) << x.pk}
       end
     end
     @c1.class_eval do
@@ -2492,18 +2492,18 @@ def p._remove_all_attributes
     h = []
     @c2.many_to_many :attributes, :class => @c1, :before_add=>[proc{|x,y| h << x.pk; h << -y.pk}, :blah], :after_add=>proc{h << 3}, :before_remove=>:blah, :after_remove=>[:blahr]
     @c2.class_eval do
-      @@blah = h
+      class_variable_set(:@@blah, h)
       def _add_attribute(v)
-        @@blah << 4
+        self.class.send(:class_variable_get, :@@blah) << 4
       end
       def _remove_attribute(v)
-        @@blah << 5
+        self.class.send(:class_variable_get, :@@blah) << 5
       end
       def blah(x)
-        @@blah << x.pk
+        self.class.send(:class_variable_get, :@@blah) << x.pk
       end
       def blahr(x)
-        @@blah << 6
+        self.class.send(:class_variable_get, :@@blah) << 6
       end
     end
     p = @c2.load(:id=>10)
@@ -2519,9 +2519,9 @@ def blahr(x)
     h = []
     @c2.many_to_many :attributes, :class => @c1, :after_load=>[proc{|x,y| h << [x.pk, y.collect{|z|z.pk}]}, :al]
     @c2.class_eval do
-      @@blah = h
+      class_variable_set(:@@blah, h)
       def al(v)
-        v.each{|x| @@blah << x.pk}
+        v.each{|x| self.class.send(:class_variable_get, :@@blah) << x.pk}
       end
     end
     @c1.class_eval do

diff --git a/spec/model/dataset_methods_spec.rb b/spec/model/dataset_methods_spec.rb
@@ -3,12 +3,12 @@
 describe Sequel::Model::DatasetMethods, "#destroy"  do
   before do
     @c = Class.new(Sequel::Model(:items)) do
-      @@destroyed = []
+      class_variable_set(:@@destroyed, [])
       def destroy
-        @@destroyed << self
+        self.class.send(:class_variable_get, :@@destroyed) << self
       end
       def self.destroyed
-        @@destroyed
+        class_variable_get(:@@destroyed)
       end
     end
     @d = @c.dataset