dragoon_system 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/dragoon_system.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dragoon_system}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["zhanyinan"]
-  s.date = %q{2011-03-01}
+  s.date = %q{2011-03-02}
   s.description = %q{personal suit}
   s.email = %q{toward7seas@gmail.com}
   s.extra_rdoc_files = [
@@ -27,10 +27,9 @@ Gem::Specification.new do |s|
     "dragoon_system.gemspec",
     "lib/active_record/base_patch.rb",
     "lib/dragoon_system.rb",
-    "lib/patches.rb",
-    "lib/string_path.rb",
-    "test/helper.rb",
-    "test/test_dragoon_system.rb"
+    "lib/module_patch.rb",
+    "lib/string_patch.rb",
+    "test/helper.rb"
   ]
   s.homepage = %q{http://github.com/toward7seas01/dragoon_system}
   s.licenses = ["MIT"]
@@ -38,8 +37,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.5.2}
   s.summary = %q{personal suit}
   s.test_files = [
-    "test/helper.rb",
-    "test/test_dragoon_system.rb"
+    "test/helper.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/active_record/base_patch.rb

@@ -20,6 +20,30 @@ module ActiveRecord
         end
       end
 
+      def fuzzy(args)
+        or_empty_scope(args) do
+          query_params = []
+          query_string = []
+
+          args.each {|model, attrs|
+            table, field, data = model, *attrs.to_a.flatten
+            table, field, data = [table.table_name, field.to_s, handle_input(data).join("|")]
+
+            unless data.blank?
+              query_string << "#{table}.#{field} regexp ?"
+              query_params << data
+            end
+          }
+
+          unless query_string.empty?
+            query_string = query_string.join(" or ")
+            scoped({:conditions => [query_string] + query_params})
+          else
+            scoped
+          end
+        end
+      end
+
       def newest
         scoped(:order => "#{self.table_name}.updated_at desc")
       end
@@ -61,7 +85,7 @@ module ActiveRecord
       def regexp_condition(field, data, table)
         or_empty_scope(data) do
           data = handle_input(data).join("|")
-          {:conditions => ["#{table}.#{field} regexp ? ", data]}
+          where("#{table}.#{field} regexp ? ", data)
         end
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dragoon_system
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - zhanyinan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 +08:00
+date: 2011-03-02 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -100,10 +100,9 @@ files:
 - dragoon_system.gemspec
 - lib/active_record/base_patch.rb
 - lib/dragoon_system.rb
-- lib/patches.rb
-- lib/string_path.rb
+- lib/module_patch.rb
+- lib/string_patch.rb
 - test/helper.rb
-- test/test_dragoon_system.rb
 has_rdoc: true
 homepage: http://github.com/toward7seas01/dragoon_system
 licenses: 
@@ -140,4 +139,3 @@ specification_version: 3
 summary: personal suit
 test_files: 
 - test/helper.rb
-- test/test_dragoon_system.rb

data/test/test_dragoon_system.rb

@@ -1,3 +0,0 @@
-require 'helper'
-
-