lucid_works 0.6.22 → 0.6.23

data/lib/lucid_works/base.rb

@@ -314,30 +314,29 @@ module LucidWorks
 
     def save
       _run_save_callbacks do
-        if valid?
-          ActiveSupport::Notifications.instrument("lucid_works.request") do |payload|
-            method, uri = persisted? ? [:put, member_url] : [:post, collection_url]
-            data = encode
-            payload[:method] = method
-            payload[:uri] = uri
-            payload[:data] = data
-            begin
-              response = RestClient.send(method, uri, data, :content_type => :json)
-              payload[:response] = response
-              @persisted = true
-              load_attributes_from_json_string(response)
-              true
-            rescue RestClient::Conflict,                   # 409
-                   RestClient::UnprocessableEntity,        # 422
-                   RestClient::InternalServerError => e    # 500
-              payload[:exceptionion] = e
-              attach_errors_to_model(e.response)
-              false
-            rescue RestClient::Exception => exception
-              # Tack on what we were doing when we got the exception, then send it on up
-              exception.message = "#{exception.message} while performing #{payload[:method]} #{payload[:uri]}"
-              raise exception
-            end
+        return false unless valid?
+        ActiveSupport::Notifications.instrument("lucid_works.request") do |payload|
+          method, uri = persisted? ? [:put, member_url] : [:post, collection_url]
+          data = encode
+          payload[:method] = method
+          payload[:uri] = uri
+          payload[:data] = data
+          begin
+            response = RestClient.send(method, uri, data, :content_type => :json)
+            payload[:response] = response
+            @persisted = true
+            load_attributes_from_json_string(response)
+            true
+          rescue RestClient::Conflict,                   # 409
+                 RestClient::UnprocessableEntity,        # 422
+                 RestClient::InternalServerError => e    # 500
+            payload[:exceptionion] = e
+            attach_errors_to_model(e.response)
+            false
+          rescue RestClient::Exception => exception
+            # Tack on what we were doing when we got the exception, then send it on up
+            exception.message = "#{exception.message} while performing #{payload[:method]} #{payload[:uri]}"
+            raise exception
           end
         end
       end

data/lib/lucid_works/field.rb

@@ -64,7 +64,7 @@ module LucidWorks
     ]
 
     validates_presence_of :name
-    validates_each :name, :allow_blank => true do |model, attr, value|
+    validates_each :name, :unless => :persisted?, :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|
@@ -90,5 +90,9 @@ module LucidWorks
     def self.t_field_type(type)
       I18n.translate(type, :scope => 'activemodel.models.lucid_works.collection.field.field_type')
     end
+    
+    def initialize(options)
+      super(options.reverse_merge(:omit_tf => false, :short_field_boost => 'high'))
+    end
   end
 end

data/lib/lucid_works/gem_version.rb

@@ -1,3 +1,3 @@
 module LucidWorks
-  VERSION = "0.6.22"
+  VERSION = "0.6.23"
 end

data/spec/lib/lucid_works/base_spec.rb

@@ -426,6 +426,10 @@ describe LucidWorks::Base do
 
     describe "#save" do
       context "for a new model" do
+        before(:each) do
+          RestClient.stub(:post)
+        end
+        
         context "with valid attributes" do
           before do
             @widget_attrs = { :name => 'widget4', :size => 'extra medium' }
@@ -440,53 +444,68 @@ describe LucidWorks::Base do
           end
 
           it "should set persisted" do
-            RestClient.should_receive(:post)
             @widget.save
             @widget.should be_persisted
           end
+
+          it "returns true" do
+            @widget.save
+            @widget.should be_true
+          end
         end
 
-        context "with invalid attributes" do
-          before :all do
-            @widget_attrs = { :name => '', :size => ''}
-            ERROR_422_RESPONSE = '{"errors":[{"message":"name is a required key","key":"name"},{"message":"name must consist of only A-Z a-z 0-9 - _","key":"name"}],"http_status_name":"Unprocessable Entity","http_status_code":422}'
+        context "with an API error" do
+          before do
             RestClient.stub(:post) {
               e = RestClient::UnprocessableEntity.new
-              e.response = ERROR_422_RESPONSE
+              e.response = '{"errors":[{"message":"name is a required key","key":"name"},{"message":"name must consist of only A-Z a-z 0-9 - _","key":"name"}],"http_status_name":"Unprocessable Entity","http_status_code":422}'
               raise e
             }
-
-            @widget = Widget.new @widget_attrs.merge(:parent => @server)
-            @returncode = @widget.save
+            @widget = Widget.new(:name => '', :size => '', :parent => @server)
           end
-
+          
           it "should set errors on the model" do
+            @widget.save
             @widget.errors.should_not be_empty
             @widget.errors['name'].should_not be_empty
           end
 
           it "should not set persisted" do
+            @widget.save
             @widget.should_not be_persisted
           end
 
-          it "should return false" do
-            @returncode.should be_false
+          it "returns false" do
+            @widget.save.should be_false
           end
         end
 
-        describe "local validation" do
+        describe "with invalid attributes" do
+          class WidgetRequiringName < LucidWorks::Base
+            validates_presence_of :name
+          end
+
           before do
-            class WidgetRequiringName < LucidWorks::Base
-              validates_presence_of :name
-            end
+            @widget = WidgetRequiringName.new(:parent => @server)
+          end
+
+          it "is invalid" do
+            @widget.save
+            @widget.should_not be_valid
+          end
+          
+          it "returns the validation errors" do
+            @widget.save
+            @widget.errors[:name].should == ["can't be blank"]
           end
 
-          it "should validate presence of" do
-            widget = WidgetRequiringName.new(:parent => @server)
+          it "doesn't post to the REST API" do
             RestClient.should_not_receive(:post)
-            widget.should_not be_valid
-            widget.errors[:name].should == ["can't be blank"]
-            widget.save
+            @widget.save
+          end
+          
+          it "returns false" do
+            @widget.save.should be_false
           end
         end
       end
@@ -615,6 +634,10 @@ describe LucidWorks::Base do
         widget.name.should == 'new_name'
         widget.size.should == 'new_size'
       end
+      
+      it "returns false" do
+        
+      end
     end
 
     describe "#destroy" do

data/spec/lib/lucid_works/field_spec.rb

@@ -11,68 +11,84 @@ describe LucidWorks::Field do
     LucidWorks::Field.new(:parent => @collection).should be_a(LucidWorks::Base)
   end
 
+  describe "default attribute values" do
+    subject { LucidWorks::Field.new(:parent => @collection) }
+    
+    it { subject.omit_tf.should be_false }
+    it { subject.short_field_boost.should == 'high' }
+  end
+  
   describe "validations" do
-    context :name do
-      it "is required" do
-        field = LucidWorks::Field.new(:parent => @collection)
-        field.should_not be_valid
-        field.errors[:name].should == ["can't be blank"]
+    context "for a new field" do
+      context :name do
+        it "is required" do
+          field = LucidWorks::Field.new(:parent => @collection)
+          field.should_not be_valid
+          field.errors[:name].should == ["can't be blank"]
+        end
+
+        it "needs to be unique" do
+          field = LucidWorks::Field.new(:parent => @collection, :name => 'data_source')
+          field.should_not be_valid
+          field.errors[:name].should == ["must be unique"]
+        end
       end
-    
-      it "needs to be unique" do
-        field = LucidWorks::Field.new(:parent => @collection, :name => 'data_source')
-        field.should_not be_valid
-        field.errors[:name].should == ["must be unique"]
+
+      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
-    end
-    
-    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']
+
+      context :include_in_results do
+        it "requires the field to be stored" do
+          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
-        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
-        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"]
+      context :highlight do
+        it "requires the field to be stored" do
+          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
-        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
-        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"]
+      context :facet do
+        it "requires the field to be indexed" do
+          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
-        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
-        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"]
+      context :use_in_find_similar do
+        it "requires the field to be indexed" do
+          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
-        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
-        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
+    context "for an existing field" do
+      it "doesn't validate the name's uniqueness" do
+        field = LucidWorks::Field.find('body', :parent => @collection)
+        field.should be_valid
       end
     end
   end

metadata

@@ -1,101 +1,105 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: lucid_works
-version: !ruby/object:Gem::Version
-  version: 0.6.22
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.6.23
 platform: ruby
-authors:
+authors: 
 - Sam Pierson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-24 00:00:00.000000000 -07:00
+
+date: 2011-06-28 00:00:00 -07:00
 default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: &2161726780 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "3"
   type: :runtime
-  prerelease: false
-  version_requirements: *2161726780
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: activemodel
-  requirement: &2161726280 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "3"
   type: :runtime
-  prerelease: false
-  version_requirements: *2161726280
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rest-client
-  requirement: &2161725820 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.6.1
   type: :runtime
-  prerelease: false
-  version_requirements: *2161725820
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: &2161725440 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *2161725440
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: rsolr
-  requirement: &2161724980 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *2161724980
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: rsolr-ext
-  requirement: &2161724560 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *2161724560
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: nokogiri
-  requirement: &2161724140 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *2161724140
+  version_requirements: *id007
 description: Ruby wrapper for the LucidWorks REST API
-email:
+email: 
 - sam.pierson@lucidimagination.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .autotest
 - .gitignore
 - .rspec
@@ -165,31 +169,34 @@ files:
 - spec/lib/lucid_works/utils_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: ''
+homepage: ""
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: lucid_works
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper for the LucidWorks REST API
-test_files:
+test_files: 
 - spec/lib/lucid_works/associations/has_many_spec.rb
 - spec/lib/lucid_works/associations/has_one_spec.rb
 - spec/lib/lucid_works/associations_spec.rb