tabl 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/tabl/column.rb

@@ -3,12 +3,15 @@ module Tabl
     attr_reader :name
     attr_accessor :label
     attr_writer :value
+    attr_reader :formats
 
     def initialize(name, args = {})
       @name = name
       @label = args[:label] || @name.to_s.titleize
       @value = args[:value] || lambda { |record| record.send(@name) }
-      @formats = Formats.new
+      @formats = {}
+      @format_dsl = FormatDsl.new(self)
+
       yield self if block_given?
     end
 
@@ -16,17 +19,23 @@ module Tabl
       @value.call(record)
     end
 
-    def format(name = nil)
-      @formats
-    end
-
-    class Formats
-      def initialize
-        @formats = {}
+    def format(key = nil, value = nil, record = nil)
+      if key.nil?
+        return @format_dsl
+      else
+        format = @formats[key]
+        return format unless value
+        if (format.arity == 1)
+          return format.call(value)
+        else
+          return format.call(value, record)
+        end
       end
+    end
 
-      def [](name)
-        @formats[name]
+    class FormatDsl
+      def initialize(column)
+        @column = column
       end
 
       def method_missing(name, *args)
@@ -34,26 +43,10 @@ module Tabl
         assign = (name =~ /=$/)
         key = name.gsub(/=$/, '').to_sym
 
-        # super unless Tabl.formats.include?(key)
-
         if (assign)
-          write(key, *args)
+          @column.formats[key] = *args
         else
-          read(key, *args)
-        end
-      end
-
-      def write(key, proc)
-        @formats[key] = proc
-      end
-
-      def read(key, value = nil, record = nil)
-        format = @formats[key]
-        return format unless value
-        if (format.arity == 1)
-          return format.call(value)
-        else
-          return format.call(value, record)
+          @column.format(key, *args)
         end
       end
     end

data/lib/tabl/deref_column.rb

@@ -6,10 +6,20 @@ module Tabl
       @column = column
       @callback = deref
       @callback = lambda { |record| record.send(deref) } if Symbol === deref
+      @format_dsl = Column::FormatDsl.new(self)
     end
 
     def value(record)
-      super(deref(record))
+      @column.value(deref(record))
+    end
+
+    def format(format = nil, value = nil, record = nil)
+      if format.nil?
+        @format_dsl
+      else
+        record = deref(record) if record
+        @column.format(format, value, record)
+      end
     end
 
     def deref(record)

data/lib/tabl/table.rb

@@ -89,7 +89,7 @@ module Tabl
           if value
             format(key, value, record)
           else
-            @base.default_value unless value
+            @base.default_value
           end
         end
       end
@@ -97,8 +97,8 @@ module Tabl
       def format(key, value, record)
         column = @table.column(key)
 
-        if column.format[@name]
-          column.format.read(@name, value, record)
+        if column.formats[@name]
+          column.format(@name, value, record)
         else
           @base.format(value)
         end

data/spec/integration_spec.rb

@@ -4,12 +4,17 @@ require 'lib/post_tables'
 
 describe PostTables do
   it 'should return csv' do
-    post = OpenStruct.new(:post => 'foo', :user => OpenStruct.new(:first_name => 'John', :last_name => 'Smith'))
+    post = OpenStruct.new(:post => 'foo', :user => OpenStruct.new(:id => 1, :first_name => 'John', :last_name => 'Smith'))
     PostTables.posts.to_csv([post]).should == <<CSV
 Post,User
 foo,John Smith
 CSV
   end
+
+  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>"]
+  end
 end
 
 

data/spec/lib/user_columns.rb

@@ -3,6 +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>" }
   end
 end
 

data/spec/tabl/deref_column_spec.rb

@@ -11,6 +11,11 @@ describe Tabl::DerefColumn do
     @deref_column.value(@bar).should == 'foo'
   end
 
+  it 'it should dereference the object when formatting' do
+    @column.format.html = lambda { |value, record| record.foo.upcase }
+    @deref_column.format.html('foo', @bar).should == 'FOO'
+  end
+
   it 'should delegate the label' do
     @column.label = 'FOO'
     @deref_column.label.should == 'FOO'

data/spec/tabl/table_spec.rb

@@ -47,6 +47,13 @@ describe Tabl::Table do
     foo = OpenStruct.new(:foo => OpenStruct.new(:bar => 'bar'))
     table.values(foo).should == ['bar']
   end
+
+  it 'should format dereferenced columns' do
+    foo_column = Tabl::DerefColumn.new(Tabl::Column.new(:foo), :bar)
+    table = Tabl::Table.new(:base_columns => [foo_column], :columns => [:foo])
+    bar = OpenStruct.new(:bar => OpenStruct.new(:foo => 'foo'))
+    table.html.values(bar).should == ['foo']
+  end
 end
 
 

data/tabl.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tabl}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   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-16}
+  s.date = %q{2011-09-17}
   s.description = %q{Gem for creating tables in Rails or any other system.}
   s.email = %q{liehannl@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tabl
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Liehann Loots
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-16 00:00:00 Z
+date: 2011-09-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime