searchy 0.0.1 → 0.0.4

data/lib/searchy/search.rb

@@ -5,14 +5,34 @@ module Searchy
     
     module ClassMethods
       def search(query = nil)
-        if query.present?
-          fields = columns.select{|c| TYPES.include?(c.type)}.map(&:name)
-          command = fields.map{|f| "#{table_name}.#{f} LIKE ?"}.join(' OR ')
-
-          where([command, *Array.new(fields.length).map{"%#{query}%"}])
-        else
-          scoped
+        @query = query.strip.split(/\s+/)
+        search_scope
+      end
+      
+      protected 
+      
+      def search_scope
+        @query.present? ? where([search_command, *search_arguments]) : scoped
+      end
+      
+      def search_arguments
+        arguments = @query.map do |word|
+          Array.new(searchable_columns.length).map{"%#{word}%"}
         end
+        
+        arguments.flatten
+      end
+      
+      def search_command
+        parts = @query.map do
+          searchable_columns.map{|f| "#{table_name}.#{f} LIKE ?"}.join(' OR ')
+        end
+        
+        parts.map{|p| "(#{p})"}.join(' AND ')
+      end
+      
+      def searchable_columns
+        self.columns.select{|c| TYPES.include?(c.type)}.map(&:name)
       end
     end
   end

data/lib/searchy/version.rb

@@ -1,3 +1,3 @@
 module Searchy
-  VERSION = "0.0.1"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,48 +1,34 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: searchy
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 0.0.4
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
 platform: ruby
-authors: 
+authors:
 - jimneath@gmail.com
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-21 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70114209015040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *70114209015040
 description: The simplest search gem
-email: 
+email:
 - jimneath@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rvmrc
 - Gemfile
@@ -52,38 +38,28 @@ files:
 - lib/searchy/version.rb
 - readme.md
 - searchy.gemspec
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: searchy
-rubygems_version: 1.8.17
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: The simplest search gem
 test_files: []
-