minor refactoring

wrote some tests
bumped version

lib/crayfish/action_view.rb

@@ -53,7 +53,7 @@ def output_buffer
       def paint template,raw=false
         begin
           html = raw ? template : eval(template)
-          CrayHtml.new(self,@pdf).draw(html)
+          Html.new(self,@pdf).draw(html)
         rescue => e
            no = 0
            ::Rails.logger.debug template.split("\n").map{ |line| no+=1; "#{no}: #{line}" }.join("\n")

lib/crayfish/html.rb

@@ -62,7 +62,7 @@ def inspect
 end
 
 module Crayfish
-  class CrayHtml
+  class Html
 
     attr_reader :pdf
 

lib/crayfish/version.rb

@@ -21,5 +21,5 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 module Crayfish
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

test/crayfish_test.rb

@@ -69,159 +69,4 @@ def setup
     @view.send(:setup)
   end
 
-  test "table" do
-
-    sub_table = @view.make_table([['                ', { :content => 'Label4'}]])
-
-    @view.instance_variable_get('@pdf').expects(:table).with(
-      [
-        [{:content => 'Label'}, sub_table],
-        [{:content => 'label2'}, ''],
-        [{:content => 'Label3'}, 'hello']
-      ], {:width => 540})
-
-    @view.send(:table,[
-      [{ :content => 'Label'}, sub_table],
-      [{ :content => 'label2'}, ''],
-      [{ :content => 'Label3'}, 'hello'],
-    ], :width => 540)
-  end
-
-  test "table block with rows" do
-    @view.instance_variable_get('@pdf').expects(:table).with(
-      [
-        [
-          {:content => 'Label1',   :background_color => 'CCCCFF'},
-          {:content => '    ',     :background_color => 'ffffff'},
-          {:content => 'Label2',   :background_color => 'CCCCFF'},
-          {:content => '    ',     :background_color => 'ffffff'}
-        ], [
-          {:content => 'Label3',   :background_color => 'CCCCFF'},
-          {:content => '    ',     :background_color => 'ffffff'}
-        ], [
-          {:content => 'Label4',   :background_color => 'CCCCFF'},
-          {:content => 'foo',      :background_color => 'ffffff'}
-        ], [
-          {:content => 'Label5',   :background_color => 'CCCCFF'},
-          {:content => 'Hello',    :background_color => 'ffffff'},
-          {:content => 'Zip Code', :background_color => 'CCCCFF'},
-          {:content => '0000',     :background_color => 'ffffff'},
-          {:content => 'City',     :background_color => 'CCCCFF'},
-          {:content => 'Internet', :background_color => 'ffffff'}
-        ]
-      ], {:width => 540}
-    )
-
-    location = { :name => 'Hello', :zip_code => '0000', :city => 'Internet'}
-    @view.send(:table) do |t| 
-       t.row do |r| 
-         r.label 'Label1'; r.span; r.text '    ' 
-         r.field :label => 'Label2', :value => '    ' 
-       end 
-       t.row do |r| 
-         r.label 'Label3';  r.span; r.text '    ' 
-       end 
-       t.row do |r| 
-         r.label 'Label4';          r.span; r.text 'foo'
-       end 
-       t.row_for location do |r| 
-         r.field :label => 'Label5' , :value => location[:name]
-         r.field :zip_code 
-         r.field :city 
-       end
-    end
-  end
-
-  test "view delegates basic form to CrayForm" do
-
-    text = %Q{
-      Aplles %c{    }x%c{    } boxes                | =%c{         }
-      Pears %c{       }+ bananas%c{       }         | =%c{         }
-    }
-
-    form = mock('CrayFrom')
-    form.expects(:heading).with('Fruits %c{      }')
-    form.expects(:form_body).with(text, :title => 'Fruits %c{      }')
-    form.expects(:draw).with('')
-    Crayfish::CrayForm.expects(:new).with(
-      instance_of(CrayfishTest::ActionView),
-      instance_of(Prawn::Document),
-      :title => 'Fruits %c{      }', :span => /\|/, :element => /%c{[^}]*}/
-    ).returns(form)
-
-    @view.send(:form,text, :title => 'Fruits %c{      }')
-  end
-
-  def table_contents table
-    table.rows(0..-1).map{ |cell|
-      if cell.kind_of?(Prawn::Table::Cell::Text)
-        cell.content
-      elsif cell.kind_of?(Prawn::Table::Cell::Subtable)
-        table_contents(cell.subtable)
-      elsif cell.kind_of?(Crayfish::CellHelper)
-        cell.content
-      else
-        cell.class.name
-      end
-    }
-  end
-
-  def cell_positions table
-    table.rows(0..-1).map{ |cell|
-      if cell.kind_of?(Prawn::Table::Cell::Text)
-        cell.x
-      elsif cell.kind_of?(Prawn::Table::Cell::Subtable)
-        cell_positions(cell.subtable)
-      elsif cell.kind_of?(Crayfish::CellHelper)
-        cell.x
-      else
-        cell.class.name
-      end
-    }
-  end
-
-  test "CrayForm's form_body" do
-
-    text = %Q{
-      Apples %c{    }x%c{    } boxes                | =%c{         }
-      Pears %c{       }+ bananas%c{       }         | =%c{         }
-    }
-
-    pdf   = Prawn::Document.new()
-
-    view  = mock('Crayfish::ActionView')
-    view.expects(:flush).at_least_once
-
-    form = Crayfish::CrayForm.new(view,pdf,:title => 'Fruits %c{      }', :span => /\|/, :element => /%c{[^}]*}/)
-    form.heading 'Fruits %c{      }'
-    form.send(:form_body,text, :title => 'Fruits %c{      }')
-    table = form.draw ''
-
-    assert_equal 3,table.row_length
-    assert_equal 1,table.column_length
-
-    assert_equal 1,table.row(0).size
-    assert_equal 1,table.row(1).size
-    assert_equal 1,table.row(2).size
-
-    assert_equal 1,table.row(0).first.subtable.row_length
-    assert_equal 1,table.row(0).first.subtable.column_length
-
-    assert_equal table_contents(table),
-      [[["Fruits ", ""]],
-       "",
-       [["Apples ", "", "x", "", " boxes                ", ""],
-        [" =", ""],
-        ["Pears ", "", "+ bananas", "", "         ", ""],
-        [" =", ""]]]
-
-    # check span alignment
-    n=0
-    aligned_cells = cell_positions(table).last.select{ |item| n+=1; item if n.even? }.map{ |row| row.last }
-
-    assert_equal 2,aligned_cells.size
-    assert_equal 1,aligned_cells.uniq.size
-
-  end
-
 end

test/html_test.rb

@@ -0,0 +1,63 @@
+# Copyright (c) 2012 Bingoentreprenøren AS
+# Copyright (c) 2012 Patrick Hanevold
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'test_helper'
+
+class HtmlTest < ActiveSupport::TestCase
+
+  def setup
+    @html = ::Crayfish::Html.new(nil,nil)
+  end
+
+  test "compile img" do
+    img = stub('html img')
+    img.stubs(:name).returns(:img)
+    img.stubs(:attributes).returns({ 'src' => OpenStruct.new(:value => '/some url')})
+    assert_equal @html.compile(img), :image=>"app/some url"
+  end
+
+  test "compile empty td" do
+    td = stub('html td')
+    td.stubs(:name).returns(:td)
+    td.stubs(:children).returns([])
+    td.stubs(:attributes).returns({})
+    row = []
+    @html.compile(td,'/td','',:tr => row)
+    assert_equal row,[{:content => ''}]
+  end
+
+  test "compile td with text" do
+    text = stub('text')
+    text.stubs(:name).returns(:text)
+    text.stubs(:content).returns('test')
+    text.stubs(:children).returns([])
+
+    td = stub('html td')
+    td.stubs(:name).returns(:td)
+    td.stubs(:children).returns([ text ])
+    td.stubs(:attributes).returns({})
+    row = []
+    @html.compile(td,'/td','',:tr => row)
+    assert_equal row,[{:content => 'test'}]
+  end
+
+end