search_magic 0.1.0 → 0.1.1

data/Gemfile.lock

@@ -1,28 +1,29 @@
 PATH
   remote: .
   specs:
-    search_magic (0.1.0)
+    search_magic (0.1.1)
       mongoid (>= 2.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.5)
-      activesupport (= 3.0.5)
+    activemodel (3.0.6)
+      activesupport (= 3.0.6)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activesupport (3.0.5)
-    bson (1.2.4)
-    bson_ext (1.2.4)
+      i18n (~> 0.5.0)
+    activesupport (3.0.6)
+    bson (1.3.0)
+    bson_ext (1.3.0)
     builder (2.1.2)
     database_cleaner (0.6.4)
     diff-lcs (1.1.2)
+    fabrication (0.9.5)
     i18n (0.5.0)
-    mongo (1.2.4)
-      bson (>= 1.2.4)
-    mongoid (2.0.0)
+    mongo (1.3.0)
+      bson (>= 1.3.0)
+    mongoid (2.0.1)
       activemodel (~> 3.0)
-      mongo (~> 1.2)
+      mongo (~> 1.3)
       tzinfo (~> 0.3.22)
       will_paginate (~> 3.0.pre)
     rspec (2.5.0)
@@ -42,5 +43,6 @@ PLATFORMS
 DEPENDENCIES
   bson_ext
   database_cleaner
+  fabrication
   rspec
   search_magic!

data/README.textile

@@ -4,7 +4,7 @@ SearchMagic provides full-text search capabilities to "mongoid":http://github.co
 
 h2. Installation
 
-SearchMagic is built on top of the latest pre-release version of mongoid; in all likelihood, it will only work with versions greater than or equal to _2.0.0.rc.8_. The project can be installed as a gem on a target system:
+SearchMagic is built on top of mongoid; in all likelihood, it will only work with versions greater than or equal to _2.0.0_. The project can be installed as a gem on a target system:
 
 bc. gem install search_magic
 
@@ -20,7 +20,7 @@ Adding FullTextSearch is as simple as including the appropriate module into a mo
 
 bc.. class Address
   include Mongoid::Document
-  include SearchMagic::FullTextSearch
+  include SearchMagic
   field :street
   field :city
   field :state
@@ -51,7 +51,7 @@ The example in the previous section showcased using :search_on on basic *Mongoid
 
 bc.. class Person
   include Mongoid::Document
-  include SearchMagic::FullTextSearch
+  include SearchMagic
   field :name
   embeds_one :address
   
@@ -78,7 +78,7 @@ Values added to *:searchable_values* automatically are split on whitespace and h
 
 bc.. class Asset
   include Mongoid::Document
-  include SearchMagic::FullTextSearch
+  include SearchMagic
   field :tags, :type => Array
   
   search_on :tags, :keep_punctuation => true
@@ -90,7 +90,7 @@ Two documents may search on each other's fields; doing so will cause each docume
 
 bc.. class Foo
   include Mongoid::Document
-  include SearchMagic::FullTextSearch
+  include SearchMagic
   field :name
   references_many :bars
   search_on :name
@@ -99,7 +99,7 @@ end
 
 class Bar
   include Mongoid::Document
-  include SearchMagic::FullTextSearch
+  include SearchMagic
   field :value
   referenced_in :foo
   search_on :value
@@ -111,7 +111,7 @@ Finally, it should be noted that nesting of searchable documents is possible. If
 bc.. class Part
   include Mongoid::Document
   include Mongoid::Timestamps
-  include SearchMagic::FullTextSearch
+  include SearchMagic
   field :serial
   references_in :part_number
   
@@ -121,7 +121,7 @@ end
 
 class PartNumber
   include Mongoid::Document
-  include SearchMagic::FullTextSearch
+  include SearchMagic
   field :value
   references_many :parts
   referenced_in :part_category
@@ -132,7 +132,7 @@ end
 
 class PartCategory
   include Mongoid::Document
-  include SearchMagic::FullTextSearch
+  include SearchMagic
   field :name
   references_many :part_numbers
   

data/lib/search_magic/full_text_search.rb

@@ -29,7 +29,7 @@ module SearchMagic
       end
       
       def search_for(pattern)
-        rval = /("[^"]+"|\S+)/
+        rval = /("[^"]+"|'[^']+'|\S+)/
         rsearch = /(?:(#{searchables.keys.join('|')}):#{rval})|#{rval}/i
         unless pattern.blank?
           terms = pattern.scan(rsearch).map(&:compact).map do |term|

data/lib/search_magic/version.rb

@@ -1,3 +1,3 @@
 module SearchMagic
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/search_magic.rb

@@ -3,4 +3,9 @@ module SearchMagic
   require 'search_magic/stack_frame'
   require 'search_magic/metadata'
   require 'search_magic/full_text_search'
+  extend ActiveSupport::Concern
+  
+  included do
+    include FullTextSearch
+  end
 end

data/search_magic.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency("rspec")
   s.add_development_dependency("database_cleaner")
   s.add_development_dependency("bson_ext")
+  s.add_development_dependency("fabrication")
 
   s.rubyforge_project = "search_magic"
 

data/spec/fabricators/asset_fabricator.rb

@@ -0,0 +1,6 @@
+Fabricator(:asset) do
+  title { Fabricate.sequence(:title) { |i| "asset-title-#{i}" } }
+  description "Generic description."
+  tags { %w{foo b.a.r b-az q:ux z!png p'zow}.sample(rand(6)) }
+  uuid { "ae9d14ee-be93-11df-9fec-78ca39fffe11" }
+end

data/spec/fabricators/simple_inclusion_model_fabricator.rb

@@ -0,0 +1,4 @@
+Fabricator(:simple_inclusion_model) do
+  foo "a foo"
+  bar "a bar"
+end

data/spec/models/simple_inclusion_model.rb

@@ -0,0 +1,8 @@
+class SimpleInclusionModel
+  include Mongoid::Document
+  include SearchMagic
+  field :foo
+  field :bar
+  search_on :foo, :keep_punctuation => true
+  search_on :bar
+end

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ require 'bundler/setup'
 
 require 'mongoid'
 require 'search_magic'
+require 'fabrication'
 
 MODELS = File.join(File.dirname(__FILE__), "models")
 

data/spec/unit/search_magic/fields_spec.rb

@@ -37,7 +37,7 @@ describe SearchMagic::FullTextSearch do
   end
   
   context "when a model is saved, its :searchable_values update" do
-    subject { Asset.new(:title => "Foo Bar: The Bazzening", :description => "Sequel to last years hit summer blockbuster.", :tags => ["movies", "foo.bar", "the-bazzening"], :uuid => "ae9d14ee-be93-11df-9fec-78ca39fffe11")}
+    subject { Fabricate.build(:asset, :title => "Foo Bar: The Bazzening", :description => "Sequel to last years hit summer blockbuster.", :tags => ["movies", "foo.bar", "the-bazzening"]) }
     before(:each) { subject.save }
     its(:searchable_values) { should_not be_empty }
     its(:searchable_values) { should include("title:foo", "title:bar", "title:the", "title:bazzening")}
@@ -45,7 +45,7 @@ describe SearchMagic::FullTextSearch do
     its(:searchable_values) { should_not include("uuid:ae9d14ee-be93-11df-9fec-78ca39fffe11", "uuid:ae9d14ee")}
     its(:searchable_values) { should include("tag:movies", "tag:foo.bar", "tag:the-bazzening")}
   end
-  
+    
   context "when :search is performed on a model without :searchables" do
     subject { NoSearchables.search_for("foo") }
     it { should be_a(Mongoid::Criteria) }

data/spec/unit/search_magic/search_pattern_syntax_spec.rb

@@ -0,0 +1,19 @@
+describe SearchMagic::FullTextSearch do
+  context "when searching for \"title:'foo bar'\"" do
+    subject { Asset.search_for("title:'foo bar'") }
+    its("selector.keys") { should include(:searchable_values) }
+    it { subject.selector[:searchable_values]["$all"].should include(/title:.*foo/i, /title:.*bar/i)}
+  end
+  
+  context "when searching for 'title:\"foo bar\"'" do
+    subject { Asset.search_for('title:"foo bar"') }
+    its("selector.keys") { should include(:searchable_values) }
+    it { subject.selector[:searchable_values]["$all"].should include(/title:.*foo/i, /title:.*bar/i)}
+  end
+  
+  context "when searching for 'title:foo title:bar'" do
+    subject { Asset.search_for('title:foo title:bar') }
+    its("selector.keys") { should include(:searchable_values) }
+    it { subject.selector[:searchable_values]["$all"].should include(/title:.*foo/i, /title:.*bar/i)}
+  end
+end

data/spec/unit/search_magic/simple_inclusion_model_spec.rb

@@ -0,0 +1,22 @@
+describe SearchMagic do
+  context "when included in a model" do
+    subject { SimpleInclusionModel }
+    it { should respond_to(:search_on, :search_for, :searchables, :arrange) }
+    its("searchables.keys") { should include(:foo, :bar) }
+  end
+  
+  context "when saving a model" do
+    subject { Fabricate.build(:simple_inclusion_model, :foo => "F.o-o") }
+    before(:each) { subject.save! }
+    its(:searchable_values) { should include("foo:f.o-o") }
+    its(:arrangeable_values) { should include(:foo => "F.o-o") }
+  end
+  
+  context "when searching for a model" do
+    before(:each) { Fabricate(:simple_inclusion_model) }
+    subject { SimpleInclusionModel.search_for("foo") }
+    its(:count) { should == 1 }
+    its("first.foo") { should == "a foo" }
+    its("first.bar") { should == "a bar" }
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: search_magic
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Joshua Bowers
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-11 00:00:00 -07:00
+date: 2011-04-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,6 +57,17 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: fabrication
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: Adds scopes to a Mongoid document providing search and sort capabilities on arbitrary fields and associations.
 email: 
 - joshua.bowers+code@gmail.com
@@ -79,6 +90,8 @@ files:
 - lib/search_magic/stack_frame.rb
 - lib/search_magic/version.rb
 - search_magic.gemspec
+- spec/fabricators/asset_fabricator.rb
+- spec/fabricators/simple_inclusion_model_fabricator.rb
 - spec/models/absolutely_not_searchable.rb
 - spec/models/address.rb
 - spec/models/asset.rb
@@ -95,12 +108,15 @@ files:
 - spec/models/person.rb
 - spec/models/phone.rb
 - spec/models/player.rb
+- spec/models/simple_inclusion_model.rb
 - spec/spec_helper.rb
 - spec/unit/search_magic/arrangements_spec.rb
 - spec/unit/search_magic/associations_spec.rb
 - spec/unit/search_magic/fields_spec.rb
 - spec/unit/search_magic/graph_searches_spec.rb
 - spec/unit/search_magic/model_updates_spec.rb
+- spec/unit/search_magic/search_pattern_syntax_spec.rb
+- spec/unit/search_magic/simple_inclusion_model_spec.rb
 has_rdoc: true
 homepage: http://github.com/joshuabowers/search_magic
 licenses: []
@@ -130,6 +146,8 @@ signing_key:
 specification_version: 3
 summary: SearchMagic provides scoped full text search and sort capabilities to Mongoid documents
 test_files: 
+- spec/fabricators/asset_fabricator.rb
+- spec/fabricators/simple_inclusion_model_fabricator.rb
 - spec/models/absolutely_not_searchable.rb
 - spec/models/address.rb
 - spec/models/asset.rb
@@ -146,9 +164,12 @@ test_files:
 - spec/models/person.rb
 - spec/models/phone.rb
 - spec/models/player.rb
+- spec/models/simple_inclusion_model.rb
 - spec/spec_helper.rb
 - spec/unit/search_magic/arrangements_spec.rb
 - spec/unit/search_magic/associations_spec.rb
 - spec/unit/search_magic/fields_spec.rb
 - spec/unit/search_magic/graph_searches_spec.rb
 - spec/unit/search_magic/model_updates_spec.rb
+- spec/unit/search_magic/search_pattern_syntax_spec.rb
+- spec/unit/search_magic/simple_inclusion_model_spec.rb