activesearch 0.0.11 → 0.0.12

data/lib/activesearch/base.rb

@@ -1,6 +1,15 @@
 require "active_support/core_ext/class/attribute"
 
 module ActiveSearch
+  def self.strip_tags(value)
+    case value
+    when String
+      value.gsub(/<\/?[^>]*>/, '')
+    when Hash
+      value.each { |k,v| value[k] = strip_tags(value[k]) }
+    end
+  end
+  
   module Base
     def self.included(parent)
       parent.extend ClassMethods

data/lib/activesearch/elastic_search/proxy.rb

@@ -17,7 +17,7 @@ module ActiveSearch
       def search
         @search ||= Tire.search('_all') do |search|
           search.query do |query|
-            query.text("_all", @text)
+            query.match("_all", @text)
           end
         end
       end

data/lib/activesearch/elastic_search.rb

@@ -18,7 +18,7 @@ module ActiveSearch
     
     def to_indexable
       elastic_properties.keys.inject({_type: self.elastic_type}) do |memo,field|
-        memo.merge(field => self.send(field))
+        memo.merge!(field => self.send(field))
       end
     end
     

data/lib/activesearch/mongoid/model.rb

@@ -40,6 +40,7 @@ module ActiveSearch
             original[f] ? memo += original[f].downcase.split : memo
           end
         end
+        self._keywords = self._keywords.map! { |k| ActiveSearch.strip_tags(k) }
         self._keywords.uniq!
       end
       

data/lib/activesearch/version.rb

@@ -1,3 +1,3 @@
 module ActiveSearch
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

data/spec/engines_spec.rb

@@ -24,7 +24,7 @@ Dir[File.join(File.dirname(__FILE__), 'models', '*.rb')].map { |f| File.basename
       cleanup(engine)
       @findable       = Object.const_get("#{engine}Model").create(title: "Findable Findable", junk: "Junk field")
       @quite_findable = Object.const_get("#{engine}Model").create(title: "Some title", text: "Findable text")
-      @another        = Object.const_get("Another#{engine}Model").create(title: "Another findable title")
+      @another        = Object.const_get("Another#{engine}Model").create(title: "Another <strong>findable</strong> title with tags")
       @junk           = Object.const_get("#{engine}Model").create(title: "Junk", junk: "Not Findable junk")
       @special        = Object.const_get("#{engine}Model").create(title: "Not findable because it's special", special: true)
     end
@@ -33,7 +33,7 @@ Dir[File.join(File.dirname(__FILE__), 'models', '*.rb')].map { |f| File.basename
       results = ActiveSearch.search("findable").map { |doc| doc.to_hash.select { |k,v| %w[title junk virtual].include?(k.to_s) } }
       results.sort_by { |result| result["title"] }.should == [
           {
-            "title"   => "Another findable title",
+            "title"   => "Another <strong>findable</strong> title with tags",
             "virtual" =>  "virtual"
           },
           {

data/spec/mongoid_spec.rb

@@ -18,7 +18,7 @@ describe ActiveSearch::Mongoid do
   before do
     Mongoid.master.collections.select { |c| c.name != 'system.indexes' }.each(&:drop)
     I18n.locale = :en
-    @localized  = LocalizedMongoidModel.create!(title: "English English")
+    @localized  = LocalizedMongoidModel.create!(title: "<strong>English</strong> English")
     I18n.with_locale(:es) do
       @localized.title = "Español Español"
       @localized.save!
@@ -26,7 +26,7 @@ describe ActiveSearch::Mongoid do
   end
   
   it "should be able to find by different locales" do
-    ActiveSearch.search("english").first._stored["title"]["en"].should == "English English"
+    ActiveSearch.search("english").first._stored["title"]["en"].should == "<strong>English</strong> English"
     I18n.with_locale(:es) do
       ActiveSearch.search("español").first._stored["title"]["es"].should == "Español Español"
     end
@@ -35,4 +35,8 @@ describe ActiveSearch::Mongoid do
   it "should store localized keywords" do
     ActiveSearch::Mongoid::Model.where(_original_type: "LocalizedMongoidModel", _original_id: @localized.id).first._keywords.should == ["en:english", "es:español"]
   end
+  
+  it "should strip tags" do
+    ActiveSearch.search("english").first._keywords.should == ['en:english', 'es:español']
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activesearch
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2013-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport