easy_filter 0.0.4 → 0.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTE3NjFkMzY5ZmYwMTIyNmUzMWUyZGYyNjkxZDhmMzE0NTNhMzdkMg==
+    M2NjMDMyOThkZmJlMjA1Nzk5ZmZjODJlZTdjZWE1M2EzZjhmM2M1NQ==
   data.tar.gz: !binary |-
-    NTlkZjNmNWExMDE5OTVhZTE4YmI4MGIwMzM1MWM0MTFmZWQ3Y2ExMQ==
+    YTViNzNkYjQwZGQ2ZDlhOGFiOGNlOTNkZmViNTVlNjQ0OGMwOTc4NQ==
 SHA512:
   metadata.gz: !binary |-
-    NmVmZjYxMTg2MGFmYjc3ZTY0NjE4MTRmMzU1N2UxYWZjMzA4MTEzZjRiNDU3
-    NTY3M2FiNTQ2YTJkNGFlMWY1NGU3OGExYmUxNzNiYThkMzQ4Zjg2ZTUxMWU4
-    NDUyOTRkMThhZDFhZDc3ZjkyMjgyMGU4YTJiZDEwYzFhZmI5ZmY=
+    ODFmZGFjOTMxODNiNTk2OTRkYjYyYWMwOWMyZGM1Y2Q3ZTE2MDM2NDYwNDU4
+    ZWEwODM1YTYxMTY0Y2VjZGI4OTNhYjk3Y2M3YjE0NDIxZjY5ZDY3ZTFkYWNl
+    YzI4NTFmYjRkMjUxYTEwMzkxMmJlOThiYzZkZWFkNmE4ZDE4MTg=
   data.tar.gz: !binary |-
-    OGYxYmNjYmUzYTZkMTg2NTE4MDU4MzNkOGRkMTUwNmJmMDM0MWM5N2ViYTA4
-    ZTExNTMzOWUyZjYwY2ZlYzQ5ODYwZTUxNGMwNDdhN2Y1MmU4Yzk0OGMwOTM1
-    ZjFjOTNhODBiOTA0Mzk4YTEyMDgyNmRjZGZmYzExZTBlMWYwZGI=
+    YzU5YjA2OTdlZjA0OTcxZmFhYWI4MWIyNjBkM2ZhNmFkN2FkMWMxOTM0YmE0
+    NjBkY2Q2OGU0OGZkMzc1MjdmOWVjMDJkOGRkNGIxMWY3MTJhNGFkM2E3Zjgy
+    NTBiZTE3NjAyMTI0Y2M1MThjMmM4ZDhhNDllY2QwN2I5OWI4NDg=

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## V0.0.4
+
+* Added TravisCI
+* Rubocop added to TravisCI
+* Reorganize source code for Rubocop
+
 ## V0.0.3
 
 * Gem homepage URL changed

data/README.md

@@ -48,10 +48,10 @@ EasyFilter works on ActiveRecord::Relation. You can chain with any other module
 
 You can define an `Array` of `Hash` and EasyFilter will generate a dropdown automaticly.
 
-Code in model or controller:
+Code in helper:
 
 ```ruby
-def self.statuses
+def model_statuses
   [
     { code: 'A', name: 'Status A', color: :default},
     { code: 'B', name: 'Status B', color: :info},
@@ -62,7 +62,7 @@ end
 
 In view:
 
-    <%= easy_filter ModelClass, [:name, :expiry_date, [:status, ModelClass.statuses]] %>
+    <%= easy_filter ModelClass, [:name, :expiry_date, {field: :status, items: model_statuses, label: t(:lable)}] %>
 
 #### Advanced parameters
 

data/app/views/easy_filter/_field_array.html.erb

@@ -1,19 +1,19 @@
 <div class="dropdown">
-<%= hidden_field_tag("#{filter_prefixes[:main]}#{filter_prefixes[:exact]}#{filter_col_name}", request.params["#{filter_prefixes[:main]}#{filter_prefixes[:exact]}#{filter_col_name}"]) %>
-<% button_text = "<span>#{t("activerecord.attributes.#{filter_model_class.name.downcase}.#{filter_col_name}")}</span>" %>
+<%= hidden_field_tag("#{filter_prefixes[:main]}#{filter_prefixes[:exact]}#{filter[:field]}", request.params["#{filter_prefixes[:main]}#{filter_prefixes[:exact]}#{filter[:field]}"]) %>
+<% button_text = "<span>#{filter[:label]}</span>" %>
 
-<% elements.each do |item|
-  if request.params["#{filter_prefixes[:main]}#{filter_prefixes[:exact]}#{filter_col_name}"] == item[:code]
+<% filter[:items].each do |item|
+  if request.params["#{filter_prefixes[:main]}#{filter_prefixes[:exact]}#{filter[:field]}"] == item[:code]
     button_text = "<span class=\"label label-#{item[:color]}\">#{item[:name]}</span>"
     break
   end
 end %>
 
-<button class="btn btn-default dropdown-toggle" type="button" id="dropdownFilterButton-<%= filter_col_name %>" data-toggle="dropdown"><%= button_text.html_safe %>
+<button class="btn btn-default dropdown-toggle" type="button" id="dropdownFilterButton-<%= filter[:field] %>" data-toggle="dropdown"><%= button_text.html_safe %>
 <span class="caret"></span></button>
 
-<ul class="dropdown-menu dropdown-filter" aria-labelledby="dropdownFilterButton-<%= filter_col_name %>">
-<% elements.each do |item| %>
+<ul class="dropdown-menu dropdown-filter" aria-labelledby="dropdownFilterButton-<%= filter[:field] %>">
+<% filter[:items].each do |item| %>
   <li role="presentation"><a role="menuitem" tabindex="-1" data-target="<%= item[:code] %>"><span class="label label-<%= item[:color]%>"><%= item[:name] %></span></a></li>
 <% end %>
 </ul>

data/app/views/easy_filter/_field_datetime.html.erb

@@ -1,2 +1,2 @@
-<%= text_field_tag("#{filter_prefixes[:main]}#{filter_prefixes[:from]}#{filter_col_name}", request.params["#{filter_prefixes[:main]}#{filter_prefixes[:from]}#{filter_col_name}"], class: 'form-control datepicker', placeholder: t("activerecord.attributes.#{filter_model_class.name.downcase}.#{filter_col_name}")) %>
-<%= text_field_tag("#{filter_prefixes[:main]}#{filter_prefixes[:to]}#{filter_col_name}", request.params["#{filter_prefixes[:main]}#{filter_prefixes[:to]}#{filter_col_name}"], class: 'form-control datepicker', placeholder: t("activerecord.attributes.#{filter_model_class.name.downcase}.#{filter_col_name}")) %>
+<%= text_field_tag("#{filter_prefixes[:main]}#{filter_prefixes[:from]}#{filter[:field]}", request.params["#{filter_prefixes[:main]}#{filter_prefixes[:from]}#{filter[:field]}"], class: 'form-control datepicker', placeholder: filter[:label]) %>
+<%= text_field_tag("#{filter_prefixes[:main]}#{filter_prefixes[:to]}#{filter[:field]}", request.params["#{filter_prefixes[:main]}#{filter_prefixes[:to]}#{filter[:field]}"], class: 'form-control datepicker', placeholder: filter[:label]) %>

data/app/views/easy_filter/_field_text.html.erb

@@ -1 +1 @@
-<%= text_field_tag("#{filter_prefixes[:main]}#{filter_col_name}", request.params["#{filter_prefixes[:main]}#{filter_col_name}"], class: 'form-control', placeholder: t("activerecord.attributes.#{filter_model_class.name.downcase}.#{filter_col_name}")) %>
+<%= text_field_tag("#{filter_prefixes[:main]}#{filter[:field]}", request.params["#{filter_prefixes[:main]}#{filter[:field]}"], class: 'form-control', placeholder: filter[:label]) %>

data/lib/easy_filter/model_additions.rb

@@ -1,6 +1,11 @@
 module EasyFilter
   # Define methods for ActiveRecord
   module ModelAdditions
+    # 'easy_filter' for ActiveRecor models to filter result based on a filter hash
+    # or HTTP parameters.
+    #
+    # @params [Hash] filter parameters hash
+    # @prefixes [Hash] filter parameter prefixes mainly for prefixing HTML input elements
     def easy_filter(params, prefixes = { main: 'filter_',
                                          from: 'from_',
                                          to: 'to_',
@@ -18,7 +23,9 @@ module EasyFilter
       params[prefixes[:sort]] ||= 'id'
       params[prefixes[:direction]] ||= 'desc'
 
-      sort_column = column_names.include?(params[prefixes[:sort]]) ? params[prefixes[:sort]] : 'id'
+      sort_column = add_model params[prefixes[:sort]]
+      # TODO included model fields not in 'column_names'. Somehow need to check if given column name valid
+      # sort_column = column_names.include?(params[prefixes[:sort]]) ? params[prefixes[:sort]] : add_model('id')
       sort_direction = %w(asc desc).include?(params[prefixes[:direction]]) ? params[prefixes[:direction]] : 'desc'
 
       filter.order("#{sort_column} #{sort_direction}")
@@ -28,16 +35,16 @@ module EasyFilter
 
     def add_where(filter, field, value, prefixes)
       if field.start_with?(prefixes[:from])
-        filter.where("#{del_prefix(field, prefixes[:from])} >= ?", value)
+        filter.where("#{add_model(del_prefix(field, prefixes[:from]))} >= ?", value)
 
       elsif field.start_with?(prefixes[:to])
-        filter.where("#{del_prefix(field, prefixes[:to])} <= ?", value)
+        filter.where("#{add_model(del_prefix(field, prefixes[:to]))} <= ?", value)
 
       elsif field.start_with?(prefixes[:exact])
-        filter.where("#{del_prefix(field, prefixes[:exact])} = ?", value)
+        filter.where("#{add_model(del_prefix(field, prefixes[:exact]))} = ?", value)
 
       else
-        filter.where("#{field} like ?", "%#{value}%")
+        filter.where("#{add_model(field)} like ?", "%#{value}%")
       end
     end
 
@@ -45,5 +52,10 @@ module EasyFilter
       return name.gsub(prefix, '').to_s if name.start_with?(prefix)
       name
     end
+
+    def add_model(field)
+      return self.quoted_table_name + '.' + field unless field.include? '.'
+      field
+    end
   end
 end

data/lib/easy_filter/version.rb

@@ -1,4 +1,4 @@
 # EasyFilter version number
 module EasyFilter
-  VERSION = '0.0.4'
+  VERSION = '0.1.0'
 end

data/lib/easy_filter/view_helpers.rb

@@ -17,53 +17,55 @@ module EasyFilter
       form = render_easy 'form_open', prefixes, model_class
 
       filters.each do |filter|
-        col_name, col_type = determine_column filter, model_class
-        form += render_easy 'form_field_open', prefixes, model_class
+        f = determine_column filter, model_class
+        form += render_easy 'form_field_open', prefixes
 
-        case col_type
+        case f[:col_type]
         when :datetime
-          form += render_easy 'field_datetime', prefixes, model_class, col_name
+          form += render_easy 'field_datetime', prefixes, f
 
         when :array
-          form += render_easy 'field_array', prefixes, model_class, col_name, filter[1]
+          form += render_easy 'field_array', prefixes, f
 
         else
-          form += render_easy 'field_text', prefixes, model_class, col_name
+          form += render_easy 'field_text', prefixes, f
         end
 
-        form += render_easy 'form_field_close', prefixes, model_class
+        form += render_easy 'form_field_close', prefixes
       end
 
-      form += render_easy 'buttons', prefixes, model_class
-      form += render_easy 'form_close', prefixes, model_class
+      form += render_easy 'buttons', prefixes
+      form += render_easy 'form_close', prefixes
     end
 
     private
 
     def determine_column(filter, model_class)
-      col_name = filter if filter.is_a?(Symbol) || filter.is_a?(String)
-      col_name = filter[0] if filter.is_a? Array
+      filter = {field: filter.to_s} if filter.is_a?(Symbol) || filter.is_a?(String)
+      p "debug:"
+      p filter[:field]
+      filter[:field] = filter[:field].to_s
 
-      col_type = nil
-      if filter.is_a? Array
-        col_type = :array
+      filter[:label] ||= t("activerecord.attributes.#{model_class.name.downcase}.#{filter[:field]}")
+
+      unless filter[:items].nil?
+        filter[:col_type] = :array
       else
         model_class.columns.each do |column|
-          if column.name == col_name.to_s
-            col_type = column.type
+          if column.name == filter[:field]
+            filter[:col_type] = column.type
             break
           end
         end
       end
-      [col_name, col_type]
+
+      filter
     end
 
-    def render_easy(name, prefixes, model_class, col_name = nil, elements = nil)
+    def render_easy(name, prefixes, filter = nil)
       render partial: "easy_filter/#{name}",
              locals: { filter_prefixes: prefixes,
-                       filter_model_class: model_class,
-                       filter_col_name: col_name,
-                       elements: elements }
+                       filter: filter }
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_filter
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Peter Kepes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-09 00:00:00.000000000 Z
+date: 2014-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler