tabulatr 0.0.4 → 0.0.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tabulatr (0.0.3)
+    tabulatr (0.0.4)
       id_stuffer (>= 0.0.1)
       rails (~> 3.0)
       whiny_hash (>= 0.0.2)

data/README.textile

@@ -149,9 +149,9 @@ If you want to use a predefined stylesheet and the images for sorting and paging
        create  public/images/tabulatr/sort_arrow_up.gif
        create  public/images/tabulatr/sort_arrow_up_off.gif
   -------------------------------------------------------
-  Please note: We have copied a sample stylesheet to 
+  Please note: We have copied a sample stylesheet to
     public/stylesheets/tabulatr.css
-  to actually use it in your application, please include 
+  to actually use it in your application, please include
   it in your layout file. You may use s/th like
     <%= stylesheet_link_tag :tabulatr %>
   for that.
@@ -260,6 +260,7 @@ h3. Column Options
   format: false,                   # a sprintf-string or a proc to do special formatting
   method: false,                   # if you want to get the column by a different method than its name
   link: false,                     # proc or symbol to make the content a link
+  map: true,                       # whether to map the call on individual records (true) of an association or call on the list (false)
   join_symbol: ', ',               # symbol used to join the elements of 'many' associations
   sortable: true                   # if set, sorting-stuff is added to the header cell
 </pre>

data/lib/tabulatr/tabulatr/data_cell.rb

@@ -79,16 +79,24 @@ class Tabulatr
     end
     assoc = @record.class.reflect_on_association(relation)
     make_tag(:td, opts[:td_html]) do
-      concat(if assoc.collection?
-        @record.send relation
+      format = opts[:format]
+      concat(if assoc.collection? and opts[:map]
+        @record.send(relation.to_sym).map do |r|
+          val = h(r.send(opts[:method] || name))
+          if format.is_a?(Proc) then format.call(val)
+          elsif format.is_a?(String) then h(format % val)
+          elsif format.is_a?(Symbol) then Tabulatr::Formattr.format(format, val)
+          else h(val.to_s)
+          end
+        end.join(opts[:join_symbol])
       else
-        [ @record.send(relation.to_sym) ]
-      end.map do |r|
-        val = h(r.send(opts[:method] || name))
-        val = opts[:format].call(val) if opts[:format].class == Proc
-        val = (opts[:format] % val)   if opts[:format].class == String
-        val
-      end.join(opts[:join_symbol]))
+        val = h(@record.send(relation.to_sym).send(opts[:method] || name))
+        val = if format.is_a?(Proc) then format.call(val)
+        elsif format.is_a?(String) then h(format % val)
+        elsif format.is_a?(Symbol) then Tabulatr::Formattr.format(format, val)
+        else h(val.to_s)
+        end
+      end)
     end # </td>
   end
 

data/lib/tabulatr/tabulatr/settings.rb

@@ -73,7 +73,7 @@ class Tabulatr
     :select_controls => [:select_all, :select_none, :select_visible, :unselect_visible,
                       :select_filtered, :unselect_filtered],
 
-    :image_path_prefix => '/images/tabulatr/',      
+    :image_path_prefix => '/images/tabulatr/',
     :pager_left_button => 'pager_arrow_left.gif',
     :pager_left_button_inactive => 'pager_arrow_left_off.gif',
     :pager_right_button => 'pager_arrow_right.gif',
@@ -147,6 +147,7 @@ class Tabulatr
     :method => false,                   # if you want to get the column by a different method than its name
     :link => false,                     # proc or symbol to make the content a link
     :join_symbol => ', ',               # symbol used to join the elements of 'many' associations
+    :map => true,                       # whether to map the call on individual records (true) or call on the list (false)
     :sortable => true                   # if set, sorting-stuff is added to the header cell
   })
 

data/lib/tabulatr/version.rb

@@ -1,3 +1,3 @@
 class Tabulatr
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/dummy_app/app/views/products/index_simple.html.erb

@@ -5,6 +5,7 @@
   t.column :active
   t.association :vendor, :name
   t.association :tags, :title
+  t.association :tags, :count, :map => false, :format => '--%d--'
 end %>
 
 

data/spec/requests/tabulatrs_spec.rb

@@ -16,7 +16,7 @@ describe "Tabulatrs" do
   # General stuf
   WORKS_IN_GENERAL = CONTAINS_BUTTONS = CONTAINS_COLUMN_HEADERS = CONTAINS_OTHER_CONTROLS = tralse
   # This fills in the data, so rather not cmment this out
-  CONTAINS_ACTUAL_DATA = CONTAINS_ACTUAL_DATA_MULTIPLE = CONTAINS_DATA_ON_FURTHER_PAGES = true
+  CONTAINS_ACTUAL_DATA = CONTAINS_ASSOC_DATA = CONTAINS_ACTUAL_DATA_MULTIPLE = CONTAINS_DATA_ON_FURTHER_PAGES = true
   # Paginatione
   PAGES_UP_AND_DOWN = JUMPS_TO_CORRECT_PAGE = CHANGES_PAGE_SIZE = tralse
   # Filters
@@ -49,7 +49,7 @@ describe "Tabulatrs" do
 
     it "contains column headers" do
       visit index_simple_products_path
-      ['Id','Title','Price','Active','Vendor Name','Tags Title'].each do |n|
+      ['Id','Title','Price','Active','Vendor Name','Tags Title','Tags Count'].each do |n|
         page.should have_content(n)
       end
     end if CONTAINS_COLUMN_HEADERS
@@ -66,9 +66,20 @@ describe "Tabulatrs" do
       page.should have_content("true")
       page.should have_content("10.0")
       page.should have_content("ven d'or")
+      page.should have_content("--0--")
       page.should have_content(sprintf(Tabulatr::TABLE_OPTIONS[:info_text], 1, 1, 0, 1))
     end if CONTAINS_ACTUAL_DATA
 
+    it "correctly contains the association data" do
+      product = Product.first
+      [tag1, tag2, tag3].each_with_index do |tag, i|
+        product.tags << tag
+        visit index_simple_products_path
+        page.should have_content tag.title
+        page.should have_content(sprintf("--%d--", i+1))
+      end
+    end if CONTAINS_ASSOC_DATA
+
     it "contains the actual data multiple" do
       9.times do |i|
         product = Product.create!(:title => names[i+1], :active => i.even?, :price => 11.0+i,

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: tabulatr
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 4
-  version: 0.0.4
+  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors: 
 - Peter Horn
@@ -15,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-26 23:00:00 +01:00
+date: 2011-03-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,9 +22,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
         version: "3.0"
   type: :runtime
   version_requirements: *id001
@@ -40,10 +33,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 2
         version: 0.0.2
   type: :runtime
   version_requirements: *id002
@@ -55,10 +44,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 1
         version: 0.0.1
   type: :runtime
   version_requirements: *id003
@@ -198,21 +183,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: tabulatr
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Tabulatr is a DSL to easily create tables for e.g. admin backends.