lucid_works 0.4.9 → 0.5.3

data/README.rdoc

@@ -271,6 +271,7 @@ A class may have a schema defined as follows:
       attributes :int2,  :int3,  :type => :integer
       attribute :string_with_values, :values => ['one', 'two']
       attribute :dontsendme, :omit_during_update => true
+      attribute :sendnull, :string, :nil_when_blank => true
     end
   end
 

data/config/locales/en.yml

@@ -113,3 +113,16 @@ en:
             numUnchanged: Unchanged docs
             numFailed: Failed docs
             numTotal: Total docs
+          sharepointUrl: SharePoint URL
+          connectorType: Connector Type
+          authorization: Authorization
+          username: Username
+          password: Password
+          domain: Domain
+          mySiteBaseURL: MySite URL
+          includedURls: Included URLs
+          excludedURls: Excluded URLs
+          kdcserver: Kerberos KDC server
+          useSPSearchVisibility: Use SP Search Visibility
+          aliases: Site Aliases Mappings
+            

data/lib/lucid_works/base.rb

@@ -39,6 +39,7 @@ module LucidWorks
     attr_writer   :persisted        # :nodoc:
     attr_accessor :raw_response     # :nodoc:
     attr_accessor :response_data    # :nodoc:
+    attr_reader   :attributes       # :nodoc:
 
     define_model_callbacks :save, :only => [:before, :after]
 
@@ -268,7 +269,9 @@ module LucidWorks
               @persisted = true
               load_attributes_from_json_string(response)
               true
-            rescue RestClient::UnprocessableEntity, RestClient::Conflict => e
+            rescue RestClient::Conflict,                   # 409
+                   RestClient::UnprocessableEntity,        # 422
+                   RestClient::InternalServerError => e    # 500
               payload[:exception] = e
               attach_errors_to_model(e.response)
               false
@@ -381,6 +384,7 @@ module LucidWorks
       if data.is_a?(Hash) && data['errors']
         data['errors'].each do |error|
           key = error['key'].blank? ? 'base' : error['key']
+          # When core implements FOCUS-2262 start checking for error['code'] and lookup a translation.
           self.errors.add(key, error['message'])
         end
       end

data/lib/lucid_works/datasource.rb

@@ -10,6 +10,7 @@ module LucidWorks
       # common
       attributes :name, :type, :crawler
       attributes :crawl_depth, :max_bytes, :max_docs, :type => :integer
+      #attribute :commitWithin, :integer
       attribute :include_paths
       attribute :exclude_paths
       attribute :mapping # Hash
@@ -20,12 +21,26 @@ module LucidWorks
       # file
       attribute :path
       attribute :follow_links, :boolean
-
-      # new un-evaluated
-      # attributes :commitWithin
+      # sharepoint
+      attribute :sharepointUrl
+      attribute :connectorType
+      attribute :authorization
+      attribute :username
+      attribute :password
+      attribute :domain
+      attribute :mySiteBaseURL, :string, :nil_when_blank => true
+      attribute :includedURls
+      attribute :excludedURls
+      attribute :kdcserver
+      attribute :useSPSearchVisibility, :boolean
+      attribute :aliases
+      # external
+      attribute :source
+      attribute :source_type
     end
 
-    validates_presence_of :type, :crawler, :name, :crawl_depth
+    validates_presence_of :type, :crawler, :name
+    validates_presence_of :crawl_depth, :unless => lambda { |d| %w{external sharepoint}.include?(d.type) }
     validates_numericality_of :max_bytes, :allow_blank => true
     validates_presence_of :url, :if => lambda { |d| d.type == 'web' }
 
@@ -37,6 +52,8 @@ module LucidWorks
       # Later we may change these to be arrays if we decide to support more than one choice
       # e.g. :web => ['lucid.aperture', 'nutch']
       :file       => 'lucid.aperture',
+      :lwelogs    => 'licid.lwelogs',
+      :external   => 'lucid.external',
       :web        => 'lucid.aperture',
       :solrxml    => 'lucid.solrxml',
       :jdbc       => 'lucid.jdbc',

data/lib/lucid_works/patch_time.rb

@@ -10,4 +10,10 @@ class Time
 
     alias_method_chain :iso8601, :support_for_timezones_without_colons
   end
+
+  def iso8601_with_support_for_timezones_without_colons
+      self.iso8601_without_support_for_timezones_without_colons.gsub /([+-])(\d\d):(\d\d)$/, '\1\2\3'
+  end
+
+  alias_method_chain :iso8601, :support_for_timezones_without_colons
 end

data/lib/lucid_works/schema.rb

@@ -2,6 +2,7 @@ module LucidWorks
 
   # Specify an attributes for a model.
   class Schema < ActiveSupport::HashWithIndifferentAccess
+    ATTRIBUTES_TYPES = [ :string, :integer, :boolean ]
 
     def initialize
       @primary_key = :id
@@ -24,6 +25,7 @@ module LucidWorks
     alias :dynamic_attributes? :dynamic_attributes
     
     def attribute(name, type=:string, options={})
+      raise "Unknown attribute type: #{type.inspect}" unless ATTRIBUTES_TYPES.include?(type)
       primary_key name if options.delete(:primary_key)
       self[name] = options.merge(:type => type)
     end
@@ -73,7 +75,8 @@ module LucidWorks
         end                                         # end
       EOF
       
-      if self[attribute][:type] == :boolean
+      case self[attribute][:type]
+      when :boolean
         klass.class_eval <<-EOF, __FILE__, __LINE__+1
           def #{attribute}?                           # def foo?
             @attributes[:#{attribute}]                #   @attributes[:foo]
@@ -83,6 +86,13 @@ module LucidWorks
             @attributes[:#{attribute}] = to_bool(new_value)    #   @attributes[:foo] = to_bool(new_value)
           end                                                  # end
         EOF
+      when :string
+        klass.class_eval <<-EOF, __FILE__, __LINE__+1
+          def #{attribute}=(new_value)                # def foo=(new_value)
+            new_value = nil if new_value.blank? && self.class.schema[:#{attribute}][:nil_when_blank]
+            @attributes[:#{attribute}] = new_value    #   @attributes[:foo] = new_value
+          end                                         # end
+        EOF
       else
         klass.class_eval <<-EOF, __FILE__, __LINE__+1
           def #{attribute}=(new_value)                # def foo=(new_value)

data/lib/lucid_works/version.rb

@@ -1,3 +1,3 @@
 module LucidWorks
-  VERSION = "0.4.9"
+  VERSION = "0.5.3"
 end

data/spec/lib/lucid_works/base_spec.rb

@@ -395,7 +395,6 @@ describe LucidWorks::Base 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}'
-            # ERROR_500_RESPONSE = '{"errors":[{"message":"The server encountered an unexpected condition which prevented it from fulfilling the request","key":""}],"http_status_name":"Internal Server Error","http_status_code":500}'
             RestClient.stub(:post) {
               e = RestClient::UnprocessableEntity.new
               e.response = ERROR_422_RESPONSE
@@ -486,6 +485,67 @@ describe LucidWorks::Base do
           @widget_with_omit.save
         end
       end
+
+      describe "error processing" do
+        before do
+          @widget_attrs = { :foo => "bar", :bar => "baz" }
+          @widget = Widget.new @widget_attrs.merge(:parent => @server)
+        end
+
+        context "for an attempt that returns attr errors and global errors" do
+          before do
+            response = '{"errors":[{"message":"foo err 1","key":"foo"},' +
+                                  '{"message":"foo err 2","key":"foo"},' +
+                                  '{"message":"bar err 1","key":"bar"},' +
+                                  '{"message":"global err 1","key":""},' +
+                                  '{"message":"global err 2","key":""}],' +
+                                  '"http_status_name":"Unprocessable Entity","http_status_code":422}'
+            RestClient.stub(:post) {
+              e = RestClient::UnprocessableEntity.new
+              e.response = response
+              raise e
+            }
+            @widget.save.should be_false
+          end
+
+          it "should attach the attr errors to their respective attributes" do
+            @widget.errors[:foo].should == ["foo err 1", "foo err 2"]
+            @widget.errors[:bar].should == ["bar err 1"]
+          end
+
+          it "should attach global errors to :base" do
+            @widget.errors[:base].should == ["global err 1", "global err 2"]
+          end
+        end  
+      end
+
+      describe "exception handling" do
+        before do
+          @widget_attrs = { :foo => "bar", :bar => "baz" }
+          @widget = Widget.new @widget_attrs.merge(:parent => @server)
+        end
+
+        it "should catch 409 errors" do
+          RestClient.stub(:post) { raise RestClient::Conflict.new }
+          lambda {
+            @widget.save.should be_false
+          }.should_not raise_error
+        end
+
+        it "should catch 422 errors" do
+          RestClient.stub(:post) { raise RestClient::UnprocessableEntity.new }
+          lambda {
+            @widget.save.should be_false
+          }.should_not raise_error
+        end
+        
+        it "should catch 500 errors" do
+          RestClient.stub(:post) { raise RestClient::InternalServerError.new }
+          lambda {
+            @widget.save.should be_false
+          }.should_not raise_error
+        end
+      end
     end
 
     describe "#update_attributes" do
@@ -513,7 +573,9 @@ describe LucidWorks::Base do
 
     describe "#human_attribute_value" do
       it "should call class.human_attribute_value with attribute name and value" do
-        #TODO
+        widget = Widget.new(:myattr => 'foo', :parent => @server)
+        Widget.should_receive(:human_attribute_value).with(:myattr, 'foo')
+        widget.human_attribute_value(:myattr)
       end
     end
   end

data/spec/lib/lucid_works/patch_time_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Time do
+  describe ".iso8601" do
+    it "should be able to parse a time with a 4 digit timezone" do
+      Time.iso8601("2011-04-15T13:11:56-0700").should == Time.utc(2011, 4, 15, 20, 11, 56)
+    end
+  end
+
+  describe "#iso8601" do
+    it "should generate a time with a 4 digit timezone" do
+      Time.utc(2011, 4, 15, 20, 11, 56).localtime.iso8601.should == "2011-04-15T13:11:56-0700"
+    end
+  end
+end

data/spec/lib/lucid_works/schema_spec.rb

@@ -4,21 +4,49 @@ describe LucidWorks::Schema do
   before do
     @schema = LucidWorks::Schema.new
     @schema.instance_eval do
-      attribute :foo, :string, :primary_key => true
+      attribute :astring, :string, :primary_key => true
       attribute :abool, :boolean
       attributes :bar, :baz, :type => :integer
+      attribute :nullstring, :string, :nil_when_blank => true
+    end
+  end
+
+  describe "#attribute" do
+    before { @schema = LucidWorks::Schema.new }
+
+    describe "using default type" do
+      it "should create a string attribute" do
+        @schema.attribute :foo
+        @schema[:foo][:type].should == :string
+      end
+    end
+
+    describe "with a bad type" do
+      it "should raise an error" do
+        lambda {
+          @schema.attribute :foo, :badtype
+        }.should raise_error
+      end
+    end
+
+    [:string, :integer, :boolean].each do |attr_type|
+      it "should allow type #{attr_type}" do
+        @schema.attribute :foo, attr_type
+        @schema[:foo][:type].should == attr_type
+      end
     end
   end
 
   describe "instance_eval" do
     it "should process the block in its context and create an attribute list" do
       @schema.should == {
-        'foo' => {'type' => :string},
-        'bar' => {'type' => :integer},
-        'baz' => {'type' => :integer},
-        'abool' => {'type' => :boolean}
+        'astring'    => {'type' => :string},
+        'bar'        => {'type' => :integer},
+        'baz'        => {'type' => :integer},
+        'abool'      => {'type' => :boolean},
+        'nullstring' => {'type' => :string, 'nil_when_blank' => true}
       }
-      @schema.primary_key.should == :foo
+      @schema.primary_key.should == :astring
     end
   end
 
@@ -30,8 +58,8 @@ describe LucidWorks::Schema do
     context "when given an argument" do
       it "should set the primary key to the provided value" do
         schema = LucidWorks::Schema.new
-        schema.primary_key 'foo'
-        schema.primary_key.should == :foo
+        schema.primary_key 'astring'
+        schema.primary_key.should == :astring
       end
     end
   end
@@ -55,17 +83,21 @@ describe LucidWorks::Schema do
     before do
       class ClassWithAddedAccessors
         include LucidWorks::Utils::BoolConverter
+        class << self
+          attr_accessor :schema
+        end
         attr_accessor :attributes
         def initialize
           @attributes = {}
         end
       end
+      ClassWithAddedAccessors.schema = @schema
       @schema.create_accessors_for_attributes(ClassWithAddedAccessors)
       @model = ClassWithAddedAccessors.new
     end
 
     it "should add readers and writers for all attributes" do
-      ClassWithAddedAccessors.new.should respond_to(:foo, :foo=)
+      ClassWithAddedAccessors.new.should respond_to(:astring, :astring=)
       ClassWithAddedAccessors.new.should respond_to(:bar, :bar=)
       ClassWithAddedAccessors.new.should respond_to(:abool, :abool=)
     end
@@ -88,11 +120,26 @@ describe LucidWorks::Schema do
         end
       end
     end
+
+    context "for a string attribute" do
+      context "without :nil_when_blank => true" do
+        it "setter save the empty string" do
+          @model.astring = ""
+          @model.astring.should == ""
+        end
+      end
+      context "with :nil_when_blank => true" do
+        it "setter should convert blank to nil" do
+          @model.nullstring = ""
+          @model.nullstring.should be_nil
+        end
+      end
+    end
   end
 
   describe "#has_attribute?" do
     it "should return true if the schema has that attribute" do
-      @schema.has_attribute?(:foo).should be_true
+      @schema.has_attribute?(:astring).should be_true
     end
 
     it "should return false if the schema does not have that attribute" do

metadata

@@ -2,7 +2,7 @@
 name: lucid_works
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.9
+  version: 0.5.3
 platform: ruby
 authors: 
 - Sam Pierson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-09 00:00:00 -07:00
+date: 2011-04-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -142,6 +142,7 @@ files:
 - spec/lib/lucid_works/datasource/status_spec.rb
 - spec/lib/lucid_works/datasource_spec.rb
 - spec/lib/lucid_works/field_spec.rb
+- spec/lib/lucid_works/patch_time_spec.rb
 - spec/lib/lucid_works/schema_spec.rb
 - spec/lib/lucid_works/server_spec.rb
 - spec/lib/lucid_works/utils_spec.rb
@@ -186,6 +187,7 @@ test_files:
 - spec/lib/lucid_works/datasource/status_spec.rb
 - spec/lib/lucid_works/datasource_spec.rb
 - spec/lib/lucid_works/field_spec.rb
+- spec/lib/lucid_works/patch_time_spec.rb
 - spec/lib/lucid_works/schema_spec.rb
 - spec/lib/lucid_works/server_spec.rb
 - spec/lib/lucid_works/utils_spec.rb