locomotivecms-search 0.0.2 → 0.0.3

data/spec/dummy/tmp/capybara/capybara-20130422110141656147449.html

@@ -0,0 +1,7 @@
+       <ul>
+       
+         Liquid error: undefined method `to_liquid' for #<ActiveSearch::Mongoid::Model:0x007fc888529740>
+       
+         Liquid error: undefined method `to_liquid' for #<ActiveSearch::Mongoid::Model:0x007fc888530748>
+       
+       </ul>

data/spec/dummy/tmp/capybara/capybara-201304221102578439136278.html

@@ -0,0 +1,3 @@
+       <ul>
+       Liquid error: undefined method `to_liquid' for #<ActiveSearch::Proxy:0x007fac7060a468>
+       </ul>

data/spec/dummy/tmp/capybara/capybara-201304221104068569441460.html

@@ -0,0 +1,3 @@
+       <ul>
+       Liquid error: undefined method `to_liquid' for #<ActiveSearch::Proxy:0x007ff334a54fe0>
+       </ul>

data/spec/dummy/tmp/capybara/capybara-201304221104343252248803.html

@@ -0,0 +1,11 @@
+       <ul>
+       
+         
+           <li><a href="/examples/findable-entry">Findable entry</a></li>
+         
+       
+         
+           <li><a href="/{"en"=>"findable"}">{"en"=>"Please search for this findable page"}</a></li>
+         
+       
+       </ul>

data/spec/dummy/tmp/capybara/capybara-201304221109199028584195.html

@@ -0,0 +1,11 @@
+       <ul>
+       
+         
+           <li><a href="/examples/findable-entry">Findable entry</a></li>
+         
+       
+         
+           <li><a href="/findable">Please search for this findable page</a></li>
+         
+       
+       </ul>

data/spec/features/algolia_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe "Algolia" do
+  before do
+    setup_search
+    require "activesearch/algolia"
+    config = YAML.load_file(Rails.root.join('config', 'backends.yml'))
+    require "activesearch/algolia/client"
+    ActiveSearch::Algolia::Client.configure(config["algolia"]["api_key"], config["algolia"]["app_id"], "locomotivecms")
+    ActiveSearch::Algolia::Client.new.delete_index
+    Locomotive.config.search_engine = "algolia"
+  end
+  
+  it_behaves_like "a search backend"
+end

data/spec/features/mongoid_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe "Mongoid" do
+  before do
+    setup_search
+    require "activesearch/mongoid"
+    Locomotive.config.search_engine = "mongoid"
+  end
+  
+  it_behaves_like "a search backend"
+end

data/spec/spec_helper.rb

@@ -9,7 +9,7 @@ require 'database_cleaner'
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
 require Locomotive::Engine.root.join('spec', 'support', 'factories')
-Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
+Dir[Locomotive::Search::Engine.root.join("spec/support/**/*.rb")].each {|f| require f}
 
 RSpec.configure do |config|
   # ## Mock Framework
@@ -34,10 +34,30 @@ RSpec.configure do |config|
   config.include FactoryGirl::Syntax::Methods
   
   config.before(:each) do
-    DatabaseCleaner.start
+    Mongoid.master.collections.select { |c| c.name != 'system.indexes' }.each(&:drop)
   end
-
+  
   config.after(:each) do
-    DatabaseCleaner.clean
+    Mongoid.master.collections.select { |c| c.name != 'system.indexes' }.each(&:drop)
+  end
+end
+
+shared_examples "a search backend" do
+  it "that works" do
+    visit 'http://test.example.com'
+    fill_in "Search", with: "findable"
+    click_on "Search"
+    page.should have_content "Please search for this"
+    page.should have_content "Findable entry"
+    page.should_not have_content "Hidden"
+    page.should_not have_content "This should never show up"
+    page.should_not have_content "NOT Findable entry"
+    click_on "Please search for this"
+    page.should have_content "This is what you were looking for"
+
+    visit 'http://test.example.com'
+    fill_in "Search", with: "not found"
+    click_on "Search"
+    page.should_not have_content "Page not found"
   end
 end

data/spec/{features/search_spec.rb → support/helpers.rb}

@@ -1,7 +1,5 @@
-require 'spec_helper'
-
-feature "Search" do
-  before do
+module SpecHelpers
+  def setup_search
     @site = create('test site')
     @ctype = build(:content_type, site: @site, name: "Examples")
     @ctype.entries_custom_fields.create!(label: "Name", type: "string", searchable: true)
@@ -20,7 +18,7 @@ feature "Search" do
        {% endfor %}
        </ul>
     EOT
-    
+
     @index = @site.pages.where(slug: "index").first
     @index.raw_template = %|
        <form action="/{{ locale }}/search" method="GET">
@@ -31,22 +29,10 @@ feature "Search" do
     @index.save!
     @another_site = create('another site')
     create(:page, site: @another_site, title: "This should never show up in the search, even if it would be findable", slug: "rickroll", raw_template: "Rickroll")
+    @ctype = build(:content_type, site: @another_site, name: "Examples")
+    @ctype.entries_custom_fields.create!(label: "Name", type: "string", searchable: true)
+    @ctype.entries.create!(name: "NOT Findable entry", stuff: "Some stuff")
   end
-  
-  scenario "on a single site" do
-    visit 'http://test.example.com'
-    fill_in "Search", with: "findable"
-    click_on "Search"
-    page.should have_content "Please search for this"
-    page.should have_content "Findable entry"
-    page.should_not have_content "Hidden"
-    page.should_not have_content "This should never show up"
-    click_on "Please search for this"
-    page.should have_content "This is what you were looking for"
-    
-    visit 'http://test.example.com'
-    fill_in "Search", with: "not found"
-    click_on "Search"
-    page.should_not have_content "Page not found"
-  end
-end
+end
+
+Rspec.configure { |c| c.include SpecHelpers }

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms-search
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Rodrigo Alvarez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-04 00:00:00.000000000 Z
+date: 2013-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: locomotive_cms
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.14
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: parallel_tests
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: LocomotiveSearch is an engine which integrates ActiveSearch into LocomotiveCMS.
 email:
 - papipo@gmail.com
@@ -119,7 +133,7 @@ files:
 - app/models/locomotive/content_entry.rb
 - app/models/locomotive/page.rb
 - config/routes.rb
-- lib/locomotive/search/concerns/activesearch/mongoid/model.rb
+- lib/locomotive/search/concerns/activesearch/proxy.rb
 - lib/locomotive/search/concerns/custom_fields/field.rb
 - lib/locomotive/search/concerns/locomotive/liquid/drops/site.rb
 - lib/locomotive/search/concerns.rb
@@ -135,6 +149,7 @@ files:
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/config/application.rb
+- spec/dummy/config/backends.yml
 - spec/dummy/config/boot.rb
 - spec/dummy/config/environment.rb
 - spec/dummy/config/environments/development.rb
@@ -152,6 +167,7 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/mongoid.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/config/sample.backends.yml
 - spec/dummy/config.ru
 - spec/dummy/log/development.log
 - spec/dummy/log/test.log
@@ -553,9 +569,16 @@ files:
 - spec/dummy/tmp/cache/sass/de5fa1264e247c74a31d8c6c2112ab09d4522445/main.css.scssc
 - spec/dummy/tmp/cache/sass/de5fa1264e247c74a31d8c6c2112ab09d4522445/sub.css.scssc
 - spec/dummy/tmp/cache/sass/fddee6582dd8de3f34f33315492ad10ef5329dc3/ui.css.scssc
+- spec/dummy/tmp/capybara/capybara-20130422110141656147449.html
+- spec/dummy/tmp/capybara/capybara-201304221102578439136278.html
+- spec/dummy/tmp/capybara/capybara-201304221104068569441460.html
+- spec/dummy/tmp/capybara/capybara-201304221104343252248803.html
+- spec/dummy/tmp/capybara/capybara-201304221109199028584195.html
 - spec/dummy/tmp/pids/server.pid
-- spec/features/search_spec.rb
+- spec/features/algolia_spec.rb
+- spec/features/mongoid_spec.rb
 - spec/spec_helper.rb
+- spec/support/helpers.rb
 homepage: https://github.com/Papipo/locomotivecms-search
 licenses: []
 metadata: {}
@@ -586,6 +609,7 @@ test_files:
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/config/application.rb
+- spec/dummy/config/backends.yml
 - spec/dummy/config/boot.rb
 - spec/dummy/config/environment.rb
 - spec/dummy/config/environments/development.rb
@@ -603,6 +627,7 @@ test_files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/mongoid.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/config/sample.backends.yml
 - spec/dummy/config.ru
 - spec/dummy/log/development.log
 - spec/dummy/log/test.log
@@ -1004,6 +1029,13 @@ test_files:
 - spec/dummy/tmp/cache/sass/de5fa1264e247c74a31d8c6c2112ab09d4522445/main.css.scssc
 - spec/dummy/tmp/cache/sass/de5fa1264e247c74a31d8c6c2112ab09d4522445/sub.css.scssc
 - spec/dummy/tmp/cache/sass/fddee6582dd8de3f34f33315492ad10ef5329dc3/ui.css.scssc
+- spec/dummy/tmp/capybara/capybara-20130422110141656147449.html
+- spec/dummy/tmp/capybara/capybara-201304221102578439136278.html
+- spec/dummy/tmp/capybara/capybara-201304221104068569441460.html
+- spec/dummy/tmp/capybara/capybara-201304221104343252248803.html
+- spec/dummy/tmp/capybara/capybara-201304221109199028584195.html
 - spec/dummy/tmp/pids/server.pid
-- spec/features/search_spec.rb
+- spec/features/algolia_spec.rb
+- spec/features/mongoid_spec.rb
 - spec/spec_helper.rb
+- spec/support/helpers.rb

data/lib/locomotive/search/concerns/activesearch/mongoid/model.rb

@@ -1,7 +0,0 @@
-class ActiveSearch::Mongoid::Model
-  def to_liquid
-    _stored.each_with_object({}) do |(k,v),memo|
-      memo[k] = v.respond_to?(:has_key?) && v.has_key?(I18n.locale.to_s) ? v[I18n.locale.to_s] : v
-    end
-  end
-end