factory_toys 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/factory_toys.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{factory_toys}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Henry", "Thomas Brand"]
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
      "spec/factory_toys_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
+     "tmp/features/simple_factory.feature",
      "tmp/ffactories/simple_factory.rb"
   ]
   s.homepage = %q{http://github.com/tom025/factory-toys}

data/lib/factory_toys/f_factory.rb

@@ -4,13 +4,16 @@ module FactoryToys
     attr_accessor :data
 
     def initialize(filename)
-      @output = ''
       @filename = filename
-      #build_output(filename)
+
+      @output = "# Auto Generated Features\n"
+      @output += "# Generated: #{Time.now.to_s}\n"
+      @output += "# Source File: #{@filename}\n\n"
+
     end
 
     def write
-      filname = @filename.gsub(/.rb/,'.feature')
+      filename = File.basename(@filename, '.rb') + '.feature'
       File.open(FactoryToys.features_location + "/" + filename, 'w') do |f|
         f.puts self.output
       end
@@ -19,36 +22,35 @@ module FactoryToys
     def output
       eval(self.data[:base])
 
-      self.build_feature(self.data[:feature])
+      self.add_feature(self.data[:feature])
 
       locals = self.send(:local_variables)
       scenarios = locals.find_all{|var| var =~ /_#{FactoryToys.scenarios}$/}
-      scenarios.each do |scenario|
-        options = get_options(scenario)
+      scenarios.each do |scenario_name|
+        feature = eval(scenario_name)
+        options = get_options(feature)
         options.each do |option|
-          eval(self.get_option_string(scenario, option))
-          option =~ /^(.+)_#{FactoryToys.scenarios}$/
+          eval(self.option_string(feature, option))
+          scenario_name =~ /^(.+)_#{FactoryToys.scenarios}$/
           identifier = $1
-          scenario = "#{identifer}_#{FactoryToys.scenario}"
-          raise MissingScenarioError, scenario unless scenarios[scenario]
-          eval(scenarios[scenario])
-          output += scenario + "\n\n"
+          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
+      @output
     end
 
     def add_feature(feature)
       raise FactoryToys::MissingFeatureDefinitionError if feature.blank?
-      output += feature
-    end
-
-    def add_scenario(scenario, options)
-
+      eval(feature)
+      @output += eval('feature') + "\n\n"
     end
 
     def data
       return @data if @data
-      file = File.open(FactoryToys.source_location + "/" + @filename, 'r')
+      file = File.open(@filename, 'r')
       @data = Parser.new(file.read).elements
     end
 
@@ -56,7 +58,22 @@ module FactoryToys
       return '' unless scenario[:foreach]
       foreach = get_option_types(scenario[:foreach], false)
       raise InternalForEachError unless foreach.size == option.size
-      foreach.map(&:to_s).join(', ') + ' = ' + option.map(&:to_s).join(', ')
+      foreach.map(&:to_s).join(', ') + ' = ' + option.map{|o| self.write_value(o)}.join(', ')
+    end
+
+    def write_value(o)
+      case o
+      when Symbol
+        return ":#{o}"
+      when String
+        return "'#{o}'"
+      when Numeric
+        return o.to_s  
+      when Array
+        "[#{o.map{|v| self.write_value(v).join(',')}}]"
+      when Hash
+        "{#{o.map{|k,v| self.write_value(k) + ' => ' + self.write_value(v)}.join(', ')}}"
+      end
     end
 
     def get_options(scenario)

data/lib/factory_toys/parser.rb

@@ -22,7 +22,7 @@ module FactoryToys
     end
 
     def split_by_row(data)
-      data.split("\n").map(&:strip).find_all{|str| !str.blank?}
+      data.split("\n")
     end
 
     def process_element(rows, row)

data/lib/factory_toys.rb

@@ -1,3 +1,4 @@
+
 module FactoryToys
   class MissingEnvironmentError < StandardError; end
   class CloseTagNotFoundError < StandardError; end
@@ -28,7 +29,7 @@ module FactoryToys
 
     protected
     def source_files
-      Dir.glob(self.source_location, '*')
+      Dir.glob(self.source_location + '/*.rb')
     rescue Errno::ENOENT => e
       return "Source Directory Does not exist: #{self.source_directory}"
     end

data/spec/factory_toys/f_factory_spec.rb

@@ -1,11 +1,5 @@
 require 'spec_helper'
 
-#implemented here to get tests to pass as in Rails Environment and not ruby core??
-class String
-  def blank?
-    self.nil? or self == ''
-  end
-end
 
 describe FactoryToys::FFactory do
   before do

data/spec/factory_toys/parser_spec.rb

@@ -36,17 +36,17 @@ describe FactoryToys::Parser do
         run_factory[:base].should == "test='testing'\ngreeting='Hello Again'"
       end
 
-      it "removes blank lines" do
+      it "does not remove blank lines" do
         run_factory("\n\ndate='Dont look at me??'")[:base].should ==
-          "test='testing'\ngreeting='Hello Again'\ndate='Dont look at me??'"
+          "test='testing'\ngreeting='Hello Again'\n\n\ndate='Dont look at me??'"
       end
 
       it "when named variables only" do
         string = <<-Data
-        other_string = <<-TestData
-          value=test
-        TestData
-        Data
+other_string = <<-TestData
+value=test
+TestData
+Data
         parser = FactoryToys::Parser.new(string)
 
         parser.elements[:base].should == ''
@@ -57,12 +57,12 @@ describe FactoryToys::Parser do
 
       def run_factory(additional_text='')
         string = <<-Data
-        test='testing'
-        other_string = <<-TestData
-          value=test
-        TestData
-        greeting='Hello Again'
-        Data
+test='testing'
+other_string = <<-TestData
+value=test
+TestData
+greeting='Hello Again'
+Data
         parser = FactoryToys::Parser.new(string + additional_text)
         parser.elements
       end

data/spec/factory_toys_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "FactoryToys" do
   before do
-    Object.const_set(:RAILS_ROOT, File.dirname(__FILE__) + '/../tmp/empty') unless Object.const_defined?(:RAILS_ROOT)
+    Object.const_set(:RAILS_ROOT, Dir.pwd + '/' + File.dirname(__FILE__) + '/../tmp/empty') unless Object.const_defined?(:RAILS_ROOT)
   end
 
   context '#update_features' do
@@ -28,9 +28,19 @@ describe "FactoryToys" do
       end
 
       it 'calls Process FFactory for each file' do
+        factory = mock(:fact1, :write => true)
         FactoryToys.stub!(:source_files).and_return(['file1', 'file2'])
-        FactoryToys::FFactory.should_receive(:new).with('file1').and_return(true)
-        FactoryToys::FFactory.should_receive(:new).with('file2').and_return(true)
+        FactoryToys::FFactory.should_receive(:new).with('file1').and_return(factory)
+        FactoryToys::FFactory.should_receive(:new).with('file2').and_return(factory)
+        FactoryToys.update_features
+      end
+
+      it 'calls write for each file' do
+        factory = mock(:fact1)
+        FactoryToys.stub!(:source_files).and_return(['file1', 'file2'])
+        FactoryToys::FFactory.stub!(:new).and_return(factory)
+        factory.should_receive(:write).and_return(true)
+        factory.should_receive(:write).and_return(true)
         FactoryToys.update_features
       end
     end
@@ -44,6 +54,15 @@ describe "FactoryToys" do
         FactoryToys.scenarios.should == 'feature'
       end
     end
+
+    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')
+        FactoryToys.update_features
+      end
+    end
   end
 
 end

data/spec/spec_helper.rb

@@ -8,3 +8,14 @@ require 'spec/autorun'
 Spec::Runner.configure do |config|
   
 end
+
+SETTLEMENT_METHODS = [DCC_DCC = {:buy => 'dcc from dcc', :to => 'dcc to dcc'},
+                      REG_REG = {:buy => 'reg from reg', :to => 'reg to reg'}
+                      ]
+
+#implemented here to get tests to pass as in Rails Environment and not ruby core??
+class String
+  def blank?
+    self.nil? or self == ''
+  end
+end

data/tmp/features/simple_factory.feature

@@ -0,0 +1,70 @@
+# 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
+
+  Test Instruction Queue and Processiung
+  In order to ensure the Back Office Processes work as expected
+  Back Office
+  wants to ensure trades process through queues as required
+
+
+  @selenium @buy_trade_ticket_requirements @login_as_middle_office
+  Ing Trade Ticket Instructions - buy dcc from dcc
+    Given I am on the Instructions Screen
+    When I click the trade row
+    Then I should see "Instruction Details"
+    When I set Settlement Method to "dcc from dcc" for trade
+    Then I should see Settlement Method "dcc from dcc" for trade
+    When I follow "Broker Confirm"
+    Then I should see "Instruct Trade"
+    And I should see trade row
+    When I follow "Instruct Trade" with confirmation
+    Then I should not see trade row
+    And Instruction File exists on Hard Drive
+
+
+  @selenium @buy_trade_ticket_requirements @login_as_middle_office
+  Ing Trade Ticket Instructions - buy reg from reg
+    Given I am on the Instructions Screen
+    When I click the trade row
+    Then I should see "Instruction Details"
+    When I set Settlement Method to "reg from reg" for trade
+    Then I should see Settlement Method "reg from reg" for trade
+    When I follow "Broker Confirm"
+    Then I should see "Instruct Trade"
+    And I should see trade row
+    When I follow "Instruct Trade" with confirmation
+    Then I should not see trade row
+    And Instruction File exists on Hard Drive
+
+
+  @selenium @sell_trade_ticket_requirements @login_as_middle_office
+  Ing Trade Ticket Instructions - sell 
+    Given I am on the Instructions Screen
+    When I click the trade row
+    Then I should see "Instruction Details"
+    When I set Settlement Method to "" for trade
+    Then I should see Settlement Method "" for trade
+    When I follow "Broker Confirm"
+    Then I should see "Instruct Trade"
+    And I should see trade row
+    When I follow "Instruct Trade" with confirmation
+    Then I should not see trade row
+    And Instruction File exists on Hard Drive
+
+
+  @selenium @sell_trade_ticket_requirements @login_as_middle_office
+  Ing Trade Ticket Instructions - sell 
+    Given I am on the Instructions Screen
+    When I click the trade row
+    Then I should see "Instruction Details"
+    When I set Settlement Method to "" for trade
+    Then I should see Settlement Method "" for trade
+    When I follow "Broker Confirm"
+    Then I should see "Instruct Trade"
+    And I should see trade row
+    When I follow "Instruct Trade" with confirmation
+    Then I should not see trade row
+    And Instruction File exists on Hard Drive
+
+

data/tmp/ffactories/simple_factory.rb

@@ -1,6 +1,3 @@
-SETTLEMENT_METHODS = [DCC_DCC = {:buy => 'dcc from dcc', :to => 'dcc to dcc'},
-                      REG_REG = {:buy => 'reg from reg', :to => 'reg to reg'}
-                      ]
 feature = <<-Data
   Test Instruction Queue and Processiung
   In order to ensure the Back Office Processes work as expected
@@ -10,7 +7,7 @@ Data
 
 ing_feature = {
   :foreach => [:direction, :settlement_method],
-  :direction => ['buy', 'sell'],
+  :direction => [:buy, :sell],
   :settlement_method => SETTLEMENT_METHODS
 }
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: factory_toys
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - David Henry
@@ -60,6 +60,7 @@ files:
 - spec/factory_toys_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- tmp/features/simple_factory.feature
 - tmp/ffactories/simple_factory.rb
 has_rdoc: true
 homepage: http://github.com/tom025/factory-toys