pollyanna 1.0.3 → 1.0.4

data/.gitignore

@@ -1,3 +1,5 @@
 doc
 pkg
 *.gem
+.idea
+

data/Gemfile

@@ -0,0 +1,7 @@
+source 'http://rubygems.org'
+
+gem 'rails', '=2.3.8'
+gem "pollyanna", :path => '.'
+gem 'rspec', '=1.3.1'
+gem 'rspec-rails', '=1.3.3'
+gem 'ruby-debug'

data/Gemfile.lock

@@ -0,0 +1,48 @@
+PATH
+  remote: .
+  specs:
+    pollyanna (1.0.2)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (2.3.8)
+      actionpack (= 2.3.8)
+    actionpack (2.3.8)
+      activesupport (= 2.3.8)
+      rack (~> 1.1.0)
+    activerecord (2.3.8)
+      activesupport (= 2.3.8)
+    activeresource (2.3.8)
+      activesupport (= 2.3.8)
+    activesupport (2.3.8)
+    columnize (0.3.2)
+    linecache (0.43)
+    rack (1.1.0)
+    rails (2.3.8)
+      actionmailer (= 2.3.8)
+      actionpack (= 2.3.8)
+      activerecord (= 2.3.8)
+      activeresource (= 2.3.8)
+      activesupport (= 2.3.8)
+      rake (>= 0.8.3)
+    rake (0.8.7)
+    rspec (1.3.1)
+    rspec-rails (1.3.3)
+      rack (>= 1.0.0)
+      rspec (= 1.3.1)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  pollyanna!
+  rails (= 2.3.8)
+  rspec (= 1.3.1)
+  rspec-rails (= 1.3.3)
+  ruby-debug

data/README.rdoc

@@ -1,59 +1,68 @@
-= Pollyanna - very simple search for your ActiveRecord models
-
-Pollyanna adds a very simple full text search to your ActiveRecord models.
-Before saving, searchable models copy strings relevant to the search into a text column.
-Pollyanna finds results for a query using LIKE patterns in SQL.
-
-We found Pollyanna very useful for search-as-you-type boxes.
-
-== Example 
-
-    class Movie < ActiveRecord::Base
-      include Pollyanna::Searchable
-
-      def search_text
-        "#{title} #{year} #{director}"
-      end
-
-    end
-
-    class MoviesController
-
-      def index
-        @movies = Movie.search(params[:query])
-      end
-
-    end
-
-== Making a model searchable
-
-1. Add a text column "search_text" to a model
-2. Have the model include <tt>Pollyanna::Searchable</tt>
-3. Overwrite <tt>search_text</tt> to define which text is indexed upon saving
-4. <tt>Model.search("query goes here")</tt> now gives you a scope for the results of your query. Blank queries return everything.
-
-== Searching other columns
-
-If you want to search a column other than <tt>search_text</tt>, you may say <tt>Movie.search(query, :by => "other_column")</tt>.
-
-== How queries are matched
-
-- Pollyanna matches partial words, so "oo" matches "foo".
-- Multiple words in a query are AND-ed automatically.
-
-== Installation
-
-Add the following to your <tt>Initializer.run</tt> block in your <tt>environment.rb</tt>:
-    config.gem 'pollyanna', :source => 'http://gemcutter.org'
-Then do a 
-    sudo rake gems:install
-
-Alternatively, use
-    sudo gem sources -a http://gemcutter.org
-    sudo gem install pollyanna
-
-== Credits
-
-Henning Koch
-
-{www.makandra.de}[http://www.makandra.de/]
+= Pollyanna - very simple search for your ActiveRecord models
+
+Pollyanna adds a very simple full text search to your ActiveRecord models.
+Before saving, searchable models copy strings relevant to the search into a text column.
+Pollyanna finds results for a query using LIKE patterns in SQL.
+
+We found Pollyanna very useful for search-as-you-type boxes.
+
+== Example 
+
+    class Movie < ActiveRecord::Base
+      include Pollyanna::Searchable
+
+      def search_text
+        "#{title} #{year} #{director}"
+      end
+
+    end
+
+    class MoviesController
+
+      def index
+        @movies = Movie.search(params[:query])
+      end
+
+    end
+
+== Making a model searchable
+
+1. Add a text column "search_text" to a model
+2. Have the model include <tt>Pollyanna::Searchable</tt>
+3. Overwrite <tt>search_text</tt> to define which text is indexed upon saving
+4. <tt>Model.search("query goes here")</tt> now gives you a scope for the results of your query. Blank queries return everything.
+
+== Searching other columns
+
+If you want to search a column other than <tt>search_text</tt>, you may say <tt>Movie.search(query, :by => "other_column")</tt>.
+
+== How queries are matched
+
+- Pollyanna matches partial words, so "oo" matches "foo".
+- Multiple words in a query are AND-ed automatically.
+
+
+== Installation
+
+Pollyanna is a gem, which you can install with
+    sudo gem install pollyanna
+
+In Rails 2, add the following to your <tt>environment.rb</tt>:
+    config.gem 'pollyanna'
+
+In Rails 3, add the following to your <tt>Gemfile</tt>:
+    gem 'pollyanna'
+
+
+== Rails 3 compatibility
+
+We cannot guarantee Rails 3 compatibility at this point, but we will upgrade the gem when Rails 3 is released.
+
+
+== Credits
+
+Henning Koch
+
+{makandra.com}[http://makandra.com/]
+
+{gem-session.com}[http://gem-session.com/]

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

data/lib/pollyanna/searchable.rb

@@ -4,8 +4,7 @@ module Pollyanna
     def self.included(klass)
       klass.class_eval do
         before_save :set_search_text
-        # Use Proc.new so the number of arguments does not matter
-        named_scope :search, Proc.new { |query, options| Search.new(query, table_name).scope_options(options) }
+        named_scope :search, lambda { |*args| query, options = args; Search.new(query, table_name).scope_options(options) }
       end
     end
     

data/pollyanna.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pollyanna}
-  s.version = "1.0.3"
+  s.version = "1.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Henning Koch"]
-  s.date = %q{2010-02-13}
+  s.date = %q{2011-03-14}
   s.description = %q{Very simple search for your ActiveRecord models.}
   s.email = %q{github@makandra.de}
   s.extra_rdoc_files = [
@@ -17,6 +17,8 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     "Gemfile",
+     "Gemfile.lock",
      "MIT-LICENSE",
      "README.rdoc",
      "Rakefile",
@@ -49,22 +51,22 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/makandra/pollyanna}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Very simple search for your ActiveRecord models.}
   s.test_files = [
-    "spec/search_spec.rb",
+    "spec/app_root/app/controllers/application_controller.rb",
      "spec/app_root/app/models/movie.rb",
-     "spec/app_root/app/controllers/application_controller.rb",
+     "spec/app_root/config/boot.rb",
      "spec/app_root/config/environment.rb",
+     "spec/app_root/config/environments/in_memory.rb",
      "spec/app_root/config/environments/mysql.rb",
      "spec/app_root/config/environments/postgresql.rb",
-     "spec/app_root/config/environments/sqlite3.rb",
-     "spec/app_root/config/environments/in_memory.rb",
      "spec/app_root/config/environments/sqlite.rb",
-     "spec/app_root/config/boot.rb",
+     "spec/app_root/config/environments/sqlite3.rb",
      "spec/app_root/config/routes.rb",
      "spec/app_root/db/migrate/001_create_movies.rb",
      "spec/app_root/lib/console_with_fixtures.rb",
+     "spec/search_spec.rb",
      "spec/searchable_spec.rb",
      "spec/spec_helper.rb"
   ]
@@ -73,7 +75,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pollyanna
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  hash: 31
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Henning Koch
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-13 00:00:00 +01:00
+date: 2011-03-14 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -23,6 +29,8 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .gitignore
+- Gemfile
+- Gemfile.lock
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
@@ -61,37 +69,43 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Very simple search for your ActiveRecord models.
 test_files: 
-- spec/search_spec.rb
-- spec/app_root/app/models/movie.rb
 - spec/app_root/app/controllers/application_controller.rb
+- spec/app_root/app/models/movie.rb
+- spec/app_root/config/boot.rb
 - spec/app_root/config/environment.rb
+- spec/app_root/config/environments/in_memory.rb
 - spec/app_root/config/environments/mysql.rb
 - spec/app_root/config/environments/postgresql.rb
-- spec/app_root/config/environments/sqlite3.rb
-- spec/app_root/config/environments/in_memory.rb
 - spec/app_root/config/environments/sqlite.rb
-- spec/app_root/config/boot.rb
+- spec/app_root/config/environments/sqlite3.rb
 - spec/app_root/config/routes.rb
 - spec/app_root/db/migrate/001_create_movies.rb
 - spec/app_root/lib/console_with_fixtures.rb
+- spec/search_spec.rb
 - spec/searchable_spec.rb
 - spec/spec_helper.rb