will_filter 3.0.5 → 3.1.1

data/db/migrate/20110924023807_create_will_filter_filters.rb

@@ -0,0 +1,15 @@
+class CreateWillFilterFilters < ActiveRecord::Migration
+  def change
+    create_table :will_filter_filters do |t|
+      t.string      :type
+      t.string      :name
+      t.text        :data
+      t.integer     :user_id
+      t.string      :model_class_name
+      
+      t.timestamps
+    end
+    
+    add_index :will_filter_filters, [:user_id]
+  end
+end

data/lib/generators/will_filter/templates/config.yml

@@ -10,34 +10,6 @@
 #############################################################################
 
 defaults: &defaults
-
-  ###########################################################################
-  # 
-  # require_filter_extension makes the filter into an abstract class
-  # and will require you to subclass it in order for the filter to be 
-  # serializeable. The following will no longer work:
-  #
-  # @users = User.filter(:params => params) 
-  #
-  # Use your own filter class instead:
-  # 
-  # @users = User.filter(:params => params, :filter => UserFilter) 
-  # 
-  # In the subclass you must provide the model name to be filtered by overloading:
-  #
-  #  def model_class
-  #    User     
-  #  end
-  # 
-  ###########################################################################
-
-  require_filter_extensions: false   
-  
-  ###########################################################################
-  # If you would like to see some JavaScript effects
-  # provide your own effects class and implement required methods
-  ###########################################################################
-
   effects_options:
     enabled:              false
     script_path:          "/will_filter/javascripts/will_filter_prototype_effects.js"

data/lib/generators/will_filter/templates/create_will_filter_filters.rb

@@ -0,0 +1,15 @@
+class CreateWillFilterFilters < ActiveRecord::Migration
+  def change
+    create_table :will_filter_filters do |t|
+      t.string      :type
+      t.string      :name
+      t.text        :data
+      t.integer     :user_id
+      t.string      :model_class_name
+      
+      t.timestamps
+    end
+    
+    add_index :will_filter_filters, [:user_id]
+  end
+end

data/lib/generators/will_filter/will_filter_generator.rb

@@ -1,9 +1,32 @@
+#--
+# Copyright (c) 2010-2011 Michael Berkovich
+#
+# 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.
+#++
+
 require 'rails/generators'
 require 'rails/generators/migration'
 
 class WillFilterGenerator < Rails::Generators::Base
   include Rails::Generators::Migration
-
+  
   def self.source_root
     @source_root ||= File.expand_path('../templates', __FILE__)
   end
@@ -18,7 +41,7 @@ class WillFilterGenerator < Rails::Generators::Base
   end
 
   def create_migration_file
-    migration_template 'create_will_filter_tables.rb', 'db/migrate/create_will_filter_tables.rb'
+    migration_template 'create_will_filter_filters.rb', 'db/migrate/create_will_filter_filters.rb'
     copy_file 'config.yml', 'config/will_filter/config.yml'
-  end
-end
+  end      
+end

data/lib/tasks/will_filter_tasks.rake

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -26,7 +26,6 @@ namespace :will_filter do
   desc "Sync extra files from will_filter plugin."
   task :sync do
     system "rsync -ruv vendor/plugins/will_filter/config/wf ./config"
-    system "rsync -ruv vendor/plugins/will_filter/db/migrate ./db"
   end
   
 end

data/lib/will_filter.rb

@@ -1,3 +1,28 @@
+#--
+# Copyright (c) 2010-2011 Michael Berkovich
+#
+# 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.
+#++
+
+require File.join(File.dirname(__FILE__), 'will_filter/railtie')
+require File.join(File.dirname(__FILE__), 'will_filter/engine')
+
 module WillFilter
-  require 'will_filter/engine' if defined?(Rails) && Rails::VERSION::MAJOR == 3
 end

data/lib/will_filter/calendar.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/will_filter/config.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -23,7 +23,6 @@
 
 module WillFilter
   class Config
-    
     def self.init(site_current_user)
       Thread.current[:current_user] = site_current_user
     end
@@ -45,10 +44,6 @@ module WillFilter
       @config ||= load_yml("/config/will_filter/config.yml")
     end
   
-    def self.require_filter_extensions?
-      config[:require_filter_extensions]
-    end
-  
     def self.effects_options
       config[:effects_options]
     end

data/lib/will_filter/containers/filter_list.rb

@@ -43,12 +43,12 @@ module WillFilter
           model_class_name = condition.key.to_s[0..-4].camelcase
         end
         
-        Wf::Filter.new(model_class_name).saved_filters(false)
+        WillFilter::Filter.new(model_class_name).saved_filters(false)
       end
     
       def sql_condition
         return nil unless operator == :is_filtered_by
-        sub_filter = Wf::Filter.find_by_id(value)
+        sub_filter = WillFilter::Filter.find_by_id(value)
         sub_conds = sub_filter.sql_conditions
         sub_sql = "SELECT #{sub_filter.table_name}.id FROM #{sub_filter.table_name} WHERE #{sub_conds[0]}"
         sub_conds[0] = " #{condition.full_key} IN (#{sub_sql}) "

data/lib/will_filter/engine.rb

@@ -1,22 +1,28 @@
-require "will_filter" # Require all the real code
-require "rails"
+#--
+# Copyright (c) 2010-2011 Michael Berkovich
+#
+# 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.
+#++
 
 module WillFilter
   class Engine < Rails::Engine
-    [
-     "../../lib/core_ext/**",
-     "../../lib/will_filter",
-     "../../lib/will_filter/containers"
-    ].each do |dir|
-        Dir[File.expand_path("#{File.dirname(__FILE__)}/#{dir}/*.rb")].sort.each do |file|
-          require(file)
-        end
-    end
-    require(File.expand_path("#{File.dirname(__FILE__)}/../../lib/application_helper.rb"))
-
-    initializer "static assets" do |app|
-      # app.middleware.use ActionDispatch::Static, "#{root}/public" # Old way, does not work in production
-      app.middleware.insert_after ActionDispatch::Static, ActionDispatch::Static, "#{root}/public"
-    end
+    isolate_namespace WillFilter
   end
 end

data/lib/will_filter/{common_methods.rb → extensions/action_controller_extension.rb}

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -22,28 +22,26 @@
 #++
 
 module WillFilter
-  module CommonMethods
-  
+  module ActionControllerExtension
     def self.included(base)
-      if 'ApplicationController' == base.name
-        base.append_before_filter :init_will_filter
-      end
+      base.send(:include, InstanceMethods) 
+      base.before_filter :init_will_filter
     end
-  
-    def init_will_filter
-      # only if the filters need to be  
-      return unless WillFilter::Config.user_filters_enabled?
-      
-      wf_current_user = nil
-      begin
-        wf_current_user = eval(WillFilter::Config.current_user_method)
-      rescue Exception => ex
-        raise WillFilter::Exception.new("will_filter cannot be initialized because #{WillFilter::Config.current_user_method} failed with: #{ex.message}")
+
+    module InstanceMethods
+      def init_will_filter
+        # only if the filters need to be  
+        return unless WillFilter::Config.user_filters_enabled?
+
+        wf_current_user = nil
+        begin
+          wf_current_user = eval(WillFilter::Config.current_user_method)
+        rescue Exception => ex
+          raise WillFilter::Exception.new("will_filter cannot be initialized because #{WillFilter::Config.current_user_method} failed with: #{ex.message}")
+        end
+
+        WillFilter::Config.init(wf_current_user)
       end
-      
-      WillFilter::Config.init(wf_current_user)
     end
-    
   end
 end
-

data/lib/will_filter/extensions/action_view_extension.rb

@@ -0,0 +1,50 @@
+#--
+# Copyright (c) 2010-2011 Michael Berkovich
+#
+# 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.
+#++
+
+module WillFilter
+  module ActionViewExtension
+    extend ActiveSupport::Concern
+    module InstanceMethods
+       def will_filter_tag(results, opts = {})
+         render(:partial => "/will_filter/filter/container", :locals => {:wf_filter => results.wf_filter, :opts => opts})
+       end
+
+       def will_filter_scripts_tag(opts = {})
+         render(:partial => "/will_filter/common/scripts", :locals => {:opts => opts})
+       end
+
+       def will_filter_table_tag(results, opts = {})
+         filter = results.wf_filter
+         opts[:columns] ||= filter.model_column_keys
+         render(:partial => "/will_filter/common/results_table", :locals => {:results => results, :filter => filter, :opts => opts})
+       end
+
+       def will_filter_actions_bar_tag(results, actions, opts = {})
+         filter = results.wf_filter
+         opts[:class] ||= "wf_actions_bar_blue"
+         opts[:style] ||= ""
+         render(:partial => "/will_filter/common/actions_bar", :locals => {:results => results, :filter => filter, :actions => actions, :opts => opts})
+       end    
+    end
+  end
+end

data/lib/{core_ext/active_record/base.rb → will_filter/extensions/active_record_extension.rb}

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -21,24 +21,29 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-class ActiveRecord::Base
-  def self.filter(opts = {})
-    if 'ActiveRecord::Base' == self.to_s
-      raise WillFilter::FilterException.new("Cannot apply filter to the ActiveRecord::Base object")
-    end
+module WillFilter
+  module ActiveRecordExtension
+    extend ActiveSupport::Concern
+    module ClassMethods
+      def filter(opts = {})
+        if ActiveRecord::Base == self.class
+          raise WillFilter::FilterException.new("Cannot apply filter to the ActiveRecord::Base object")
+        end
+
+        params = opts[:params] || {}
+
+        if opts[:filter]
+          case opts[:filter].class.name
+            when "String" then filter_class = opts[:filter].constantize
+            when "Symbol" then filter_class = opts[:filter].to_s.camelcase.constantize
+            else filter_class = opts[:filter]
+          end
+        else
+          filter_class = WillFilter::Filter
+        end
 
-    params = opts[:params] || {}
-    
-    if opts[:filter]
-      case opts[:filter].class.name
-        when "String" then filter_class = opts[:filter].constantize
-        when "Symbol" then filter_class = opts[:filter].to_s.camelcase.constantize
-        else filter_class = opts[:filter]
+        filter_class.new(self).deserialize_from_params(params).results
       end
-    else
-      filter_class = WillFilter::Filter
     end
-  
-    filter_class.new(self).deserialize_from_params(params).results
   end
 end

data/lib/{core_ext/array.rb → will_filter/extensions/array_extension.rb}

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/{application_helper.rb → will_filter/railtie.rb}

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2011 Michael Berkovich
+# Copyright (c) 2010-2011 Michael Berkovich
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -21,25 +21,35 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-module ApplicationHelper
-  def will_filter(results)
-    render(:partial => "/will_filter/filter/container", :locals => {:wf_filter => results.wf_filter})
-  end
+require 'rails'
+require 'pp'
 
-  def will_filter_scripts_tag
-    render(:partial => "/will_filter/common/scripts")
-  end
-  
-  def will_filter_table_tag(results, opts = {})
-    filter = results.wf_filter
-    opts[:columns] ||= filter.model_column_keys
-    render(:partial => "/will_filter/common/results_table", :locals => {:results => results, :filter => filter, :opts => opts})
-  end
+[
+ ".",
+ "./containers"
+].each do |dir|
+    Dir[File.expand_path("#{File.dirname(__FILE__)}/#{dir}/*.rb")].sort.each do |file|
+      require(file)
+    end
+end
+
+require File.join(File.dirname(__FILE__), 'extensions/array_extension')
+require File.join(File.dirname(__FILE__), 'extensions/action_view_extension')
+require File.join(File.dirname(__FILE__), 'extensions/active_record_extension')
+require File.join(File.dirname(__FILE__), 'extensions/action_controller_extension')
 
-  def will_filter_actions_bar_tag(results, actions, opts = {})
-    filter = results.wf_filter
-    opts[:class] ||= "wf_actions_bar_blue"
-    opts[:style] ||= ""
-    render(:partial => "/will_filter/common/actions_bar", :locals => {:results => results, :filter => filter, :actions => actions, :opts => opts})
+module WillFilter
+  class Railtie < ::Rails::Railtie #:nodoc:
+    initializer 'will_filter' do |app|
+      ActiveSupport.on_load(:active_record) do
+        ::ActiveRecord::Base.send :include, WillFilter::ActiveRecordExtension
+      end
+      ActiveSupport.on_load(:action_view) do
+        ::ActionView::Base.send :include, WillFilter::ActionViewExtension
+      end
+      ActiveSupport.on_load(:action_controller) do
+        include WillFilter::ActionControllerExtension
+      end      
+    end
   end
-end
+end