fit 1.1 → 1.2

data/lib/fit/fixture.rb

@@ -2,9 +2,10 @@
 # Released under the terms of the GNU General Public License version 2 or later.
 
 require 'fit/scientific_double'
-require 'parsedate'
 require 'fit/fixture_loader'
 
+require 'date'
+
 module Fit
 
   class RunTime
@@ -60,13 +61,14 @@ module Fit
     @@metadata = {}
     def Fixture.metadata; @@metadata; end
 
+    @@loader = FixtureLoader.new
+
     attr_accessor :summary, :counts, :listener, :args
 
     def initialize
       @summary = {}
       @counts = Counts.new
       @listener = FixtureListener.new
-      @loader = FixtureLoader.new
       @args = []
     end
 
@@ -77,7 +79,7 @@ module Fit
     # Traversal
 
     def find_class class_name
-      @loader.find_fixture_class class_name
+      @@loader.find_fixture_class class_name
     end
     
     def do_tables tables
@@ -91,6 +93,7 @@ module Fit
             fixture.interpret_tables tables
           rescue Exception => e
             exception fixture_name, e
+            @listener.table_finished(tables)
             interpret_following_tables tables
           end
         end
@@ -267,7 +270,10 @@ module Fit
     end
 
     def parse string, klass
-      return ParseDate.parsedate(string) if klass == ParseDate
+      if klass == Date
+        d = Date._parse string
+        return [d[:year], d[:mon], d[:mday], d[:hour], d[:min], d[:sec], d[:zone], d[:wday]] 
+      end
       return ScientificDouble.value_of(string) if klass == ScientificDouble
       return string if klass == String
       nil

data/lib/fit/fixture_loader.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 module Fit
 
   class FixtureLoader
@@ -9,9 +11,10 @@ module Fit
     
     def find_fixture_class name
       camelizedName = (name.split(/[^a-zA-Z0-9.:$]/).collect { |word| first = word.slice!(0,1).upcase; first + word }).join.chomp('.')
-      klass = ([camelizedName, camelizedName + 'Fixture'].collect { |n| find_class n }).find { |fixtureKlass| fixtureKlass }
-      raise "Fixture #{name} not found." unless klass
-      raise "#{name} is not a fixture." unless klass < Fixture
+      klasses = ([camelizedName, camelizedName + 'Fixture'].collect { |n| find_class(n) }).compact
+      raise "Fixture #{name} not found." if klasses.length == 0
+      klass = klasses.find { |k| k < Fixture }
+      raise "#{name} is not a fixture." unless klass
       klass
     end
     
@@ -23,7 +26,7 @@ module Fit
     def find_class name
       klass = find_constant name
       unless klass
-        ([''] + @@fixture_packages).detect do |prefix|
+        ([''] + @@fixture_packages.to_a).detect do |prefix|
           file_path = (prefix + name).gsub(/::/, '/').gsub(/\./, '/')
           classname = basename = File::basename(file_path)
           if basename.index('$')
@@ -34,19 +37,13 @@ module Fit
           file_basename = basename.split(/([A-Z][^A-Z]+)/).delete_if {|e| e.empty?}.collect {|e| e.downcase!}.join('_')
           file_dirname = File::dirname(file_path)
           file_name = (file_dirname == '.' ? '' : file_dirname + '/') + file_basename
-          begin
-            begin
-              require file_name
-            rescue LoadError
-              require file_name.downcase
-            end
-          rescue LoadError
-            #raise "Couldn't load file #{file_name} or file #{file_name.downcase}"
-          end
+
+          require_file file_name
+
           if file_dirname == '.'
             klass_name = classname
           else
-            klass_name =  File::dirname(file_path).split(%r{/}).collect { |e|
+            klass_name = File::dirname(file_path).split(%r{/}).collect { |e|
               e.index(/[A-Z]/).nil? ? e.capitalize : e
             }.join('::') + "::#{classname}"
           end
@@ -58,18 +55,31 @@ module Fit
     
     def find_constant name
       class_name = name.gsub '.', '::'
-      classes = []
-      ObjectSpace.each_object(Class) { |klass| classes << klass }
-      classes.find { |klass| klass.name == class_name }
+      return class_name.split('::').inject(Object) { |par, const| par.const_get(const) }
+    rescue NameError
+      return nil
+    end
+
+    def require_file file_name
+      begin
+        require file_name.downcase
+      rescue LoadError
+        require file_name
+      end
+    rescue LoadError
+      #raise "Couldn't load file #{file_name} or file #{file_name.downcase}"
     end
     
-    @@fixture_packages=['Fit::']
+    @@fixture_packages = Set.new(['Fit::'])
     # This method adds the name of a module as a 'package' we should search for fixtures.
     # Supports import_fixture
     def FixtureLoader.add_fixture_package module_name
       @@fixture_packages << module_name + '::'
     end
+    def FixtureLoader.fixture_packages
+      @@fixture_packages
+    end
     
   end
   
-end
+end

data/lib/fit/parse.rb

@@ -68,19 +68,19 @@ module Fit
       @more.nil? ? 1 : @more.size + 1
     end
 
-    def print out
-      out.print @leader
-      out.print @tag
+    def print out, conv=nil
+      out.print conv.nil? ? @leader : conv.iconv(@leader)
+      out.print conv.nil? ? @tag : conv.iconv(@tag)
       if @parts
-        @parts.print out
+        @parts.print out, conv
       else
-        out.print @body
+        out.print conv.nil? ? @body : conv.iconv(@body)
       end
-      out.print @end
+      out.print conv.nil? ? @end : conv.iconv(@end)
       if @more
-        @more.print out
+        @more.print out, conv
       else
-        out.print @trailer
+        out.print conv.nil? ? @trailer : conv.iconv(@end)
       end
     end
 
@@ -165,16 +165,50 @@ module Fit
     end
 
     def Parse.unescape s
-      str = s.gsub %r{<br />}, "\n"
+      str = Parse.unescape_numeric_entities s
+      str = str.gsub %r{<br />}, "\n"
       # unescape HTML entities
       str = str.gsub(%r{&lt;}, '<').gsub(%r{&gt;}, '>').gsub(%r{&nbsp;}, ' ').gsub(%r{&quot;}, '"').gsub(%r{&amp;}, '&')
       # unescape smart quotes
-      str.gsub(/\223/, '"').gsub(/\224/, '"').gsub(/\221/, "'").gsub(/\222/, "'")
+      left_double_quotes = [0x201c].pack('U')
+      right_double_quotes = [0x201d].pack('U')
+      left_single_quotes = [0x2018].pack('U')
+      right_single_quotes = [0x2019].pack('U')
+      str.gsub(left_double_quotes, '"').gsub(right_double_quotes, '"').gsub(left_single_quotes, "'").gsub(right_single_quotes, "'")
+    end
+
+    def Parse.unescape_numeric_entities s
+      result = ''
+      last_start = 0
+      starts_at = s.index '&#'
+      while not starts_at.nil?
+        ends_at = s.index ';', starts_at
+        if ends_at.nil?
+          starts_at = s.index('&#', starts_at + 1)
+          next
+        end
+        begin
+          entity = s[(starts_at + 2)...ends_at]
+          entity = '0x' + entity[1..-1] if (entity =~ /^x/ or entity =~ /^X/)
+          char = Integer(entity)
+          if char <= 0xFFFF
+            result += s[last_start...starts_at] + [char].pack('U')
+            last_start = ends_at + 1
+          end
+        rescue ArgumentError
+          # just loop around again
+        ensure
+          starts_at = s.index '&#', ends_at
+        end
+      end
+      result += s[last_start..-1]
     end
 
     def Parse.condense_whitespace s
-      # NOT_BREAKING_SPACE is decimal character 160, hex a0, oct 240
-      s.gsub(%r{\s+}, ' ').gsub(/\240/, ' ').gsub(%r{&nbsp;}, ' ').strip
+      not_breaking_space = [0x00a0].pack('U')
+      # Hack to work around not_breaking_space being considered
+      # a normal whitespace in Ruby 1.9, thus matching %r{\s+}
+      s.gsub(not_breaking_space, '&nbsp;').gsub(%r{\s+}, ' ').gsub(%r{&nbsp;}, ' ').strip
     end
 
     # The original implementation of footnote hardcodes the creation path,

data/lib/fit/type_adapter.rb

@@ -59,7 +59,12 @@ module Fit
     end
 
     def to_s target
-      target.to_s
+      case target
+      when Array
+        target.join(", ")
+      else
+        target.to_s
+      end
     end
 
   end
@@ -77,8 +82,8 @@ module Fit
         result = @fixture.parse value, @type
         return result unless result.nil?
       end
-      return Integer(value) if value =~ /^-?\d+$/
-      return Float(value) if (value =~ /^-?\d*\.\d*$/ || value =~ /^-?\d*\.\d*[e|E]\d+$/)
+      return Integer(value) if value =~ /\A-?\d+\Z/
+      return Float(value) if value =~ /\A[+-]?\d*\.\d+([eE][+-]?\d+)?\Z/
       elements = value.split(',')
       unless elements.size == 1
         array = []

data/lib/fit/version.rb

@@ -0,0 +1,26 @@
+# Copyright (c) 2002 Cunningham & Cunningham, Inc.
+# Released under the terms of the GNU General Public License version 2 or later.
+
+module Fit
+  VERSION = '1.2'
+
+  VERSION_BLURB = <<EOF_VERSION_BLURB
+RubyFIT v#{Fit::VERSION}
+Conforms to Fit Specification v1.2
+Copyright (C) 2006-9 Giulio Piancastelli
+License GPLv2+: GNU GPL version 2 or later
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
+EOF_VERSION_BLURB
+
+  HELP_BLURB = <<EOF_HELP_BLURB
+usage: #{File.basename($0)} [options] infile outfile
+
+Options:
+  --encoding=CHARENC   read and write files using specified character encoding
+  --version            print version number
+  --help               show this help screen
+
+See http://fit.rubyforge.org for further information and to report bugs
+EOF_HELP_BLURB
+end

data/lib/fitlibrary/comment_fixture.rb

@@ -0,0 +1,12 @@
+# Copyright (c) 2005 Rick Mugridge, University of Auckland, NZ
+# Released under the terms of the GNU General Public License version 2 or later.
+
+require 'fit/fixture'
+
+module Fitlibrary
+
+  class CommentFixture < Fit::Fixture
+    def do_table table; end
+  end
+
+end

data/lib/fitlibrary/spec/specify_fixture.rb

@@ -0,0 +1,154 @@
+# Copyright (c) 2005 Rick Mugridge, University of Auckland, NZ
+# Released under the terms of the GNU General Public License version 2 or later.
+
+require 'fit/fixture'
+
+module Fitlibrary
+  module Spec
+  
+    # Uses embedded tables to specify how fixtures work, based on simple
+    # subclasses of those fixtures.
+    # The test and the report can be in two separate rows, or in a single row.
+    class SpecifyFixture < Fit::Fixture
+    
+      def do_table table
+        first_row = table.parts.more
+        actual = first_row.parts.parts
+        second_row = first_row.more
+        expected_cell = second_row.nil? ? first_row.parts.more : second_row.parts
+        expected = expected_cell.parts
+        Fit::Fixture.new.do_tables(actual)
+        if reports_equal(actual, expected)
+          right expected_cell
+        else
+          wrong expected_cell
+          print_parse actual, 'actual'
+          add_table_to_better_show_differences table, actual, expected
+        end
+      end
+      
+      def add_table_to_better_show_differences table, actual, expected
+        parse_end = table.last
+        cells1 = Fit::ParseHolder.create('td', 'fitlibrary.CommentFixture', nil, nil)
+        cells2 = Fit::ParseHolder.create('td', 'actual', nil, Fit::ParseHolder.create('td', 'expected', nil, nil))
+        cells3 = Fit::ParseHolder.create('td', show(actual), nil, Fit::ParseHolder.create('td', show(expected), nil, nil))
+        rows = Fit::ParseHolder.create('tr', '', cells1, Fit::ParseHolder.create('tr', '', cells2, Fit::ParseHolder.create('tr', '', cells3, nil)))
+        parse_end.more = Fit::ParseHolder.create('table', '', rows, nil)
+      end
+      
+      def show parse
+        return 'nil' if parse.nil?
+        result = "&lt;#{parse.tag[0..-2]}&gt;<ul>"
+        result += show_field('leader', parse.leader)
+        result += parse.parts.nil? ? show_field('body', parse.body) : show(parse.parts)
+        result += show_field('trailer', parse.trailer)
+        result += '</ul>'
+        result += show(parse.more) unless parse.more.nil?
+        result
+      end
+      
+      def show_field field, value
+        if (not value.nil?) and (not value.strip.empty?)
+          "<li>#{field}: '#{no_tags(value)}'"
+        else
+          ""
+        end
+      end
+      
+      def no_tags value
+        while true
+          index = value.index '<'
+          break if index < 0
+          value = value[0..index] + '&lt;' + value[index + 1..-1]
+        end
+        value
+      end
+      
+      def reports_equal actual, expected
+        return expected.nil? if actual.nil?
+        return false if expected.nil?
+        massage_body_to_table actual
+        result = equal_tags(actual, expected) and
+                 equal_strings(actual.leader, expected.leader) and
+                 equal_bodies(actual, expected) and
+                 equal_strings(actual.trailer, expected.trailer) and
+                 reports_equal(actual.more, expected.more) and
+                 reports_equal(actual.parts, expected.parts)
+        result
+      end
+      
+      def massage_body_to_table actual
+        if (not actual.body.nil?) and (not actual.body.index('<table').nil?)
+          if actual.parts.nil?
+            begin
+              actual.parts = Fit::Parse.new actual.body
+            rescue Exception => e # FIXME FitParseException
+              # do nothing
+            end
+          end
+          actual.body = ''
+        end
+      end
+      
+      def equal_bodies actual, expected
+        result = equal_bodies_22 actual, expected
+        puts "!SpecifyFixture#equal_bodies(\"#{actual.body}\",\"#{expected.body}\")" unless result
+        result
+      end
+      
+      def equal_bodies_22 actual, expected
+        expected_body = canonical_string expected.body
+        actual_body = canonical_string actual.body
+        return true if expected_body == 'IGNORE'
+        return true if actual_body == expected_body
+        stack_trace = 'class="fit_stacktrace">'
+        start = expected_body.index stack_trace
+        unless start.nil?
+          pattern = expected_body[0, start + stack_trace.size]
+          return actual.body =~ pattern
+        end
+        error_message = '<span class="fit_label">'
+        start = expected_body.index error_message
+        unless start.nil?
+          end_span = expected_body.index '</span>', start
+          unless end_span.nil?
+            pattern = expected_body[0, end_span - 1]
+            return actual.body =~ pattern
+          end
+        end
+        false
+      end
+      
+      def canonical_string body
+        s = body.nil? ? '' : body.strip
+        s
+      end
+      
+      def equal_tags p1, p2
+        p1.tag == p2.tag
+      end
+      
+      def equal_strings actual, expected
+        result = equal_strings_22 actual, expected
+        puts "!SpecifyFixture#equal_strings(\"#{actual}\",\"#{expected}\")" unless result
+        result
+      end
+      
+      def equal_strings_22 actual, expected
+        return (expected.nil? or expected.strip.empty? or expected == "\n") if actual.nil?
+        return (actual.strip.empty? or actual == "\n") if expected.nil?
+        return true if expected == 'IGNORE'
+        actual.strip == expected.strip
+      end
+      
+      # FIXME This should go in Fitlibrary::ParseUtility
+      def print_parse tables, title
+        puts "---------Parse tables for #{title}:----------"
+        tables.print(STDOUT) unless tables.nil?
+        puts "-------------------"
+      end
+      
+    end
+  
+  end
+end

data/lib/fitlibrary/specify/column_fixture_under_test.rb

@@ -0,0 +1,17 @@
+# Copyright (c) 2003 Rick Mugridge, University of Auckland, NZ
+# Released under the terms of the GNU General Public License version 2 or later.
+
+require 'fit/column_fixture'
+
+module Fitlibrary
+  module Specify
+  
+  class ColumnFixtureUnderTest < Fit::ColumnFixture
+    attr_accessor :camel_field_name
+    def get_camel_field_name
+      @camel_field_name
+    end
+  end
+  
+  end
+end