mundane-search 0.0.1 → 0.0.2

data/lib/mundane-search/filters.rb

@@ -1,12 +1,11 @@
 module MundaneSearch
   module Filters
-  end
-end
 
-require_relative 'filters/helpers'
-require_relative 'filters/base'
-require_relative 'filters/typical'
-require_relative 'filters/exact_match'
-require_relative 'filters/blank_params_are_nil'
-require_relative 'filters/attribute_match'
+    # autoload all the stuff in filters under this namespace
+    Dir.glob("#{File.dirname(__FILE__)}/filters/*.rb").each do |filename|
+      class_name = File.basename(filename, '.*').split('_').collect(&:capitalize).join.to_sym
+      autoload class_name, filename
+    end
 
+  end
+end

data/lib/mundane-search/filters/attribute_match.rb

@@ -1,14 +1,13 @@
 module MundaneSearch::Filters
   class AttributeMatch < Typical
-    def filtered_collection
-      case collection
-      when ActiveRecord::Relation
+    class ActiveRecord < self
+      def filtered_collection
         collection.where(param_key => params[param_key.to_s])
-      when :sunspot?
-        # nothing yet
-      else
-        collection.select {|e| e.send(param_key) == params[param_key.to_s] }
       end
     end
+
+    def filtered_collection
+      collection.select {|e| e.send(param_key) == params[param_key.to_s] }
+    end
   end
 end

data/lib/mundane-search/filters/attribute_substring.rb

@@ -0,0 +1,14 @@
+module MundaneSearch::Filters
+  class AttributeSubstring < Typical
+    class ActiveRecord < self
+      def filtered_collection
+        # collection.where(param_key => params[param_key.to_s])
+        collection.where(["#{target} LIKE ?", "%#{params[param_key.to_s]}%"])
+      end
+    end
+
+    def filtered_collection
+      collection.select {|e| e.send(target).index(params[param_key.to_s]) }
+    end
+  end
+end

data/lib/mundane-search/filters/base.rb

@@ -1,6 +1,5 @@
 module MundaneSearch::Filters
   class Base
-    include Helpers
     attr_reader :collection, :params, :options
     def initialize(collection, params = {}, options= {})
       @collection, @params, @options = collection, params, options
@@ -19,7 +18,11 @@ module MundaneSearch::Filters
     end
 
     def call
-      [filtered_collection, filtered_params]
+      if apply?
+        [filtered_collection, filtered_params]
+      else
+        [collection, params]
+      end
     end
   end
 end

data/lib/mundane-search/filters/blank_params_are_nil.rb

@@ -3,7 +3,7 @@ module MundaneSearch::Filters
     def filtered_params
       params.inject({}) do |hash,e|
         val = e.last
-        hash[e.first] = (val.nil? || val.empty?) ? nil : val
+        hash[e.first] = val.empty? ? nil : val
         hash
       end
     end

data/lib/mundane-search/filters/operator.rb

@@ -0,0 +1,18 @@
+module MundaneSearch::Filters
+  class Operator < Typical
+    class ActiveRecord < self
+      def filtered_collection
+        collection.where(["#{target} #{operator} ?", params[param_key.to_s]])
+      end
+    end
+
+    def filtered_collection
+      collection.select {|e| e.send(target).send(operator, params[param_key.to_s]) }
+    end
+
+    def operator
+      options[:operator]
+    end
+
+  end
+end

data/lib/mundane-search/filters/shortcuts.rb

@@ -0,0 +1,33 @@
+require 'active_support/inflector'
+
+module MundaneSearch
+  module Filters
+    module Shortcuts
+      def employ(shortcut, options = {}, &block)
+        filter_name, default_options = filter_for(shortcut)
+        filter = "#{filter_name}".safe_constantize
+        raise "No filter found for #{shortcut}" unless filter
+        [options].flatten.each do |opts|
+          use filter, default_options.merge(opts), &block
+        end
+      end
+
+      private
+
+      # Use symbols to avoid loading all shortcutted filters.
+      def filter_for(shortcut)
+        {
+          attribute_filter: [:"MundaneSearch::Filters::AttributeMatch", {}],
+          filter_greater_than: operator_filter(:>),
+          filter_less_than:    operator_filter(:<),
+          filter_greater_than_or_equal_to: operator_filter(:>=),
+          filter_less_than_or_equal_to:    operator_filter(:<=),
+        }[shortcut]
+      end
+
+      def operator_filter(operator)
+        [:"MundaneSearch::Filters::Operator", { operator: operator }]
+      end
+    end
+  end
+end

data/lib/mundane-search/filters/typical.rb

@@ -1,6 +1,31 @@
 module MundaneSearch::Filters
   class Typical < Base
-    has_a_match_value
-    optional_without_match_value
+    def self.param_key_type
+      :string # common default
+    end
+
+    def target
+      options[:target] || param_key
+    end
+
+    def optional?
+      options[:required]
+    end
+
+    def apply?
+      match_value || optional?
+    end
+
+    def param_key
+      options.fetch(:param_key)
+    end
+
+    def match_value
+      params[param_key]
+    end
+
+    def param_key_type
+      options[:type] || :string
+    end
   end
-end
+end

data/lib/mundane-search/initial_stack.rb

@@ -0,0 +1,13 @@
+module MundaneSearch
+  class InitialStack < Stack
+    attr_reader :collection, :params
+    def initialize(collection,params)
+      @collection, @params, @result_class = collection, params
+    end
+
+    def all_results
+      []
+    end
+
+  end
+end

data/lib/mundane-search/railtie.rb

@@ -0,0 +1,7 @@
+module MundaneSearch
+  class Railtie < Rails::Railtie
+    initializer "mundane-search.view_helpers" do
+      ActionView::Base.send :include, ViewHelpers
+    end
+  end
+end

data/lib/mundane-search/result.rb

@@ -1,19 +1,34 @@
+require 'active_model/naming'
+
 module MundaneSearch
   class Result
+    include Buildable
     include Enumerable
-    attr_reader :collection, :params, :previous_result
-    def initialize(previous_result, filter)
-      @previous_result = previous_result
-      @collection, @params = filter.call(previous_result.collection, previous_result.params)
+
+    def self.options
+      @options ||= {}
+    end
+
+    attr_reader :stack
+    def initialize(collection, params)
+      @stack = self.class.builder.result_for(collection,params)
+    end
+
+    def to_model
+      @result_model ||= self.class.result_model_class.new(self)
+    end
+
+    def self.result_model_class
+      @result_model_class ||= ResultModel.model_class_for(self)
     end
 
-    def add_filter(filter)
-      Result.new(self,filter)
+    def to_a
+      stack.collection
     end
 
     def each(*args, &block)
       return enum_for(__callee__) unless block_given?
-      collection.each(*args, &block)
+      to_a.each(*args, &block)
     end
   end
-end
+end

data/lib/mundane-search/result_model.rb

@@ -0,0 +1,65 @@
+require 'active_model/validations'
+require 'active_model/naming'
+require 'active_model/translation'
+
+module MundaneSearch
+  class ResultModel
+    include ColumnsHash
+    include ActiveModel::Validations
+
+    def self.model_class_for(result_class)
+      builder = result_class.builder
+      Class.new(ResultModel) do |model_class|
+        model_class.model_name = result_class.options[:name] || result_class.name
+        builder.filter_canisters.each do |fc|
+          if fc.param_key
+            attribute_column(fc.param_key, fc.param_key_type)
+            define_method(fc.param_key) do
+              send(:result).stack.params[fc.param_key.to_s]
+            end
+          end
+        end
+      end
+    end
+
+    def self.model_name
+      name = 'GenericSearch' unless self.name
+      namespace = nil
+      ForcedSingularRouteKeyName.new(self, namespace, (@model_name || name))
+    end
+
+    # As string, for when ActionView turns a model name into a url.
+    def self.model_name=(name)
+      @model_name = name
+    end
+
+    def initialize(result)
+      @result = result
+    end
+
+    def to_key
+      ['result-of-to-key']
+    end
+
+    def to_model
+      self
+    end
+
+    def persisted?
+      false
+    end
+
+    private
+
+    attr_reader :result
+
+  end
+
+  class ForcedSingularRouteKeyName < ActiveModel::Name
+    def initialize(klass, namespace = nil, name = nil)
+      super(klass, namespace, name)
+      @route_key = (namespace ? ActiveSupport::Inflector.singularize(@param_key) : @singular.dup)
+    end
+  end
+
+end

data/lib/mundane-search/stack.rb

@@ -0,0 +1,38 @@
+module MundaneSearch
+  class Stack
+    def all_filters
+      return @all_filters if @all_filters
+      @all_filters = all_results.collect(&:filter)
+    end
+
+    def all_results
+      [self] + previous_result.all_results
+    end
+
+    def initialize(previous_result, filter_canister)
+      @previous_result, @filter_canister = previous_result, filter_canister
+    end
+
+    def collection
+      filter.call.first
+    end
+
+    # necessary?
+    def params
+      filter.call.last
+    end
+
+    def add(filter_canister)
+      Stack.new(self,filter_canister)
+    end
+
+    def filter
+      @filter ||= filter_canister.build(previous_result.collection, previous_result.params)
+    end
+
+    private
+
+    attr_reader :previous_result, :filter_canister
+
+  end
+end

data/lib/mundane-search/version.rb

@@ -1,3 +1,3 @@
 module MundaneSearch
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/mundane-search/view_helpers.rb

@@ -0,0 +1,24 @@
+module MundaneSearch
+  module ViewHelpers
+    def search_form_for(record, options = {}, &block)
+      # Later!
+      # if block_given?
+      #   form_for(record, search_form_default_options(record).merge(options), &block)
+      # else
+      #   # Auto-generate form
+      # end
+      form_for(record.to_model, search_form_default_options.merge(options), &block)
+    end
+
+    def simple_search_form_for(record, options = {}, &block)
+      # TODO: warn if simple_form not available?
+      simple_form_for(record.to_model, search_form_default_options.merge(options), &block)
+    end
+
+    def search_form_default_options
+      {
+        method: "GET"
+      }
+    end
+  end
+end

data/mundane-search.gemspec

@@ -17,9 +17,16 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
+  gem.add_dependency "activemodel"
+
   gem.add_development_dependency "minitest"
+  gem.add_development_dependency "mocha"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "activerecord"
   gem.add_development_dependency "sqlite3"
   gem.add_development_dependency "database_cleaner"
+  gem.add_development_dependency "actionpack"
+  gem.add_development_dependency "simple_form"
+  gem.add_development_dependency "guard"
+  gem.add_development_dependency "guard-minitest"
 end

data/script/console

@@ -6,6 +6,12 @@ require 'rubygems'
 require 'bundler/setup'
 require 'mundane-search'
 
+require './spec/active_record_setup'
+
+def minitest!
+  require './spec/minitest_helper'
+end
+
 begin
   require 'pry'
   Pry.start

data/spec/active_record_setup.rb

@@ -19,52 +19,9 @@ class Book < ActiveRecord::Base
   # t.integer   :sold
 end
 
-
+require_relative 'demo_data'
 def populate_books!
-  [
-    {
-      title: "A Tale of Two Cities",
-      author: "Charles Dickens",
-      publication_date: Date.parse('31-12-1859'),
-      first_purchased_at: Time.utc(1859,"jan",1,20,15,1),
-      sold: 200_000_000
-    },
-    {
-      title: "The Lord of the Rings",
-      author: "J. R. R. Tolkien",
-      publication_date: Date.parse('31-12-1954'),
-      first_purchased_at: Time.utc(1954,"jan",1,20,15,1),
-      sold: 150_000_000
-    },
-    {
-      title: "The Little Prince (Le Petit Prince)",
-      author: "Antoine de Saint-Exupery",
-      publication_date: Date.parse('31-12-1943'),
-      first_purchased_at: Time.utc(1943,"jan",1,20,15,1),
-      sold: 140_000_000
-    },
-    {
-      title: "The Hobbit",
-      author: "J. R. R. Tolkien",
-      publication_date: Date.parse('31-12-1937'),
-      first_purchased_at: Time.utc(1937,"jan",1,20,15,1),
-      sold: 100_000_000
-    },
-    {
-      title: "Hong lou meng (Dream of the Red Chamber/The Story of the Stone)",
-      author: "Cao Xueqin",
-      publication_date: Date.parse('31-12-1754'),
-      first_purchased_at: Time.utc(1754,"jan",1,20,15,1),
-      sold: 100_000_000
-    },
-    {
-      title: "And Then There Were None",
-      author: "Agatha Christie",
-      publication_date: Date.parse('31-12-1939'),
-      first_purchased_at: Time.utc(1939,"jan",1,20,15,1),
-      sold: 100_000_000
-    }
-  ].each do |book_hash|
+  demo_data.each do |book_hash|
     Book.create(book_hash)
   end
 end