will_filter 3.0.0 → 3.0.1

data/Gemfile

@@ -3,30 +3,4 @@ source 'http://rubygems.org'
 gem 'rails', '~> 3.0.0'
 gem "will_paginate", "~> 3.0.pre2"
 
-# Bundle edge Rails instead:
-# gem 'rails', :git => 'git://github.com/rails/rails.git'
-
 # gem 'sqlite3'
-
-# Use unicorn as the web server
-# gem 'unicorn'
-
-# Deploy with Capistrano
-# gem 'capistrano'
-
-# To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)
-# gem 'ruby-debug'
-# gem 'ruby-debug19', :require => 'ruby-debug'
-
-# Bundle the extra gems:
-# gem 'bj'
-# gem 'nokogiri'
-# gem 'sqlite3-ruby', :require => 'sqlite3'
-# gem 'aws-s3', :require => 'aws/s3'
-
-# Bundle gems for the local environment. Make sure to
-# put test-only gems in this group so their generators
-# and rake tasks are available in development mode:
-# group :development, :test do
-#   gem 'webrat'
-# end

data/Gemfile.lock

@@ -59,6 +59,7 @@ GEM
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.9.1)
+    sqlite3 (1.3.3)
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
@@ -69,5 +70,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  rails (= 3.0.7)
+  rails (~> 3.0.0)
+  sqlite3
   will_paginate (~> 3.0.pre2)

data/README.rdoc

@@ -17,7 +17,7 @@ http://github.com/berk/will_filter_examples
 Add the following gems to your Gemfile: 
 
   gem "will_paginate", "~> 3.0.pre2"
-  gem 'will_filter', "0.1.1" 
+  gem 'will_filter', "~> 3.0.0" 
 
 And run:
 

data/VERSION

@@ -1 +1 @@
-3.0.0
+3.0.1

data/app/views/will_filter/common/_results_table.html.erb

@@ -57,10 +57,11 @@
     <% results.each_with_index do |obj, index| %>
       <tr class='data_row <%=(index % 2 == 0) ? "wf_row_even" : "wf_row_odd"%>'>
         <% opts[:columns].each_with_index do |column, column_index| %>
-          <% 
+          <%
             style = 'padding:3px;'
             if column.is_a?(Array)
               key = column.first
+
               if column.second.is_a?(Proc)
                 value = column.second.call(obj)
               else

data/config/environment.rb

@@ -1,13 +1,15 @@
 # Load the rails application
 require File.expand_path('../application', __FILE__)
 
-["../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
+Rails.configuration.after_initialize do
+  ["../lib",
+   "../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_or_load file
+      end
+  end
 end
 
-# Initialize the rails application
 WillFilter::Application.initialize!

data/lib/will_filter/calendar.rb

@@ -24,8 +24,8 @@
 module WillFilter
   class Calendar
   
-    MONTHS = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']
-    DAYS = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat']
+    MONTHS = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'] unless defined?(MONTHS)
+    DAYS = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat']  unless defined?(DAYS)
     
     def initialize(selected_date = nil, start_date = nil, show_time = false, mode = 'month')
       if selected_date.blank?

data/lib/will_filter/containers/numeric_delimited.rb

@@ -24,7 +24,7 @@
 module WillFilter
   module Containers
     class NumericDelimited < WillFilter::FilterContainer
-      NUMERIC_DELIMITER = ","
+      NUMERIC_DELIMITER = ","   unless defined?(NUMERIC_DELIMITER)
     
       def self.operators
         [:is_in]

data/lib/will_filter/containers/text_delimited.rb

@@ -24,7 +24,7 @@
 module WillFilter
   module Containers
     class TextDelimited < WillFilter::FilterContainer
-      TEXT_DELIMITER = ","
+      TEXT_DELIMITER = ","  unless defined?(TEXT_DELIMITER)
     
       def self.operators
         [:is_in, :is_not_in]

data/lib/will_filter/engine.rb

@@ -3,6 +3,22 @@ require "rails"
 
 module WillFilter
   class Engine < Rails::Engine
+    config.autoload_paths << File.expand_path("../../lib", __FILE__)
+    config.autoload_paths << File.expand_path("../../lib/core_ext/**", __FILE__)
+    config.autoload_paths << File.expand_path("../../lib/will_filter", __FILE__)
+    config.autoload_paths << File.expand_path("../../lib/will_filter/containers", __FILE__)
+    
+    [
+     "../../lib",
+     "../../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
+
     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"

data/lib/will_filter.rb

@@ -1,15 +1,3 @@
 module WillFilter
-  [
-   "core_ext/**",
-   "will_filter",
-   "will_filter/containers",
-   "../app/models/will_filter"
-  ].each do |dir|
-      Dir[File.expand_path("#{File.dirname(__FILE__)}/#{dir}/*.rb")].sort.each do |file|
-        require(file)
-      end
-  end
-
-  require 'application_helper'
-  
+  require 'will_filter/engine' if defined?(Rails) && Rails::VERSION::MAJOR == 3
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: will_filter
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 3
   - 0
-  - 0
-  version: 3.0.0
+  - 1
+  version: 3.0.1
 platform: ruby
 authors: 
 - Michael Berkovich
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-14 00:00:00 -07:00
+date: 2011-06-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency