will_filter 3.1.6 → 3.1.7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    will_filter (3.1.6)
+    will_filter (3.1.7)
       coffee-script
       kaminari
       rails (>= 3.1.0)

data/app/controllers/will_filter/filter_controller.rb

@@ -70,7 +70,7 @@ module WillFilter
       
       wf_filter = WillFilter::Filter.deserialize_from_params(params)
       wf_filter.validate!
-      
+
       unless wf_filter.errors?
         wf_filter.save
       end

data/app/models/will_filter/filter.rb

@@ -458,8 +458,12 @@ module WillFilter
       if params[:wf_submitted] == 'true'
         validate!
       end
+
+      if WillFilter::Config.user_filters_enabled? and WillFilter::Config.current_user
+        self.user_id = WillFilter::Config.current_user.id
+      end
   
-      return self
+      self
     end
     
     #############################################################################
@@ -515,6 +519,7 @@ module WillFilter
           0.upto(size - 1) do |index|
             condition = condition_at(index)
             next if custom_condition?(condition)
+            next unless condition.container
 
             sql_condition = condition.container.sql_condition
             
@@ -574,6 +579,24 @@ module WillFilter
     #############################################################################
     # Saved Filters 
     #############################################################################
+
+    def user_filters
+      @user_filters ||= begin
+        conditions = ["model_class_name = ?", self.model_class_name]
+
+        if WillFilter::Config.user_filters_enabled?
+          conditions[0] << " and user_id = ? "
+          if WillFilter::Config.current_user and WillFilter::Config.current_user.id
+            conditions << WillFilter::Config.current_user.id
+          else
+            conditions << "0"
+          end
+        end
+  
+        WillFilter::Filter.find(:all, :conditions => conditions)
+      end
+    end
+
     def saved_filters(include_default = true)
       @saved_filters ||= begin
         filters = []
@@ -585,26 +608,8 @@ module WillFilter
           end
         end
   
-        if include_default
-          conditions = ["type = ? and model_class_name = ?", self.class.name, self.model_class_name]
-        else
-          conditions = ["model_class_name = ?", self.model_class_name]
-        end
-  
-        if WillFilter::Config.user_filters_enabled?
-          conditions[0] << " and user_id = ? "
-          if WillFilter::Config.current_user and WillFilter::Config.current_user.id
-            conditions << WillFilter::Config.current_user.id
-          else
-            conditions << "0"
-          end
-        end
-  
-        user_filters = WillFilter::Filter.find(:all, :conditions => conditions)
-        
-        if user_filters.size > 0
+        if user_filters.any?
           filters << ["Select saved filter", "-2"] if include_default
-          
           user_filters.each do |filter|
             filters << [filter.name, filter.id.to_s]
           end
@@ -613,7 +618,7 @@ module WillFilter
         filters
       end
     end
-    
+
     #############################################################################
     # overload this method if you don't want to allow empty filters
     #############################################################################

data/app/views/will_filter/filter/_conditions_header.html.erb

@@ -23,9 +23,9 @@
   <% if wf_filter.show_save_options? %>
     <div class="end">
       <%=link_to_function("<span>Save As New...</span>".html_safe, "wfFilter.saveFilter()", :class => "wf_grey_button wf_pcb") %>
-      <% if params[:wf_id] %>
-      <%=link_to_function("<span>Update</span>".html_safe, "wfFilter.updateFilter()", :class => "wf_grey_button wf_pcb") %>
-      <%=link_to_function("<span>Delete</span>".html_safe, "wfFilter.deleteFilter()", :class => "wf_grey_button wf_pcb") %>
+      <% if wf_filter.id %>
+        <%=link_to_function("<span>Update</span>".html_safe, "wfFilter.updateFilter()", :class => "wf_grey_button wf_pcb") %>
+        <%=link_to_function("<span>Delete</span>".html_safe, "wfFilter.deleteFilter()", :class => "wf_grey_button wf_pcb") %>
       <% end %>
     </div>
   <% end %>

data/lib/will_filter/containers/date_time_range.rb

@@ -39,9 +39,9 @@ module WillFilter
     
       def validate
         return "Start value must be provided" if start_value.blank?
-        return "Start value must be a valid date/time (2008-01-01 14:30:00)" if start_time.nil?
+        return "Start value must be a valid date/time (2008-01-01 14:30:00)" if time(start_value).nil?
         return "End value must be provided" if end_value.blank?
-        return "End value must be a valid date/time (2008-01-01 14:30:00)" if end_time.nil?
+        return "End value must be a valid date/time (2008-01-01 14:30:00)" if time(end_value).nil?
       end
     
       def sql_condition

data/lib/will_filter/containers/filter_list.rb

@@ -35,23 +35,35 @@ module WillFilter
       def template_name
         'list'
       end
+
+      def linked_filter
+        @linked_filter ||= begin
+          if condition.key == :id
+            model_class_name = filter.model_class_name
+          else
+            model_class_name = condition.key.to_s[0..-4].camelcase
+          end
+          WillFilter::Filter.new(model_class_name)
+        end
+      end
     
       def options
-        if condition.key == :id
-          model_class_name = filter.model_class_name
-        else
-          model_class_name = condition.key.to_s[0..-4].camelcase
-        end
-        
-        WillFilter::Filter.new(model_class_name).saved_filters(false)
+        linked_filter.saved_filters(false)
       end
     
       def sql_condition
         return nil unless operator == :is_filtered_by
-        sub_filter = WillFilter::Filter.find_by_id(value)
+        sub_filter = WillFilter::Filter.find_by_id(value) || linked_filter.user_filters.first
+        return [""] unless sub_filter
+
         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}) "
+
+        if sub_conds[0].blank?
+          sub_conds[0] = " #{condition.full_key} IN (SELECT #{sub_filter.table_name}.id FROM #{sub_filter.table_name}) "
+        else
+          sub_conds[0] = " #{condition.full_key} IN (SELECT #{sub_filter.table_name}.id FROM #{sub_filter.table_name} WHERE #{sub_conds[0]}) "
+        end  
+
         sub_conds
       end
     end

data/lib/will_filter/extensions/action_controller_extension.rb

@@ -37,7 +37,7 @@ module WillFilter
         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}")
+          raise WillFilter::FilterException.new("will_filter cannot be initialized because #{WillFilter::Config.current_user_method} failed with: #{ex.message}")
         end
 
         WillFilter::Config.init(wf_current_user)

data/lib/will_filter/version.rb

@@ -22,5 +22,5 @@
 #++
 
 module WillFilter
-  VERSION = "3.1.6"
+  VERSION = "3.1.7"
 end

data/test/dummy/app/controllers/application_controller.rb

@@ -2,7 +2,12 @@ class ApplicationController < ActionController::Base
   protect_from_forgery
   
   def current_user
-    @current_user ||= User.new
+  	# for testing purposes we just create a user and store it in the db
+    @current_user ||= begin
+    	u = User.find_by_id(session[:user_id]) || User.create(:first_name =>"Michael")
+    	session[:user_id] = u.id
+    	u
+    end
   end
   
 end

data/test/dummy/config/will_filter/config.yml

@@ -19,7 +19,7 @@ defaults: &defaults
     
   save_options: 
     enabled:              true
-    user_filters_enabled: false   # if set to true, the filters will be private
+    user_filters_enabled: true   # if set to true, the filters will be private
     user_class_name:      User 
     current_user_method:  current_user 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: will_filter
 version: !ruby/object:Gem::Version
-  version: 3.1.6
+  version: 3.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-06 00:00:00.000000000Z
+date: 2012-04-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2164951700 !ruby/object:Gem::Requirement
+  requirement: &2152943440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2164951700
+  version_requirements: *2152943440
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &2164948000 !ruby/object:Gem::Requirement
+  requirement: &2152940860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164948000
+  version_requirements: *2152940860
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &2164944880 !ruby/object:Gem::Requirement
+  requirement: &2152939700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164944880
+  version_requirements: *2152939700
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &2164941460 !ruby/object:Gem::Requirement
+  requirement: &2152938280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164941460
+  version_requirements: *2152938280
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2164936460 !ruby/object:Gem::Requirement
+  requirement: &2152936520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2164936460
+  version_requirements: *2152936520
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2164935220 !ruby/object:Gem::Requirement
+  requirement: &2152934600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164935220
+  version_requirements: *2152934600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2164933660 !ruby/object:Gem::Requirement
+  requirement: &2152932580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164933660
+  version_requirements: *2152932580
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2164931900 !ruby/object:Gem::Requirement
+  requirement: &2152931400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164931900
+  version_requirements: *2152931400
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &2164861240 !ruby/object:Gem::Requirement
+  requirement: &2152916760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164861240
+  version_requirements: *2152916760
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2164859840 !ruby/object:Gem::Requirement
+  requirement: &2152913860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164859840
+  version_requirements: *2152913860
 - !ruby/object:Gem::Dependency
   name: steak
-  requirement: &2164858760 !ruby/object:Gem::Requirement
+  requirement: &2152912020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164858760
+  version_requirements: *2152912020
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2164857640 !ruby/object:Gem::Requirement
+  requirement: &2152909700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164857640
+  version_requirements: *2152909700
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &2164856120 !ruby/object:Gem::Requirement
+  requirement: &2152897720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164856120
+  version_requirements: *2152897720
 description: will_filter is a powerful customizable framework for filtering active_record
   models.
 email:
@@ -188,7 +188,6 @@ files:
 - app/assets/stylesheets/will_filter/exporter.css.scss
 - app/assets/stylesheets/will_filter/filter.css.scss
 - app/assets/stylesheets/will_filter/results.css.scss
-- app/controllers/will_filter/application_controller.rb
 - app/controllers/will_filter/calendar_controller.rb
 - app/controllers/will_filter/exporter_controller.rb
 - app/controllers/will_filter/filter_controller.rb
@@ -363,7 +362,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -509527631151697114
+      hash: 3132715724976267421
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -372,7 +371,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -509527631151697114
+      hash: 3132715724976267421
 requirements: []
 rubyforge_project: will_filter
 rubygems_version: 1.8.11

data/app/controllers/will_filter/application_controller.rb

@@ -1,27 +0,0 @@
-#--
-# Copyright (c) 2010-2012 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 ApplicationController < ActionController::Base
-  end
-end