texticle 2.0.pre4 → 2.0

data/README.rdoc

@@ -15,13 +15,13 @@ extending ActiveRecord with scopes making search easy and fun!
 
 == SYNOPSIS:
 
-=== Configuration
+=== Quick Start
 
 * Rails 3
 
 In the project's Gemfile add
 
-    gem 'texticle', '~> 2.0.pre', :require => 'texticle/rails'
+    gem 'texticle', '~> 2.0', :require => 'texticle/rails'
 
 * ActiveRecord outside of Rails 3
 
@@ -36,6 +36,7 @@ Your models now have access to the search method:
   Game.search(:title => 'Mario')
   Game.search_by_title('Street Fighter').search_by_system('PS3')
   Game.search_by_title_and_system('Final Fantasy', 'PS2')
+  Game.search_by_title_or_system('Final Fantasy, 'PS3')
 
 == REQUIREMENTS:
 
@@ -43,7 +44,7 @@ Your models now have access to the search method:
 
 == INSTALL:
 
-* gem install texticle --pre
+* gem install texticle
 
 == LICENSE:
 

data/lib/texticle.rb

@@ -2,11 +2,9 @@ require 'active_record'
 
 module Texticle
 
-  def search(query = "")
+  def search(query = "", exclusive = true)
     language = connection.quote('english')
 
-    exclusive = true
-
     unless query.is_a?(Hash)
       exclusive = false
       query = searchable_columns.inject({}) do |terms, column|
@@ -34,15 +32,16 @@ module Texticle
   def method_missing(method, *search_terms)
     return super if self == ActiveRecord::Base
     if Helper.dynamic_search_method?(method, self.columns)
-      columns = Helper.dynamic_search_columns(method)
+      exclusive = Helper.exclusive_dynamic_search_method?(method, self.columns)
+      columns = exclusive ? Helper.exclusive_dynamic_search_columns(method) : Helper.inclusive_dynamic_search_columns(method)
       metaclass = class << self; self; end
       metaclass.__send__(:define_method, method) do |*args|
         query = columns.inject({}) do |query, column|
           query.merge column => args.shift
         end
-        search(query)
+        search(query, exclusive)
       end
-      __send__(method, *search_terms)
+      __send__(method, *search_terms, exclusive)
     else
       super
     end
@@ -69,23 +68,46 @@ module Texticle
         query.to_s.gsub(' ', '\\\\ ')
       end
 
-      def dynamic_search_columns(method)
-        if match = method.to_s.match(/search_by_(?<columns>[_a-zA-Z]\w*)/)
+      def exclusive_dynamic_search_columns(method)
+        if match = method.to_s.match(/^search_by_(?<columns>[_a-zA-Z]\w*)$/)
           match[:columns].split('_and_')
         else
           []
         end
       end
 
-      def dynamic_search_method?(method, class_columns)
+      def inclusive_dynamic_search_columns(method)
+        if match = method.to_s.match(/^search_by_(?<columns>[_a-zA-Z]\w*)$/)
+          match[:columns].split('_or_')
+        else
+          []
+        end
+      end
+
+      def exclusive_dynamic_search_method?(method, class_columns)
+        string_columns = class_columns.select {|column| column.type == :string }.map(&:name)
+        columns = exclusive_dynamic_search_columns(method)
+        unless columns.empty?
+          columns.all? {|column| string_columns.include?(column) }
+        else
+          false
+        end
+      end
+
+      def inclusive_dynamic_search_method?(method, class_columns)
         string_columns = class_columns.select {|column| column.type == :string }.map(&:name)
-        columns = dynamic_search_columns(method)
+        columns = inclusive_dynamic_search_columns(method)
         unless columns.empty?
           columns.all? {|column| string_columns.include?(column) }
         else
           false
         end
       end
+
+      def dynamic_search_method?(method, class_columns)
+        exclusive_dynamic_search_method?(method, class_columns) or
+          inclusive_dynamic_search_method?(method, class_columns)
+      end
     end
   end
 

data/spec/texticle_spec.rb

@@ -111,6 +111,10 @@ class TexticleTest < Test::Unit::TestCase
         assert_equal [@mario], Game.search_by_title_and_title("Mario", "Mario")
       end
 
+      should "generate methods for inclusive searches" do
+        assert_equal Set.new([@megam, @takun]), Game.search_by_system_or_title("Saturn", "Mega Man").to_set
+      end
+
       should "scope consecutively" do
         assert_equal [@sfgen], Game.search_by_system("Genesis").search_by_title("Street Fighter")
       end
@@ -123,9 +127,11 @@ class TexticleTest < Test::Unit::TestCase
         assert Game.respond_to?(:search_by_system)
         assert Game.respond_to?(:search_by_title)
         assert Game.respond_to?(:search_by_system_and_title)
+        assert Game.respond_to?(:search_by_system_or_title)
         assert Game.respond_to?(:search_by_title_and_title_and_title)
 
         assert !Game.respond_to?(:search_by_id)
+        assert !Game.respond_to?(:search_by_title_and_title_or_title)
       end
 
       should "allow for 2 arguments to #respond_to?" do

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: texticle
 version: !ruby/object:Gem::Version 
-  prerelease: 4
-  version: 2.0.pre4
+  prerelease: 
+  version: "2.0"
 platform: ruby
 authors: 
 - ecin
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-03 00:00:00 Z
+date: 2011-07-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: pg