table_for_collection 1.0.6 → 1.0.7

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZDdhZmYyNDM3OWU5NDI1OGE3MzdjMTBhODI0ZDE5MWU1MWQ2MzhmYw==
+  data.tar.gz: !binary |-
+    YjRkOGVmMThhZWI0YmEwZjdkYWVkODRjNTk2ZjI1ZGI0YzM2MGFkOA==
+SHA512:
+  metadata.gz: !binary |-
+    ZmIyNzYxOThjNTMxMzE1NjRmYWQ2ODM5MTU5M2QwYzgwZTNmOTUzMWViMjgw
+    ZjQxMmQ0ZTAwNWNlNzA0ZDg3ZTcwMjJlNGRjMmU0MDQzZWVkNDZiZTJiYThk
+    Nzk1NmUzMGNlNDY3ZWU0NGU0YWUzMzc5NjRlYmU3NzM2ODdhOTA=
+  data.tar.gz: !binary |-
+    NjJlZjlkNTQyMGYyYjYwOTI3NjdlZDVkYjM3ZGU4MDc0YTY1Njk5OGVmMmQ2
+    N2JiMGMzODdhNTk3ODQwYzUzOGY0ODhiMGMwNmI2MjgxY2JiZTk0Yzg3MTVh
+    YzlhMzZkNzllY2I3Zjg5NzA1OGZlNTIzMTcwY2JkMjFmYmI5NjI=

data/Changelog

@@ -1,4 +1,9 @@
-== master
+== v.1.0.7
+
+Add :attr option
+Add :default option
+Dynamic :class for tr added
+Gemfile fix
 
 == v.1.0.6
 

data/Gemfile

@@ -1,4 +1,4 @@
-source :gemcutter
+source 'https://rubygems.org'
 
 gem "actionpack"
 

data/README.rdoc

@@ -1,4 +1,6 @@
+{<img src="https://fury-badge.herokuapp.com/rb/table_for_collection.png" />}[http://badge.fury.io/rb/table_for_collection]
 {<img src="https://secure.travis-ci.org/lunich/table_for.png" />}[http://travis-ci.org/lunich/table_for]
+{<img src="https://codeclimate.com/github/lunich/table_for.png" />}[https://codeclimate.com/github/lunich/table_for]
 
 == Description
 
@@ -43,7 +45,7 @@ This ruby code will produce following HTML:
     :id => "users",
     :width => "100%",
     :tr => {
-      :class => "simple-row",
+      :class => lambda { |user| "simple-row #{user.role}" },
       :id => lambda { |user| "user-row-#{user.id}" }
     }
   } do -%>
@@ -97,6 +99,7 @@ It will produce HTML similar to:
     <% column :title => "Actions" do |user| %>
       <% [link_to("Show", user), link_to("Delete", user, :method => :delete)].join(" | ") %>
     <% end %>
+    <% column :role, :default => "guest" %>
     <% column :created_at, :time_format => "%Y-%m-%d" %>
   <% end %>
 
@@ -114,7 +117,17 @@ Also class given by :stripe option will be merged with options[:html][:tr] so th
   <tr class="row odd">...
   <tr class="row even">...
   <tr class="row odd">...
-  
+
+== Relations
+
+If you need a column for relation or apply method for simple column you can use :attr option:
+
+  <%= table_for @users do -%>
+    <% column :login %>
+    <% column :company, :attr => :name %>
+    <% column :name, :attr => :underscore %>
+  <% end %>
+
 == I18n
 
 When column name is set, but :title is not, helper tries to find translation in standard mechanism of the ActiveModel.

data/lib/table_for/simple_column.rb

@@ -2,6 +2,15 @@ module TableHelper
   class SimpleColumn < Column # :nodoc:
     def content_for(record)
       called_record = record.kind_of?(Hash) ? record[@attr] : record.send(@attr)
+
+      if @options[:attr] && called_record.respond_to?(@options[:attr])
+        called_record = called_record.send(@options[:attr])
+      end
+
+      if @options[:default] && called_record.nil?
+        called_record = @options[:default]
+      end
+
       if @options[:time_format] and called_record.is_a? Time
         called_record = called_record.strftime(@options[:time_format])
       end

data/lib/table_for/table.rb

@@ -66,34 +66,46 @@ module TableHelper
       end
     end
 
+    def columns_content(record)
+      @columns.map do |col|
+        content_tag :td, col.html[:td] do
+          col.content_for(record).to_s
+        end
+      end.join.html_safe
+    end
+
+    def records_content
+      @records.map do |record|
+        content_tag :tr, tr_options(record) do
+          columns_content(record)
+        end
+      end.join.html_safe
+    end
+
     def body
-      content_tag :tbody do
-        @records.map do |rec|
-          content_tag :tr, tr_options(rec) do
-            @columns.map do |col|
-              content_tag :td, col.html[:td] do
-                col.content_for(rec).to_s
-              end
-            end.join.html_safe
-          end
-        end.join.html_safe
-      end
+      content_tag :tbody, records_content
     end
-    
-    def tr_options(rec)
+
+    def tr_classes(record, base_class)
+      klasses = []
+      klasses << dom_class(record) if record.respond_to?(:model_name)
+      klasses << base_class if base_class
+      stripe = @stripes.next
+      klasses << stripe if stripe
+      klasses
+    end
+
+    def tr_options(record)
       res = @tr_html_options.nil? ? {} : @tr_html_options.clone
-      html_class = @stripes.next
-      unless html_class.nil?
-        klasses = [res[:class], html_class]
-        klasses << dom_class(rec) if rec.respond_to?(:model_name)
-        res[:class] = klasses.compact.join(" ")
-      end
-      if res.has_key?(:id) && res[:id].respond_to?(:call)
-        res[:id] = res[:id].call(rec)
+      # check if we have proc in :id or :class
+      [:id, :class].each do |key|
+        res[key] = res[key].call(record) if res.has_key?(key) && res[key].respond_to?(:call)
       end
-      res[:id] ||= dom_id(rec) if rec.respond_to?(:to_key)
+      # update class
+      res[:class] = tr_classes(record, res[:class]).join(" ")
+      # update id
+      res[:id] ||= dom_id(record) if record.respond_to?(:to_key)
       res
     end
-
   end
 end

data/lib/table_for/version.rb

@@ -1,4 +1,4 @@
 module TableHelper
   GEM_NAME = "table_for_collection"
-  VERSION  = "1.0.6"
+  VERSION  = "1.0.7"
 end

data/spec/spec_helper.rb

@@ -44,6 +44,7 @@ end
 class User < OpenStruct
   require "active_model"
   extend ActiveModel::Naming
+
   def id
     @table[:id]
   end

data/spec/table_for/simple_column_spec.rb

@@ -6,7 +6,8 @@ describe TableHelper::SimpleColumn do
   # TableHelper::SimpleColumn
   let(:klass) { TableHelper::SimpleColumn }
   # user (stubbed data)
-  let(:user) { mock(:id => 12, :created_at => Time.gm(2011, "feb", 24, 14, 23, 1)) }
+  let(:company) { mock(:id => 2, :name => "Zorg inc.") }
+  let(:user) { mock(:id => 12, :created_at => Time.gm(2011, "feb", 24, 14, 23, 1), :company => company, :role => nil) }
   # user (hash)
   let(:user_hash) { { :id => 12, :created_at => Time.gm(2011, "feb", 24, 14, 23, 1) } }
   # Instance methods
@@ -23,18 +24,43 @@ describe TableHelper::SimpleColumn do
         col.title.should eq("Some title")
       end
     end
+
     # :content_for
     it ":content_for method should success" do
       col = build_column(klass, :id)
-      col.content_for(user).should == "12"
-      col.content_for(user_hash).should == "12"
+      col.content_for(user).should eq("12")
+      col.content_for(user_hash).should eq("12")
     end
 
     describe "format" do
       it ":time_format should be displayed correctly" do
         col = build_column(klass, :created_at, :time_format => '%Y-%m')
-        col.content_for(user).should == "2011-02"
-        col.content_for(user_hash).should == "2011-02"
+        col.content_for(user).should eq("2011-02")
+        col.content_for(user_hash).should eq("2011-02")
+      end
+    end
+
+    describe ":attr option" do
+      it "should be success" do
+        col = build_column(klass, :company, :attr => :name)
+        col.content_for(user).should eq("Zorg inc.")
+      end
+
+      it "should not be called when not acceptable" do
+        col = build_column(klass, :id, :attr => :name)
+        col.content_for(user).should eq("12")
+      end
+    end
+
+    describe ":default option" do
+      it "should be success" do
+        col = build_column(klass, :role, :default => "Guest")
+        col.content_for(user).should eq("Guest")
+      end
+
+      it "should not be called if have a result" do
+        col = build_column(klass, :id, :default => 42)
+        col.content_for(user).should eq("12")
       end
     end
   end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: table_for_collection
 version: !ruby/object:Gem::Version
-  version: 1.0.6
-  prerelease: 
+  version: 1.0.7
 platform: ruby
 authors:
 - Dima Lunich
@@ -11,30 +10,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-17 00:00:00.000000000Z
+date: 2013-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70131758124600 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *70131758124600
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70131758124180 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70131758124180
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This gem builds HTML-table using given array
 email:
 - dima.lunich@gmail.com
@@ -66,7 +71,9 @@ files:
 - Gemfile
 - init.rb
 homepage: http://github.com/lunich/table_for
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -74,23 +81,21 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: ''
-rubygems_version: 1.8.6
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
-summary: table_for_collection-1.0.6
+specification_version: 4
+summary: table_for_collection-1.0.7
 test_files:
 - spec/core_ex/array_spec.rb
 - spec/spec_helper.rb