rcor 0.8.1 → 0.9.5

data/lib/concordion_test_methods.rb

@@ -0,0 +1,127 @@
+# To change this template, choose Tools | Templates
+# and open the template in the editor.
+require 'concordion_utility'
+require 'concordion_reader'
+require 'concordion_parser'
+require 'concordion_processor'
+require 'concordion_parse_result'
+require 'concordion_test_case'
+require 'concordion_writer'
+require 'concordion_environment'
+require 'concordion'
+require 'concordion_css_decorator'
+require 'concordion_utility'
+
+
+module ConcordionConfigMethods
+  
+
+  def default_config
+    concordion = Concordion.new
+    parser = ConcordionParser.new(ConcordionReader.new, concordion)
+    decorator = ConcordionCSSDecorator.new
+    processor = ConcordionProcessor.new(concordion, decorator)
+    { 
+      :parser => parser,
+      :writer => ConcordionWriter.new(ConcordionEnvironment.output_dir),
+      :concordion => concordion,
+      :decorator => decorator,
+      :processor => processor,
+      :write_goldmaster => false,
+      :css_type => ConcordionEnvironment.css_type
+    }
+  end
+
+  def bind_test_method_to(subclass, config)
+    subclass.class_eval do
+      define_method :test_spec do
+        filename = snake_cased_test_name(subclass.to_s)
+        parse_spec(filename,config)
+        failures = run_spec(filename, config)
+        report_spec(filename,config, failures)
+      end
+    end
+    subclass
+  end
+
+
+end
+
+module ConcordionInternalTestMethods
+  @@EXPECTED_FAILURE_COUNT = 0
+  include ConcordionUtility
+
+  def parse_spec(filename,config)
+    config[:parser].parse(filename)
+    assert_concordion_document(config)
+    config[:decorator].add_concordion_css_link(config[:parser].root, config[:parser].html, config[:css_type])
+  end
+
+  def run_spec(filename, config)
+    failures = []
+    config[:parser].each_eligible_concordion_element do |elem|
+      failure = config[:processor].process(elem, self)
+      failures << failure unless failure.nil?
+    end
+    failures
+  end
+
+  def report_spec(filename, config, failures)
+    config[:decorator].add_css_file_to_output_dir(config[:writer], config[:css_type])
+
+    writer = config[:writer]
+    if self.class.method_defined?(:rcor_writer)
+      writer = rcor_writer()
+    end
+    
+    outfilename = writer.calculate_filename_and_overwrite(config[:parser].root, filename)
+    assert_no_failures(outfilename, config, failures)
+  end
+
+  def assert_no_failures(outfilename, config, failures)
+    expected = @@EXPECTED_FAILURE_COUNT
+
+    if self.class.method_defined?(:expected_failure_count)
+      expected = expected_failure_count()
+    end
+
+    message = build_message "#{show_failures(failures)}\nWrote output to #{outfilename}.", 
+                            'Actual failure count <?> did not match expected <?>.',
+                            failures.size, expected
+    assert_block message do
+      failures.size == expected
+    end
+  end
+
+  def show_failures(failures)
+    rv = ""
+    failures.each_with_index do |failure, index|
+      rv += "[Error:#{index + 1}] #{failure}\n"
+    end
+    rv
+  end
+
+  def assert_concordion_document(config)
+    assert_equal "http://www.concordion.org/2007/concordion", config[:parser].html.get_attribute("xmlns:concordion")
+  end
+  
+end
+
+module ConcordionTestMethods
+  include ConcordionInternalTestMethods
+  extend  ConcordionConfigMethods
+
+  class << self
+    alias_method :original_included, :included
+  end
+
+  def self.included(cmod)
+    original_included(cmod)
+    conf = default_config
+    cm = class << cmod
+      include ConcordionConfigMethods
+    end
+    
+    bind_test_method_to(cmod, conf)
+  end
+end

data/lib/concordion_utility.rb

@@ -25,9 +25,21 @@ module ConcordionUtility
 
   def concordion_arguments(name)
     return [] unless has_arguments?(name)
-    name_no_end_paren = name.gsub(")", '')
-    arg_string = name_no_end_paren.split("(")[1]
-
+    arg_string = nil
+    if name =~ /\(/
+      name_no_end_paren = name.gsub(")", '')
+      arg_string = name_no_end_paren.split("(")[1]
+    else
+      
+      base = name.strip
+      if base =~ /=/
+        arg_string = nil
+        base = base.split("=")[1].strip
+      end
+      tokens = base.split(" ").compact
+      arg_string = tokens.slice(1, tokens.size - 1).join(" ")
+    end
+    
     arg_string.split(",").collect { |arg| arg.strip }
   end
   def concordion_variable_name(conc_call)

data/lib/goldmaster_test_case.rb

@@ -1,32 +1,49 @@
 require 'concordion_test_case'
 require 'concordion_string_writer'
+
+require 'diff/lcs'
+
 class GoldmasterTestCase < ConcordionTestCase
   
 
   def initialize(suite, conf = {})
     @writer = ConcordionStringWriter.new
 
-    config = ConcordionTestCase.default_config.merge({:writer => @writer}).merge(conf)
+    config = ConcordionTestCase.default_config.merge(conf)
     @write_goldmaster = config[:write_goldmaster]    
     super(suite, config)
   end
 
+  def rcor_writer
+    @writer
+  end
   def test_spec
     trivial
   end
 
 
   def teardown
-    if @write_goldmaster
+    if self.class.method_defined?(:write_goldmaster!)
       ConcordionWriter.new.write(@writer.data, snake_cased_goldmaster_name(self.class.to_s))
 
-      assert !@write_goldmaster, "Disable write to goldmaster"
+      assert false, "Disable write to goldmaster (erase write_goldmaster! in #{self.class})"
     end
-
+    
     unless is_trivial?
       goldmaster = ConcordionReader.new.read(snake_cased_goldmaster_name(self.class.to_s))
-      assert_equal @writer.data, goldmaster 
+      assert @writer.data.size > 0
+
+      diffs = Diff::LCS.diff(@writer.data, goldmaster)
+      pos = diffs[0].entries[0].position
+      context_exp = goldmaster.slice(pos - 50, 100)
+      context_act = @writer.data.slice(pos - 50, 100)
+      
+      assert_equal @writer.data, goldmaster, "First difference at #{pos} bytes into goldmaster:\n(#{context_exp}) goldmaster vs\n(#{context_act}) actual"
     end
 
   end
+  
+  def meths(o)
+    (o.methods - Object.methods).sort
+  end
 end

data/lib/loader_helper.rb

@@ -0,0 +1,16 @@
+# 
+# To change this template, choose Tools | Templates
+# and open the template in the editor.
+ 
+
+module LoaderHelper
+  def path_for(filename)
+    return filename if File.exists?(filename)
+    
+    $LOAD_PATH.each do |path|
+      candidate = "#{path}/#{filename}"
+      return candidate if File.exists?(candidate)
+    end
+    throw Exception.new("could not find '#{filename}' on load path")
+  end
+end

data/nbproject/private/private.xml

@@ -1,10 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-private xmlns="http://www.netbeans.org/ns/project-private/1">
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
-    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/1">
-        <file>file:/home/bg/src/rcor/rcor/trunk/Rakefile.rb</file>
-        <file>file:/home/bg/src/rcor/rcor/trunk/lib/concordion_css_decorator.rb</file>
-        <file>file:/home/bg/src/rcor/rcor/trunk/lib/concordion_environment.rb</file>
-        <file>file:/home/bg/src/rcor/rcor/trunk/tests/concordion_environment_test.rb</file>
-    </open-files>
 </project-private>

data/nbproject/private/rake-d.txt

@@ -0,0 +1,13 @@
+clean=Remove any temporary products.
+clobber=Remove any generated file.
+clobber_package=Remove package products
+default=
+gem=Build the gem file rcor-0.9.2.gem
+package=Build all the packages
+pkg=
+pkg/rcor-0.9.2=
+pkg/rcor-0.9.2.gem=
+pkg/rcor-0.9.2.tgz=
+pkg/rcor-0.9.2.zip=
+repackage=Force a rebuild of the package files
+test=Run tests

data/tests/apostrophe.html

@@ -0,0 +1,7 @@
+<html xmlns:concordion="http://www.concordion.org/2007/concordion">
+    <body>
+        <p concordion:assertEquals="apostrophe()">Apostrophe's</p>
+        <p concordion:assertEquals="as_apostrophe_bs()">As &#39; Bs</p>
+        <p concordion:assertEquals="check(#TEXT)">A's</p>
+    </body>
+</html>

data/tests/apostrophe_test.rb

@@ -0,0 +1,18 @@
+require 'test_helper'
+require 'concordion_test_case'
+
+class ApostropheTest < ConcordionTestCase
+
+  def apostrophe
+    "Apostrophe's"
+  end
+  
+  def as_apostrophe_bs
+    "As ' Bs"
+  end
+  
+  def check(text)
+    "A's"
+  end
+  
+end

data/tests/ariel_example.html

@@ -0,0 +1,13 @@
+<html xmlns:concordion="http://www.concordion.org/2007/concordion">
+   <body>
+       <p>Given an <span concordion:execute="#author = setup_user (#TEXT)">author</span> 
+       who has an 
+       <span concordion:execute="#entity = setup_entity(#author,#TEXT)">entity</span> 
+       with no versions,
+       </p>
+       <p concordion:execute="delete_users_entity(#author,#entity)"
+>When the author deletes the entity,</p>
+       <p concordion:assertTrue="is_deleted?(#entity)">Then entity is
+deleted from the system.</p>
+   </body>
+</html>

data/tests/ariel_example_test.rb

@@ -0,0 +1,36 @@
+require 'test_helper'
+require 'concordion_test_case'
+require 'user'
+
+class SomeEntity
+  attr_accessor :nombre, :deleted
+  def initialize(nombre)
+    @nombre = nombre
+    @deleted = false
+  end
+end
+
+class ArielExampleTest < ConcordionTestCase
+
+  def setup_user(name)
+    User.new(name, "whatever")
+  end
+  
+  def setup_entity(user, entity_name)
+    entity = SomeEntity.new(entity_name)
+    user.other = entity
+    
+    entity
+  end
+  
+  def delete_users_entity(user, entity)
+    if user.other.nombre == entity.nombre
+      user.other.deleted = true
+    end
+  end
+  
+  def is_deleted?(entity)
+    entity.deleted
+  end
+end
+

data/tests/attr_assert.html

@@ -1,5 +1,7 @@
 <html xmlns:concordion="http://www.concordion.org/2007/concordion">
     <body>
         <p concordion:assertEquals="greeting()">attribute based</p>
+        <p concordion:execute="greeting=(#TEXT)">updated</p>
+        <p concordion:assertEquals="greeting()">updated</p>
     </body>
 </html>

data/tests/basic_assert_true_test.rb

@@ -1,10 +1,14 @@
 # To change this template, choose Tools | Templates
 # and open the template in the editor.
-
+require 'concordion_test_case'
 class BasicAssertTrueTest < ConcordionTestCase
   def initialize(suite)
     super(suite, {:expected_failure_count => 1})
   end
+  def expected_failure_count
+    1
+  end
+
   def is_boiling_point(temperature)
     212 == temperature.to_i
   end

data/tests/basic_set.html

@@ -2,6 +2,9 @@
     <body>
       Here's some text
         <p concordion:set="#username">Chuck Norris</p>
+        <p concordion:set="#mnks">Monkeys</p>
+        <p concordion:set="#mnks">Monkeys</p>
+
 	<p concordion:assertEquals="greetingFor(#username)">Hello Chuck Norris, you nancy-boy.</p>
 	it should be in the output.
     </body>

data/tests/basic_text.html

@@ -2,5 +2,13 @@
     <body>
         <p concordion:execute="set_name(#TEXT)">No</p>
 	<p concordion:assertEquals="double_down()">NoNo</p>
+        
+	<p concordion:execute="#result = return_arg(#TEXT)">Working Text</p>
+	<p concordion:assertEquals="#result">Working Text</p>
+        
+	<p concordion:execute="#result = concat(#TEXT,#TEXT)">Working Text 2</p>
+	<p concordion:assertEquals="#result">Working Text 2:Working Text 2</p>
+        
+        
     </body>
 </html>

data/tests/basic_text_test.rb

@@ -6,6 +6,17 @@ class BasicTextTest < ConcordionTestCase
     @name = name
   end
 
+  def return_arg(arg)
+    arg
+  end
+  
+  def concat(a,b)
+    raise "second arg nil" if b.nil?
+    raise "first arg nil" if a.nil?
+
+    "#{a}:#{b}"
+  end
+  
   def double_down
     "#{@name*2}"
   end

data/tests/concordion_parse_result_test.rb

@@ -1,6 +1,7 @@
 require 'test_helper'
 require 'concordion_parse_result'
-
+require 'rubygems'
+require 'mocha'
 class ConcordionParseResultTest < Test::Unit::TestCase
 
   def test_is_set_command
@@ -8,6 +9,11 @@ class ConcordionParseResultTest < Test::Unit::TestCase
     assert !ConcordionParseResult.new("asdf",nil,nil,nil).is_set_command?
   end
 
+  def test_is_assert_image_command
+    assert ConcordionParseResult.new("assert_image",nil,nil,nil).is_assert_image_command?
+    assert !ConcordionParseResult.new("set",nil,nil,nil).is_assert_image_command?
+  end
+
   def test_is_execute_command
     assert ConcordionParseResult.new("execute",nil,nil,nil).is_execute_command?
     assert !ConcordionParseResult.new("asdf",nil,nil,nil).is_execute_command?
@@ -17,7 +23,16 @@ class ConcordionParseResultTest < Test::Unit::TestCase
     assert ConcordionParseResult.new("verifyrows",nil,nil,nil).is_verify_command?
     assert !ConcordionParseResult.new("monkeys",nil,nil,nil).is_verify_command?
   end
+  def test_is_asserttrue_command
+    assert ConcordionParseResult.new("asserttrue",nil,nil,nil).is_assert_true_command?
+    assert !ConcordionParseResult.new("monkeys",nil,nil,nil).is_assert_true_command?
+  end
 
+  def test_image_location
+    tag = mock("tag")
+    tag.expects(:get_attribute).with('src').returns "foo" 
+    assert_equal "foo", ConcordionParseResult.new(nil,nil,nil, tag).image_location
+  end
   def test_assignment
     assert_equal "#user", ConcordionParseResult.new("verifyrows","  #user = asdfasdf",nil,nil).assignment
     assert_equal "#bob",  ConcordionParseResult.new("monkeys","#bob=asdf",nil,nil).assignment

data/tests/concordion_test.rb

@@ -15,20 +15,6 @@ class ConcordionTest < Test::Unit::TestCase
     assert_equal "bar", @concordion.get_variable("#foo")
   end
 
-  def test_build_invocation_string
-    assert_equal "self.send('foo')", @concordion.build_invocation_string("foo()", "content")
-    @concordion.set_variable("#bar", "baz")
-    assert_equal "self.send('foo', 'baz')", @concordion.build_invocation_string("foo(#bar)", "content")
-
-    @concordion.set_variable("#purplemonkey", "dishwasher")
-    assert_equal "self.send('other', 'baz', 'dishwasher')", @concordion.build_invocation_string("other(#bar,  #purplemonkey)", "content")
-  end
-
-  def test_build_invocation_string_replaces_text
-    assert_equal "self.send('foo', 'ASDF')", @concordion.build_invocation_string("foo(#TEXT)", "ASDF")
-    
-  end
-
   def test_dereference
     @concordion.set_variable("#result", @thingy)