fixture_background 0.9.0.2 → 0.9.1

data/lib/fixture_background.rb

@@ -1,6 +1,7 @@
 require 'fixture_background/version'
 require 'fixture_background/background'
 require 'fixture_background/generator'
+require 'fixture_background/ivars'
 require 'fixture_background/shoulda'
 require 'fixture_background/active_support/test_case'
 

data/lib/fixture_background/active_support/test_case.rb

@@ -4,7 +4,7 @@ module FixtureBackground
       extend ::ActiveSupport::Concern
   
       included do
-        class_inheritable_accessor :background_ivar_cache
+        class_inheritable_accessor :background_ivars
         class_inheritable_accessor :active_record_fixture_cache_resetted
 
         set_callback(:setup, :before, :reset_active_record_fixture_cache, {:prepend => true})
@@ -27,22 +27,12 @@ module FixtureBackground
   
       module InstanceMethods
         def setup_background_ivars
-          return unless File.exist?("#{fixture_path}/ivars.dump")
+          self.background_ivars ||= IVars.deserialize((YAML.load_file("#{fixture_path}/ivars.dump") rescue {})) 
 
-          fill_background_ivar_cache unless background_ivar_cache
-          background_ivar_cache.each do |ivar, record|
-            # deep clone the object
-            instance_variable_set(ivar, Marshal.load(Marshal.dump(record)))
-          end
-        end
-    
-        def fill_background_ivar_cache
-          bm = Benchmark.realtime do
-            self.background_ivar_cache = YAML.load_file("#{fixture_path}/ivars.dump")
-            background_ivar_cache.each do |ivar, (class_name, id)|
-              record = class_name.constantize.find(id)
-              self.background_ivar_cache[ivar] = record
-            end
+          deep_copy = Marshal.load(Marshal.dump(self.background_ivars))
+
+          deep_copy.each do |ivar, record|
+            instance_variable_set(ivar,record)
           end
         end
     

data/lib/fixture_background/background.rb

@@ -1,5 +1,31 @@
 module FixtureBackground
   class Background
+    
+    class << self
+      def class_for_test(full_class_name, background_to_use, test_unit_class)
+        klass = class_by_name(full_class_name) || Object.const_set(full_class_name, Class.new(test_unit_class))
+        
+        if helper_class = test_unit_class.instance_variable_get(:@helper_class)
+          klass.instance_variable_set(:@helper_class, helper_class)
+        end
+
+        if controller_class = (test_unit_class.respond_to?(:controller_class) && test_unit_class.controller_class)
+          klass.controller_class = controller_class
+        end 
+
+        klass.fixture_path = background_to_use.fixture_path
+        klass.fixtures :all
+        klass 
+      end
+
+      def class_by_name(class_name)
+        klass = Module.const_get(class_name)
+        klass.is_a?(Class) && klass
+      rescue NameError
+        return false
+      end
+    end
+    
     attr_reader :background_block
     
     def initialize(full_class_name, test_unit_class, parent, blk)
@@ -34,10 +60,7 @@ module FixtureBackground
     end
     
     def class_for_test
-      klass = Kernel.const_set(@full_class_name, Class.new(@test_unit_class))
-      klass.fixture_path = fixture_path
-      klass.fixtures :all
-      klass 
+      self.class.class_for_test(@full_class_name, self, @test_unit_class)
     end
   end
 end

data/lib/fixture_background/generator.rb

@@ -54,12 +54,13 @@ module FixtureBackground
         
         yield klass
         
-        ivar_hash = {}
-        (klass.instance_variables - existing_ivars).each do |ivar|
-          record = klass.instance_variable_get(ivar)
-          ivar_hash[ivar.to_s] = [record.class.name, record.id] if record.class.respond_to? :find
+        ivars_with_value = (klass.instance_variables - existing_ivars).inject({}) do |memo, ivar|
+          memo[ivar] = klass.instance_variable_get(ivar)
+          memo
         end
         
+        ivar_hash = IVars.serialize(ivars_with_value)
+        
         File.open("#{@background_dir}/ivars.dump", 'w+') do |f|
           YAML.dump(ivar_hash, f)
         end
@@ -73,7 +74,7 @@ module FixtureBackground
           
           fixtures = {}
           records.each do |record|
-            fixtures[table_name + record.id.to_s] = record.attributes
+            fixtures[table_name + record.id.to_s] = record.instance_variable_get(:@attributes)
           end
           
           File.open("#{@background_dir}/#{table_name}.yml", 'w+') do |f|

data/lib/fixture_background/ivars.rb

@@ -0,0 +1,122 @@
+module FixtureBackground
+  class IVars
+    class << self
+      def serialize(value)
+        case value 
+        when Hash
+          value.inject({}) do |memo, (key, v)| 
+            memo[key] = serialize(v)
+            memo
+          end
+        when Array
+          value.map { |v| serialize(v) }
+        else 
+          if value.class.respond_to?(:find) && value.respond_to?(:id) 
+            "#{value.class.name}##{value.id}"
+          else
+            raise ArgumentError
+          end
+        end
+      end
+      
+      def deserialize(value)
+        case value
+        when Hash
+          value.inject({}) do |memo, (key, v)| 
+            memo[key] = deserialize(v)
+            memo
+          end
+        when Array
+          value.map { |v| deserialize(v) }
+        when String
+          klass, id = value.split("#")
+          klass.constantize.find(id)
+        end
+      end
+    end
+  end
+end
+
+if __FILE__ == $0
+  require 'test/unit'
+  gem "activesupport"
+  require 'active_support/all'
+  
+  include FixtureBackground
+
+  class Record
+    attr_reader :id
+    
+    class << self
+      def find(id)
+        new(id)
+      end
+    end
+
+    def initialize(id) 
+      @id = id.to_i
+    end
+    
+    def ==(other)
+      other.class == Record && other.id == id
+    end
+  end
+
+  class IVarsTest < Test::Unit::TestCase
+    def test_serialize_simple_values
+      data = {
+        :hase => Record.find(1), 
+        :igel => Record.find(2)
+      }
+
+      expected = {
+        :hase => 'Record#1',
+        :igel => 'Record#2'
+      }
+      
+      assert_serialize_deserialize expected, data
+    end
+    
+    def test_serialize_arrays
+      data = {
+        :hase => [Record.find(1), Record.find(2), [Record.find(3), Record.find(4)]] 
+      }
+
+      expected = {
+        :hase => ['Record#1', 'Record#2', ['Record#3', 'Record#4']]
+      }
+      
+      assert_serialize_deserialize expected, data
+    end
+
+    def test_serialize_hash
+      data = {
+        :hase => { 'thies' => [Record.find(1), Record.find(2)], :sebastian => [Record.find(3), Record.find(4)]}
+      }
+
+      expected = {
+        :hase => {'thies' => ['Record#1', 'Record#2'], :sebastian => ['Record#3', 'Record#4']}
+      }
+      
+      assert_serialize_deserialize expected, data
+    end
+
+    def test_raises_exception_if_some_var_does_not_respond_to_find
+      data = [
+        :some => 1
+      ]
+      
+      assert_raises(ArgumentError) { IVars.serialize(data) }
+    end
+  end
+  
+  def assert_serialize_deserialize(expected, data)
+    serialized = IVars.serialize(data)
+    deserialized = IVars.deserialize(serialized)
+    
+    assert_equal expected, serialized
+    assert_equal deserialized, data
+  end
+end
+
+

data/lib/fixture_background/shoulda.rb

@@ -1,11 +1,17 @@
 module Shoulda
   raise "fixture_background is only compatible with shoulda 2.11.3 installed #{VERSION}" if VERSION != "2.11.3"
 
+  module ClassMethods
+    def described_type
+      self.name.gsub(/Test.*/, '').constantize
+    end
+  end
+
   class Context
     attr_reader :fixture_background
     
     def full_class_name
-      (test_unit_class.name + full_name.gsub(/\s+/, '_')).camelcase
+      (test_unit_class.name + full_name.gsub(/[^a-zA-Z0-9]/, '_')).camelcase
     end
 
     def parent_fixture_background
@@ -19,9 +25,10 @@ module Shoulda
     end
     
     def class_for_test
-      @fixture_background ? @fixture_background.class_for_test : test_unit_class
+      (@fixture_background && @fixture_background.class_for_test) || 
+      (parent_fixture_background && FixtureBackground::Background.class_for_test(full_class_name, parent_fixture_background, test_unit_class)) || 
+      test_unit_class
     end
-
     
     #
     # the following functions are copied from shoulda/context.rb
@@ -29,11 +36,11 @@ module Shoulda
     
     def create_test_from_should_hash(klass, should)
       test_name = ["test:", full_name, "should", "#{should[:name]}. "].flatten.join(' ').to_sym
-
+    
       if klass.instance_methods.include?(test_name.to_s)
         warn "  * WARNING: '#{test_name}' is already defined"
       end
-
+    
       context = self
       klass.send(:define_method, test_name) do
         @shoulda_context = context
@@ -54,9 +61,9 @@ module Shoulda
       shoulds.each do |should|
         create_test_from_should_hash(klass, should)
       end
-
+    
       subcontexts.each { |context| context.build }
-
+    
       print_should_eventuallys
     end
   end

data/lib/fixture_background/version.rb

@@ -1,4 +1,4 @@
 module FixtureBackground
-  VERSION = "0.9.0.2"
+  VERSION = "0.9.1"
 end
 

metadata

@@ -5,9 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 0
-  - 2
-  version: 0.9.0.2
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Thies C. Arntzen
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-07 00:00:00 +01:00
+date: 2011-01-12 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -41,6 +40,7 @@ files:
 - lib/fixture_background/active_support/test_case.rb
 - lib/fixture_background/background.rb
 - lib/fixture_background/generator.rb
+- lib/fixture_background/ivars.rb
 - lib/fixture_background/shoulda.rb
 - lib/fixture_background/version.rb
 has_rdoc: true