index_for 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd2792a5f94dea8fb9f4a3a2f9da83dffa4c684b
-  data.tar.gz: 9e8adff35f4d147c0403dbb13ef931aae14677e1
+  metadata.gz: 925b8036067c5c22249a884e6159c2c9921c1c2d
+  data.tar.gz: 3e65dec6318633705463a0b9a5de2029d29d8195
 SHA512:
-  metadata.gz: 6e033886586e5dbbf81c6f85c29810b44558e89b8bffda374e7bf9d514f31f77506b52ea62738e1e66cc00de3963862a1c8d8a1ae40a5971ca5f3c6713be194a
-  data.tar.gz: 31580f4b85224ccfb321a9fd98d5d7a08d98f7ab5029b17b7c50bbd4a9b54b8090e2bada7b3344b85859f1a739943713840049e27114fdda29ba89b1ff59ef3c
+  metadata.gz: 82fd862e2f45217f5fffc8dc086d9966c026f1229c49ac00b8f0a8cd62669c4e3461c36c5393388a53b855f494d113232b1be37b173320085b64d165089b4af2
+  data.tar.gz: 978fc9786afe8f83da7567686fd2896756a6101d2b494902328f6a84a8d2e14d1797a86566ad51663cc95df112effe4d4335f23a2832439572cebe291851e226

data/lib/index_for/builder.rb

@@ -25,11 +25,20 @@ module IndexFor
     end
 
     def fields_for attribute_name, options = {}, &block
-      object = @object.send(attribute_name)
-      fields_for = @html_options[:fields_for] || []
+      object = @object
+      html_options = @html_options
+
+      @object = @object.send(attribute_name)
+      fields_for = @html_options[:fields_for] ? @html_options[:fields_for].clone : []
       fields_for.push attribute_name
-      options.merge!(fields_for: attribute_name)
-      @template.capture(self.class.new(object, options, @template), &block)
+      @html_options = html_options.merge(options).merge(fields_for: fields_for)
+
+      result = @template.capture(self, &block)
+
+      @object = object
+      @html_options = html_options
+
+      result
     end
 
     def actions *action_names, █ end
@@ -44,7 +53,7 @@ module IndexFor
     end
 
     def apply_html_options type, options = {}
-      type_class = IndexFor.send :"#{type}_class"
+      type_class = IndexFor.try(:"#{type}_class")
 
       type_html_options = {}
       type_html_options.merge!(html_options[:"#{type}_html"]) if html_options[:"#{type}_html"]

data/lib/index_for/builders/action_builder.rb

@@ -8,8 +8,7 @@ module IndexFor
         @template.capture(@object, &block)
       else
         object = @html_options[:namespace] ? @html_options[:namespace].clone.push(@object) : @object
-        action_title = translate(:"actions.#{action_name}",
-          default: action_name.to_s.humanize).html_safe
+        action_title = (translate(:"actions.#{action_name}") || action_name.to_s.humanize).html_safe
         action_html_options = apply_html_options :action_link, options
         append_class action_html_options, :"action_#{action_name}", options[:class]
         action_html_options[:data] ||= {}

data/lib/index_for/builders/wice_builder.rb

@@ -5,17 +5,34 @@ module IndexFor
     attr_accessor :per_page, :page, :order, :direction, :search
 
     def sortable_fields
-      @sortable_fields ||= []
+      @sortable_fields ||= {}
     end
 
     def searchable_fields
       @searchable_fields ||= []
     end
 
+    def filterable_fields
+      @filterable_fields ||= {}
+    end
+
+    def parse_option option, default
+      option === true ? default : option if option
+    end
+
+    def column_exists? field_name
+      ActiveRecord::Base.connection.column_exists? *field_name.split(".", 2)
+    end
+
     def attribute attribute_name, options = {}
       model_class = options[:model] || html_options[:model] || @object
-      sortable_fields << (options[:sortable] || "#{model_class.table_name}.#{attribute_name}")
-      searchable_fields << "#{model_class.table_name}.#{attribute_name}" if options[:searchable]
+      field_name = "#{model_class.table_name}.#{attribute_name}"
+      sortable_field = parse_option(options[:sortable] || true, field_name)
+      sortable_fields.merge!(field_name => sortable_field) if sortable_field
+      searchable_field = parse_option(options[:searchable] || false, field_name)
+      searchable_fields << searchable_field if searchable_field
+      filterable_field = parse_option(options[:filterable] || false, field_name)
+      filterable_fields.merge! filterable_field if filterable_field
       nil
     end
 
@@ -32,14 +49,15 @@ module IndexFor
 
       self.per_page = (params[:per_page] || IndexFor.per_page).to_i
       self.page = (params[:page] || 1).to_i
-      self.order = params[:order] if sortable_fields.include? params[:order]
+      self.order = sortable_fields[params[:order]] if sortable_fields.key? params[:order]
       self.direction = params[:direction] || "asc"
       self.search = params[:search]
 
       collection = @object
       collection = collection.page(page).per(per_page)
-      collection = collection.order("#{order} #{direction.upcase}") if order
-      collection = collection.where(searchable_fields.map{|f|"#{f} LIKE '%#{search}%'"}.join(" OR ")) if search
+      collection = collection.order(Array.wrap(order).select{|f|column_exists? f}.map{|f|"#{f} #{direction.upcase}"}.join(", ")) if order
+      collection = collection.where((searchable_fields.flatten.map{|f|"#{f} LIKE '%#{search}%'"} + filterable_fields.select{|k,v|v}.map{|k,v|"#{k} = #{v}"}).join(" OR ")) if search
+
       collection
     end
 

data/lib/index_for/builders/wice_head_column_builder.rb

@@ -6,7 +6,7 @@ module IndexFor
 
     def attribute attribute_name, options = {}
       model_class = options[:model] || html_options[:model] || @object.class
-      order = options[:sortable] || "#{model_class.table_name}.#{attribute_name}"
+      order = "#{model_class.table_name}.#{attribute_name}"
 
       params = @template.params
       direction = params[:direction] || "asc"

data/lib/index_for/helper.rb

@@ -128,9 +128,10 @@ module IndexFor
       append_class row_html_options, IndexFor.table_row_class
 
       content_tag(body_tag, body_html_options) do
+        builder = html_options[:body_builder] || IndexFor::BodyColumnBuilder
+        builder = builder.new(objects, html_options, self)
         objects.map do |object|
-          builder = html_options[:body_builder] || IndexFor::BodyColumnBuilder
-          builder = builder.new(object, html_options, self)
+          builder.object = object
           content = capture(builder, &block)
           content_tag(row_tag, content, row_html_options)
         end.join.html_safe

data/lib/index_for/version.rb

@@ -1,3 +1,3 @@
 module IndexFor
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: index_for
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Theo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-22 00:00:00.000000000 Z
+date: 2016-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel