mebla 1.0.2 → 1.0.3

data/Gemfile.lock

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

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/lib/mebla/mongoid/mebla.rb

@@ -10,8 +10,7 @@ module Mongoid
     included do
       # Used to properly represent data types
       unless defined?(SLINGSHOT_TYPE_MAPPING)
-        SLINGSHOT_TYPE_MAPPING = {
-          'Array' => 'array',
+        SLINGSHOT_TYPE_MAPPING = {          
           'Date' => 'date',
           'DateTime' => 'date',
           'Time' => 'date',
@@ -106,7 +105,9 @@ module Mongoid
         attrs_mappings = {}
         
         attrs.each do |attribute|
-          attrs_mappings[attribute] = {:type => SLINGSHOT_TYPE_MAPPING[self.fields[attribute.to_s].type.to_s] || "string"}
+          unless (field_type = self.fields[attribute.to_s].type.to_s) == "Array" # arrays don't need mappings
+            attrs_mappings[attribute] = {:type => SLINGSHOT_TYPE_MAPPING[field_type] || "string"}
+          end
         end
         
         # Generate advanced indeces' mappings

data/mebla.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mebla}
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Omar Mekky"]
@@ -162,6 +162,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"])
@@ -257,6 +265,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"])
@@ -353,6 +369,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

@@ -43,6 +43,15 @@ class MongoidOmega < MongoidDelta
   search_in :name
 end
 
+class MongoidZeta
+  include Mongoid::Document
+  include Mongoid::Mebla
+  field :name
+  field :an_array, :type => Array
+  
+  search_in :name, :an_array
+end
+
 class MongoidGamma
   include Mongoid::Document
   include Mongoid::Mebla

data/spec/mebla/indexing_spec.rb

@@ -30,6 +30,22 @@ describe "Mebla" do
       maps["cost"]["type"].should == "float"
     end
     
+    describe "array fields" do
+      it "should index arrays" do
+        Mebla.context.drop_index
+        
+        zeta = nil
+        
+        MongoidZeta.without_indexing do
+          zeta = MongoidZeta.create! :name => "Document with an array", :an_array => [:item, :item2]
+        end
+        
+        Mebla.context.index_data
+        
+        lambda {Mebla.context.slingshot_index.retrieve(:mongoid_zeta, zeta.id.to_s)}.should_not raise_error
+      end
+    end
+    
     describe "for sub-classed documents" do
       it "should index existing records" do
         Mebla.context.drop_index

data/spec/mebla/searching_spec.rb

@@ -19,6 +19,25 @@ describe "Mebla" do
       results.first.class.should == MongoidAlpha
     end
     
+    describe "documents with arrays" do
+      before(:each) do
+        Mebla.context.rebuild_index
+        MongoidZeta.create! :name => "Document with array", :an_array => [:item, :item2]
+      end
+      
+      it "should return arrays correctly" do
+        results = MongoidZeta.search "Document with array"
+        
+        results.first.an_array.class.should == Array
+      end
+      
+      it "should search within arrays" do
+        results = MongoidZeta.search "item2"
+        
+        results.count.should == 1
+      end
+    end
+    
     describe "multiple types" do
       before(:each) do
         MongoidBeta.create! :name => "Testing index"

data/spec/mebla/synchronization_spec.rb

@@ -47,6 +47,15 @@ describe "Mebla" do
     end
   end
   
+  describe "array fields documents" do
+    it "should index array fields and retrieve them correctly" do
+      Mebla.context.rebuild_index
+      zdocument = MongoidZeta.create :name => "Document with array", :an_array => [:index, :index2, :index2]
+      
+      lambda {Mebla.context.slingshot_index.retrieve(:mongoid_zeta, zdocument.id.to_s)}.should_not raise_error
+    end
+  end
+  
   describe "embedded documents" do
     before(:each) do
       Mebla.context.rebuild_index

metadata

@@ -2,7 +2,7 @@
 name: mebla
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Omar Mekky
@@ -916,8 +916,96 @@ dependencies:
   prerelease: false
   version_requirements: *id082
 - !ruby/object:Gem::Dependency 
-  name: slingshot-rb
+  name: rspec
   requirement: &id083 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.3.0
+  type: :development
+  prerelease: false
+  version_requirements: *id083
+- !ruby/object:Gem::Dependency 
+  name: yard
+  requirement: &id084 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.6.0
+  type: :development
+  prerelease: false
+  version_requirements: *id084
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  requirement: &id085 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: *id085
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id086 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.5.2
+  type: :development
+  prerelease: false
+  version_requirements: *id086
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  requirement: &id087 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id087
+- !ruby/object:Gem::Dependency 
+  name: mongoid-rspec
+  requirement: &id088 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.4.1
+  type: :development
+  prerelease: false
+  version_requirements: *id088
+- !ruby/object:Gem::Dependency 
+  name: database_cleaner
+  requirement: &id089 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.6.4
+  type: :development
+  prerelease: false
+  version_requirements: *id089
+- !ruby/object:Gem::Dependency 
+  name: bluecloth
+  requirement: &id090 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.1.0
+  type: :development
+  prerelease: false
+  version_requirements: *id090
+- !ruby/object:Gem::Dependency 
+  name: slingshot-rb
+  requirement: &id091 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -925,10 +1013,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *id083
+  version_requirements: *id091
 - !ruby/object:Gem::Dependency 
   name: mongoid
-  requirement: &id084 !ruby/object:Gem::Requirement 
+  requirement: &id092 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -936,10 +1024,10 @@ dependencies:
         version: 2.0.0.rc.7
   type: :runtime
   prerelease: false
-  version_requirements: *id084
+  version_requirements: *id092
 - !ruby/object:Gem::Dependency 
   name: bson
-  requirement: &id085 !ruby/object:Gem::Requirement 
+  requirement: &id093 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -947,10 +1035,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *id085
+  version_requirements: *id093
 - !ruby/object:Gem::Dependency 
   name: bson_ext
-  requirement: &id086 !ruby/object:Gem::Requirement 
+  requirement: &id094 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -958,10 +1046,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *id086
+  version_requirements: *id094
 - !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &id087 !ruby/object:Gem::Requirement 
+  requirement: &id095 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -969,10 +1057,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *id087
+  version_requirements: *id095
 - !ruby/object:Gem::Dependency 
   name: yard
-  requirement: &id088 !ruby/object:Gem::Requirement 
+  requirement: &id096 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -980,10 +1068,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *id088
+  version_requirements: *id096
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id089 !ruby/object:Gem::Requirement 
+  requirement: &id097 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -991,10 +1079,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id089
+  version_requirements: *id097
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id090 !ruby/object:Gem::Requirement 
+  requirement: &id098 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -1002,10 +1090,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id090
+  version_requirements: *id098
 - !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &id091 !ruby/object:Gem::Requirement 
+  requirement: &id099 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -1013,10 +1101,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id091
+  version_requirements: *id099
 - !ruby/object:Gem::Dependency 
   name: mongoid-rspec
-  requirement: &id092 !ruby/object:Gem::Requirement 
+  requirement: &id100 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -1024,10 +1112,10 @@ dependencies:
         version: 1.4.1
   type: :development
   prerelease: false
-  version_requirements: *id092
+  version_requirements: *id100
 - !ruby/object:Gem::Dependency 
   name: database_cleaner
-  requirement: &id093 !ruby/object:Gem::Requirement 
+  requirement: &id101 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -1035,10 +1123,10 @@ dependencies:
         version: 0.6.4
   type: :development
   prerelease: false
-  version_requirements: *id093
+  version_requirements: *id101
 - !ruby/object:Gem::Dependency 
   name: bluecloth
-  requirement: &id094 !ruby/object:Gem::Requirement 
+  requirement: &id102 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -1046,7 +1134,7 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *id094
+  version_requirements: *id102
 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: []
@@ -1109,7 +1197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1595562442589662284
+      hash: -929217804110582376
       segments: 
       - 0
       version: "0"