lucid_works 0.6.29 → 0.7.1

data/lib/lucid_works/server.rb

@@ -21,5 +21,19 @@ module LucidWorks
     def uri
       @host + @path
     end
+    alias :rest_api_uri :uri
+
+    def crawler(name)
+      crawlers.detect { |c| c.name == name }
+    end
+
+    def solr_uri
+      "#{host}/solr/"
+    end
+
+    # Location where raw log files may be retrieved
+    def logs_url
+      "#{host}/logs/"
+    end
   end
 end

data/lib/lucid_works.rb

@@ -25,11 +25,18 @@ require 'lucid_works/associations/has_many'
 require 'lucid_works/server'
 require 'lucid_works/base'
 require 'lucid_works/schema'
+require 'lucid_works/schema/attribute'
+require 'lucid_works/schema/boolean_attribute'
+require 'lucid_works/schema/custom_attribute'
+require 'lucid_works/schema/integer_attribute'
+require 'lucid_works/schema/iso8601_attribute'
+require 'lucid_works/schema/string_attribute'
 
 require 'lucid_works/collection'
 require 'lucid_works/collection/info'
 require 'lucid_works/collection/index'
 require 'lucid_works/collection/settings'
+require 'lucid_works/collection/click'
 require 'lucid_works/activity'
 require 'lucid_works/activity/status'
 require 'lucid_works/activity/history'
@@ -41,7 +48,12 @@ require 'lucid_works/datasource/history'
 require 'lucid_works/datasource/schedule'
 require 'lucid_works/datasource/crawldata'
 require 'lucid_works/datasource/job'
+require 'lucid_works/datasource_type'
+require 'lucid_works/datasource_property'
 require 'lucid_works/field'
+require 'lucid_works/fieldtype'
+require 'lucid_works/jdbcdriver'
+require 'lucid_works/role'
 require 'lucid_works/synonym'
 require 'lucid_works/logs'
 require 'lucid_works/logs/query'

data/spec/lib/lucid_works/associations/has_many_spec.rb

@@ -129,22 +129,23 @@ describe LucidWorks::Associations::HasMany do
     context "when save fails" do
       before do
         @mock_target.should_receive(:save).and_return(false)
+        @mock_target.stub_chain(:errors, :full_messages) { ['an error'] }
       end
 
       it "should raise an error" do
         lambda {
           @owner.targets.create!(:foo => :bar)
-        }.should raise_error
+        }.should raise_error(LucidWorks::RecordInvalid)
       end
     end
   end
 
-  context "with options :supports_all => true" do
+  context "with options :retrieveable_en_masse => true" do
     before :all do
       class ::AllableTarget < LucidWorks::Base
       end
       class ::Owner
-        has_many :allable_targets, :supports_all => true
+        has_many :allable_targets, :retrieveable_en_masse => true
       end
     end
 

data/spec/lib/lucid_works/associations/has_one_spec.rb

@@ -109,12 +109,13 @@ describe LucidWorks::Associations::HasOne do
     context "when save fails" do
       before do
         @mock_target.should_receive(:save).and_return(false)
+        @mock_target.stub_chain(:errors, :full_messages) { ['an error'] }
       end
 
       it "should raise an error" do
         lambda {
           @owner.target.create!(:foo => :bar)
-        }.should raise_error
+        }.should raise_error(LucidWorks::RecordInvalid)
       end
     end
   end
@@ -151,12 +152,12 @@ describe LucidWorks::Associations::HasOne do
     end
   end
 
-  context "with options :supports_all => true" do
+  context "with options :retrieveable_en_masse => true" do
     before :all do
       class ::TargetWithAll < LucidWorks::Base
       end
       class ::Owner
-        has_one :target_with_all, :supports_all => true
+        has_one :target_with_all, :retrieveable_en_masse => true
       end
     end
 

data/spec/lib/lucid_works/base_spec.rb

@@ -16,7 +16,7 @@ describe LucidWorks::Base do
 
     class Widget < LucidWorks::Base
       has_one :singleton_widget
-      has_one :singleton_widget_that_supports_all, :supports_all => true
+      has_one :singleton_widget_that_is_retrieveable_en_masse, :retrieveable_en_masse => true
     end
 
     class SingletonWidget < LucidWorks::Base
@@ -35,6 +35,10 @@ describe LucidWorks::Base do
     end
   end
 
+  subject { Widget.new(:parent => @server) }
+
+  it_should_behave_like "ActiveModel"
+  
   describe "naming support" do
     context "for a namespaced model" do
       class LucidWorks::NamespacedModel < LucidWorks::Base
@@ -308,9 +312,9 @@ describe LucidWorks::Base do
             mock_singleton1 = double('singleton widget1')
             mock_singleton2 = double('singleton widget2')
             mock_singleton3 = double('singleton widget3')
-            mock_other_widgets_1 = double('other widgets 1', :supports_all? => false)
-            mock_other_widgets_2 = double('other widgets 2', :supports_all? => false)
-            mock_other_widgets_3 = double('other widgets 3', :supports_all? => false)
+            mock_other_widgets_1 = double('other widgets 1', :retrieveable_en_masse? => false)
+            mock_other_widgets_2 = double('other widgets 2', :retrieveable_en_masse? => false)
+            mock_other_widgets_3 = double('other widgets 3', :retrieveable_en_masse? => false)
             SingletonWidget.should_receive(:find).and_return(mock_singleton1, mock_singleton2, mock_singleton3)
             OtherWidget.should_receive(:find).and_return(mock_other_widgets_1, mock_other_widgets_2, mock_other_widgets_3)
 
@@ -346,56 +350,13 @@ describe LucidWorks::Base do
     end
 
     context "for a model with a schema" do
-      before :all do
-        class WidgetWithBigSchema < LucidWorks::Base
-          schema do
-            attribute :astring,      :string
-            attribute :large_number, :integer
-            attribute :iambool,      :boolean
-            #attribute :when,         :iso8601
-          end
-        end
-        class TrueClass
-          def to_yesno
-            self ? "yes" : "no"
-          end
-        end
-      end
-
       describe ".human_attribute_value(attribute, value)" do
-
-        context "for an attribute described as :boolean in the schema" do
-          it "should to_yesno the attribute" do
-            WidgetWithBigSchema.human_attribute_value(:iambool, true).should == "yes"
-          end
-        end
-
-        context "for an attribute described as :integer in the schema" do
-          before do
-            # So we can test without actually needing ActionPack
-            class LucidWorks::Base
-              def self.number_with_delimiter(x)
-                 x.to_s.gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1,")
-              end
-            end
-          end
-
-          it "should number_with_delimeter the attribute" do
-            WidgetWithBigSchema.human_attribute_value(:large_number, 12345678).should == "12,345,678"
-          end
-        end
-
-        context "for an attributed described as :string in the schema" do
-          it "should just to_s the attribute" do
-            WidgetWithBigSchema.human_attribute_value(:astring, true).should == "true"
-          end
+        it "should call attribute.human_value with the value" do
+          widget = Widget.new(:myattr => 'foo', :parent => @server)
+          attr = widget.class.send(:schema)[:myattr]
+          attr.should_receive(:human_value).with('foo')
+          Widget.human_attribute_value(:myattr, 'foo')
         end
-
-        #context "for an attribute described as :iso8601 in the schema" do
-        #  it "should convert it to localtime to_s(:short)" do
-        #    @widget.human_attribute_value(:when).should == "19 Mar 10:40"
-        #  end
-        #end
       end
 
       describe ".to_select(attribute)" do
@@ -641,12 +602,66 @@ describe LucidWorks::Base do
     end
 
     describe "#destroy" do
-      it "should call RestClient.delete with the appropriate URL" do
-        widget = Widget.new(:parent => @server)
-        widget.id = 27
-        RestClient.should_receive(:delete).with("#{@fake_server_uri}/widgets/27", {})
-        widget.destroy
+      before do
+        @widget = Widget.new(:parent => @server)
+        @widget.id = 27
+      end
+
+      context "when successfull" do
+        it "should call RestClient.delete with the appropriate URL, and return true" do
+          RestClient.should_receive(:delete).with("#{@fake_server_uri}/widgets/27", {}).and_return("")
+          result = @widget.destroy
+          result.should be_true
+        end
+      end
+
+      describe "exceptions" do
+        context "when it recevies a 409 response" do
+          before do
+            RestClient.stub(:delete) {
+              e = RestClient::Conflict.new
+              e.response = "{\"errors\":[{\"message\":\"Field Type currently in use: text_en\"," +
+                           "\"code\":\"error.invalid.value\",\"key\":\"name\"}]," +
+                           "\"http_status_name\":\"Conflict\",\"http_status_code\":409}"
+              raise e
+            }
+          end
+
+          it "should attach errors to the model" do
+            @widget.destroy
+            @widget.errors.should == {:name => ["Field Type currently in use: text_en"]}
+          end
+
+          it "should return false" do
+            result = @widget.destroy
+            result.should be_false
+          end
+        end
+
+        context "when it receives an unexpected RestClient exception" do
+          before do
+            RestClient.stub(:delete) { raise RestClient::UnprocessableEntity.new }
+          end
+
+          it "should re-raise the exception" do
+            exception = nil
+            lambda {
+              @widget.destroy
+            }.should raise_error(RestClient::UnprocessableEntity)
+          end
+
+          it "should augment the error message" do
+            exception = nil
+            begin
+              @widget.destroy
+            rescue Exception => e
+              exception = e
+            end
+            e.message.should =~ /^Unprocessable Entity while performing delete http:\/\/127\.0\.0\.1:123456\/api\/widgets\/27/
+          end
+        end
       end
+
     end
 
     describe "#human_attribute_value" do
@@ -726,7 +741,8 @@ describe LucidWorks::Base do
 
         it "should add attributes to the schema as it loads them" do
           model = ModelWithDynamicAttrs.new(:parent => @server)
-          model.class.schema.should_receive(:add_attribute).with(ModelWithDynamicAttrs, :foo, :string)
+          mock_attribute = mock('Attribute', :name => 'foo')
+          model.class.schema.should_receive(:add_attribute).with(:foo, :string).and_return(mock_attribute)
           model.stub(:foo=)
           model.send(:load_attributes, {:foo => 'bar'})
         end
@@ -771,7 +787,7 @@ describe LucidWorks::Base do
         class ModelToBeEncoded < LucidWorks::Base
           schema do
             attribute :time, :iso8601
-            attribute :blanktime, :iso8601, :omit_when_blank => true
+            attribute :blankish, :string, :omit_when_blank => true
           end
         end
       end
@@ -785,9 +801,41 @@ describe LucidWorks::Base do
       end
 
       describe "for a model with an attr with option :omit_when_blank" do
-        it "should not encode the attribute" do
-          model = ModelToBeEncoded.new(:parent => @server, :time => 123, :blanktime => nil)
-          model.send(:encode).should == '{"time":123}'
+
+        context "when the attr is nil" do
+          before do
+            @model = ModelToBeEncoded.new(:parent => @server, :time => 123, :blankish => nil)
+          end
+          it "should not encode the attribute" do
+            @model.send(:encode).should == '{"time":123}'
+          end
+        end
+
+        context "when the attr is an empty string" do
+          before do
+            @model = ModelToBeEncoded.new(:parent => @server, :time => 123, :blankish => "")
+          end
+          it "should not encode the attribute" do
+            @model.send(:encode).should == '{"time":123}'
+          end
+        end
+
+        context "when the attr is an empty Array" do
+          before do
+            @model = ModelToBeEncoded.new(:parent => @server, :time => 123, :blankish => [])
+          end
+          it "SHOULD encode the attribute" do
+            @model.send(:encode).should == '{"time":123,"blankish":[]}'
+          end
+        end
+
+        context "when the attr is an empty Hash" do
+          before do
+            @model = ModelToBeEncoded.new(:parent => @server, :time => 123, :blankish => {})
+          end
+          it "should not encode the attribute" do
+            @model.send(:encode).should == '{"time":123,"blankish":{}}'
+          end
         end
       end
     end

data/spec/lib/lucid_works/collection/activity/history_spec.rb

@@ -20,7 +20,7 @@ describe LucidWorks::Activity::History do
       histories.count.should == 1
     end
 
-    it "should subtract crawlStarted form crawlStopped and return the difference in seconds" do
+    it "should subtract crawl_started form crawl_stopped and return the difference in seconds" do
       include ActiveSupport::Duration
 
       history = LucidWorks::Activity::History.new(:parent => @activity)

data/spec/lib/lucid_works/collection_spec.rb

@@ -56,20 +56,20 @@ describe LucidWorks::Collection do
         end
       end
 
-      context "with a reserved name" do
-        before do
-          logs = @server.collection(LucidWorks::Collection::LOGS_COLLECTION_NAME) rescue nil
-          logs.destroy if logs
-          @name = LucidWorks::Collection::LOGS_COLLECTION_NAME
-        end
-
-        it "should not create" do
-          c = LucidWorks::Collection.create(:name => @name, :parent => @server)
-          c.should_not be_persisted
-          c.errors.should_not be_empty
-          c.errors[:name].should include "is reserved"
-        end
-      end
+      #context "with a reserved name" do
+      #  before do
+      #    logs = @server.collection(LucidWorks::Collection::LOGS_COLLECTION_NAME) rescue nil
+      #    logs.destroy if logs
+      #    @name = LucidWorks::Collection::LOGS_COLLECTION_NAME
+      #  end
+      #
+      #  it "should not create" do
+      #    c = LucidWorks::Collection.create(:name => @name, :parent => @server)
+      #    c.should_not be_persisted
+      #    c.errors.should_not be_empty
+      #    c.errors[:name].should include "is reserved"
+      #  end
+      #end
     end
 
     describe ".find" do
@@ -284,7 +284,7 @@ describe LucidWorks::Collection do
           begin
             sleep 1
             status = @ds1.status!
-          end while status.crawlState != 'FINISHED'
+          end while status.crawl_state != 'FINISHED'
         end
       rescue Timeout::Error
         raise "Timed out waiting for collection #{@collection.name} datasource #{@ds1.name} crawl to complete"
@@ -338,10 +338,10 @@ describe LucidWorks::Collection do
           datasources = @collection.datasources(:include => [:histories, :status])
           datasource = datasources.detect { |ds| ds.id == @ds1.id }
           datasource.histories.first.should be_a(LucidWorks::Datasource::History)
-          datasource.histories.first.crawlState.should == "FINISHED"
+          datasource.histories.first.crawl_state.should == "FINISHED"
           status = datasource.status
           status.should be_a(LucidWorks::Datasource::Status)
-          status.crawlState.should == 'FINISHED'
+          status.crawl_state.should == 'FINISHED'
         end
       end
     end

data/spec/lib/lucid_works/datasource/history_spec.rb

@@ -13,7 +13,7 @@ describe LucidWorks::Datasource::History do
     it "should sum counds of Updated, New and Unchanged" do
       # History doesn't actually descend drectly from server, but for this test that doesn't matter
       RestClient.should_receive(:get).
-        with("#{@fake_server_uri}/history").and_return('[{"numUpdated":11,"numNew":22,"numUnchanged":33}]')
+        with("#{@fake_server_uri}/history").and_return('[{"num_updated":11,"num_new":22,"num_unchanged":33}]')
       histories = LucidWorks::Datasource::History.all(:parent => @fake_server)
       histories.first.doc_count.should == 66
     end
@@ -21,7 +21,7 @@ describe LucidWorks::Datasource::History do
 
   describe "#crawl_stopped" do
     it "should convert to a Time with the correct value" do
-      history = LucidWorks::Datasource::History.new(:parent => @fake_server, :crawlStopped => "2011-03-25T21:20:52+0000")
+      history = LucidWorks::Datasource::History.new(:parent => @fake_server, :crawl_stopped => "2011-03-25T21:20:52+0000")
       history.crawl_stopped.should be_a(Time)
       # Time.iso8601("2011-03-25T21:20:52+0000").to_yaml # => "--- 2011-03-25 21:20:52 Z\n"
       history.crawl_stopped.should == YAML.load("--- 2011-03-25 21:20:52 Z")
@@ -30,7 +30,7 @@ describe LucidWorks::Datasource::History do
 
   describe "#crawl_started" do
     it "should convert to a Time with the correct value" do
-      history = LucidWorks::Datasource::History.new(:parent => @fake_server, :crawlStarted => "2011-03-25T21:20:52+0000")
+      history = LucidWorks::Datasource::History.new(:parent => @fake_server, :crawl_started => "2011-03-25T21:20:52+0000")
       history.crawl_started.should be_a(Time)
       # Time.iso8601("2011-03-25T21:20:52+0000").to_yaml # => "--- 2011-03-25 21:20:52 Z\n"
       history.crawl_started.should == YAML.load("--- 2011-03-25 21:20:52 Z")
@@ -38,7 +38,7 @@ describe LucidWorks::Datasource::History do
   end
 
   describe "#duration" do
-    it "should subtract crawlStarted form crawlStopped and return the difference in seconds" do
+    it "should subtract crawl_started form crawl_stopped and return the difference in seconds" do
       include ActiveSupport::Duration
 
       history = LucidWorks::Datasource::History.new(:parent => @fake_server)