active_filter 0.0.5 → 0.0.6

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/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,8 +1,7 @@
-# coding: utf-8
-require "active_filter/version"
-require "active_filter/filter"
-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

@@ -1,5 +1,14 @@
 # coding: utf-8
 require "active_filter/filter"
+require "active_filter/filter/string_filter"
+require "active_filter/filter/text_filter"
+require "active_filter/filter/integer_filter"
+require "active_filter/filter/float_filter"
+require "active_filter/filter/decimal_filter"
+require "active_filter/filter/boolean_filter"
+require "active_filter/filter/date_time_filter"
+require "active_filter/filter/date_filter"
+require "active_filter/filter/time_filter"
 
 module ActiveFilter
   class Base
@@ -11,19 +20,19 @@ module ActiveFilter
       @data = data
       @scope = scope
 
-      columns = self.class._model.columns
-      
+      columns = self.model.columns
+
       # fields で指定した列だけをフィルタ可能にする
-      fields = self.class._fields
+      fields = self.class.__send__(:_fields)
       unless fields.empty?
         columns = columns.select { |column|
           fields.include?(column.name) ||
             fields.include?(column.name.to_sym)
         }
       end
-      
+
       # exclude で指定した列を除外する
-      excludes = self.class._exclude
+      excludes = self.class.__send__(:_exclude)
       unless excludes.empty?
         columns = columns.reject { |column|
           fields.include?(column.name) ||
@@ -36,91 +45,52 @@ module ActiveFilter
       }
     end
 
-    def self._fields #:nodoc:
-      @fields ||= []
-    end
-
-    def self._model #:nodoc:
-      @model
-    end
-
-    def self._exclude #:nodoc:
-      @excludes ||= []
-    end
+    module ClassMethods
+      # フィルタを作成する対象のモデルを指定します。
+      def 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._orders #:nodoc:
-      @orders ||= []
-    end
+      def fields(*names)
+        # Class クラスのインスタンスである ActiveFilter::Base オブジェクトの
+        # インスタンス変数にフィールド名を格納
+        @fields = names
+      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)
-      else
-        raise ArgumentError.new("#{column.type} is not supported.")
+      def exclude(*names)
+        @excludes = names
       end
-    end
-    private :_create_filter_from_column
 
-    # コンストラクタで受け取ったスコープまたは
-    # model.scoped を返す
-    def _scoped
-      if @scope.nil?
-        self.class._model.scoped
-      else
-        @scope
+      def order(*names)
+        @orders = names
       end
-    end
-    private :_scoped
 
-    # フィルタを作成する対象のモデルを指定します。
-    def self.model(klass)
-      # Class クラスのインスタンスである ActiveFilter::Base オブジェクトの
-      # インスタンス変数にモデルの型を格納
-      unless klass.ancestors.include?(ActiveRecord::Base)
-        raise ArgumentError.new("klass required inherit ActiveRecord::Base")
+      private
+      def _model
+        @model
       end
-      @model = klass
-    end
 
-    def self.fields(*names)
-      # Class クラスのインスタンスである ActiveFilter::Base オブジェクトの
-      # インスタンス変数にフィールド名を格納
-      @fields = names
-    end
+      def _fields
+        @fields ||= []
+      end
 
-    def self.exclude(*names)
-      @excludes = names
-    end
+      def _exclude
+        @excludes ||= []
+      end
 
-    def self.order(*names)
-      @orders = names
+      def _orders
+        @orders ||= []
+      end
     end
+    extend ClassMethods
 
     def model
-      self.class._model
+      self.class.__send__(:_model)
     end
 
     def each(&block)
@@ -135,19 +105,6 @@ module ActiveFilter
       self
     end
 
-    def _lookups_from_filter(filter)
-      lookups = { filter.name => "exact" }
-
-      lookup_types = [filter.lookup_type].flatten
-      lookup_types.each do |lookup_type|
-        lookup = "#{filter.name}__#{lookup_type}"
-        lookups[lookup] = lookup_type
-      end
-
-      lookups
-    end
-    private :_lookups_from_filter
-
     def to_scope
       scope = _scoped
       matched = false
@@ -173,12 +130,71 @@ module ActiveFilter
         scope = scope.where("1 = 2")
       end
 
-      self.class._orders.each do |order|
+      self.class.__send__(:_orders).each do |order|
         scope = scope.order(order.to_s)
       end
 
       scope
     end
+
+    private
+    # コンストラクタで受け取ったスコープまたは
+    # model.scoped を返す
+    def _scoped
+      if @scope.nil?
+        if ActiveRecord::VERSION::STRING < '4.0'
+          self.model.scoped
+        else
+          # Rails 4 以上のとき
+          self.model.all
+        end
+      else
+        @scope
+      end
+    end
+
+    def _lookups_from_filter(filter)
+      lookups = { filter.name => "exact" }
+
+      lookup_types = [filter.lookup_type].flatten
+      lookup_types.each do |lookup_type|
+        lookup = "#{filter.name}__#{lookup_type}"
+        lookups[lookup] = lookup_type
+      end
+
+      lookups
+    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)
+      else
+        raise ArgumentError.new("#{column.type} is not supported.")
+      end
+    end
   end
 end
 

data/lib/active_filter/filter.rb

@@ -36,69 +36,5 @@ module ActiveFilter
       end
     end
   end
-
-  class StringFilter < Filter
-    def lookup_type
-      ["exact", "contains"]
-    end
-  end
-
-  class TextFilter < StringFilter;end
-
-  class IntegerFilter < Filter
-    def lookup_type
-      ["exact", "gt", "lt", "gte", "lte"]
-    end
-
-    def convert_value(value)
-      value.to_i
-    end
-  end
-
-  class FloatFilter < IntegerFilter
-    def convert_value(value)
-      value.to_f
-    end
-  end
-
-  class DecimalFilter < IntegerFilter;end
-
-  class DateTimeFilter < Filter
-    def lookup_type
-      ["exact", "gt", "lt", "gte", "lte"]
-    end
-
-    def convert_value(value)
-      value.to_datetime
-    end
-  end
-
-  class DateFilter < DateTimeFilter
-    def convert_value(value)
-      value.to_date
-    end
-  end
-
-  class TimeFilter < DateTimeFilter
-    def convert_value(value)
-      value.to_time
-    end
-  end
-
-  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/boolean_filter.rb

@@ -0,0 +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
+

data/lib/active_filter/filter/date_filter.rb

@@ -0,0 +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
+

data/lib/active_filter/filter/date_time_filter.rb

@@ -0,0 +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
+

data/lib/active_filter/filter/decimal_filter.rb

@@ -0,0 +1,8 @@
+# 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

@@ -0,0 +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
+

data/lib/active_filter/filter/integer_filter.rb

@@ -0,0 +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
+

data/lib/active_filter/filter/string_filter.rb

@@ -0,0 +1,11 @@
+# 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

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

data/lib/active_filter/filter/time_filter.rb

@@ -0,0 +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
+

data/lib/active_filter/version.rb

@@ -1,3 +1,3 @@
-module ActiveFilter
-  VERSION = "0.0.5"
-end
+module ActiveFilter
+  VERSION = "0.0.6"
+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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_filter
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-16 00:00:00.000000000 Z
+date: 2013-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -100,6 +100,15 @@ extra_rdoc_files: []
 files:
 - lib/active_filter/base.rb
 - lib/active_filter/engine.rb
+- lib/active_filter/filter/boolean_filter.rb
+- lib/active_filter/filter/date_filter.rb
+- lib/active_filter/filter/date_time_filter.rb
+- lib/active_filter/filter/decimal_filter.rb
+- lib/active_filter/filter/float_filter.rb
+- lib/active_filter/filter/integer_filter.rb
+- lib/active_filter/filter/string_filter.rb
+- lib/active_filter/filter/text_filter.rb
+- lib/active_filter/filter/time_filter.rb
 - lib/active_filter/filter.rb
 - lib/active_filter/railtie.rb
 - lib/active_filter/version.rb
@@ -124,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3669060738230829906
+      hash: -272579427
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -133,10 +142,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3669060738230829906
+      hash: -272579427
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A rails engine for filtering scope based on user selections.