tabl 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/tabl/column.rb

@@ -19,16 +19,24 @@ module Tabl
       @value.call(record)
     end
 
-    def format(key = nil, value = nil, record = nil)
+    def format(key = nil, value = nil, record = nil, context = nil)
       if key.nil?
         return @format_dsl
       else
         format = @formats[key]
         return format unless value
-        if (format.arity == 1)
-          return format.call(value)
+        if (context)
+          if (format.arity == 1)
+            context.instance_exec(value, &format)
+          else
+            context.instance_exec(value, record, &format)
+          end
         else
-          return format.call(value, record)
+          if (format.arity == 1)
+            return format.call(value)
+          else
+            return format.call(value, record)
+          end
         end
       end
     end

data/lib/tabl/deref_column.rb

@@ -13,12 +13,12 @@ module Tabl
       @column.value(deref(record))
     end
 
-    def format(format = nil, value = nil, record = nil)
+    def format(format = nil, value = nil, record = nil, context = nil)
       if format.nil?
         @format_dsl
       else
         record = deref(record) if record
-        @column.format(format, value, record)
+        @column.format(format, value, record, context)
       end
     end
 

data/lib/tabl/table.rb

@@ -83,22 +83,22 @@ module Tabl
         @base = base
       end
 
-      def values(record)
+      def values(record, context = nil)
         @table.keys.map do |key|
           value = @table.value(key, record)
           if value
-            format(key, value, record)
+            format(key, value, record, context)
           else
             @base.default_value
           end
         end
       end
 
-      def format(key, value, record)
+      def format(key, value, record, context)
         column = @table.column(key)
 
         if column.formats[@name]
-          column.format(@name, value, record)
+          column.format(@name, value, record, context)
         else
           @base.format(value)
         end

data/spec/integration_spec.rb

@@ -3,6 +3,10 @@ require 'lib/user_columns'
 require 'lib/post_tables'
 
 describe PostTables do
+  before do
+    @view = LinkHelper.new
+  end
+
   it 'should return csv' do
     post = OpenStruct.new(:post => 'foo', :user => OpenStruct.new(:id => 1, :first_name => 'John', :last_name => 'Smith'))
     PostTables.posts.to_csv([post]).should == <<CSV
@@ -13,7 +17,7 @@ CSV
 
   it 'should format values for html' do
     post = OpenStruct.new(:post => '<>', :user => OpenStruct.new(:key => 1, :first_name => 'John', :last_name => 'Smith'))
-    PostTables.posts.html.values(post).should == ['&lt;&gt;', "<a href='/user/1'>John Smith</a>"]
+    PostTables.posts.html.values(post, @view).should == ['&lt;&gt;', "<a href='/user/1'>John Smith</a>"]
   end
 end
 

data/spec/lib/link_helper.rb

@@ -0,0 +1,10 @@
+class LinkHelper
+  def self.link_to(text, href)
+    "<a href='#{href}'>#{ERB::Util.h(text)}</a>"
+  end
+
+  def link_to(text, href)
+    LinkHelper.link_to(text, href)
+  end
+end
+

data/spec/lib/user_columns.rb

@@ -3,7 +3,7 @@ class UserColumns
 
   column :user do |column|
     column.value = lambda { |user| [ user.first_name, user.last_name ].join(' ') }
-    column.format.html = lambda { |value, user| "<a href='/user/#{user.key}'>#{ERB::Util.h(value)}</a>" }
+    column.format.html = lambda { |value, user| link_to value, "/user/#{user.key}" }
   end
 end
 

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'rspec'
 require 'tabl'
 require 'ostruct'
+require 'lib/link_helper'
 
 $: << File.join(File.dirname(File.expand_path(__FILE__)), 'lib')
 

data/spec/tabl/column_spec.rb

@@ -45,5 +45,13 @@ describe Tabl::Column do
     column.value(foo).should == 'bar'
     column.format.html('bar').should == 'BAR'
   end
+
+  it 'should evaluate format with a context' do
+    foo = OpenStruct.new(:foo => 'foo')
+    column = Tabl::Column.new(:foo)
+    context = LinkHelper.new
+    column.format.html = lambda { |v, foo| link_to 'foo', v }
+    column.format.html('foo', foo, context).should == LinkHelper.link_to('foo', 'foo')
+  end
 end
 

data/tabl.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tabl}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Liehann Loots}]
-  s.date = %q{2011-09-17}
+  s.date = %q{2011-09-19}
   s.description = %q{Gem for creating tables in Rails or any other system.}
   s.email = %q{liehannl@gmail.com}
   s.extra_rdoc_files = [
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
     "lib/tabl/formats/html.rb",
     "lib/tabl/table.rb",
     "spec/integration_spec.rb",
+    "spec/lib/link_helper.rb",
     "spec/lib/post_tables.rb",
     "spec/lib/user_columns.rb",
     "spec/spec_helper.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tabl
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Liehann Loots
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-17 00:00:00 Z
+date: 2011-09-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -149,6 +149,7 @@ files:
 - lib/tabl/formats/html.rb
 - lib/tabl/table.rb
 - spec/integration_spec.rb
+- spec/lib/link_helper.rb
 - spec/lib/post_tables.rb
 - spec/lib/user_columns.rb
 - spec/spec_helper.rb