query_report 0.0.7 → 0.0.8

data/lib/query_report/filter.rb

@@ -1,8 +1,9 @@
 module QueryReport
   class Filter
-    attr_reader :column, :type, :comparators, :block, :custom
+    attr_reader :params, :column, :type, :comparators, :block, :custom
 
-    def initialize(column, options, &block)
+    def initialize(params, column, options, &block)
+      @params = params
       @column = column
       @type = options if options.kind_of? String
       if options.kind_of? Hash
@@ -27,15 +28,25 @@ module QueryReport
       end
     end
 
+    def filter_with_values
+      hash = {}
+      @comparators.each do |key, filter_name|
+        [key, filter_name]
+        param_key = "#{column.to_s}_#{key.to_s}"
+        hash[filter_name] = @params['q'][param_key] || @params['custom_search'][param_key] rescue ''
+      end
+      hash
+    end
+
     private
     def detect_comparators(type)
       case type
         when :date
-          return {gteq: 'From', lteq: 'To'}
+          return {gteq: I18n.t('query_report.filters.from'), lteq: I18n.t('query_report.filters.to')}
         when :text
           return {cont: @column.to_s.humanize}
       end
-      {eq: 'Equal'}
+      {eq: I18n.t('query_report.filters.equal')}
     end
   end
 end

data/lib/query_report/report.rb

@@ -87,7 +87,15 @@ module QueryReport
     end
 
     def filter(column, options, &block)
-      @filters << Filter.new(column, options, &block)
+      @filters << Filter.new(@params, column, options, &block)
+    end
+
+    def filter_with_values
+      hash = {}
+      @filters.each do |filter|
+        hash.merge!(filter.filter_with_values)
+      end
+      hash
     end
 
     def column_chart(title, columns)

data/lib/query_report/version.rb

@@ -1,3 +1,3 @@
 module QueryReport
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: query_report
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-16 00:00:00.000000000 Z
+date: 2013-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ransack