graffle 0.1.7 → 0.1.8

data/test/graphical_tests_for_rails/in-workflow-order-tests.rb

@@ -0,0 +1,165 @@
+#!/usr/bin/env ruby
+#
+#  Created by Brian Marick on 2007-07-11.
+#  Copyright (c) 2007. All rights reserved.
+
+require 'test/unit'
+require 's4t-utils'
+include S4tUtils
+
+require "../set-standalone-test-paths.rb" unless $started_from_rakefile
+
+require 'extensions/string'
+require 'graphical_tests_for_rails/orderings.rb'
+
+class TestWorkflowOrder < Test::Unit::TestCase
+  include Graffle::Builders
+  include GraphicalTestsForRails
+  
+  def test_workflow_order_finds_highest_first
+    s = sheet {
+      with line_graphic {
+        graffle_id_is 2
+        points_at [10, 10], [11, 11]
+      }
+      with line_graphic {
+        graffle_id_is 1
+        points_at [1, 1], [100, 100]
+      }
+    }
+    
+    graphics = InWorkflowOrder.new(s).graphics
+    assert_equal([1, 2], graphics.collect { |g| g.graffle_id })
+  end
+
+  def test_workflow_order_finds_shaped_graphics_too
+    s = sheet {
+      with line_graphic {
+        graffle_id_is 2
+        points_at [10, 10], [1000, 1000]
+      }
+      with shaped_graphic {
+        graffle_id_is 1
+        bounded_by 5, 5, 100, 100
+      }
+    }
+    
+    graphics = InWorkflowOrder.new(s).graphics
+    assert_equal([1, 2], graphics.collect { |g| g.graffle_id })
+  end
+  
+  def test_it_is_the_origin_that_matters
+    s = sheet {
+      with shaped_graphic {
+        graffle_id_is 1
+        bounded_by 5, 5, 100, 100
+      }
+      with line_graphic {
+        graffle_id_is 2
+        # Note that line extends above shape.
+        points_at [10, 10], [1, 1]
+      }
+    }
+    graphics = InWorkflowOrder.new(s).graphics
+    assert_equal([1, 2], graphics.collect { |g| g.graffle_id })
+  end
+  
+  def test_workflow_order_ignores_labels
+    s = sheet {
+      with line_label {
+        graffle_id_is 222
+        bounded_by 1, 1, 1, 1
+        for_line 1
+      }
+      with line_graphic {
+        graffle_id_is 1
+        points_at [10, 10], [1, 1]
+      }
+    }
+    graphics = InWorkflowOrder.new(s).graphics
+    assert_equal([1], graphics.collect { |g| g.graffle_id })
+  end
+  
+  def test_workflows_break_order_by_following_lines
+    
+    # Id is the order in which they are linked together.
+    # That is NOT the vertical order on the page.
+    s = sheet {
+      with line_graphic {
+        graffle_id_is 3
+        points_at [40, 40], [20, 20]    # fourth highest
+        go_from 2
+        go_to 4
+      }    
+      with shaped_graphic {
+        graffle_id_is 2
+        bounded_by 30, 30, 20, 20       # third highest
+      }
+      with shaped_graphic {
+        graffle_id_is 4
+        bounded_by 20, 20, 10, 10       # second highest
+      }
+      with line_graphic { 
+        graffle_id_is 1
+        points_at [10, 10], [30, 30]    # highest
+        go_to 2
+      }
+      
+    }
+    graphics = InWorkflowOrder.new(s).graphics
+    assert_equal([1, 2, 3, 4], graphics.collect { |g| g.graffle_id })
+  end
+
+
+  def test_large_example_of_disconnected_workflows
+    
+    # Id is the order in which they are linked together.
+    # That is NOT the vertical order on the page.
+    s = sheet {
+      
+      # Third workflow - starts with shaped graphic, ends with line
+      with line_graphic {
+        graffle_id_is 7
+        points_at [12, 12], [200, 200]    
+        go_from 6
+      }    
+      with shaped_graphic {
+        graffle_id_is 6
+        bounded_by 11, 11, 2, 2       # third highest
+      }
+      
+      # Second workflow - a single element
+      with shaped_graphic {
+        graffle_id_is 5
+        bounded_by 11, 10, 20, 20       # second highest
+      }
+      
+      # First workflow
+      with line_graphic {
+        graffle_id_is 3
+        points_at [40, 40], [20, 20]    
+        go_from 2
+        go_to 4
+      }    
+      with shaped_graphic {
+        graffle_id_is 2
+        bounded_by 30, 30, 20, 20       
+      }
+      with shaped_graphic {
+        graffle_id_is 4
+        bounded_by 20, 20, 10, 10       
+      }
+      with line_graphic { 
+        graffle_id_is 1
+        points_at [10, 10], [30, 30]    # highest
+        go_to 2
+      }
+      
+    }
+    graphics = InWorkflowOrder.new(s).graphics
+    assert_equal((1..7).to_a, graphics.collect { |g| g.graffle_id })
+  end
+
+
+
+end

data/test/{grails-tests/commands-from-quoted-args-tests.rb → graphical_tests_for_rails/text-interpreter-tests.rb}

@@ -1,40 +1,29 @@
 #!/usr/bin/env ruby
 #
-#  Created by Brian Marick on 2007-07-06.
+#  Created by Brian Marick on 2007-07-11.
 #  Copyright (c) 2007. All rights reserved.
 
 require "../set-standalone-test-paths.rb" unless $started_from_rakefile
-require 'test/grails-tests/translation-testcase'
 
-class TestCommandsFromQuotedArgs < TranslationTestCase
+require 'test/unit'
+require 's4t-utils'
+include S4tUtils
 
-  
-  # TODO: put this somewhere right.
-  PLAIN = ['John follows "sign up" link',
-           'he logs in with "john", password "fred", and auth key "foo".',
-           'plain command with trailing period',
-           'Plain command - (upper case and special chars)'
-         ]
-
-  # TODO: put this somewhere right.
-  RTF = %Q{
-     | {\\rtf1\\mac\\ansicpg10000\\cocoartf824\\cocoasubrtf420
-     | {\\fonttbl\\f0\\fswiss\\fcharset77 Helvetica;}
-     | {\\colortbl;\\red255\\green255\\blue255;}
-     | \\pard\\tx560\\tx1120\\tx1680\\tx2240\\tx2800\\tx3360\\tx3920\\tx4480\\tx5040\\tx5600\\tx6160\\tx6720\\qc\\pardirnatural
-     |
-     | \\f0\\fs24 \\cf0 #{PLAIN[0]}\\
-     | #{PLAIN[1]}\\
-     | #{PLAIN[2]}\\
-     | #{PLAIN[3]}}}.trim('|')
+require 'extensions/string'
+require 'graphical_tests_for_rails'
 
 
-  def setup
-    @interpreter = CommandsWithQuotedArgs.new
+class TestProductionOfMessages < Test::Unit::TestCase
+  include GraphicalTestsForRails
+  
+  def assert_translation(expected, original)
+    actual = @interpreter.produce_method_call(original)
+    assert_equal(expected, actual)
   end
   
-  def test_translation
-    # Underscoring
+  def test_messages_whose_arguments_come_from_quoted_text
+    @interpreter = ArgsFromQuotedText.new
+
     assert_translation(['token'], "token")
     assert_translation(['underscore_separated_tokens'],
                        'underscore separated tokens'
@@ -82,5 +71,27 @@ class TestCommandsFromQuotedArgs < TranslationTestCase
     assert_translation(["while_a_messages_quotes_are_stripped", "an argument's are retained"],
                        %q{while a message's quotes are stripped, "an argument's are retained"}
     )
+    
+    assert_translation(["capitals_are_lowercased_throughout"],
+                       %q{Capitals are lowercased THROUGHOUT})
+  end
+
+  def test_messages_created_from_page_names
+    @interpreter = TextIsNameOfPage.new('assert_on_page')
+    assert_translation(['assert_on_page', "markup"],
+                       "MARKUP")
+                       
+    assert_translation(['assert_on_page', "outside-spaces"],
+                        " outside-spaces ")
+
+    # TODO: don't know what makes sense for interior spaces or 
+    # non-\w characters.
+                       
+  end
+
+
+  def test_ineffectual_interpreters_produce_messages_that_do_nothing
+    @interpreter = Ineffectual.new
+    assert_translation([:object_id], "MARKUP")
   end
-end 
+end

data/test/line-graphic-tests.rb

@@ -109,6 +109,14 @@ class TestLineGraphics < Test::Unit::TestCase
                  s.graphics[1].graphics[1].from)
   end
   
+  def test_lines_need_not_be_connected_to_anything
+    s = sheet { with line_graphic }
+    line = s.graphics[0]
+    
+    assert_equal(nil, line.to)
+    assert_equal(nil, line.from)
+  end
+  
   LINE_LABEL_TEXT = "
      | {\\rtf1\\mac\\ansicpg10000\\cocoartf824\\cocoasubrtf420
      | {\\fonttbl\\f0\\fswiss\\fcharset77 Helvetica;}

data/test/sheet-tests.rb

@@ -31,6 +31,24 @@ class TestSheets < Test::Unit::TestCase
                 sheet { with abstract, line, shaped }.graphics)
   end
   
+  def test_sheet_can_omit_labels_when_returning_graphics
+    s = sheet {
+      with shaped_graphic {
+        graffle_id_is 33
+      }
+      with line_label {
+        for_line 1
+        graffle_id_is 3
+      }
+      with line_graphic {
+        graffle_id_is 1
+      }
+    }
+    
+    graphics = s.graphics_without_labels
+    assert_equal([33, 1], graphics.collect { |g| g.graffle_id })
+  end
+  
   
   def test_sheet_elements_know_parent
     abstract = abstract_graphic

data/test/tests-of-examples/workflow-slowtests.rb

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+#
+#  Created by Brian Marick on 2007-07-11.
+#  Copyright (c) 2007. All rights reserved.
+
+require "../set-standalone-test-paths.rb" unless $started_from_rakefile
+require "test/unit"
+require 's4t-utils'
+
+
+class TestThatExamplesWork < Test::Unit::TestCase
+  In_examples = "cd #{PACKAGE_ROOT}/examples;"
+  def test_all
+    system "#{In_examples} ruby rails-workflow-test.rb > rails-workflow-test.actual 2>&1"
+    system("#{In_examples} diff rails-workflow-test.{e*,a*}")
+    assert_equal(0, $?)
+    system "#{In_examples} rm rails-workflow-test.actual" if $? == 0
+  end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: graffle
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
-date: 2007-07-11 00:00:00 -05:00
+  version: 0.1.8
+date: 2007-07-13 00:00:00 -05:00
 summary: Working with OmniGraffle documents, including support for Rails integration tests.
 require_paths: 
 - lib
@@ -35,18 +35,23 @@ files:
 - README.txt
 - Rakefile
 - Rakefile.hoe
-- bin/bin-skeleton
+- examples/rails-workflow-test.expected
+- examples/rails-workflow-test.graffle/data.plist
+- examples/rails-workflow-test.graffle/image1.png
+- examples/rails-workflow-test.graffle/image2.png
+- examples/rails-workflow-test.graffle/image3.png
+- examples/rails-workflow-test.rb
 - graffle.tmproj
 - lib/graffle.rb
 - lib/graffle/.document
-- lib/graffle/lib-skeleton
 - lib/graffle/nodoc/hacks.rb
 - lib/graffle/point.rb
 - lib/graffle/stereotypes.rb
 - lib/graffle/styled-text-reader.rb
 - lib/graffle/version.rb
-- lib/grail_test.rb
-- lib/grail_test/command-interpreters.rb
+- lib/graphical_tests_for_rails.rb
+- lib/graphical_tests_for_rails/interpreters.rb
+- lib/graphical_tests_for_rails/orderings.rb
 - setup.rb
 - test/abstract-graphic-tests.rb
 - test/array-and-hash-stereotyping-tests.rb
@@ -58,11 +63,9 @@ files:
 - test/graffle-file-types/multiple-canvases.graffle
 - test/graffle-file-types/opening-tests.rb
 - test/graffle-file-types/two-boxes-and-a-line.graffle
-- test/grails-tests/commands-from-quoted-args-tests.rb
-- test/grails-tests/destinations-tests.rb
-- test/grails-tests/do-nothing-commands-tests.rb
-- test/grails-tests/graphic-interpreter-tests.rb
-- test/grails-tests/translation-testcase.rb
+- test/graphical_tests_for_rails/graphic-interpreter-tests.rb
+- test/graphical_tests_for_rails/in-workflow-order-tests.rb
+- test/graphical_tests_for_rails/text-interpreter-tests.rb
 - test/group-tests.rb
 - test/hacks-tests.rb
 - test/line-graphic-tests.rb
@@ -71,7 +74,7 @@ files:
 - test/shaped-graphic-tests.rb
 - test/sheet-tests.rb
 - test/styled-text-reader-tests.rb
-- test/test-skeleton
+- test/tests-of-examples/workflow-slowtests.rb
 - test/text-tests.rb
 - test/util.rb
 test_files: 
@@ -87,10 +90,9 @@ test_files:
 - test/styled-text-reader-tests.rb
 - test/text-tests.rb
 - test/graffle-file-types/opening-tests.rb
-- test/grails-tests/commands-from-quoted-args-tests.rb
-- test/grails-tests/destinations-tests.rb
-- test/grails-tests/do-nothing-commands-tests.rb
-- test/grails-tests/graphic-interpreter-tests.rb
+- test/graphical_tests_for_rails/graphic-interpreter-tests.rb
+- test/graphical_tests_for_rails/in-workflow-order-tests.rb
+- test/graphical_tests_for_rails/text-interpreter-tests.rb
 rdoc_options: 
 - --main
 - README.txt
@@ -99,8 +101,8 @@ extra_rdoc_files:
 - LICENSE.txt
 - Manifest.txt
 - README.txt
-executables: 
-- bin-skeleton
+executables: []
+
 extensions: []
 
 requirements: []

data/bin/bin-skeleton

@@ -1,13 +0,0 @@
-#! /opt/local/bin/ruby
-
-require 's4t-utils'
-include S4tUtils
-
-require 'graffle'
-include Graffle
-
-if $0 == __FILE__
-  with_pleasant_exceptions do
-     # Your program here.
-  end
-end

data/lib/graffle/lib-skeleton

@@ -1,3 +0,0 @@
-module Graffle
-  # Your code here
-end

data/lib/grail_test.rb

@@ -1,16 +0,0 @@
-#!/usr/bin/env ruby
-#
-#  Created by Brian Marick on 2007-07-10.
-#  Copyright (c) 2007. All rights reserved.
-
-
-
-require 'graffle'
-require 'grail_test/command-interpreters'
-
-# See README.txt[link:files/README_txt.html]
-module GrailTest
-  
-end
-
-GrailTests=GrailTest   # Be tolerant of typos

data/lib/grail_test/command-interpreters.rb

@@ -1,78 +0,0 @@
-require 'enumerator'
-
-module GrailTest
-  
-  class GraphicInterpreter
-    
-    def initialize(graphics, hash = {})
-      @graphics = graphics
-      @line_label_strategy = 
-          hash['interpret line labels as'] || DoNothingCommands
-      @shaped_graphic_text_strategy = 
-          hash['interpret shaped graphic text as'] || DoNothingCommands
-    end
-    
-    def run_against(target)
-      @target = target
-      @graphics.each do |g|
-        case g.stereotype.basename
-        when "ShapedGraphic"
-          process_commands(@shaped_graphic_text_strategy.new,
-                           g.content.as_lines)
-        when "LineGraphic"
-          process_commands(@line_label_strategy.new,
-                           g.label_lines)
-        end
-      end
-    end
-    
-    private
-    
-    def process_commands(command_maker, command_lines)
-      command_lines.each do |line|
-        info = command_maker.produce_method_call(line)
-        @target.send(*info)
-      end    
-    end
-  end
-  
-    
-  class CommandsWithQuotedArgs
-    
-    def produce_method_call(string)
-      quote_marker = '%<<<==-'
-      
-      string = string.gsub(/(\w)'(\w)/, "#{quote_marker}\\1\\2#{quote_marker}")
-      tokens = string.split(/['"],?/, allow_trailing_null_fields = -1)
-      message = tokens[0].strip
-      args = tokens[1..-1]
-      
-      
-      message.gsub!(/#{quote_marker}(.)(.)#{quote_marker}/, "\\1\\2")
-      message.gsub!(/\s+/,'_')
-      message.gsub!(/-/, '_')
-      message.gsub!(/\W/, '')
-      
-      
-      args = args.enum_slice(2).collect { |e| e[0] } 
-      args = args.collect do | arg | 
-        arg.gsub(/#{quote_marker}(.)(.)#{quote_marker}/, "\\1'\\2")
-      end
-      
-      [message] + args
-    end
-  end
-  
-  class Destinations
-    def produce_method_call(string)
-      ['assert_on_page', string.downcase]
-    end
-  end
-  
-  class DoNothingCommands
-    def produce_method_call(string)
-      [:object_id] # no_op
-    end
-  end
-end
-