fit 1.1 → 1.2

data/lib/eg/all_files.rb

@@ -18,7 +18,7 @@ module Eg
         cell.add_to_body Fit::Fixture.gray('no match')
       end
     end
-    def expand pattern; Dir[pattern]; end
+    def expand pattern; Dir[pattern].sort; end
     protected
     def do_row_files row, files; do_files row, files; end
     def do_files row, files

data/lib/eg/book/calculate_discount.rb

@@ -0,0 +1,25 @@
+require 'fit/column_fixture'
+
+module Eg
+  module Book
+
+    class CalculateDiscount < Fit::ColumnFixture
+      attr_writer :amount
+      def initialize
+        @application = Discount.new
+      end
+      def discount
+        @application.get_discount @amount
+      end
+    end
+
+    class Discount
+      # A 5 percent discount is provided whenever the
+      # total purchase is greater than $1,000
+      def get_discount amount
+        (amount >= 1000) ? (amount / 100.0) * 5 : 0.0
+      end
+    end
+
+  end
+end

data/lib/eg/book/calculate_discount_money.rb

@@ -0,0 +1,60 @@
+require 'fit/column_fixture'
+
+module Eg
+  module Book
+
+    class MoneyDiscount
+      # A 5 percent discount is provided whenever the
+      # total purchase is greater than $1,000
+      def get_discount amount
+        (amount >= Money.new(1000)) ? (amount * 0.05) : Money.new
+      end
+    end
+
+    class Money
+      attr_reader :cents
+      def initialize amount = 0
+        @cents = (amount * 100 + 0.5).to_i
+      end
+      def >= money
+        @cents >= money.cents
+      end
+      def * times
+        Money.new(@cents / 100.0 * times)
+      end
+      def == money
+        money.class == Money and @cents == money.cents
+      end
+      def Money.parse string
+        raise Exception.new('Invalid money value') unless string =~ /^\$/
+        dot = string.index '.'
+        raise Exception.new('Invalid money value') if dot.nil? or dot != string.size - 3
+        money = string[1..-1].to_f
+        Money.new money
+      end
+      def to_s
+        cent_string = "#{@cents % 100}"
+        cent_string += '0' if cent_string.size == 1
+        "$#{cents / 100}.#{cent_string}"
+      end
+    end
+
+    # Fixture
+
+    class CalculateDiscountMoney < Fit::ColumnFixture
+      attr_writer :amount
+      def initialize
+        @application = MoneyDiscount.new
+      end
+      def discount
+        @application.get_discount @amount
+      end
+      @@metadata = { 'amount' => Money, 'discount()' => Money }
+      def parse string, klass
+        return Money.parse(string) if klass == Money
+        super
+      end
+    end
+
+  end
+end

data/lib/eg/book/chat_server_actions.rb

@@ -0,0 +1,85 @@
+require 'fit/fixture'
+
+module Eg
+  module Book
+
+    class ChatServerActions < Fit::Fixture
+      def initialize
+        @chat = ChatRoom.new
+      end
+      def user user_name
+        @user_name = user_name
+      end
+      def connect
+        @chat.connect_user @user_name
+      end
+      def room room_name
+        @room_name = room_name
+      end
+      def new_room
+        @chat.user_creates_room @user_name, @room_name
+      end
+      def enter_room
+        @chat.user_enters_room @user_name, @room_name
+      end
+      def occupant_count
+        @chat.occupants @room_name
+      end
+    end
+
+    class ChatRoom
+      def initialize
+        @users = {}
+        @rooms = {}
+      end
+      def connect_user user_name
+        return false unless @users[user_name].nil?
+        @users[user_name] = User.new user_name
+        return true
+      end
+      def user_creates_room user_name, room_name
+        user = @users[user_name]
+        raise Exception.new("Unknown user name: #{user_name}") unless user
+        raise Exception.new("Duplicate room name: #{room_name}") if @rooms.include? room_name
+        @rooms[room_name] = Room.new room_name, user, self
+      end
+      def user_enters_room user_name, room_name
+        user = @users[user_name]
+        room = @rooms[room_name]
+        return false if user.nil? or room.nil?
+        room.add user
+        return true
+      end
+      def occupants room_name
+        room = @rooms[room_name]
+        raise Exception.new("Unknown room: #{room_name}") unless room
+        room.occupant_count
+      end
+    end
+
+    class User
+      attr_accessor :name
+      def initialize name
+        @name = name
+      end
+    end
+
+    require 'set'
+
+    class Room
+      def initialize room_name, owner, chat
+        @name = room_name
+        @owner = owner
+        @chat = chat
+        @users = Set.new
+      end
+      def add user
+        @users.add user
+      end
+      def occupant_count
+        @users.size
+      end
+    end
+
+  end
+end

data/lib/eg/book/discount_group_ordered_list.rb

@@ -0,0 +1,59 @@
+require 'fit/row_fixture'
+
+module Eg
+  module Book
+
+    class DiscountGroupOrderedList < Fit::RowFixture
+      def query
+        groups = DiscountGroup.get_elements
+        ordered_groups = []
+        groups.each_with_index { |e, i|
+          group = OrderedDiscountGroup.new(i + 1, e.future_value,
+                                           e.max_owing, e.min_purchase, e.discount_percent)
+          ordered_groups << group
+        }
+        ordered_groups
+      end
+      def get_target_class
+        OrderedDiscountGroup
+      end
+    end
+
+    # System under test
+
+    class OrderedDiscountGroup
+      attr_reader :order, :future_value
+      attr_reader :max_owing, :min_purchase, :discount_percent
+      def initialize order, future_value, max_owing, min_purchase, discount_percent
+        @order = order
+        @future_value = future_value
+        @max_owing = max_owing
+        @min_purchase = min_purchase
+        @discount_percent = discount_percent
+      end
+      @@metadata = { 'order' => Fixnum, 'future_value' => String,
+                     'max_owing' => Float, 'min_purchase' => Float, 'discount_percent' => Float }
+      def OrderedDiscountGroup.metadata; @@metadata; end
+    end
+
+    class DiscountGroup
+      attr_reader :future_value
+      attr_reader :max_owing, :min_purchase, :discount_percent
+      def initialize future_value, max_owing, min_purchase, discount_percent
+        @future_value = future_value
+        @max_owing = max_owing
+        @min_purchase = min_purchase
+        @discount_percent = discount_percent
+      end
+      def DiscountGroup.get_elements
+        [ DiscountGroup.new('low', 0, 0, 0),
+          DiscountGroup.new('low', 0, 2000, 3),
+          DiscountGroup.new('medium', 500, 600, 3),
+          DiscountGroup.new('medium', 0, 500, 5),
+          DiscountGroup.new('high', 2000, 2000, 10)
+        ]
+      end
+    end
+
+  end
+end

data/lib/eg/book/rent/calculate_late_hours.rb

@@ -0,0 +1,35 @@
+require 'fit/column_fixture'
+
+module Eg
+  module Book
+
+    module Rent
+      class CalculateLateHours < Fit::ColumnFixture
+        attr_writer :hours_late, :grace, :high_demand
+        attr_writer :count_grace
+        def count_grace= string
+          @count_grace = { 'yes' => true, 'no' => false }[string]
+        end
+        def extra_hours
+          late_returns = LateReturns.new @count_grace
+          late_returns.extra_hours @hours_late, @grace, @high_demand
+        end
+      end
+    end
+
+    # System under test
+
+    class LateReturns
+      def initialize count_grace
+        @count_grace = count_grace
+      end
+      def extra_hours hours_late, grace, high_demand
+       return 0 if hours_late < 1
+       hours = @count_grace ? hours_late : (hours_late - grace)
+       return 0 if hours.zero?
+       high_demand + hours
+      end
+    end
+
+  end
+end

data/lib/eg/column_index.rb

@@ -31,8 +31,9 @@ module Eg
       # ...then find the columns in these classes
       columns = []
       names.each do |name|
-        obj = Fit::FixtureLoader.new.find_class(name).new
-        attributes = obj.methods - Object.new.methods
+        obj = @@loader.find_class(name).new
+        # Ruby 1.9 returns method names as symbols
+        attributes = (obj.methods - Object.new.methods).collect {|a| a.to_s}
         setters = attributes.dup.delete_if {|a| a[-1..-1] != "="}
         attributes -= setters
         setters.each do |s|
@@ -58,7 +59,7 @@ module Eg
     end
 
     def parse_class name
-      Fit::FixtureLoader.new.find_class(name)
+      @@loader.find_class(name)
     end
     
     # Helper class

data/lib/eg/music/display.rb

@@ -3,7 +3,7 @@
 
 require 'fit/row_fixture'
 
-require 'parsedate'
+require 'date'
 
 module Eg
   module Music
@@ -13,7 +13,9 @@ module Eg
       def query; MusicLibrary.display_contents; end
       def parse string, klass
         if klass == Time
-          Time.gm(*ParseDate.parsedate(string).compact)
+          d = Date._parse string
+          d_array = [d[:year], d[:mon], d[:mday], d[:hour], d[:min], d[:sec], d[:zone], d[:wday]] 
+          Time.gm(*d_array.compact)
         else
           super
         end

data/lib/eg/music/music.rb

@@ -1,7 +1,7 @@
 # Copyright (c) 2002 Cunningham & Cunningham, Inc.
 # Released under the terms of the GNU General Public License version 2 or later.
 
-require 'parsedate'
+require 'date'
 
 module Eg
   module Music
@@ -48,7 +48,9 @@ module Eg
         m.track_number = data[6].to_i
         m.track_count = data[7].to_i
         m.year = data[8].to_i
-        m.date = Time.gm(*ParseDate.parsedate(data[9]).compact)
+        d = Date._parse data[9]
+        d_array = [d[:year], d[:mon], d[:mday], d[:hour], d[:min], d[:sec], d[:zone], d[:wday]] 
+        m.date = Time.gm(*d_array.compact)
         m
       end
 

data/lib/fat/command_line_fixture.rb

@@ -0,0 +1,33 @@
+# Copyright (c) 2002 Cunningham & Cunningham, Inc.
+# Released under the terms of the GNU General Public License version 2 or later.
+
+require 'fit/column_fixture'
+
+require 'optparse'
+
+module Fat
+
+  # This is really testing OptionParser rather than some
+  # new RubyFIT code, but it's nice to have anyway just
+  # in case the Ruby standard library behaviour should
+  # change between subsequent versions.
+  class CommandLineFixture < Fit::ColumnFixture
+    attr_accessor :command_line
+    attr_reader :encoding
+    def initialize
+      @options = OptionParser.new
+      @options.on('--encoding=ENC') { |enc| @encoding = enc }
+    end
+    def input_file
+      args()[0]
+    end
+    def output_file
+      args()[1]
+    end
+    def args
+      @encoding = 'Implementation-specific'
+      @options.parse(command_line.split)
+    end
+  end
+
+end

data/lib/fat/html_to_text_fixture.rb

@@ -9,12 +9,12 @@ module Fat
     @@metadata = {'html' => String}
     attr_writer :html
     def text
-      html = @html.gsub(/\\u00a0/, "\240")
+      html = @html.gsub(/\\u00a0/, [0x00a0].pack('U'))
       escape_ascii(Fit::Parse.html_to_text(html))
     end
     def escape_ascii text
-      text.gsub("\x0a", "\\n").gsub("\x0d", "\\r").gsub("\xa0", " ")
+      text.gsub([0x0a].pack('U'), "\\n").gsub([0x0d].pack('U'), "\\r").gsub([0xa0].pack('U'), " ")
     end
   end
 
-end
+end

data/lib/fit/column_fixture.rb

@@ -79,13 +79,7 @@ module Fit
           if name.empty?
             @column_bindings << nil
           else
-            suffix = ''
-            if name =~ /\(\)$/
-              suffix = '()'
-              name = name[0...-2]
-            end
-            name = name.split(/([a-zA-Z][^A-Z]+)/).delete_if {|e| e.empty?}.collect {|e| e.downcase}.join('_')
-            name += suffix
+            name = camel name
             adapter = TypeAdapter.for(self, name)
             adapter.type = get_target_class.metadata[name]
             @column_bindings << adapter
@@ -97,6 +91,16 @@ module Fit
       end
     end
 
+    def camel name
+      suffix = ''
+      if name =~ /\(\)$/
+        suffix = '()'
+        name = name[0...-2]
+      end
+      name = name.split(/([a-zA-Z][^A-Z]+)/).delete_if {|e| e.empty?}.collect {|e| e.strip.downcase}.join('_')
+      name += suffix
+    end
+
     def get_target_class; self.class; end
 
   end

data/lib/fit/file_runner.rb

@@ -5,17 +5,23 @@ require 'fit/fixture'
 require 'fit/parse'
 
 require 'fileutils' # for report generation
+require 'iconv' # for I/O encoding
+require 'stringio' # to help fix any possibly invalid byte sequence
 
 module Fit
 
   class FileRunner
     attr_accessor :input, :tables, :fixture, :output
 
+    DEFAULT_ENCODING = 'UTF-8'
+
     def initialize
       @fixture = Fixture.new
+      @encoding = DEFAULT_ENCODING
     end
 
-    def run args
+    def run args, opts=nil
+      @encoding = opts[:encoding].upcase unless opts.nil?
       process_args args
       process
       $stderr.puts @fixture.totals
@@ -23,20 +29,58 @@ module Fit
     end
 
     def process_args args
-      error "Usage: #{File.basename($0)} input_file output_file" unless args.size == 2
-
+      error "no input file" if args[0].nil?
       input_name = File.expand_path args[0]
-      input_file = File.open input_name
-      output_name = File.expand_path args[1]
-      FileUtils.mkpath File.dirname(output_name)
-      @output = File.open output_name, 'w'
+      begin
+        if input_name.respond_to? :encoding
+          input_file = File.open input_name, "r:#@encoding"
+        else
+          input_file = File.open input_name
+        end
+      rescue Errno::ENOENT
+        error "#{input_name}: file not found"
+      end
+      output_name = check_output_file args[1]
+      create_output_file output_name
       @fixture.summary['input file'] = input_name
       @fixture.summary['input update'] = input_file.mtime.to_s
       @fixture.summary['output file'] = output_name
-      @input = input_file.read
+      unless input_name.respond_to? :encoding
+        read_file_with_encoding input_file
+      else
+        read_file input_file
+      end
       input_file.close
     end
 
+    def check_output_file arg
+      error "no output file" if arg.nil?
+      output_name = File.expand_path arg
+    end
+
+    def create_output_file output_name
+      FileUtils.mkpath File.dirname(output_name)
+      if output_name.respond_to? :encoding
+        @output = File.open output_name, "w:#@encoding"
+      else
+        @output = File.open output_name, 'w'
+      end
+    end
+
+    def read_file_with_encoding input_file
+      if @encoding == DEFAULT_ENCODING
+        @input = input_file.read
+      else
+        conv = Iconv.new DEFAULT_ENCODING, @encoding
+        @input = conv.iconv(input_file.read)
+        @input << conv.iconv(nil)
+      end
+    end
+
+    def read_file input_file
+      @input = (@encoding == DEFAULT_ENCODING) ? input_file.read : input_file.read.encode(DEFAULT_ENCODING)
+    end
+
     def process
       begin
         unless @input.index('<wiki>').nil?
@@ -49,7 +93,18 @@ module Fit
       rescue Exception => e
         exception e
       end
-      @tables.print @output
+      if @encoding == DEFAULT_ENCODING
+        @tables.print @output
+      else
+        buffer = StringIO.new
+        conv = Iconv.new "#{DEFAULT_ENCODING}//IGNORE", DEFAULT_ENCODING
+        @tables.print buffer, conv
+        buffer.print conv.iconv(nil)
+        conv = Iconv.new "#@encoding//IGNORE", DEFAULT_ENCODING
+        @output.print conv.iconv(buffer.string)
+        @output << conv.iconv(nil)
+        buffer.close
+      end
       @output.close
     end
 
@@ -59,7 +114,7 @@ module Fit
     end
 
     def error msg
-      $stderr.puts msg
+      $stderr.puts "#{File.basename($0)}: #{msg}"
       exit -1
     end