mongoid-giza 0.5.1 → 0.6.0

data/spec/mongoid/giza_spec.rb

@@ -1,88 +1,84 @@
 require "spec_helper"
 
 describe Mongoid::Giza do
-  before do
-    allow(Mongoid::Giza::GizaID).to receive(:create).with(id: :Person)
-    allow(Mongoid::Giza::Configuration.instance).to receive(:add_index)
+  let(:index) { double("index") }
+
+  let(:search) { double("search") }
 
+  let(:config) { Mongoid::Giza::Configuration.instance }
+
+  before do
+    # :nodoc:
     class Person
       include Mongoid::Document
+      include Mongoid::Attributes::Dynamic
       include Mongoid::Giza
 
       field :name, type: String
       field :age, type: Integer
     end
+
+    allow(Mongoid::Giza::Configuration.instance).to receive(:add_index)
+    allow(Mongoid::Giza::Search).to receive(:new)
+      .with("localhost", 9132, []) { search }
+    allow(search).to receive(:run) { double("results").as_null_object }
+    allow(search).to receive(:indexes=)
   end
 
   after do
     Object.send(:remove_const, :Person)
   end
 
-  let(:index) do
-    index = double("index")
-    allow(index).to receive(:name) { :Person }
-    index
-  end
-
-  let(:new_index) { allow(Mongoid::Giza::Index).to receive(:new).with(Person, {}) { index } }
-
-  let(:search) do
-    search = double("search")
-    allow(Mongoid::Giza::Search).to receive(:new).with("localhost", 9132, []) { search }
-    search
-  end
-
-  let(:search_run) { allow(search).to receive(:run) { double("results").as_null_object } }
-
-  let(:search_indexes) { allow(search).to receive(:indexes=) }
-
-  let(:config) { Mongoid::Giza::Configuration.instance }
-
   describe "sphinx_index" do
     context "static index" do
       it "should add the index" do
-        expect(Person).to receive(:add_static_sphinx_index).with({}, kind_of(Proc))
-        Person.sphinx_index { }
+        expect(Person).to receive(:add_static_sphinx_index)
+          .with({}, kind_of(Proc))
+        Person.sphinx_index {}
       end
     end
 
     context "dynamic index" do
       it "should add the index to the dynamic index list" do
-        expect(Person).to receive(:add_dynamic_sphinx_index).with({}, kind_of(Proc))
-        Person.sphinx_index { |person| }
+        expect(Person).to receive(:add_dynamic_sphinx_index)
+          .with({}, kind_of(Proc))
+        Person.sphinx_index { |person| person }
       end
     end
   end
 
   describe "add_static_sphinx_index" do
+    before do
+      allow(Mongoid::Giza::Index).to receive(:new).with(Person, {}) { index }
+      allow(index).to receive(:name) { :Person }
+    end
+
     it "should create an index" do
       expect(Mongoid::Giza::Index).to receive(:new).with(Person, {}) { index }
-      Person.add_static_sphinx_index({}, Proc.new { })
+      Person.add_static_sphinx_index({}, -> {})
     end
 
     it "should call index methods" do
       expect(index).to receive(:field).with(:name)
-      new_index
-      Person.add_static_sphinx_index({}, Proc.new { field :name })
+      Person.add_static_sphinx_index({}, -> { field :name })
     end
 
     it "should register the index on the class" do
       sphinx_indexes = double("sphinx_indexes")
       expect(sphinx_indexes).to receive(:[]=).with(index.name, index)
       allow(Person).to receive(:static_sphinx_indexes) { sphinx_indexes }
-      new_index
-      Person.add_static_sphinx_index({}, Proc.new { })
+      Person.add_static_sphinx_index({}, -> {})
     end
 
     it "should accept settings" do
-      expect(Mongoid::Giza::Index).to receive(:new).with(Person, enable_star: 1) { index }
-      Person.add_static_sphinx_index({enable_star: 1}, Proc.new { })
+      expect(Mongoid::Giza::Index).to receive(:new)
+        .with(Person, enable_star: 1) { index }
+      Person.add_static_sphinx_index({enable_star: 1}, -> {})
     end
 
     it "should add the index to the configuration" do
       expect(config).to receive(:add_index).with(index)
-      new_index
-      Person.add_static_sphinx_index({}, Proc.new { })
+      Person.add_static_sphinx_index({}, -> {})
     end
   end
 
@@ -94,15 +90,19 @@ describe Mongoid::Giza do
     end
 
     it "should create a dynamic index" do
-      allow(Person).to receive(:generated_sphinx_indexes) { double.as_null_object }
-      expect(Mongoid::Giza::DynamicIndex).to receive(:new).with(Person, {}, kind_of(Proc)) { double.as_null_object }
-      Person.add_dynamic_sphinx_index({}, Proc.new { })
+      allow(Person).to receive(:generated_sphinx_indexes) do
+        double.as_null_object
+      end
+      expect(Mongoid::Giza::DynamicIndex).to receive(:new)
+        .with(Person, {}, kind_of(Proc)) { double.as_null_object }
+      Person.add_dynamic_sphinx_index({}, -> {})
     end
 
     it "should generate the indexes" do
       allow(Mongoid::Giza::DynamicIndex).to receive(:new) { dynamic_index }
-      expect(Person).to receive(:process_dynamic_sphinx_index).with(dynamic_index)
-      Person.add_dynamic_sphinx_index({}, Proc.new { })
+      expect(Person).to receive(:process_dynamic_sphinx_index)
+        .with(dynamic_index)
+      Person.add_dynamic_sphinx_index({}, -> {})
     end
   end
 
@@ -115,7 +115,9 @@ describe Mongoid::Giza do
 
     before do
       allow(generated).to receive(:each)
-      allow(Person).to receive(:generated_sphinx_indexes) { generated_sphinx_indexes }
+      allow(Person).to receive(:generated_sphinx_indexes) do
+        generated_sphinx_indexes
+      end
       allow(generated_sphinx_indexes).to receive(:merge!)
     end
 
@@ -139,74 +141,44 @@ describe Mongoid::Giza do
   end
 
   describe "search" do
+    let(:mapped_results) { double("mapped results") }
+
     before do
-      allow(Mongoid::Giza::Configuration.instance.searchd).to receive(:address) { "localhost" }
-      allow(Mongoid::Giza::Configuration.instance.searchd).to receive(:port) { 9132 }
+      allow(Mongoid::Giza::Configuration.instance.searchd)
+        .to receive(:address) { "localhost" }
+      allow(Mongoid::Giza::Configuration.instance.searchd)
+        .to receive(:port) { 9132 }
     end
 
     it "should create a search" do
-      expect(Mongoid::Giza::Search).to receive(:new).with("localhost", 9132, [:Person, :Person_2]) { double("search").as_null_object }
-      Person.sphinx_index { }
+      expect(Mongoid::Giza::Search).to receive(:new)
+        .with("localhost", 9132, [:Person, :Person_2]) do
+          double("search").as_null_object
+        end
+      Person.sphinx_index {}
       Person.sphinx_index { name :Person_2 }
-      Person.search {  }
+      Person.search {}
     end
 
     it "should call search methods" do
-      search_run
-      search_indexes
       expect(search).to receive(:fulltext).with("query")
       Person.search { fulltext "query" }
     end
 
     it "should run the query" do
-      search_run
-      search_indexes
-      Person.search { }
-    end
-
-    it "should return an array of results" do
-      search_indexes
-      allow(search).to receive(:run) { [{matches: []}, {matches: []}] }
-      allow(Person).to receive(:in) { Mongoid::Criteria.new(Person) }
-      expect(Person.search { }).to be_a_kind_of(Array)
-    end
-
-    it "should return a Mongoid::Criteria with on each search results" do
-      search_indexes
-      allow(search).to receive(:run) { [{matches: []}, {matches: []}] }
-      expect(Person).to receive(:in).twice { Mongoid::Criteria.new(Person) }
-      Person.search { }
-    end
-  end
-
-  describe "giza_id" do
-    let(:person) { Person.new }
-
-    it "should use a previously created giza id" do
-      person[:giza_id] = 1
-      expect(person.giza_id).to eql(1)
+      expect(search).to receive(:run)
+      Person.search {}
     end
 
-    it "should create a new giza id when needed" do
-      allow(Mongoid::Giza::GizaID).to receive(:next_id).with(:Person) { 1 }
-      expect(person.giza_id).to eql(1)
-    end
-
-    it "should save the object when the id is created" do
-      allow(Mongoid::Giza::GizaID).to receive(:next_id).with(:Person) { 1 }
-      expect(person).to receive(:set).with(:giza_id, 1)
-      person.giza_id
-    end
-
-    it "should not save the object when the id is reused" do
-      person[:giza_id] = 1
-      expect(person).not_to receive(:set)
-      person.giza_id
+    it "should retur map_to_mongoid" do
+      expect(Person).to receive(:map_to_mongoid) { mapped_results }
+      Person.search {}
     end
   end
 
   describe "sphinx_indexes" do
-    it "should return an collection containg static indexes and generated indexes" do
+    it "should return an collection containg static indexes and generated " \
+      "indexes" do
       static = double("static")
       generated = double("generated")
       merged = double("merged")
@@ -222,14 +194,14 @@ describe Mongoid::Giza do
 
     it "should execute the index with all indexes from this class" do
       expect(indexer).to receive(:index!).with(:Person, :Person_2)
-      Person.sphinx_index { }
+      Person.sphinx_index {}
       Person.sphinx_index { name :Person_2 }
       Person.sphinx_indexer!
     end
 
     it "should accept a list of indexes names" do
       expect(indexer).to receive(:index!).with(:Person, :Person_3)
-      Person.sphinx_index { }
+      Person.sphinx_index {}
       Person.sphinx_index { name :Person_2 }
       Person.sphinx_index { name :Person_3 }
       Person.sphinx_indexer!(:Person, :Person_3)
@@ -240,9 +212,10 @@ describe Mongoid::Giza do
       Person.sphinx_indexer!
     end
 
-    it "should not execute if the supplied names do not match any index name of the current class" do
+    it "should not execute if the supplied names do not match any index name " \
+      "of the current class" do
       expect(indexer).not_to receive(:index!)
-      Person.sphinx_index { }
+      Person.sphinx_index {}
       Person.sphinx_indexer!(:Person_2)
     end
   end
@@ -288,7 +261,8 @@ describe Mongoid::Giza do
     it "should process all dynamic indexes" do
       allow(Person).to receive(:dynamic_sphinx_indexes) { dynamic }
       allow(dynamic).to receive(:each).and_yield(:dynamic_index)
-      expect(Person).to receive(:process_dynamic_sphinx_index).with(:dynamic_index)
+      expect(Person).to receive(:process_dynamic_sphinx_index)
+        .with(:dynamic_index)
       Person.regenerate_sphinx_indexes
     end
   end
@@ -305,18 +279,21 @@ describe Mongoid::Giza do
     let(:index2) { double("index 2") }
 
     before do
-      allow(Person).to receive(:dynamic_sphinx_indexes) { [dynamic_index, dynamic_index] }
+      allow(Person)
+        .to receive(:dynamic_sphinx_indexes) { [dynamic_index, dynamic_index] }
       allow(dynamic_index).to receive(:generate_index) { index }
       allow(index).to receive(:name) { :name }
     end
 
     it "should generate all the dynamic indexes of the class for the object" do
-      expect(dynamic_index).to receive(:generate_index).with(person).twice { index }
+      expect(dynamic_index).to receive(:generate_index).with(person)
+        .twice { index }
       person.generate_sphinx_indexes
     end
 
     it "should merge the resulting indexes to the class' generated indexes" do
-      expect(Person.generated_sphinx_indexes).to receive(:merge!).with({name: index}).twice
+      expect(Person.generated_sphinx_indexes).to receive(:merge!)
+        .with(name: index).twice
       person.generate_sphinx_indexes
     end
 
@@ -330,13 +307,28 @@ describe Mongoid::Giza do
     let(:index_name) { double("index name") }
 
     it "should remove the indexes from the generated indexes collection" do
-      expect(Person.generated_sphinx_indexes).to receive(:delete).with(index_name).twice
+      expect(Person.generated_sphinx_indexes).to receive(:delete)
+        .with(index_name).twice
       Person.remove_generated_sphinx_indexes(index_name, index_name)
     end
 
     it "should remove the indexes from the configuration" do
-      expect(config).to receive(:remove_generated_indexes).with([index_name, index_name])
+      expect(config).to receive(:remove_generated_indexes)
+        .with([index_name, index_name])
       Person.remove_generated_sphinx_indexes(index_name, index_name)
     end
   end
+
+  describe "map_to_mongoid" do
+    it "should return an result hash" do
+      allow(Person).to receive(:in) { Mongoid::Criteria.new(Person) }
+      expect(Person.send(:map_to_mongoid, matches: [])).to be_a_kind_of(Hash)
+    end
+
+    it "should add an entry with the Mongoid::Criteria Hash" do
+      allow(Person).to receive(:in) { Mongoid::Criteria.new(Person) }
+      result = Person.send(:map_to_mongoid, matches: [])
+      expect(result).to include(:Person)
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@
 # loaded once.
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
-require 'coveralls'
+require "coveralls"
 Coveralls.wear!
 
 require "database_cleaner"
@@ -15,7 +15,7 @@ MONGOID_CONFIG = {
   sessions: {
     default: {
       database: "mongoid_giza_test",
-      hosts: [ "localhost:27017" ]
+      hosts: ["localhost:27017"]
     }
   }
 }
@@ -25,7 +25,6 @@ Mongoid.configure do |config|
 end
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 
@@ -33,7 +32,7 @@ RSpec.configure do |config|
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.
   #     --seed 1234
-  config.order = 'random'
+  config.order = "random"
 
   config.include Mongoid::Matchers, type: :model
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-giza
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Maurício Batista
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-05 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,34 +94,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.29.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.29.0
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: riddle
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.5.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.5.11
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +170,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 description: Mongoid layer for the Sphinx fulltext search server that supports block
   fields and dynamic indexes
 email:
@@ -173,6 +187,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -186,7 +201,7 @@ files:
 - lib/mongoid/giza/index/attribute.rb
 - lib/mongoid/giza/index/field.rb
 - lib/mongoid/giza/indexer.rb
-- lib/mongoid/giza/models/giza_id.rb
+- lib/mongoid/giza/models/id.rb
 - lib/mongoid/giza/railtie.rb
 - lib/mongoid/giza/search.rb
 - lib/mongoid/giza/version.rb
@@ -223,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Mongoid layer for the Sphinx fulltext search server