active_filter 0.0.3 → 0.0.4

data/lib/active_filter/base.rb

@@ -5,14 +5,9 @@ module ActiveFilter
   class Base
     attr_reader :fields
 
-    def initialize(scope=nil, data={})
-      if scope.is_a?(Hash)
-        @scope = nil
-        @data = scope
-      else
-        @scope = scope
-        @data = data
-      end
+    def initialize(data, scope=nil)
+      @data = data
+      @scope = scope
 
       @fields = []
       self.class._model.columns.each do |column|
@@ -109,16 +104,19 @@ module ActiveFilter
 
     def to_scope
       scope = _scoped
+      matched = false
 
       @fields.each do |field|
         # フィールド名でフィルタする
         name = field.name
         if @data.include?(name)
           converted_value = field.convert_value(@data[name])
-          scope = field.filter(scope, converted_value, "extract")
+          scope = field.filter(scope, converted_value, "exact")
+          matched = true
         elsif @data.include?(name.to_sym)
           converted_value = field.convert_value(@data[name.to_sym])
-          scope = field.filter(scope, converted_value, "extract")
+          scope = field.filter(scope, converted_value, "exact")
+          matched = true
         end
 
         # lookup_type でフィルタする
@@ -128,13 +126,21 @@ module ActiveFilter
           if @data.include?(lookup)
             converted_value = field.convert_value(@data[lookup])
             scope = field.filter(scope, converted_value, lookup_type)
+            matched = true
           elsif @data.include?(lookup.to_sym)
             converted_value = field.convert_value(@data[lookup.to_sym])
             scope = field.filter(scope, converted_value, lookup_type)
+            matched = true
           end
         end
       end
 
+      # ユーザーの入力がフィルタにかからなかった場合は
+      # 該当無しにする
+      unless matched
+        scope = scope.where("1 = 2")
+      end
+
       scope
     end
   end

data/lib/active_filter/field.rb

@@ -14,29 +14,40 @@ module ActiveFilter
     end
 
     def lookup_type
-      "extract"
+      "exact"
     end
 
     def filter(scope, value, lookup_type)
       case lookup_type
-      when "extract"
+      when "exact"
         return scope.where("#{@name} = ?", value)
+      when "contains"
+        return scope.where("#{@name} LIKE ?", "%#{value}%")
       when "gt"
         return scope.where("#{@name} > ?", value)
       when "lt"
         return scope.where("#{@name} < ?", value)
+      when "gte"
+        return scope.where("#{@name} >= ?", value)
+      when "lte"
+        return scope.where("#{@name} <= ?", value)
       else
         raise ArgumentError.new("#{lookup_type} is not supported.")
       end
     end
   end
 
-  class StringField < Field;end
-  class TextField < Field;end
+  class StringField < Field
+    def lookup_type
+      ["exact", "contains"]
+    end
+  end
+
+  class TextField < StringField;end
 
   class IntegerField < Field
     def lookup_type
-      ["extract", "gt", "lt"]
+      ["exact", "gt", "lt", "gte", "lte"]
     end
 
     def convert_value(value)
@@ -54,7 +65,7 @@ module ActiveFilter
 
   class DateTimeField < Field
     def lookup_type
-      ["extract", "gt", "lt"]
+      ["exact", "gt", "lt", "gte", "lte"]
     end
 
     def convert_value(value)

data/lib/active_filter/version.rb

@@ -1,3 +1,3 @@
 module ActiveFilter
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_filter
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-06 00:00:00.000000000 Z
+date: 2013-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -124,7 +124,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3354574353873881808
+      hash: -52441896280290827
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3354574353873881808
+      hash: -52441896280290827
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24