mebla 1.0.1 → 1.0.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mebla (1.0.0)
+    mebla (1.0.1)
       bson (= 1.2.0)
       bson_ext (= 1.2.0)
       mebla

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/lib/mebla/context.rb

@@ -16,7 +16,7 @@ module Mebla
     
     # @private
     # Adds a model to the list of indexed models
-    def add_indexed_model(model, mappings = {})      
+    def add_indexed_model(model, mappings = {})
       model = model.name if model.is_a?(Class)
       
       @indexed_models << model
@@ -91,7 +91,7 @@ module Mebla
         only_index = @indexed_models
       else
         only_index = models.collect{|m| m.to_s}
-      end
+      end      
       
       Mebla.log("Indexing #{only_index.join(", ")}", :debug)
       
@@ -111,25 +111,34 @@ module Mebla
           # Get the records    
           entries = []
           unless to_index.embedded?
-            entries = to_index.all.only(to_index.search_fields)            
+            if to_index.sub_class?
+              entries = to_index.any_in(:_type => [to_index.name]).only(to_index.search_fields)            
+            else              
+              entries = to_index.any_in(:_type => [nil, to_index.name]).only(to_index.search_fields)            
+            end
           else
             parent = to_index.embedded_parent
             access_method = to_index.embedded_as
             
-           parent.all.each do |parent_record|
-              entries += parent_record.send(access_method.to_sym).all.only(to_index.search_fields)
+            parent.all.each do |parent_record|
+              if to_index.sub_class?
+                entries += parent_record.send(access_method.to_sym).any_in(:_type => [to_index.name]).only(to_index.search_fields)
+              else
+                entries += parent_record.send(access_method.to_sym).any_in(:_type => [nil, to_index.name]).only(to_index.search_fields)
+              end
             end
           end
           
           # Save the number of entries to be indexed
-          indexed_count[model] = entries.count
+          indexed_count[model] = entries.count          
           
           # Build the queries for this model          
           entries.each do |document|
             attrs = document.attributes.dup # make sure we dont modify the document it self
             attrs["id"] = attrs.delete("_id") # the id is already added in the meta data of the action part of the query
             
-            # only index search fields
+            
+            # only index search fields            
             attrs.select!{|field, value| document.class.search_fields.include?(field.to_sym)}
             
             # If embedded get the parent id

data/lib/mebla/mongoid/mebla.rb

@@ -95,7 +95,7 @@ module Mongoid
               raise ::Mebla::Errors::MeblaConfigurationException.new("Couldn't infer #{embedor.to_s} inverse relation, please set :inverse_of option on the relation.")
             end
           else
-            raise ::Mebla::Errors::MeblaConfigurationException.new("#{self.model_name} is embedded: embedded_in option should be set to the parent class if the document is embedded.")
+            raise ::Mebla::Errors::MeblaConfigurationException.new("#{self.name} is embedded: embedded_in option should be set to the parent class if the document is embedded.")
           end
         end
         
@@ -157,6 +157,12 @@ module Mongoid
         set_callback(:destroy, :before, :remove_from_index)
       end
       
+      # Checks if the class is a subclass
+      # @return [Boolean] true if class is a subclass
+      def sub_class?
+        self.superclass != Object
+      end
+      
       private
       # Prepare the mappings required for this document
       # @return [Hash]

data/mebla.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mebla}
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Omar Mekky"]
-  s.date = %q{2011-03-18}
+  s.date = %q{2011-03-22}
   s.description = %q{
     An elasticsearch wrapper for mongoid odm based on slingshot. Makes integration between ElasticSearch full-text 
     search engine and Mongoid documents seemless and simple.
@@ -154,6 +154,14 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<mongoid-rspec>, ["= 1.4.1"])
       s.add_development_dependency(%q<database_cleaner>, ["= 0.6.4"])
       s.add_development_dependency(%q<bluecloth>, ["~> 2.1.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<mongoid-rspec>, ["= 1.4.1"])
+      s.add_development_dependency(%q<database_cleaner>, ["= 0.6.4"])
+      s.add_development_dependency(%q<bluecloth>, ["~> 2.1.0"])
       s.add_runtime_dependency(%q<slingshot-rb>, ["~> 0.0.6"])
       s.add_runtime_dependency(%q<mongoid>, ["= 2.0.0.rc.7"])
       s.add_runtime_dependency(%q<bson>, ["= 1.2.0"])
@@ -241,6 +249,14 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<mongoid-rspec>, ["= 1.4.1"])
       s.add_dependency(%q<database_cleaner>, ["= 0.6.4"])
       s.add_dependency(%q<bluecloth>, ["~> 2.1.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_dependency(%q<yard>, ["~> 0.6.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<mongoid-rspec>, ["= 1.4.1"])
+      s.add_dependency(%q<database_cleaner>, ["= 0.6.4"])
+      s.add_dependency(%q<bluecloth>, ["~> 2.1.0"])
       s.add_dependency(%q<slingshot-rb>, ["~> 0.0.6"])
       s.add_dependency(%q<mongoid>, ["= 2.0.0.rc.7"])
       s.add_dependency(%q<bson>, ["= 1.2.0"])
@@ -329,6 +345,14 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<mongoid-rspec>, ["= 1.4.1"])
     s.add_dependency(%q<database_cleaner>, ["= 0.6.4"])
     s.add_dependency(%q<bluecloth>, ["~> 2.1.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+    s.add_dependency(%q<yard>, ["~> 0.6.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<mongoid-rspec>, ["= 1.4.1"])
+    s.add_dependency(%q<database_cleaner>, ["= 0.6.4"])
+    s.add_dependency(%q<bluecloth>, ["~> 2.1.0"])
     s.add_dependency(%q<slingshot-rb>, ["~> 0.0.6"])
     s.add_dependency(%q<mongoid>, ["= 2.0.0.rc.7"])
     s.add_dependency(%q<bson>, ["= 1.2.0"])

data/spec/fixtures/models.rb

@@ -29,6 +29,20 @@ class MongoidTheta < MongoidAlpha
   search_in :extra
 end
 
+class MongoidTau < MongoidAlpha
+  field :extra2  
+end
+
+class MongoidDelta
+  include Mongoid::Document
+  include Mongoid::Mebla
+  field :name
+end
+
+class MongoidOmega < MongoidDelta
+  search_in :name
+end
+
 class MongoidGamma
   include Mongoid::Document
   include Mongoid::Mebla

data/spec/mebla/indexing_spec.rb

@@ -17,7 +17,7 @@ describe "Mebla" do
       
       lambda {Mebla.context.slingshot_index.retrieve(:mongoid_alpha, fdocument.id.to_s)}.should_not raise_error
       lambda {Mebla.context.slingshot_index.retrieve(:mongoid_alpha, ldocument.id.to_s)}.should_not raise_error
-    end
+    end    
     
     it "should delete the existing index and create a new one" do
       Mebla.context.rebuild_index.should_not == false
@@ -30,7 +30,48 @@ describe "Mebla" do
       maps["cost"]["type"].should == "float"
     end
     
-    describe "embedded documents" do
+    describe "for sub-classed documents" do
+      it "should index existing records" do
+        Mebla.context.drop_index
+        
+        theta = nil
+        
+        MongoidTheta.without_indexing do
+          theta = MongoidTheta.create! :extra => "Subclassed parent"
+        end
+        
+        Mebla.context.index_data
+        
+        lambda {Mebla.context.slingshot_index.retrieve(:mongoid_theta, theta.id.to_s)}.should_not raise_error
+      end
+      
+      it "should not index non searchable subclassed models" do
+        Mebla.context.drop_index        
+        
+        tau = nil
+        MongoidAlpha.without_indexing do
+          MongoidAlpha.create! :name => "Testing indexing bulkly", :value => 1, :cost => 1.0          
+          tau = MongoidTau.create! :extra2 => "Should not be indexed"
+        end
+        
+        lambda {Mebla.context.index_data}.should_not raise_error
+        lambda {Mebla.context.slingshot_index.retrieve(:mongoid_tau, tau.id.to_s)}.should raise_error
+      end
+      
+      it "should index only models with defined indecies" do
+        Mebla.context.drop_index
+        
+        theta = nil
+        
+        MongoidOmega.without_indexing do
+          theta = MongoidOmega.create! :name => "Subclassed parent"
+        end        
+        
+        lambda {Mebla.context.index_data}.should_not raise_error
+      end
+    end
+    
+    describe "for embedded documents" do
       it "should index existing records" do
         Mebla.context.drop_index
                 
@@ -42,7 +83,7 @@ describe "Mebla" do
           MongoidGamma.without_indexing do
             gamma = beta.mongoid_gammas.create :name => "Embedded", :value => 1
           end
-        end
+        end        
         
         Mebla.context.index_data
         

metadata

@@ -2,7 +2,7 @@
 name: mebla
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Omar Mekky
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-18 00:00:00 +02:00
+date: 2011-03-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -828,8 +828,96 @@ dependencies:
   prerelease: false
   version_requirements: *id074
 - !ruby/object:Gem::Dependency 
-  name: slingshot-rb
+  name: rspec
   requirement: &id075 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.3.0
+  type: :development
+  prerelease: false
+  version_requirements: *id075
+- !ruby/object:Gem::Dependency 
+  name: yard
+  requirement: &id076 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.6.0
+  type: :development
+  prerelease: false
+  version_requirements: *id076
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  requirement: &id077 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: *id077
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id078 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.5.2
+  type: :development
+  prerelease: false
+  version_requirements: *id078
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  requirement: &id079 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id079
+- !ruby/object:Gem::Dependency 
+  name: mongoid-rspec
+  requirement: &id080 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.4.1
+  type: :development
+  prerelease: false
+  version_requirements: *id080
+- !ruby/object:Gem::Dependency 
+  name: database_cleaner
+  requirement: &id081 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.6.4
+  type: :development
+  prerelease: false
+  version_requirements: *id081
+- !ruby/object:Gem::Dependency 
+  name: bluecloth
+  requirement: &id082 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.1.0
+  type: :development
+  prerelease: false
+  version_requirements: *id082
+- !ruby/object:Gem::Dependency 
+  name: slingshot-rb
+  requirement: &id083 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -837,10 +925,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *id075
+  version_requirements: *id083
 - !ruby/object:Gem::Dependency 
   name: mongoid
-  requirement: &id076 !ruby/object:Gem::Requirement 
+  requirement: &id084 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -848,10 +936,10 @@ dependencies:
         version: 2.0.0.rc.7
   type: :runtime
   prerelease: false
-  version_requirements: *id076
+  version_requirements: *id084
 - !ruby/object:Gem::Dependency 
   name: bson
-  requirement: &id077 !ruby/object:Gem::Requirement 
+  requirement: &id085 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -859,10 +947,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *id077
+  version_requirements: *id085
 - !ruby/object:Gem::Dependency 
   name: bson_ext
-  requirement: &id078 !ruby/object:Gem::Requirement 
+  requirement: &id086 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -870,10 +958,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *id078
+  version_requirements: *id086
 - !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &id079 !ruby/object:Gem::Requirement 
+  requirement: &id087 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -881,10 +969,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *id079
+  version_requirements: *id087
 - !ruby/object:Gem::Dependency 
   name: yard
-  requirement: &id080 !ruby/object:Gem::Requirement 
+  requirement: &id088 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -892,10 +980,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *id080
+  version_requirements: *id088
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id081 !ruby/object:Gem::Requirement 
+  requirement: &id089 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -903,10 +991,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id081
+  version_requirements: *id089
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id082 !ruby/object:Gem::Requirement 
+  requirement: &id090 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -914,10 +1002,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id082
+  version_requirements: *id090
 - !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &id083 !ruby/object:Gem::Requirement 
+  requirement: &id091 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -925,10 +1013,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id083
+  version_requirements: *id091
 - !ruby/object:Gem::Dependency 
   name: mongoid-rspec
-  requirement: &id084 !ruby/object:Gem::Requirement 
+  requirement: &id092 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -936,10 +1024,10 @@ dependencies:
         version: 1.4.1
   type: :development
   prerelease: false
-  version_requirements: *id084
+  version_requirements: *id092
 - !ruby/object:Gem::Dependency 
   name: database_cleaner
-  requirement: &id085 !ruby/object:Gem::Requirement 
+  requirement: &id093 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -947,10 +1035,10 @@ dependencies:
         version: 0.6.4
   type: :development
   prerelease: false
-  version_requirements: *id085
+  version_requirements: *id093
 - !ruby/object:Gem::Dependency 
   name: bluecloth
-  requirement: &id086 !ruby/object:Gem::Requirement 
+  requirement: &id094 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -958,7 +1046,7 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *id086
+  version_requirements: *id094
 description: "\n    An elasticsearch wrapper for mongoid odm based on slingshot. Makes integration between ElasticSearch full-text \n    search engine and Mongoid documents seemless and simple.\n  "
 email: omar.mekky@mashsolvents.com
 executables: []
@@ -1021,7 +1109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3644119659415680929
+      hash: -1595562442589662284
       segments: 
       - 0
       version: "0"