searchify 0.0.1 → 0.0.2

data/README.md

@@ -57,6 +57,14 @@ Searchify can also be used in a form. For example, let's say that a post belongs
 
 Searchify will include a `user_id` field in your form, which will be automatically populated.
 
+#### Scopes
+
+Searchify is scopes aware. Let's say you are here:
+
+`/posts?created_by=3`
+
+Assuming your `Post` model responds to the `created_by` method, it will be included in the search.
+
 #### Search stategies
 
 By default, Searchify does a case insensitive search on `name`, `title` and `abbreviation` fields of your models, if they exist. You can of course specify

data/app/controllers/searchify/searchify_controller.rb

@@ -1,5 +1,5 @@
 module Searchify
-  class SearchifyController < ActionController::Base
+  class SearchifyController < ::ApplicationController
 
     respond_to :js
 
@@ -14,16 +14,14 @@ module Searchify
       search_term     = params[:term]
       search_keyword  = extract_search_key(resource_class)
 
-      scopes = params.except("controller", "action", "format", "collection", "term", "page")
-
       collection = if resource_class.respond_to?(:search_strategy)
-        resource_class.search_strategy(search_term, scopes)
+        resource_class.search_strategy(search_term, current_scopes)
       else
         columns = DEFAULT_COLUMNS & resource_class.column_names
 
         scoped = resource_class.where( columns.map{ |c| "(#{c} #{search_keyword} :term)" }.join(' OR '), :term => "%#{search_term}%")
 
-        scopes.each do |key, value|
+        searchify_scopes.each do |key, value|
           scoped = scoped.send(key, value) if resource_class.respond_to?(key)
         end
 

data/app/helpers/searchify/searchify_helper.rb

@@ -4,9 +4,9 @@ module Searchify
       options = args.extract_options!
 
       collection  = options[:collection] || args.shift || extract_collection
-      search_url  = options[:search_url] || extract_search_url(collection)
+      search_url  = options[:search_url] || extract_search_url(collection, searchify_scopes)
       select_url  = options[:select_url] || extract_select_url
-
+      
       text_field_tag(:searchify, nil, :class => :searchify, :data => {:'select-url' => select_url, :'search-url' => search_url})
     end
 
@@ -20,8 +20,8 @@ module Searchify
       end
     end
 
-    def extract_search_url(collection)
-      "/searchify/search/#{collection}.json"
+    def extract_search_url(collection, scopes)
+      "/searchify/search/#{collection}.json?" + scopes.map{ |k,v| "#{k}=#{v}" }.join('&')
     end
 
     def extract_select_url

data/lib/searchify.rb

@@ -1,3 +1,4 @@
+require "searchify/controller"
 require "searchify/engine"
 
 module Searchify

data/lib/searchify/controller.rb

@@ -0,0 +1,17 @@
+module Searchify
+  module Controller
+    SCOPE_EXCLUSION = %w( controller action format collection term page )
+
+    def self.included(base)
+      base.class_eval do
+        include InstanceMethods
+      end
+    end
+
+    module InstanceMethods
+      def searchify_scopes
+        params.except(*SCOPE_EXCLUSION)
+      end
+    end
+  end
+end

data/lib/searchify/engine.rb

@@ -3,6 +3,8 @@ module Searchify
     isolate_namespace Searchify
 
     initializer "extend Controller with Searchify helpers" do |app|
+      ActionController::Base.send :include, Searchify::Controller
+      ActionController::Base.helper_method :searchify_scopes
       ActionController::Base.helper Searchify::SearchifyHelper
     end
   end

data/lib/searchify/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: searchify
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &14660900 !ruby/object:Gem::Requirement
+  requirement: &21309620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *14660900
+  version_requirements: *21309620
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &14660380 !ruby/object:Gem::Requirement
+  requirement: &21309180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14660380
+  version_requirements: *21309180
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &14659500 !ruby/object:Gem::Requirement
+  requirement: &21308660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14659500
+  version_requirements: *21308660
 description: Searchify provides a quick way to search your collections.
 email:
 - christ.blais@gmail.com
@@ -53,12 +53,11 @@ extra_rdoc_files: []
 files:
 - app/helpers/searchify/searchify_helper.rb
 - app/controllers/searchify/searchify_controller.rb
-- app/views/searchify/searchify/search.html.erb
-- app/views/layouts/searchify/application.html.erb
 - app/assets/javascripts/searchify/searchify.js.coffee
 - config/routes.rb
 - lib/searchify/version.rb
 - lib/searchify/engine.rb
+- lib/searchify/controller.rb
 - lib/searchify.rb
 - lib/tasks/searchify_tasks.rake
 - MIT-LICENSE

data/app/views/layouts/searchify/application.html.erb

@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Searchify</title>
-  <%= stylesheet_link_tag    "searchify/application" %>
-  <%= javascript_include_tag "searchify/application" %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>

data/app/views/searchify/searchify/search.html.erb

@@ -1,2 +0,0 @@
-<h1>Searchify#search</h1>
-<p>Find me in app/views/searchify/searchify/search.html.erb</p>