scoped-search 0.4.0 → 0.5.0

data/.gitignore

@@ -1 +1,2 @@
-.bundle
+.bundle
+pkg

data/Gemfile

@@ -2,7 +2,7 @@ source :rubygems
 
 gem "rspec-rails", ">= 2.0.0.beta.17"
 gem 'jeweler'
-gem "rails", ">= 3.0.0.beta4"
+gem "rails", ">= 3.0.0.rc"
 gem "ruby-debug"
 
 gem 'sqlite3-ruby', :require => 'sqlite3'

data/README.textile

@@ -119,6 +119,31 @@ Then in your views, you may use the order_for_scoped_search view helper like thi
       ...
 </pre>
 
+h2. Issue with single Array attribute and multi parameters scopes
+
+When you define a scope, you may define it with a single value that accepts an array, or as a multi parameters scope.
+But I haven't find an easy way yet to know the number of parameters a scope accepts (if you know, please tell me!).
+So, for now, if you pass an array to a scoped attribute, it will be passed as an array to the scope.
+If you set attributename_multi_params to true, it will be passed as multiple params to the scope.
+
+Example :
+
+<pre>
+  class Post < ActiveRecord::Base
+    scope :retrieve_in_title_and_body, lambda { |a, b| where("title like ? and body like ?", "%#{a}%", "%#{b}") }
+    scope :retrieve_ids, lambda { |ids| where(:id => ids) }
+  end
+  
+  # For a multi params scope
+  #
+  > search = Post.scoped_search
+  > search.retrieve_in_title_and_body = ["test", "whaaaa"]
+  > search.retrieve_in_title_and_body_multi_params = true
+  
+  # For an Array param
+  > search.retrieve_ids = [1,2,3]  
+</pre>
+
 h2. Notes
 
 This plugin is new and under development, patches and contributions are welcome! Please fork and make pull requests, thanks!

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/lib/scoped_search.rb

@@ -18,6 +18,8 @@ class ScopedSearch
 
       @attributes_merged.each do |attribute, value|
         class_eval <<-RUBY
+          attr_accessor :#{attribute}_multi_params
+        
           def #{attribute}
             @attributes[:#{attribute}]
           end
@@ -33,7 +35,13 @@ class ScopedSearch
       return model_class if attributes.empty?
       attributes.reject { |k,v| v.blank? || EXCLUDED_SCOPES_VALUES.include?(v.to_s) }.inject(model_class) do |s, k|
         if model_class.scopes.keys.include?(k.first.to_sym)
-          k.size == 2 && SINGLE_SCOPES_VALUES.include?(k.last.to_s) ? s.send(k.first) : s.send(*k.flatten)
+          
+          if k.size == 2 && SINGLE_SCOPES_VALUES.include?(k.last.to_s)
+            s.send(k.first)
+          else
+            multi_params?(k.first) ? s.send(*k.flatten) : s.send(k.first, k[1..-1].flatten)
+          end
+          
         else
           s
         end
@@ -45,6 +53,11 @@ class ScopedSearch
     def method_missing(method_name, *args)
       build_relation.send(method_name, *args)
     end
+    
+    protected
+    def multi_params?(attribute)
+      send("#{attribute}_multi_params").present?
+    end
   end
   
   module Helpers

data/scoped-search.gemspec

@@ -0,0 +1,55 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{scoped-search}
+  s.version = "0.5.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["slainer68"]
+  s.date = %q{2010-07-28}
+  s.description = %q{Easily implement search forms and column ordering based on your models scopes. For Rails 3, compatible with ActiveRecord and Mongoid.}
+  s.email = %q{slainer68@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.textile"
+  ]
+  s.files = [
+    ".gitignore",
+     "Gemfile",
+     "LICENSE",
+     "README.textile",
+     "Rakefile",
+     "VERSION",
+     "init.rb",
+     "lib/scoped_search.rb",
+     "scoped-search.gemspec",
+     "spec/scoped_search_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/novagile/scoped-search}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Easily implement search forms and column ordering based on your models scopes}
+  s.test_files = [
+    "spec/scoped_search_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+    else
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+  end
+end
+

data/spec/scoped_search_spec.rb

@@ -4,6 +4,8 @@ require "spec_helper"
   Post.create(:title => title, :body => "blah", :published => title.include?("pipo"))
 end
 
+Post.create(:title => "test multi params", :body => "this is to test multi params, whaaaa")
+
 describe 'ScopedSearch' do
   it 'should respond to scoped_search and return a ScopedSearch::Base object' do
     Post.should respond_to(:scoped_search)
@@ -11,10 +13,10 @@ describe 'ScopedSearch' do
   end
   
   it 'should have the same count when initializing an empty search' do
-    Post.count.should == 6
+    Post.count.should == 7
     
     @search = Post.scoped_search
-    @search.count.should == 6
+    @search.count.should == 7
   end
   
   describe 'initialization' do
@@ -46,7 +48,7 @@ describe 'ScopedSearch' do
       
       @search.all.should have(1).element
       @search.retrieve = nil
-      @search.count.should == 6
+      @search.count.should == 7
     end
     
     it 'should be possible to search with multiple parameters' do
@@ -60,6 +62,27 @@ describe 'ScopedSearch' do
       @search.count.should == 2
       @search.all.should have(2).elements
     end
+    
+    it 'should be possible to search in a multi params scope' do
+      @search = Post.scoped_search
+      
+      @search.retrieve_in_title_and_body = ["test", "whaaaa"]
+      @search.retrieve_in_title_and_body_multi_params = true
+      @search.count.should == 1
+      
+      @search = Post.scoped_search({ :retrieve_in_title_and_body => ["test", "whaaaa"], :retrieve_in_title_and_body_multi_params => "true" })
+      @search.count.should == 1
+    end
+    
+    it 'should be possible to search in a scope that wants an Array' do
+      @search = Post.scoped_search
+
+      @search.retrieve_ids = ["3", "4"]
+      @search.count.should == 2
+      
+      @search = Post.scoped_search({ :retrieve_ids => ["3", "4"] })
+      @search.count.should == 2
+    end
   end
   
   it 'should be possible to build the relation' do

data/spec/spec_helper.rb

@@ -24,8 +24,11 @@ class Post < ActiveRecord::Base
   
   scope :published, where(:published => true)
   scope :retrieve, lambda { |q| where("title like ?", "%#{q}%") }
+  scope :retrieve_in_title_and_body, lambda { |a,b| where("title like ? and body like ?", "%#{a}%", "%#{b}") }
+  scope :retrieve_ids, lambda { |ids| where(:id => ids) }
 end
 
 RSpec.configure do |config|
   config.mock_with :rspec
 end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scoped-search
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - slainer68
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-21 00:00:00 +02:00
+date: 2010-07-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,6 +52,7 @@ files:
 - VERSION
 - init.rb
 - lib/scoped_search.rb
+- scoped-search.gemspec
 - spec/scoped_search_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true