active_filter 0.0.6 → 0.0.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: dc53bd1d410478d79ed8099e4cd540a94c5f1930
+  data.tar.gz: 9cf04de26c134385a2499f52e2fe61fee24afd7c
+SHA512:
+  metadata.gz: 487c29b7cbb266e4d9ffc1b52811a02c45b3f0c401aa1e475a3378f03c81b4ae761ae127186c1ca6c8f0a7f9d7d02fb46630fde2802393b3b76e86f139d3b635
+  data.tar.gz: 3166120e57c3bd6a0726218e9dfc4c66d3460fb939378908d44568ec886616aaeb03ad353d296c76c9dcd66040f4472e6ad7f596a71a7d6f1d1ba08354e2e903

data/MIT-LICENSE

@@ -1,20 +1,20 @@
-Copyright 2012 tnakamura
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright 2012 tnakamura
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,4 +1,4 @@
-# ActiveFilter
+# ActiveFilter [![Build Status](https://travis-ci.org/tnakamura/active_filter.png?branch=master)](https://travis-ci.org/tnakamura/active_filter) [![Code Climate](https://codeclimate.com/github/tnakamura/active_filter.png)](https://codeclimate.com/github/tnakamura/active_filter) [![Dependency Status](https://gemnasium.com/tnakamura/active_filter.png)](https://gemnasium.com/tnakamura/active_filter) [![Coverage Status](https://coveralls.io/repos/tnakamura/active_filter/badge.png?branch=master)](https://coveralls.io/r/tnakamura/active_filter)
 
 ActiveFilter is a Rails engine for allowing users to filter scope dynamically.
 
@@ -34,7 +34,10 @@ And then in your controller you could do:
 ```ruby
 class BlogsController < ApplicationController
   def index
-    @filter = BlogFilter.new(params)
+    @filter = BlogFilter.new({
+      title: "foo",
+      description__exact: "bar",
+    })
     @blogs = @filter.to_scope
   end
 end

data/Rakefile

@@ -1,27 +1,27 @@
-#!/usr/bin/env rake
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'ActiveFilter'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-
-
-
-Bundler::GemHelper.install_tasks
-
+#!/usr/bin/env rake
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+begin
+  require 'rdoc/task'
+rescue LoadError
+  require 'rdoc/rdoc'
+  require 'rake/rdoctask'
+  RDoc::Task = Rake::RDocTask
+end
+
+RDoc::Task.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'ActiveFilter'
+  rdoc.options << '--line-numbers'
+  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+
+
+
+Bundler::GemHelper.install_tasks
+

data/lib/active_filter.rb

@@ -1,7 +1,7 @@
-# coding: utf-8
-require "active_filter/version"
-require "active_filter/base"
-
-module ActiveFilter
-  # Your code goes here...
-end
+# coding: utf-8
+require "active_filter/version"
+require "active_filter/base"
+
+module ActiveFilter
+  # Your code goes here...
+end

data/lib/active_filter/base.rb

@@ -12,6 +12,21 @@ require "active_filter/filter/time_filter"
 
 module ActiveFilter
   class Base
+    TYPE_FILTER_MAP = {
+      primary_key: Filter,
+      string: StringFilter,
+      text: TextFilter,
+      integer: IntegerFilter,
+      float:  FloatFilter,
+      decimal:  DecimalFilter,
+      datetime: DateTimeFilter,
+      timestamp: Filter,
+      time: TimeFilter,
+      date: DateFilter,
+      binary: Filter,
+      boolean: BooleanFilter,
+    }
+
     include ::Enumerable
 
     attr_reader :filters
@@ -19,26 +34,15 @@ module ActiveFilter
     def initialize(data, scope=nil)
       @data = data
       @scope = scope
-
       columns = self.model.columns
 
       # fields で指定した列だけをフィルタ可能にする
       fields = self.class.__send__(:_fields)
-      unless fields.empty?
-        columns = columns.select { |column|
-          fields.include?(column.name) ||
-            fields.include?(column.name.to_sym)
-        }
-      end
+      columns = _select_columns(columns, fields) unless fields.empty?
 
       # exclude で指定した列を除外する
       excludes = self.class.__send__(:_exclude)
-      unless excludes.empty?
-        columns = columns.reject { |column|
-          fields.include?(column.name) ||
-            fields.include?(column.name.to_sym)
-        }
-      end
+      columns = _reject_columns(columns, excludes) unless excludes.empty?
 
       @filters = columns.map { |column|
         _create_filter_from_column(column)
@@ -138,6 +142,21 @@ module ActiveFilter
     end
 
     private
+
+    def _select_columns(columns, fields)
+      columns.select { |column|
+        fields.include?(column.name) ||
+          fields.include?(column.name.to_sym)
+      }
+    end
+
+    def _reject_columns(columns, fields)
+      columns.reject { |column|
+        fields.include?(column.name) ||
+          fields.include?(column.name.to_sym)
+      }
+    end
+
     # コンストラクタで受け取ったスコープまたは
     # model.scoped を返す
     def _scoped
@@ -166,31 +185,8 @@ module ActiveFilter
     end
 
     def _create_filter_from_column(column)
-      case column.type
-      when :primary_key
-        return Filter.new(column.name)
-      when :string
-        return StringFilter.new(column.name)
-      when :text
-        return TextFilter.new(column.name)
-      when :integer
-        return IntegerFilter.new(column.name)
-      when :float
-        return FloatFilter.new(column.name)
-      when :decimal
-        return DecimalFilter.new(column.name)
-      when :datetime
-        return DateTimeFilter.new(column.name)
-      when :timestamp
-        return Filter.new(column.name)
-      when :time
-        return TimeFilter.new(column.name)
-      when :date
-        return DateFilter.new(column.name)
-      when :binary
-        return Filter.new(column.name)
-      when :boolean
-        return BooleanFilter.new(column.name)
+      if TYPE_FILTER_MAP.include?(column.type)
+        TYPE_FILTER_MAP[column.type].new(column.name)
       else
         raise ArgumentError.new("#{column.type} is not supported.")
       end

data/lib/active_filter/filter.rb

@@ -31,6 +31,10 @@ module ActiveFilter
         return scope.where("#{@name} >= ?", value)
       when "lte"
         return scope.where("#{@name} <= ?", value)
+      when "startswith"
+        return scope.where("#{@name} LIKE ?", "#{value}%")
+      when "endswith"
+        return scope.where("#{@name} LIKE ?", "%#{value}")
       else
         raise ArgumentError.new("#{lookup_type} is not supported.")
       end

data/lib/active_filter/filter/boolean_filter.rb

@@ -1,21 +1,21 @@
-# coding: utf-8
-require "active_filter/filter"
-
-module ActiveFilter
-  class BooleanFilter < Filter
-    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
-
+# coding: utf-8
+require "active_filter/filter"
+
+module ActiveFilter
+  class BooleanFilter < Filter
+    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/filter/date_filter.rb

@@ -1,12 +1,12 @@
-# coding: utf-8
-require "active_support"
-require "active_filter/filter/date_time_filter"
-
-module ActiveFilter
-  class DateFilter < DateTimeFilter
-    def convert_value(value)
-      value.to_date
-    end
-  end
-end
-
+# coding: utf-8
+require "active_support"
+require "active_filter/filter/date_time_filter"
+
+module ActiveFilter
+  class DateFilter < DateTimeFilter
+    def convert_value(value)
+      value.to_date
+    end
+  end
+end
+

data/lib/active_filter/filter/date_time_filter.rb

@@ -1,16 +1,16 @@
-# coding: utf-8
-require "active_support"
-require "active_filter/filter"
-
-module ActiveFilter
-  class DateTimeFilter < Filter
-    def lookup_type
-      ["exact", "gt", "lt", "gte", "lte"]
-    end
-
-    def convert_value(value)
-      value.to_datetime
-    end
-  end
-end
-
+# coding: utf-8
+require "active_support"
+require "active_filter/filter"
+
+module ActiveFilter
+  class DateTimeFilter < Filter
+    def lookup_type
+      ["exact", "gt", "lt", "gte", "lte"]
+    end
+
+    def convert_value(value)
+      value.to_datetime
+    end
+  end
+end
+

data/lib/active_filter/filter/decimal_filter.rb

@@ -1,8 +1,8 @@
-# coding: utf-8
-require "active_support"
-require "active_filter/filter/integer_filter"
-
-module ActiveFilter
-  class DecimalFilter < IntegerFilter;end
-end
-
+# coding: utf-8
+require "active_support"
+require "active_filter/filter/integer_filter"
+
+module ActiveFilter
+  class DecimalFilter < IntegerFilter;end
+end
+

data/lib/active_filter/filter/float_filter.rb

@@ -1,11 +1,11 @@
-# coding: utf-8
-require "active_filter/filter/integer_filter"
-
-module ActiveFilter
-  class FloatFilter < IntegerFilter
-    def convert_value(value)
-      value.to_f
-    end
-  end
-end
-
+# coding: utf-8
+require "active_filter/filter/integer_filter"
+
+module ActiveFilter
+  class FloatFilter < IntegerFilter
+    def convert_value(value)
+      value.to_f
+    end
+  end
+end
+

data/lib/active_filter/filter/integer_filter.rb

@@ -1,15 +1,15 @@
-# coding: utf-8
-require "active_filter/filter"
-
-module ActiveFilter
-  class IntegerFilter < Filter
-    def lookup_type
-      ["exact", "gt", "lt", "gte", "lte"]
-    end
-
-    def convert_value(value)
-      value.to_i
-    end
-  end
-end
-
+# coding: utf-8
+require "active_filter/filter"
+
+module ActiveFilter
+  class IntegerFilter < Filter
+    def lookup_type
+      ["exact", "gt", "lt", "gte", "lte"]
+    end
+
+    def convert_value(value)
+      value.to_i
+    end
+  end
+end
+

data/lib/active_filter/filter/string_filter.rb

@@ -1,11 +1,11 @@
-# coding: utf-8
-require "active_filter/filter"
-
-module ActiveFilter
-  class StringFilter < Filter
-    def lookup_type
-      ["exact", "contains"]
-    end
-  end
-end
-
+# coding: utf-8
+require "active_filter/filter"
+
+module ActiveFilter
+  class StringFilter < Filter
+    def lookup_type
+      ["exact", "contains"]
+    end
+  end
+end
+

data/lib/active_filter/filter/text_filter.rb

@@ -1,7 +1,7 @@
-# coding: utf-8
-require "active_filter/filter/string_filter"
-
-module ActiveFilter
-  class TextFilter < StringFilter;end
-end
-
+# coding: utf-8
+require "active_filter/filter/string_filter"
+
+module ActiveFilter
+  class TextFilter < StringFilter;end
+end
+

data/lib/active_filter/filter/time_filter.rb

@@ -1,12 +1,12 @@
-# coding: utf-8
-require "active_support"
-require "active_filter/filter/date_time_filter"
-
-module ActiveFilter
-  class TimeFilter < DateTimeFilter
-    def convert_value(value)
-      value.to_time
-    end
-  end
-end
-
+# coding: utf-8
+require "active_support"
+require "active_filter/filter/date_time_filter"
+
+module ActiveFilter
+  class TimeFilter < DateTimeFilter
+    def convert_value(value)
+      value.to_time
+    end
+  end
+end
+

data/lib/active_filter/version.rb

@@ -1,3 +1,3 @@
-module ActiveFilter
-  VERSION = "0.0.6"
-end
+module ActiveFilter
+  VERSION = "0.0.7"
+end

data/lib/generators/active_filter/filter_generator.rb

@@ -1,15 +1,15 @@
-# coding: utf-8
-module ActiveFilter
-  module Generators
-    class FilterGenerator < ::Rails::Generators::NamedBase
-      source_root File.expand_path("../templates", __FILE__)
-
-      argument :attributes, :type => :array, :default => [], :banner => "field field"
-
-      def create_filter_file
-        template "filter.rb", "app/filters/#{file_name}_filter.rb"
-      end
-    end
-  end
-end
-
+# coding: utf-8
+module ActiveFilter
+  module Generators
+    class FilterGenerator < ::Rails::Generators::NamedBase
+      source_root File.expand_path("../templates", __FILE__)
+
+      argument :attributes, :type => :array, :default => [], :banner => "field field"
+
+      def create_filter_file
+        template "filter.rb", "app/filters/#{file_name}_filter.rb"
+      end
+    end
+  end
+end
+

data/lib/tasks/active_filter_tasks.rake

@@ -1,4 +1,4 @@
-# desc "Explaining what the task does"
-# task :active_filter do
-#   # Task goes here
-# end
+# desc "Explaining what the task does"
+# task :active_filter do
+#   # Task goes here
+# end

metadata

@@ -1,94 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: active_filter
 version: !ruby/object:Gem::Version
-  version: 0.0.6
-  prerelease: 
+  version: 0.0.7
 platform: ruby
 authors:
 - tnakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-14 00:00:00.000000000 Z
+date: 2013-08-11 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: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    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'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   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'
 - !ruby/object:Gem::Dependency
   name: rspec
   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'
 - !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
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: factory_girl_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    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.
@@ -121,32 +152,25 @@ files:
 - README.md
 homepage: https://github.com/tnakamura/active_filter
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -272579427
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -272579427
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A rails engine for filtering scope based on user selections.
 test_files: []