active_filter 0.0.2 → 0.0.3

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2012 YOURNAME
+Copyright 2012 tnakamura
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/active_filter/base.rb

@@ -1,55 +1,93 @@
 # coding: utf-8
-require "active_filter/rule"
+require "active_filter/field"
 
 module ActiveFilter
   class Base
-    def initialize(params={})
-      @params = params
+    attr_reader :fields
+
+    def initialize(scope=nil, data={})
+      if scope.is_a?(Hash)
+        @scope = nil
+        @data = scope
+      else
+        @scope = scope
+        @data = data
+      end
+
+      @fields = []
+      self.class._model.columns.each do |column|
+        if self.class._field_names.include?(column.name) ||
+          self.class._field_names.include?(column.name.to_sym)
+          @fields << _create_field_from_column(column)
+        end
+      end
     end
 
     private
-    def self._rules
-      # Class クラスのインスタンスである ActiveFilter::Base オブジェクトの
-      # インスタンス変数にルールを格納
-      @rules ||= []
+    def self._field_names
+      @field_names ||= []
     end
 
     def self._model
-      # Class クラスのインスタンスである ActiveFilter::Base オブジェクトの
-      # インスタンス変数にモデルの型を格納
       @model
     end
 
-    protected
-    def self.model(klass)
-      @model = klass
+    def _create_field_from_column(column)
+      case column.type
+      when :primary_key
+        return Field.new(column.name)
+      when :string
+        return StringField.new(column.name)
+      when :text
+        return TextField.new(column.name)
+      when :integer
+        return IntegerField.new(column.name)
+      when :float
+        return FloatField.new(column.name)
+      when :decimal
+        return DecimalField.new(column.name)
+      when :datetime
+        return DateTimeField.new(column.name)
+      when :timestamp
+        return Field.new(column.name)
+      when :time
+        return TimeField.new(column.name)
+      when :date
+        return DateField.new(column.name)
+      when :binary
+        return Field.new(column.name)
+      when :boolean
+        return BooleanField.new(column.name)
+      else
+        raise ArgumentError.new("#{column.type} is not supported.")
+      end
     end
 
-    def self.rule(pattern, lmbda=nil, &block)
-      if lmbda.nil?
-        if block_given?
-          callback = block
-        else
-          # ラムダ式またはブロックのどちらか必須
-          raise ArgumentError, "lambda or block are required!"
-        end
+    # コンストラクタで受け取ったスコープまたは
+    # model.scoped を返す
+    def _scoped
+      if @scope.nil?
+        self.class._model.scoped
       else
-        callback = lmbda 
+        @scope
       end
-
-      _rules << ActiveFilter::Rule.new(pattern, &callback)
     end
 
-    def self.field(name)
-      self.rule "^#{name}$" do |scope, value|
-        scope.where(name => value)
+    protected
+    # フィルタを作成する対象のモデルを指定します。
+    def self.model(klass)
+      # Class クラスのインスタンスである ActiveFilter::Base オブジェクトの
+      # インスタンス変数にモデルの型を格納
+      unless klass.ancestors.include?(ActiveRecord::Base)
+        raise ArgumentError.new("klass required inherit ActiveRecord::Base")
       end
+      @model = klass
     end
 
     def self.fields(*names)
-      names.each do |name|
-        self.field(name)
-      end
+      # Class クラスのインスタンスである ActiveFilter::Base オブジェクトの
+      # インスタンス変数にフィールド名を格納
+      @field_names = names
     end
 
     public
@@ -57,10 +95,6 @@ module ActiveFilter
       self.class._model
     end
 
-    def rules
-      self.class._rules
-    end
-
     def each(&block)
       scope = self.to_scope
       unless block_given?
@@ -74,14 +108,33 @@ module ActiveFilter
     end
 
     def to_scope
-      scope = self.model.scoped
-      @params.each do |key, value|
-        # 最初にマッチしたルールを適用する
-        rule = self.rules.find { |r| r.match?(key) }
-        if rule
-          scope = rule.filter(scope, value)
+      scope = _scoped
+
+      @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")
+        elsif @data.include?(name.to_sym)
+          converted_value = field.convert_value(@data[name.to_sym])
+          scope = field.filter(scope, converted_value, "extract")
+        end
+
+        # lookup_type でフィルタする
+        lookup_types = [field.lookup_type].flatten
+        lookup_types.each do |lookup_type|
+          lookup = "#{name}__#{lookup_type}"
+          if @data.include?(lookup)
+            converted_value = field.convert_value(@data[lookup])
+            scope = field.filter(scope, converted_value, lookup_type)
+          elsif @data.include?(lookup.to_sym)
+            converted_value = field.convert_value(@data[lookup.to_sym])
+            scope = field.filter(scope, converted_value, lookup_type)
+          end
         end
       end
+
       scope
     end
   end

data/lib/active_filter/engine.rb

@@ -1,5 +1,8 @@
 #coding: utf-8
 module ActiveFilter #:nodoc:
   class Engine < ::Rails::Engine #:nodoc:
+    config.generators do |g|
+      g.test_framework :rspec, :view_specs => false
+    end
   end
 end

data/lib/active_filter/field.rb

@@ -0,0 +1,93 @@
+# coding: utf-8
+require "active_support"
+
+module ActiveFilter
+  class Field
+    attr_reader :name
+
+    def initialize(name)
+      @name = name.to_s
+    end
+
+    def convert_value(value)
+      value
+    end
+
+    def lookup_type
+      "extract"
+    end
+
+    def filter(scope, value, lookup_type)
+      case lookup_type
+      when "extract"
+        return scope.where("#{@name} = ?", value)
+      when "gt"
+        return scope.where("#{@name} > ?", value)
+      when "lt"
+        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 IntegerField < Field
+    def lookup_type
+      ["extract", "gt", "lt"]
+    end
+
+    def convert_value(value)
+      value.to_i
+    end
+  end
+
+  class FloatField < IntegerField
+    def convert_value(value)
+      value.to_f
+    end
+  end
+
+  class DecimalField < IntegerField;end
+
+  class DateTimeField < Field
+    def lookup_type
+      ["extract", "gt", "lt"]
+    end
+
+    def convert_value(value)
+      value.to_datetime
+    end
+  end
+
+  class DateField < DateTimeField
+    def convert_value(value)
+      value.to_date
+    end
+  end
+
+  class TimeField < DateTimeField
+    def convert_value(value)
+      value.to_time
+    end
+  end
+
+  class BooleanField < Field
+    def convert_value(value)
+      compare_value = value.is_a?(String) ? value.downcase : value
+      case compare_value
+      when "no", "false", false, "0", 0
+        false
+      when "yes", "true", true, "1", 1
+        true
+      when nil
+        false
+      else
+        !!compare_value
+      end
+    end
+  end
+end
+

data/lib/active_filter/version.rb

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

data/lib/active_filter.rb

@@ -1,6 +1,6 @@
 # coding: utf-8
 require "active_filter/version"
-require "active_filter/rule"
+require "active_filter/field"
 require "active_filter/base"
 
 module ActiveFilter

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_filter
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2013-01-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ActiveFilter is a Rails engine for allowing users to filter scope dynamically.
 email:
 - griefworker@gmail.com
@@ -68,8 +100,8 @@ extra_rdoc_files: []
 files:
 - lib/active_filter/base.rb
 - lib/active_filter/engine.rb
+- lib/active_filter/field.rb
 - lib/active_filter/railtie.rb
-- lib/active_filter/rule.rb
 - lib/active_filter/version.rb
 - lib/active_filter.rb
 - lib/generators/active_filter/filter_generator.rb
@@ -92,7 +124,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3925253136135546622
+      hash: -3354574353873881808
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -101,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3925253136135546622
+      hash: -3354574353873881808
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/lib/active_filter/rule.rb

@@ -1,23 +0,0 @@
-# coding: utf-8
-
-module ActiveFilter
-  class Rule
-    attr_reader :pattern
-
-    def initialize(pattern, &block)
-      @pattern = pattern
-      @block = block
-    end
-
-    def match?(value)
-      @regexp ||= Regexp.new(@pattern)
-      matched = (@regexp =~ value.to_s)
-      !matched.nil?
-    end
-
-    def filter(scope, value)
-      @block.call(scope, value)
-    end
-  end
-end
-