lucid_works 0.6.20 → 0.6.21

data/lib/lucid_works/field.rb

@@ -67,17 +67,20 @@ module LucidWorks
     validates_each :name, :allow_blank => true do |model, attr, value|
       model.errors.add(attr, 'must be unique') if model.collection.fields.any? {|f| f.name == value }
     end
+    validates_each :short_field_boost do |model, attr, value|
+      model.errors.add(attr, "cannot be set to \"#{value}\" for a non-indexed field") if value == 'none' && !model.indexed?
+    end
     validates_each :include_in_results do |model, attr, value|
-      model.errors.add(attr, 'a field must be stored to be included in results') unless model.stored?
+      model.errors.add(attr, 'a field must be stored to be included in results') if value == true && !model.stored?
     end
     validates_each :highlight do |model, attr, value|
-      model.errors.add(attr, 'a field must be stored to be highlighted') unless model.stored?
+      model.errors.add(attr, 'a field must be stored to be highlighted') if value == true && !model.stored?
     end
     validates_each :facet do |model, attr, value|
-      model.errors.add(attr, 'a field must be indexed to be facetable') unless model.indexed?
+      model.errors.add(attr, 'a field must be indexed to be facetable') if value == true && !model.indexed?
     end
     validates_each :use_in_find_similar do |model, attr, value|
-      model.errors.add(attr, 'a field must be indexed for it to be used for find-similar') unless model.indexed?
+      model.errors.add(attr, 'a field must be indexed for it to be used for find-similar') if value == true && !model.indexed?
     end
     
     def t_field_type

data/lib/lucid_works/gem_version.rb

@@ -1,3 +1,3 @@
 module LucidWorks
-  VERSION = "0.6.20"
+  VERSION = "0.6.21"
 end

data/spec/lib/lucid_works/field_spec.rb

@@ -26,35 +26,53 @@ describe LucidWorks::Field do
       end
     end
     
-    context :include_in_result do
+    context :short_field_boost do
+      it "cannot be set to 'none' for a non-indexed field" do
+        LucidWorks::Field.new(:parent => @collection, :name => 'my_field', :indexed => false, :short_field_boost => 'none').tap do |field|
+          field.should_not be_valid
+          field.errors[:short_field_boost].should == ['cannot be set to "none" for a non-indexed field']
+        end
+        LucidWorks::Field.new(:parent => @collection, :name => 'my_field', :indexed => true, :short_field_boost => true).should be_valid
+      end
+    end
+
+    context :include_in_results do
       it "requires the field to be stored" do
-        field = LucidWorks::Field.new(:parent => @collection, :name => 'my_field', :stored => false, :include_in_result => true)
-        field.should_not be_valid
-        field.errors[:include_in_results].should == ["a field must be stored to be included in results"]
+        LucidWorks::Field.new(:parent => @collection, :name => 'my_field', :stored => false, :include_in_results => true).tap do |field|
+          field.should_not be_valid
+          field.errors[:include_in_results].should == ["a field must be stored to be included in results"]
+        end
+        LucidWorks::Field.new(:parent => @collection, :name => 'my_field', :stored => true, :include_in_results => true).should be_valid
       end
     end
 
     context :highlight do
       it "requires the field to be stored" do
-        field = LucidWorks::Field.new(:parent => @collection, :name => 'my_field', :stored => false, :highlight => true)
-        field.should_not be_valid
-        field.errors[:highlight].should == ["a field must be stored to be highlighted"]
+        LucidWorks::Field.new(:parent => @collection, :name => 'my_field', :stored => false, :highlight => true).tap do |field|
+          field.should_not be_valid
+          field.errors[:highlight].should == ["a field must be stored to be highlighted"]
+        end
+        LucidWorks::Field.new(:parent => @collection, :name => 'my_field', :stored => true, :highlighted => true).should be_valid
       end
     end
 
     context :facet do
       it "requires the field to be indexed" do
-        field = LucidWorks::Field.new(:parent => @collection, :name => 'my_field', :indexed => false, :facet => true)
-        field.should_not be_valid
-        field.errors[:facet].should == ["a field must be indexed to be facetable"]
+        LucidWorks::Field.new(:parent => @collection, :name => 'my_field', :indexed => false, :facet => true).tap do |field|
+          field.should_not be_valid
+          field.errors[:facet].should == ["a field must be indexed to be facetable"]
+        end
+        LucidWorks::Field.new(:parent => @collection, :name => 'my_field', :indexed => true, :facet => true).should be_valid
       end
     end
     
     context :use_in_find_similar do
       it "requires the field to be indexed" do
-        field = LucidWorks::Field.new(:parent => @collection, :name => 'my_field', :indexed => false, :use_in_find_similar => true)
-        field.should_not be_valid
-        field.errors[:use_in_find_similar].should == ["a field must be indexed for it to be used for find-similar"]
+        LucidWorks::Field.new(:parent => @collection, :name => 'my_field', :indexed => false, :use_in_find_similar => true).tap do |field|
+          field.should_not be_valid
+          field.errors[:use_in_find_similar].should == ["a field must be indexed for it to be used for find-similar"]
+        end
+        LucidWorks::Field.new(:parent => @collection, :name => 'my_field', :indexed => true, :use_in_find_similar => true).should be_valid
       end
     end
   end

metadata

@@ -2,7 +2,7 @@
 name: lucid_works
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.20
+  version: 0.6.21
 platform: ruby
 authors: 
 - Sam Pierson