factory_toys 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/factory_toys.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{factory_toys}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Henry", "Thomas Brand"]

data/lib/factory_toys/f_factory.rb

@@ -3,13 +3,18 @@ module FactoryToys
     attr_accessor :filename
     attr_accessor :data
 
+    def method_missing(name, *args, &block)
+      value = eval("@#{name}")
+      return value if value
+      super(name, *args, &block)
+    end
+
     def initialize(filename)
       @filename = filename
 
       @output = "# Auto Generated Features\n"
       @output += "# Generated: #{Time.now.to_s}\n"
       @output += "# Source File: #{@filename}\n\n"
-
     end
 
     def write
@@ -21,33 +26,47 @@ module FactoryToys
     
     def output
       eval(self.data[:base])
-
       self.add_feature(self.data[:feature])
-
-      locals = self.send(:local_variables)
-      scenarios = locals.find_all{|var| var =~ /_#{FactoryToys.scenarios}$/}
-      scenarios.each do |scenario_name|
-        feature = eval(scenario_name)
-        options = get_options(feature)
-        options.each do |option|
-          eval(self.option_string(feature, option))
-          scenario_name =~ /^(.+)_#{FactoryToys.scenarios}$/
-          identifier = $1
-          scenario = "#{identifier}_#{FactoryToys.scenario}".to_sym
-          raise MissingScenarioError, scenario unless self.data[scenario]
-          eval(self.data[scenario])
-          @output += eval(scenario.to_s) + "\n\n"
-        end
-      end
+      conf_names = self.instance_variables
+      self.process_file(conf_names)
       @output
     end
 
-    def add_feature(feature)
-      raise FactoryToys::MissingFeatureDefinitionError if feature.blank?
-      eval(feature)
+    def add_feature(feature_def)
+      raise FactoryToys::MissingFeatureDefinitionError if feature_def.blank?
+      eval(feature_def)
       @output += eval('feature') + "\n\n"
     end
 
+    def process_file(conf_names)
+      scenarios = conf_names.find_all{|var| var =~ /_#{FactoryToys.scenarios}$/}
+      scenarios.each do |feature_name|
+        self.process_scenarios(feature_name)
+      end
+    end
+
+    def process_scenarios(feature_name)
+      feature = eval(feature_name)
+      options = self.get_options(feature)
+      options.each do |option|
+        self.add_scenario(feature, option, feature_name)
+      end
+    end
+
+    def add_scenario(feature, option, feature_name)
+      eval(self.option_string(feature, option))
+      scenario_name = self.get_scenario_name(feature_name)
+      raise MissingScenarioError, scenario_name unless self.data[scenario_name]
+      eval(self.data[scenario_name])
+      @output += eval(scenario_name.to_s) + "\n\n"
+    end
+
+    def get_scenario_name(feature_name)
+      feature_name =~ /^@(.+)_#{FactoryToys.scenarios}$/
+      identifier = $1
+      return "#{identifier}_#{FactoryToys.scenario}".to_sym
+    end
+
     def data
       return @data if @data
       file = File.open(@filename, 'r')
@@ -77,20 +96,21 @@ module FactoryToys
     end
 
     def get_options(scenario)
-      all_options = []
+      all_options = [[]]
       if scenario[:foreach]
         self.get_option_types(scenario[:foreach]).each do |element|
-          raise MissingForeachListError, element.to_s unless scenario[element].is_a?(Array)
-          if all_options.empty?
-            all_options = scenario[element].map{|element_value| [element_value]}
-          else
-            all_options = add_option(all_options, scenario[element])
-          end
+          all_options = process_options(all_options, scenario[element], element)
         end
       end
       return all_options
     end
 
+    def process_options(all_options, elements, element)
+      raise MissingForeachListError, element.to_s unless elements.is_a?(Array)
+#      return elements.map{|element_value| [element_value]} if all_options.empty?
+      return self.add_option(all_options, elements)
+    end
+
     def add_option(all_options, elements)
       options = all_options.clone
       all_options = []

data/lib/factory_toys/parser.rb

@@ -28,13 +28,24 @@ module FactoryToys
     def process_element(rows, row)
       if rows[row] =~ /^[\s]*([^\s]+)[\s]*=[\s]*<<-([^\s]+)[\s]*$/
         name, start_text = $1, $2
+        self.make_instance_variable(rows, row)
         rows = self.extract_element(rows, row, name, start_text)
         return rows, row
       else
+        self.make_instance_variable(rows, row)
         return rows, row + 1
       end
     end
 
+    def make_instance_variable(rows, row)
+      if rows[row] =~ /^([\s]*)([^\s]+)([\s]*)=(.*)$/
+        unless [':','"','"','@'].include?($2[0..0]) or
+            ['>'].include?($4[0..0])
+          rows[row] = "#{$1}@#{$2}#{$3}=#{$4}"
+        end
+      end
+    end
+
     def extract_element(rows, row, name, start_text)
       end_row = find_row(rows, row, start_text)
       elements[name.to_sym] = rows[row..end_row].join("\n")

data/spec/factory_toys/f_factory_spec.rb

@@ -20,7 +20,7 @@ describe FactoryToys::FFactory do
 
   context '#get_options' do
     it 'with no options' do
-      get_options({}).should == []
+      get_options({}).should == [[]]
     end
 
     it 'with a single foreach option' do

data/spec/factory_toys/parser_spec.rb

@@ -12,13 +12,20 @@ describe FactoryToys::Parser do
     it 'returns straight text in the under :base' do
       parser = FactoryToys::Parser.new('hello="hello there"')
       parser.elements.should ==
-        {:base => 'hello="hello there"'}
+        {:base => '@hello="hello there"'}
     end
 
     it 'returns straight text in the under :base with multiple lines' do
-      parser = FactoryToys::Parser.new('hello="hello there"\ngoodbye="bye bye"')
+      parser = FactoryToys::Parser.new("hello='hello there'\ngoodbye='bye bye'")
       parser.elements.should ==
-        {:base => 'hello="hello there"\ngoodbye="bye bye"'}
+        {:base => "@hello='hello there'\n@goodbye='bye bye'"}
+    end
+
+    it 'does not break hashs' do
+      parser = FactoryToys::Parser.new("hello_hash = {\n:hello='hello there',\n:goodbye='bye bye'}")
+      parser.elements.should ==
+        {:base => "@hello_hash = {\n:hello='hello there',\n:goodbye='bye bye'}"}
+
     end
 
     context 'extracting from multi-line comment' do
@@ -27,18 +34,18 @@ describe FactoryToys::Parser do
       end
 
       it 'removes excess white space' do
-        run_factory[:other_string].should == "other_string = <<-TestData\n" +
+        run_factory[:other_string].should == "@other_string = <<-TestData\n" +
                                      "value=test\n" +
                                      "TestData"
       end
 
       it "returns unextracted data" do
-        run_factory[:base].should == "test='testing'\ngreeting='Hello Again'"
+        run_factory[:base].should == "@test='testing'\n@greeting='Hello Again'"
       end
 
       it "does not remove blank lines" do
         run_factory("\n\ndate='Dont look at me??'")[:base].should ==
-          "test='testing'\ngreeting='Hello Again'\n\n\ndate='Dont look at me??'"
+          "@test='testing'\n@greeting='Hello Again'\n\n\n@date='Dont look at me??'"
       end
 
       it "when named variables only" do
@@ -50,7 +57,7 @@ Data
         parser = FactoryToys::Parser.new(string)
 
         parser.elements[:base].should == ''
-        parser.elements[:other_string].should == "other_string = <<-TestData\n" +
+        parser.elements[:other_string].should == "@other_string = <<-TestData\n" +
                                      "value=test\n" +
                                      "TestData"
       end

data/spec/factory_toys_spec.rb

@@ -2,7 +2,10 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "FactoryToys" do
   before do
-    Object.const_set(:RAILS_ROOT, Dir.pwd + '/' + File.dirname(__FILE__) + '/../tmp/empty') unless Object.const_defined?(:RAILS_ROOT)
+    path = File.dirname(__FILE__)
+    path += Dir.pwd + '/' unless path[0..0] == '/'
+    Object.send(:remove_const, :RAILS_ROOT) if Object.const_defined?(:RAILS_ROOT)
+    Object.const_set(:RAILS_ROOT, path + '/../tmp/empty') 
   end
 
   context '#update_features' do
@@ -57,9 +60,11 @@ describe "FactoryToys" do
 
     context 'actually produce a file' do
       it 'creates a file' do
-        FileUtils.rm_r(FactoryToys.features_location + '/*', :force => true)
         Object.send(:remove_const, :RAILS_ROOT)
-        Object.const_set(:RAILS_ROOT, Dir.pwd + '/' + File.dirname(__FILE__) + '/../tmp')
+        path = File.dirname(__FILE__)
+        path += Dir.pwd + '/' unless path[0..0] == '/'
+        Object.const_set(:RAILS_ROOT, path + '/../tmp')
+        FileUtils.rm_r(FactoryToys.features_location + '/*', :force => true)
         FactoryToys.update_features
       end
     end

data/tmp/features/simple_factory.feature

@@ -1,6 +1,6 @@
 # Auto Generated Features
-# Generated: Wed Sep 15 16:47:45 +0100 2010
-# Source File: /Users/tom025/rails/factory-toys/./spec/../tmp/ffactories/simple_factory.rb
+# Generated: Wed Sep 15 18:31:15 +0100 2010
+# Source File: /Users/tom025/rails/factory-toys/spec/../tmp/ffactories/simple_factory.rb
 
   Test Instruction Queue and Processiung
   In order to ensure the Back Office Processes work as expected

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: factory_toys
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - David Henry