scoped_search 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af5bbaee1bcd8c43d9a31e7facd1cbb132b6de4c
-  data.tar.gz: 3f7bbad05696d74941c0f878b5c9aea2f87ad242
+  metadata.gz: 43261f39db1d9b12979b0a8ac09d325b89c31335
+  data.tar.gz: 65f7f0cf411208478aee6aa9c7bb11d13036bd88
 SHA512:
-  metadata.gz: 1057f7ecafc42146520d82c06ccb045854df6b941b68ffadfae12177888b12582dd79f8ca0d2087a6e22b610545755b77be3e20fa77a7b98ba79bad04f3571b0
-  data.tar.gz: 8a6795724808b89895fe7eaa90d99fd7f3aef5e5afefd8a178ba6ca70d1a6f2ded74585a56d12af7c841eeb2c76d037af7e980ad9df75005a2561ef2c37715aa
+  metadata.gz: 96ec7c114d8d6cde7413eb1a3247540f181694acbaba09044d6d97a65405a87f44f55101b6c868108e8502254762a8a689290038f63ba743c2f67948f5a288ff
+  data.tar.gz: 26dc0c35c2547547af5759ba31128dce71784f93f70cecdff67c1cf5c108c81504f827a382249f7e076050fc2ede54ea5330bf1b10cf2fe3993de378466f64f6

data/.travis.yml

@@ -1,5 +1,6 @@
 
 language: ruby
+cache: bundler
 
 sudo: false
 

data/README.rdoc

@@ -1,6 +1,6 @@
 = Scoped search {<img src="https://secure.travis-ci.org/wvanbergen/scoped_search.png" />}[http://travis-ci.org/wvanbergen/scoped_search]
 
-The <b>scoped_search</b> Rails plugin makes it easy to search your ActiveRecord
+The <b>scoped_search</b> gem makes it easy to search your ActiveRecord
 models. Searching is performed using a query string, which should be passed to
 the named_scope <tt>search_for</tt>. Based on a definition in what fields to
 look, it will build query conditions and return those as a named scope.
@@ -27,7 +27,7 @@ Add the following line in your Gemfile, and run <tt>bundle install</tt>:
 Scoped search requires you to define the fields you want to search in:
 
   class User < ActiveRecord::Base
-    scoped_search :on => [:first_name, :last_name]
+    scoped_search on: [:first_name, :last_name]
   end
 
 For more information about options and using fields from relations, see the
@@ -44,12 +44,12 @@ The result is returned as <tt>named_scope</tt>. Because of this, you can
 actually chain the call with other scopes, or with will_paginate. An example:
 
   class Project < ActiveRecord::Base
-    searchable_on :name, :description
-    named_scope :public, :conditions => {:public => true }
+    scoped_search on: [:name, :description]
+    named_scope :public, conditions: { public: true }
   end
 
   # using chained named_scopes and will_paginate in your controller
-  Project.public.search_for(params[:q]).paginate(:page => params[:page], :include => :tasks)
+  Project.public.search_for(params[:q]).paginate(page: params[:page], include: :tasks)
 
 === Search profiles
 
@@ -57,8 +57,8 @@ If you include a :profile option to the scoped_search call, the fields specified
 be searched when you include this :profile into the search_for command as well:
 
   class User < ActiveRecord::Base
-    scoped_search :on => :public_information
-    scoped_search :on => :private_information, :profile => :members
+    scoped_search on: :public_information
+    scoped_search on: :private_information, profile: :members
   end
 
 This will only search the :public_information column:
@@ -67,7 +67,7 @@ This will only search the :public_information column:
 
 And this will only search the :private_information column:
 
-  User.search_for('blah blah blah', :profile => :members)
+  User.search_for('blah blah blah', profile: :members)
 
 === More information
 

data/lib/scoped_search/definition.rb

@@ -222,8 +222,8 @@ module ScopedSearch
     def parse_temporal(value)
       return Date.current if value =~ /\btoday\b/i
       return 1.day.ago.to_date if value =~ /\byesterday\b/i
-      return (eval(value.strip.gsub(/\s+/,'.').downcase)).to_datetime if value =~ /\A\s*\d+\s+\bhours?|minutes?\b\s+\bago\b\s*\z/i
-      return (eval(value.strip.gsub(/\s+/,'.').downcase)).to_date if value =~ /\A\s*\d+\s+\b(days?|weeks?|months?|years?)\b\s+\bago\b\s*\z/i
+      return (eval($1.strip.gsub(/\s+/,'.').downcase)).to_datetime if value =~ /\A\s*(\d+\s+\b(?:hours?|minutes?)\b\s+\bago)\b\s*\z/i
+      return (eval($1.strip.gsub(/\s+/,'.').downcase)).to_date     if value =~ /\A\s*(\d+\s+\b(?:days?|weeks?|months?|years?)\b\s+\bago)\b\s*\z/i
       DateTime.parse(value, true) rescue nil
     end
 

data/lib/scoped_search/version.rb

@@ -1,3 +1,3 @@
 module ScopedSearch
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scoped_search
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Amos Benari
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-21 00:00:00.000000000 Z
+date: 2014-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord