index_for 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e51681ee6904866e0b057b58feaac06fd709b82
-  data.tar.gz: 6c98c2b5b7b41ed2c7440464c47e66d4da789553
+  metadata.gz: f637db5d2b2459b10bfe9685fc3ccac559bafb13
+  data.tar.gz: e4d74aaad50eff2af5a5146e7175f88e1b561500
 SHA512:
-  metadata.gz: 2fe646bf96b40a2d47ecaf7678a8a4046aa9ceb46604f7fe333e9e8c390664d4f6dc4682826b796f93730a425ab4b18b0276c4a56dd6910d1d80493a357eef02
-  data.tar.gz: 89a67513b4904a901470751550efe0fad410f4523585e514547eee15ed3796c428f776a4b1e73b18dc90716143a67de07b8c721e1c1cf57195e82d5913b92575
+  metadata.gz: a443df37260f74e1bde7ba93144eef584c5215ce799c615e54cd625c73ef491ad943f5d1645860121013f745e7e6a2288aaea77fc721fd969b9f16e38ab8a8d2
+  data.tar.gz: a9ee356a9fa0bced86a328b41088604fd2d5af8d22815ccd83acdfa6983792f02dcc3bdbc2bf39776fb48bf390317090f0fe9ef35b8a440c90d61c902c42c70f

data/lib/index_for/attribute.rb

@@ -3,7 +3,7 @@ module IndexFor
 
     private
 
-    def attribute_value attribute_name, options, &block
+    def attribute_value attribute_name, options
       attribute_name = options[:value] if options[:value]
       attribute_name = :"#{attribute_name}.#{options[:with]}" if options[:with]
 
@@ -15,9 +15,7 @@ module IndexFor
         object = object.send(attribute_name)
       end if parts.any?
 
-      if block
-        nil
-      elsif object.respond_to?(:"human_#{attribute_name}")
+      if object.respond_to?(:"human_#{attribute_name}")
         object.send :"human_#{attribute_name}"
       else
         object.send(attribute_name)

data/lib/index_for/builder.rb

@@ -61,23 +61,25 @@ module IndexFor
       class_name.join("_").to_sym
     end
 
-    def wrap_content_with type, content, options = {}, &block #:nodoc:
+    def wrap_attribute_with type, attribute, options = {}, &block
       type_tag, type_html_options = apply_html type, options
-      append_class type_html_options, IndexFor.blank_content_class if content.blank?
+
+      if block
+        content = block
+      else
+        content = attribute_value attribute, options
+        append_class type_html_options, IndexFor.blank_content_class if content.blank?
+      end
 
       @template.content_tag type_tag, type_html_options do
-        format_content(content, options, &block)
+        format_content(content, options)
       end
     end
 
-    def format_content content, options = {}, &block
+    def format_content content, options = {}
       # We need to convert content to_a because when dealing with ActiveRecord
       # Array proxies, the follow statement Array# === content return false
-      if block && block.arity <= 1
-        content = block
-      elsif content.respond_to?(:to_ary)
-        content = content.to_a
-      end
+      content = content.to_ary if content.respond_to?(:to_ary)
 
       case content
       when Date, Time, DateTime
@@ -86,15 +88,23 @@ module IndexFor
         translate :"index_for.yes", :default => "Yes"
       when FalseClass
         translate :"index_for.no", :default => "No"
-      when Array, Hash
-        content.empty? ? blank_content(options) :
-          collection_content(content, options, &block)
-      when Proc
-        @template.capture(@object, &content)
       when NilClass
         blank_content(options)
+      when Proc
+        @template.capture(@object, &content)
       else
-        content.to_s
+        formatter = options[:format] && IndexFor.formatters[options[:format]]
+
+        if formatter
+          @template.instance_exec(content, @object, &formatter)
+        else
+          case content
+          when Array, Hash
+            content.empty? ? blank_content(options) : collection_content(content, options)
+          else
+            content.to_s
+          end
+        end
       end
     end
 
@@ -102,16 +112,12 @@ module IndexFor
       options[:if_blank] || translate(:blank, :default => "Not specified")
     end
 
-    def collection_content collection, options, &block
+    def collection_content collection, options
       collection_tag = options[:collection_tag] || IndexFor.collection_tag
       collection_column_tag = options[:collection_column_tag] || IndexFor.collection_column_tag
       @template.content_tag collection_tag do
         collection.map do |content|
-          if block
-            @template.capture content, collection, @object, &block
-          else
-            @template.content_tag collection_column_tag, content
-          end
+          @template.content_tag collection_column_tag, content
         end.join.html_safe
       end
     end

data/lib/index_for/builders/body_column_builder.rb

@@ -5,8 +5,7 @@ module IndexFor
 
     def attribute attribute_name, options = {}, &block
       append_html_class options, attribute_class_name(attribute_name)
-      wrap_content_with :table_body_cell, attribute_value(attribute_name,
-        options, &block), options, &block
+      wrap_attribute_with :table_body_cell, attribute_name, options, &block
     end
 
     def actions *action_names, &block

data/lib/index_for/builders/list_column_builder.rb

@@ -24,8 +24,7 @@ module IndexFor
 
     def list_content attribute_name, options, &block
       append_html_class options, attribute_class_name(attribute_name)
-      wrap_content_with :list_content, attribute_value(attribute_name,
-        options), options, &block
+      wrap_attribute_with :list_content, attribute_name, options, &block
     end
 
   end

data/lib/index_for/version.rb

@@ -1,3 +1,3 @@
 module IndexFor
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/index_for.rb

@@ -14,7 +14,7 @@ module IndexFor
   @@table_tag = :table
   mattr_accessor :table_class
   @@table_class = nil
-  
+
   mattr_accessor :table_head_tag
   @@table_head_tag = :thead
   mattr_accessor :table_head_class
@@ -34,7 +34,7 @@ module IndexFor
   @@table_head_cell_tag = :th
   mattr_accessor :table_head_cell_class
   @@table_head_cell_class = nil
-  
+
   mattr_accessor :table_body_cell_tag
   @@table_body_cell_tag = :td
   mattr_accessor :table_body_cell_class
@@ -93,4 +93,10 @@ module IndexFor
   def self.setup
     yield self
   end
+
+  mattr_accessor :formatters
+  @@formatters = {}
+  def self.format key, &block
+    formatters[key] = block
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: index_for
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Theo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-22 00:00:00.000000000 Z
+date: 2015-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel