factory_toys 0.2.3 → 0.3.0

data/README.rdoc

@@ -76,10 +76,29 @@ This is the Scenario that will be generated with the above options. This is shou
 The variable name used should be in the format:
   <identifier>_scenario
 
+To Simplify the logic parts of the SCENARIO TEMNPLATE can be shared as follows
+
+  shared_scenario_part <<-DATA
+    @setup_#{dow}_settings
+    Given David is Better than Tom
+    When Tom is Great
+  DATA
+
+  my_first_scenario = <<- SCENARIO_TEMPLATE
+    << shared_scenario_part
+    Then Dave is Better
+  SCENARIO_TEMPLATE
+
+  my_second_scenario = <<- SCENARIO_TEMPLATE
+    << shared_scenario_part
+    And There is cake
+    Then Dave eats cake
+  SCENARIO_TEMPLATE
+
+Note the use of '<< ' to insert the shared element
+
 == ToDo
 
-* Allow scenarios to be built from parts rather than just as a block of text
-  - allow common parts of features to only be specified once and then shared basically
 * Add functionality to only rebuild the feature file if there has been a change most likely using fssm once I have a look and understand how it works..
 * Add other configuration options.. Not really sure what else is needed but am sure somthing will turn up
 * Fix the readme so it is not quite so much of a ramble.

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.3.0

data/factory_toys.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{factory_toys}
-  s.version = "0.2.3"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Henry", "Thomas Brand"]
-  s.date = %q{2010-09-15}
+  s.date = %q{2010-09-20}
   s.description = %q{Simplify Feature Management}
   s.email = %q{dw_henry@yahoo.com.au}
   s.extra_rdoc_files = [

data/lib/factory_toys/parser.rb

@@ -39,7 +39,7 @@ module FactoryToys
 
     def make_instance_variable(rows, row)
       if rows[row] =~ /^([\s]*)([^\s]+)([\s]*)=(.*)$/
-        unless [':','"','"','@'].include?($2[0..0]) or
+        unless [':','"',"'",'@'].include?($2[0..0]) or
             ['>'].include?($4[0..0])
           rows[row] = "#{$1}@#{$2}#{$3}=#{$4}"
         end
@@ -47,12 +47,24 @@ module FactoryToys
     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")
+      end_row = find_closure_text(rows, row, start_text)
+      elements[name.to_sym] = self.element_string(rows[row..end_row])
       (row == 0 ? [] : rows[0..row-1]) + rows[end_row+1..-1]
     end
 
-    def find_row(rows, row, start_text)
+    def element_string(element_rows)
+      element_rows.map! do |row|
+        if row =~ /^[\s]*<< ([^\s]+)[\s]*$/
+          raise UnknownInlineError, $1 unless elements[$1.to_sym]
+          elements[$1.to_sym].split("\n")[1..-2]
+        else
+          row
+        end
+      end
+      return element_rows.join("\n")
+    end
+
+    def find_closure_text(rows, row, start_text)
       rows[row..-1].each_with_index do |row_text, i|
         return row + i if row_text.strip == start_text
       end

data/lib/factory_toys.rb

@@ -5,6 +5,7 @@ module FactoryToys
   class MissingForeachListError < StandardError; end
   class InternalForEachError < StandardError; end
   class MissingScenarioError < StandardError; end
+  class UnknownInlineError < StandardError; end
 
   class << self
     attr_accessor :features_directory, :source_directory

data/spec/factory_toys/parser_spec.rb

@@ -74,5 +74,68 @@ Data
         parser.elements
       end
     end
+
+    context 'with inline data sharing' do
+      it 'supports unline use of existing elements' do
+        string = <<-Data
+string_one = <<-Str1
+This is the test
+Str1
+string_two = <<-Str2
+This is an inline test
+<< string_one
+Str2
+Data
+
+        parser = FactoryToys::Parser.new(string)
+
+        parser.elements[:base].should == ''
+        parser.elements[:string_one].should == "@string_one = <<-Str1\n" +
+                      "This is the test\n" +
+                      "Str1"
+
+        parser.elements[:string_two].should == "@string_two = <<-Str2\n" +
+                      "This is an inline test\n" +
+                      "This is the test\n" +
+                      "Str2"
+      end
+
+      it 'supports inline use of multi-line existing elements' do
+        string = <<-Data
+string_one = <<-Str1
+This is the test
+And so is this
+Str1
+string_two = <<-Str2
+This is an inline test
+<< string_one
+Str2
+Data
+
+        parser = FactoryToys::Parser.new(string)
+
+        parser.elements[:base].should == ''
+
+        parser.elements[:string_two].should == "@string_two = <<-Str2\n" +
+                      "This is an inline test\n" +
+                      "This is the test\n" +
+                      "And so is this\n" +
+                      "Str2"
+      end
+
+      it 'when invalid inline element raises an error' do
+        string = <<-Data
+string_one = <<-Str1
+This is the test
+Str1
+string_two = <<-Str2
+This is an inline test
+<< string_error
+Str2
+Data
+
+        lambda{ FactoryToys::Parser.new(string) }.should raise_error FactoryToys::UnknownInlineError, "string_error"
+      end
+    end
   end
 end

data/tmp/features/simple_factory.feature

@@ -1,5 +1,5 @@
 # Auto Generated Features
-# Generated: Wed Sep 15 18:31:15 +0100 2010
+# Generated: Mon Sep 20 10:55:43 +0100 2010
 # Source File: /Users/tom025/rails/factory-toys/spec/../tmp/ffactories/simple_factory.rb
 
   Test Instruction Queue and Processiung

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: factory_toys
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
   - 3
-  version: 0.2.3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - David Henry
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-15 00:00:00 +01:00
+date: 2010-09-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency