collate 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 984410b26595114259b1b7f04b911e545fcf9c1a
-  data.tar.gz: 7c70901aee7e073d5ce119e14c67b219505ec1b2
+  metadata.gz: f6b83915624fb82cd112faccebbd22f5d298f651
+  data.tar.gz: 959313f8d709d29499a7f8aad05e7187ee98c5e2
 SHA512:
-  metadata.gz: 2c53dd532b38d172b5b278c80c073b5dfec8c306d2fa31db7e57aaa66afceff938f0f3be70437edfc574ece0dabdba9cb1bfb2f167ddc66f2f2967ad32c252d7
-  data.tar.gz: 8e9a7c5e833e0f6e5a627ebcc78b9286676b7a0fdacfa4c14219e8d387867fd05da2b2ce51c5c87afa01489d1c581c31e26b30769e94f7b5392f3539e49eda04
+  metadata.gz: b3ec77b60c452a7e81c0ad455a85d5b00c91c8cec73da5ce8433ae9bce4ba0765031c5cbbad4e5c8ea1fdc80464282a5efbf0b0f7e743be1351c073686d55026
+  data.tar.gz: b167d550eb09ca697e0d99d373574926bf1448f360272470b3d0ca78fa013fee841660de221d43fe6241789611153e0845a9a1ea6bf9fa738d34d0e1ead19573

data/README.md

@@ -134,6 +134,7 @@ Here are the available value transformations:
 | Transformation | Behavior |
 |:-------------------------|:--------------------|
 | ```:join```        | ```value = value.join(arg1)``` |
+| ```:as_array```    | ```value = "{#{value}}"``` |
 | ```:downcase```    | ```value = value.downcase``` |
 | ```:string_part``` | ```value = "%#{value}%"``` |
 
@@ -149,6 +150,18 @@ collate_on :name, label: 'Character Name'
 
 This argument will overwrite the default label for the filter, which is ```field.to_s.titleize```
 
+#### Or
+--------------
+```
+collate_on :name, or: true
+```
+
+This argument causes the query to use "OR" for each element of the filter value array passed in from the user. For example, if the user passed in ```["John Doe", "Jane Doe"]``` as the parameter for the above collation, this is the PostgreSQL query that would result:
+
+```
+WHERE name = "John Doe" OR name = "Jane Doe"
+```
+
 #### Not
 --------------
 ```

data/collate.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   end
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features|app|coverage|config|log)/})
+    f.match(%r{^(test|spec|features|app/controllers|app/models|app/views/actors|app/views/movies|coverage|config|log)/})
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

data/lib/app/views/collate/_checkbox_field.html.haml

@@ -0,0 +1,5 @@
+%label.custom-control.custom-checkbox
+  = check_box_tag filter.param_key, nil, params[filter.param_key], id: "#{filter.html_id}", class: 'custom-control-input'
+  %span.custom-control-indicator
+  %span.custom-control-description
+    = filter.label

data/lib/app/views/collate/_checkboxgroup_field.html.haml

@@ -0,0 +1,8 @@
+= filter.label
+%br
+- filter.component[:values].each do |value|
+  %label.custom-control.custom-checkbox
+    = check_box_tag "#{filter.param_key}[]", value[:id], ([] + params[filter.param_key].to_a).include?(value[:id]), class: 'custom-control-input'
+    %span.custom-control-indicator
+    %span.custom-control-description
+      = value[:text]

data/lib/app/views/collate/_date_field.html.haml

@@ -0,0 +1,3 @@
+= filter.label
+%br
+= text_field_tag filter.param_key, params[filter.param_key], id: "#{filter.html_id}"

data/lib/app/views/collate/_select_field.html.haml

@@ -0,0 +1,5 @@
+= filter.label
+%br
+- select_params = [{style: 'width:100%', id: "#{filter.html_id}"}]
+- select_params[0].merge!({multiple: "multiple"}) if filter.component[:multiple]
+= select_tag "#{filter.param_key}[]", options_for_select(filter.component[:values].map { |o| params[filter.param_key].to_a.include?(o[:id].to_s) ? [o[:text], o[:id], selected: "selected"] : [o[:text], o[:id]] } ), *select_params

data/lib/app/views/collate/_string_field.html.haml

@@ -0,0 +1,3 @@
+= filter.label
+%br
+= text_field_tag filter.param_key, params[filter.param_key], id: "#{filter.html_id}", style:'width:100%'

data/lib/collate/action_view_extension.rb

@@ -0,0 +1,15 @@
+module Collate
+  module ActionViewExtension
+    def filters_for_group record, group_key
+      groups = record.model.collate_filters ||= {}
+
+      group = groups[group_key]
+
+      filters = group[:filters] ||= []
+    end
+
+    def filter_for filter
+      render :partial => "collate/#{filter.component[:type]}_field", locals: {filter: filter}
+    end
+  end
+end

data/lib/collate/active_record_extension.rb

@@ -47,7 +47,13 @@ module Collate
       self.group_options ||= {}
     end
 
-    def apply_filter ar_rel, filter, filter_value
+    def apply_filter ar_rel, filter, param_value
+      filter_value = if param_value.duplicable?
+        param_value.dup
+      else
+        param_value
+      end
+
       if filter.joins
         filter.joins.each do |join|
           ar_rel = if filter.joins_prefix
@@ -125,16 +131,26 @@ module Collate
         transformation = vt
         transformation = vt[0] if !transformation.is_a? Symbol
 
-        filter_value = case transformation
-        when :join
-          "{#{filter_value.join(', ')}}"
-        when :downcase
-          filter_value.downcase
-        when :string_part
-          "%#{filter_value}%"
-        else
-          filter_value
+        filter_value = [filter_value] unless filter.or
+
+        filter_value.each_with_index do |f, i|
+          filter_value[i] = case transformation
+          when :join
+            "#{f.join(vt[1])}"
+          when :as_array
+            "{#{f}}"
+          when :downcase
+            f.downcase
+          when :string_part
+            "%#{f}%"
+          when :to_json
+            "{\"#{vt[1]}\": \"#{f}\"}"
+          else
+            f
+          end
         end
+        filter_value = filter_value[0] unless filter.or
+
       end
 
       ar_method = filter.having ? "having" : "where"
@@ -162,10 +178,15 @@ module Collate
         ""
       end
 
+      query_string = filter_value.length.times.collect{query_string}.join(' OR ') if filter.or
       query_string = "NOT(#{query_string})" if filter.not
 
       ar_rel = if query_string.include?('?')
-        ar_rel.send(ar_method, query_string, filter_value)
+        if filter.or
+          ar_rel.send(ar_method, query_string, *filter_value)
+        else
+          ar_rel.send(ar_method, query_string, filter_value)
+        end
       else
         ar_rel.send(ar_method, query_string)
       end

data/lib/collate/engine.rb

@@ -1,4 +1,5 @@
 require_relative 'active_record_extension'
+require_relative 'action_view_extension'
 require 'rails'
 
 module Collate
@@ -6,9 +7,16 @@ module Collate
 
     isolate_namespace Collate
 
+    ActiveSupport.on_load :action_view do
+      include Collate::ActionViewExtension
+    end
+
     ActiveSupport.on_load :active_record do
       extend Collate::ActiveRecordExtension
     end
 
+    if defined? ActionController::Base
+      ActionController::Base.prepend_view_path File.dirname(__FILE__) + "/../app/views"
+    end
   end
 end

data/lib/collate/filter.rb

@@ -4,11 +4,11 @@ module Collate
 
     FIELD_TRANSFORMATIONS = [:date_difference, :date_part, :array_agg, :downcase, :split, :array_length]
     AGGREGATE_TRANSFORMATIONS = [:array_agg]
-    VALUE_TRANSFORMATIONS = [:join, :downcase, :string_part]
+    VALUE_TRANSFORMATIONS = [:join, :downcase, :string_part, :to_json]
 
     attr_accessor :field, :operator, :base_model_table_name, :field_transformations, :label,
                   :component, :joins, :value_transformations, :grouping, :html_id, :having,
-                  :joins_prefix, :not
+                  :joins_prefix, :not, :or
 
     def initialize(field, opt={})
       opt.each do |field, value|

data/lib/collate/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collate
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nicholas Page
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-04 00:00:00.000000000 Z
+date: 2017-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -172,7 +172,13 @@ files:
 - circle.yml
 - collate.gemspec
 - deploy.sh
+- lib/app/views/collate/_checkbox_field.html.haml
+- lib/app/views/collate/_checkboxgroup_field.html.haml
+- lib/app/views/collate/_date_field.html.haml
+- lib/app/views/collate/_select_field.html.haml
+- lib/app/views/collate/_string_field.html.haml
 - lib/collate.rb
+- lib/collate/action_view_extension.rb
 - lib/collate/active_record_extension.rb
 - lib/collate/engine.rb
 - lib/collate/filter.rb