tablemaker 0.0.1 → 0.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: 2020838ec57d806d09cdf6f7cdca6e510445af70
+  data.tar.gz: 6fbd9ee26378d4a235523e09cace326bab7bd8e9
+!binary "U0hBNTEy":
+  metadata.gz: 1147d0331ddfe3b0a755396da495ed0041a92c4a92b64fefba6f018958b547d547578a9b2be922bac06c39a1a6ba3805116d4c27dfc7ce7d92129a29616c7339
+  data.tar.gz: b8acde1b9d40dd5fd0433d35a3ae0946ffd1b10655e80fa56cb72403206fdf2fac0d5deb2d3b207e2e23e509dd37e452327823ba1c6390dfce00d5fe1d761cc4

data/README.md

@@ -3,7 +3,61 @@
 HTML table generator that allows arbitrary nested cell subdivisions
 and applies colspan/rowspan as needed.
 
-## Examples
+Including the gem in your Rails project will give you a new view helper `make_table`
+
+## Usage
+
+    = make_table(class: 'foo') do |t|
+      - t.row do
+        - t.th("A")
+        - t.th("B")
+        - t.th("C")
+      - t.row do
+        - t.column do
+          - t.td("E")
+          - t.td("F)
+      - t.td(style: 'background: green') do
+        %p cell content
+
+this will generate this output:
+
+<table class='foo'>
+  <tr>
+    <td>A</td>
+    <td>B</td>
+    <td>C</td>
+  </tr>
+  <tr>
+    <td>E</td>
+    <td style='background: green' rowspan='2' colspan='2'><p>cell centent</p></td>
+  </tr>
+  <tr>
+    <td>F</td>
+  </tr>
+</table>
+
+
+source:
+
+    <table class='foo'>
+      <tr>
+        <td>A</td>
+        <td>B</td>
+        <td>C</td>
+      </tr>
+      <tr>
+        <td>E</td>
+        <td style='background: green' rowspan='2' colspan='2'>
+          <p>cell centent</p>
+        </td>
+      </tr>
+      <tr>
+        <td>F</td>
+      </tr>
+    </table>
+
+
+## Examples outside Rails
 
 A very basic table:
 
@@ -72,23 +126,23 @@ A more advanced example:
 
 this will generate the following output:
 
-    <table>
-      <tr>
-        <td rowspan=4>A</td>
-        <td rowspan=2>B</td>
-        <td>D</td>
-      </tr>
-      <tr>
-        <td>E</td>
-      </tr>
-      <tr>
-        <td rowspan=2>C</td>
-        <td>F</td>
-      </tr>
-      <tr>
-        <td>G</td>
-      </tr>
-    </table>
+<table>
+  <tr>
+    <td rowspan=4>A</td>
+    <td rowspan=2>B</td>
+    <td>D</td>
+  </tr>
+  <tr>
+    <td>E</td>
+  </tr>
+  <tr>
+    <td rowspan=2>C</td>
+    <td>F</td>
+  </tr>
+  <tr>
+    <td>G</td>
+  </tr>
+</table>
 
 
 Tablemaker keeps track of all the rowspan/colspan attributes required to generate a valid HTML table

data/lib/tablemaker.rb

@@ -9,7 +9,6 @@ module Tablemaker
   def self.row(&blk)
     Row.new(&blk)
   end
-
 end
 
 require 'tablemaker/railtie' if defined?(Rails)

data/lib/tablemaker/table_helper.rb

@@ -0,0 +1,88 @@
+module Tablemaker
+  class TableHelper
+    def initialize(context, &block)
+      @context = context
+      @stack = []
+
+      @root = Tablemaker.column do |r|
+        stack(r) do
+          yield self
+        end
+      end
+    end
+
+    def row(&block)
+      current.row do |r|
+        stack(r) do
+          yield
+        end
+      end
+    end
+
+    def column(&block)
+      current.column do |c|
+        stack(c, &block)
+      end
+    end
+
+    def line(&block)
+      current.respond_to?(:row) ? row(&block) : column(&block)
+    end
+
+    def td(*args, &blk)
+      cell("td", *args, &blk)
+    end
+
+    def th(*args, &blk)
+      cell("th", *args, &blk)
+    end
+
+    def to_html(attrs = {})
+      context.content_tag("table", attrs) do
+        @root.each_row do |r|
+          s = context.content_tag("tr") do
+            r.each do |c|
+              attrs = {}
+              attrs[:rowspan] = c.real_rows if c.real_rows > 1
+              attrs[:colspan] = c.real_cols if c.real_cols > 1
+              s2 = context.content_tag(c.data[:name], c.data[:opts].merge(attrs)) do
+                c.data[:text]
+              end
+
+              context.concat(s2)
+            end
+          end
+          context.concat(s)
+        end
+      end
+    end
+
+
+    private
+
+    def cell(name, *args, &block)
+      opts = args.extract_options!
+      text = if block_given?
+               @context.capture(&block)
+             else
+               args.shift
+             end
+      current.cell(text: text, name: name, opts: opts)
+    end
+
+    def stack(frame)
+      @stack.push(frame)
+      yield
+      @stack.pop
+    end
+
+    def context
+      @context
+    end
+
+    def current
+      @stack.last
+    end
+
+  end
+end

data/lib/tablemaker/version.rb

@@ -1,3 +1,3 @@
 module Tablemaker
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/tablemaker/view_helpers.rb

@@ -1,97 +1,9 @@
 require 'action_view'
+require 'tablemaker/table_helper'
 
 module Tablemaker
   module ViewHelpers
     module ActionView
-      class TableHelper
-        def initialize(context, &block)
-          @context = context
-          @stack = []
-          @root = Tablemaker.column do |r|
-            stack(r) do
-              yield self
-            end
-          end
-        end
-
-        def row
-          current.row do |r|
-            stack(r) do
-              yield
-            end
-          end
-        end
-
-        def column(&blk)
-          if @stack.size == 1
-            row do
-              column(&blk)
-            end
-          else
-            current.column do |c|
-              stack(c, &blk)
-            end
-          end
-        end
-
-        def td(*args, &blk)
-          cell("td", *args, &blk)
-        end
-
-        def th(*args, &blk)
-          cell("th", *args, &blk)
-        end
-
-        def to_html(attrs = {})
-          context.content_tag("table", attrs) do
-            @root.each_row do |r|
-              s = context.content_tag("tr") do
-                r.each do |c|
-                  attrs = {}
-                  attrs[:rowspan] = c.real_rows if c.real_rows > 1
-                  attrs[:colspan] = c.real_cols if c.real_cols > 1
-                  s2 = context.content_tag(c.data[:name], c.data[:opts].merge(attrs)) do
-                    c.data[:text]
-                  end
-
-                  context.concat(s2)
-                end
-              end
-              context.concat(s)
-            end
-          end
-        end
-
-
-        private
-
-        def cell(name, *args, &block)
-          opts = args.extract_options!
-          text = if block_given?
-                   @context.capture(&block)
-                 else
-                   args.shift
-                 end
-          current.cell(text: text, name: name, opts: opts)
-        end
-
-        def stack(frame)
-          @stack.push(frame)
-          yield
-          @stack.pop
-        end
-
-        def context
-          @context
-        end
-
-        def current
-          @stack.last
-        end
-
-      end
-
-
       def make_table(opts = {}, &block)
         table = TableHelper.new(self, &block).to_html(opts)
       end

data/test/test_action_view_helper.rb

@@ -23,18 +23,6 @@ class TestTableMaker < ActionView::TestCase
     assert_dom_equal expected, table
   end
 
-  test "should output simple table starting with columns correctly" do
-    table = make_table do |t|
-            t.column do
-              t.td("A")
-              t.td("B")
-            end
-          end
-
-    expected = "<table><tr><td>A</td></tr><tr><td>B</td></tr></table>"
-    assert_dom_equal expected, table
-  end
-
   test "should output complex table correctly" do
     table = make_table do |t|
       t.row do
@@ -59,4 +47,33 @@ class TestTableMaker < ActionView::TestCase
 
     assert_dom_equal expected, table
   end
+
+  test "should have generic 'line' method that alternates between rows and columns" do
+    table = make_table do |t|
+      t.line do
+        t.line do
+          t.line do
+            t.td("A")
+            t.td("B")
+          end
+        end
+        t.line do
+          t.td("C")
+          t.td("D")
+        end
+      end
+      t.line do
+        t.td("E")
+        t.td("F")
+      end
+    end
+
+    expected = "<table>" +
+                 "<tr><td rowspan=2>A</td><td rowspan=2>B</td><td>C</td></tr>" +
+                 "<tr><td>D</td></tr>" +
+                 "<tr><td>E</td><td colspan=2>F</td></tr>" +
+               "</table>"
+
+    assert_dom_equal expected, table
+  end
 end

data/test/test_tablemaker.rb

@@ -225,7 +225,5 @@ describe "starting with rows or columns does not matter" do
     assert_table_structure [[@a1, @b1], [@c1, @d1]], @table1
     assert_table_structure [[@a2, @b2], [@c2, @d2]], @table2
   end
-
-
 end
 

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: tablemaker
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.0.2
 platform: ruby
 authors:
 - Levin Alexander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-17 00:00:00.000000000 Z
+date: 2013-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: psych
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -92,6 +83,7 @@ files:
 - lib/tablemaker.rb
 - lib/tablemaker/frame.rb
 - lib/tablemaker/railtie.rb
+- lib/tablemaker/table_helper.rb
 - lib/tablemaker/version.rb
 - lib/tablemaker/view_helpers.rb
 - tablemaker.gemspec
@@ -100,33 +92,26 @@ files:
 - test/test_tablemaker.rb
 homepage: https://github.com/levinalex/tablemaker
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3601937828848287223
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3601937828848287223
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ''
 test_files:
 - test/helper.rb