lucid_works 0.7.2 → 0.7.9

data/.gitignore

@@ -1,6 +1,5 @@
 .idea
 *.gem
 .bundle
-Gemfile.lock
 pkg/*
 /rdoc

data/.rvmrc

@@ -1 +1,4 @@
 rvm use 1.9.2-p180@lucidworks --create
+
+# Enable the following to run the tests under MRI 1.8
+# rvm use ruby-1.8.7-p352@lucidworks --create

data/Gemfile

@@ -4,7 +4,12 @@ source "http://rubygems.org"
 gemspec
 
 group :development do
-  gem 'ruby-debug19'
+  platforms :ruby_18 do
+    gem 'ruby-debug'
+  end
+  platforms :ruby_19 do
+    gem 'ruby-debug19', :require => 'ruby-debug'
+  end
   gem 'rspec'
   gem 'autotest'
   gem "autotest-fsevent"

data/Gemfile.lock

@@ -0,0 +1,83 @@
+PATH
+  remote: .
+  specs:
+    lucid_works (0.7.7)
+      activemodel (>= 3)
+      activesupport (>= 3)
+      json
+      nokogiri
+      rest-client (>= 1.6.1)
+      rsolr
+      rsolr-ext
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    ZenTest (4.5.0)
+    activemodel (3.0.10)
+      activesupport (= 3.0.10)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activesupport (3.0.10)
+    archive-tar-minitar (0.5.2)
+    autotest (4.4.6)
+      ZenTest (>= 4.4.1)
+    autotest-fsevent (0.2.5)
+      sys-uname
+    builder (2.1.2)
+    columnize (0.3.4)
+    diff-lcs (1.1.2)
+    i18n (0.5.0)
+    json (1.5.3)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    linecache19 (0.5.12)
+      ruby_core_source (>= 0.1.4)
+    mime-types (1.16)
+    nokogiri (1.5.0)
+    rbx-require-relative (0.0.5)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    rsolr (1.0.2)
+      builder (>= 2.1.2)
+    rsolr-ext (1.0.3)
+      rsolr (>= 1.0.2)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.5.0)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
+    ruby-debug-base19 (0.11.25)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.5)
+      archive-tar-minitar (>= 0.5.2)
+    sys-uname (0.8.5)
+    timecop (0.3.5)
+    tzinfo (0.3.27)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  autotest
+  autotest-fsevent
+  lucid_works!
+  rspec
+  ruby-debug
+  ruby-debug19
+  timecop
+  tzinfo

data/config/locales/en.yml

@@ -154,7 +154,6 @@ en:
             autocomplete: Generate autocomplete index
             click: Process click logs
             optimize: Optimize index
-            spelling: Generate spellcheck index
         collection:
           one: Collection
           other: Collections
@@ -214,12 +213,14 @@ en:
         name: ! 'Collection names may use the characters: A-Z, a-z, 0-9, dash and
           underscore'
       datasource:
-        crawl_depth: Set to -1 to crawl with no depth limit.
+        crawl_depth: Leave blank or set to -1 to crawl with no depth limit.
         exclude_paths: A list of regular expressions, one per line, e.g. .*\.pdf will
           ignore filenames ending in .pdf.
         include_paths: A list of regular expressions, one per line, e.g. http://example\.com/.*
           will match everything within the site only.
         max_bytes: Default = 10 MiB. Set to -1 to indicate no file size limit.
         url: e.g. http://cnn.com. Please include protocol (http/https).
+      field:
+        copy_fields: A list of fields separated by spaces.
       synonym:
         mapping: ! 'Example: car, automobile, auto'

data/lib/lucid_works/activity.rb

@@ -2,7 +2,7 @@ require 'active_support/core_ext/numeric/time.rb'
 module LucidWorks
 
   class Activity < Base
-    TYPES = %w{ optimize spelling click autocomplete}
+    TYPES = %w{ optimize click autocomplete }
 
     # Unlike Datasource schedules, the API allows multiples of these
     # So, to be honest with gem users, we can't really say this:
@@ -36,9 +36,9 @@ module LucidWorks
     #
     def frequency=(frequency)
       self.period = case frequency
-      when 'hourly' then 1.hours.seconds
-      when 'daily' then 1.days.seconds
-      when 'weekly' then 1.weeks.seconds
+      when 'hourly' then 1.hours.seconds.to_i
+      when 'daily' then 1.days.seconds.to_i
+      when 'weekly' then 1.weeks.seconds.to_i
       else raise "unknown frequency"
       end
     end

data/lib/lucid_works/collection/settings.rb

@@ -14,7 +14,7 @@ module LucidWorks
 
       schema do
         # Indexing Settings
-        attribute  :unknown_type_handling, :string, :values => LucidWorks::Field::TYPES
+        attribute  :unknown_type_handling, :string
         attribute  :de_duplication, :string, :values => DEDUP_OPTIONS
 
         # Querying Settings

data/lib/lucid_works/collection.rb

@@ -14,6 +14,12 @@ module LucidWorks
     end
 
     LOGS_COLLECTION_NAME = 'LucidWorksLogs'
+    AD_FILTERING = 'adfiltering'
+    ROLE_FILTERING = 'filterbyrole'
+    STATIC_ACL_CONFIG = {
+      "filterer.class" => "com.lucid.security.WindowsACLQueryFilterer",
+      "provider.class" => "com.lucid.security.ad.ADACLTagProvider",
+    }
 
     validates_presence_of :name
 
@@ -81,13 +87,13 @@ module LucidWorks
     def prime_activities
       self.activities!.sort!{|a,b|a.id <=> b.id}
       num_created = 0
-      activities_to_return = %w(optimize spelling autocomplete click).map do |type|
+      activities_to_return = ::LucidWorks::Activity::TYPES.map do |type|
         if act = self.activities.detect{|act| act.type == type}
           act
         else
           num_created += 1
           start_time = Time.now.change(:min => 0) + num_created.hours
-          self.create_activity(:type => type, :active => false, :start_time => start_time, :period => 1.days.seconds)
+          self.create_activity(:type => type, :active => false, :start_time => start_time, :period => 1.days.seconds.to_i)
         end
       end
       self.activities! if num_created > 0
@@ -97,20 +103,13 @@ module LucidWorks
     # return the first for each kind of activity
     # don't use these if you need more than one activity
     # b/c each forces an API hit
-    def optimize_activity
-      prime_activities.detect{|act| act.type == 'optimize'}
-    end
-
-    def spelling_activity
-      prime_activities.detect{|act| act.type == 'spelling'}
-    end
-
-    def click_activity
-      prime_activities.detect{|act| act.type == 'click'}
-    end
 
-    def autocomplete_activity
-      prime_activities.detect{|act| act.type == 'autocomplete'}
+    ::LucidWorks::Activity::TYPES.each do |activity|
+      class_eval <<-EOF
+        def #{activity}_activity                                       # def optimize_activity
+          prime_activities.detect{|act| act.type == '#{activity}'}     #   prime_activities.detect{|act| act.type == 'optimize'}
+        end                                                            # end
+      EOF
     end
 
     # URL of Solr's build-in admin page
@@ -132,5 +131,56 @@ module LucidWorks
       JSON.parse RestClient.get(uri + "/jdbcdrivers/classes")
     end
 
+    def components
+      JSON.parse(RestClient.get(uri + "/components/all.json?handlerName=%2Flucid"))
+    end
+    
+    def filtering_enabled?
+      # current core implementation requires exactly one of filterbyrole or adfiltering
+      assert_components_include_ad_xor_role
+      return self.components.include?(AD_FILTERING)
+    end
+
+    def assert_components_include_ad_xor_role
+      # require 'ruby-debug'; debugger
+      raise "conflicting filtering components" if self.components.include?(AD_FILTERING) && self.components.include?(ROLE_FILTERING)
+      raise "missing filtering components" if ! self.components.include?(AD_FILTERING) && ! self.components.include?(ROLE_FILTERING)
+    end
+
+    def filtering_settings
+      JSON.parse(RestClient.get(uri + "/filtering"))['adfiltering'] || {}
+    end
+
+    def compute_component_set(acl_filtering_enabled)
+      new_component_set = self.components.clone
+      new_component_set.delete(ROLE_FILTERING)
+      new_component_set.delete(AD_FILTERING)
+      new_component_set.unshift acl_filtering_enabled == 'true' ? AD_FILTERING : ROLE_FILTERING
+    end
+    
+    def configure_filtering(opts)
+      if ! opts[:config]['java.naming.provider.url'].blank? && opts[:config]['java.naming.provider.url'] !~ %r(://)
+        opts[:config]['java.naming.provider.url'] = "ldap://#{opts[:config]['java.naming.provider.url']}" 
+      end
+      filtering_settings = STATIC_ACL_CONFIG.merge('provider.config' => opts[:config])
+
+      errors = {}
+      method = RestClient.send(:get, uri+'/filtering')['adfiltering'] ? :put : :post
+      begin
+        response = RestClient.send(method, uri+'/filtering/adfiltering', filtering_settings.to_json, :content_type => :json)
+      rescue => exception
+        JSON.parse(exception.response)['errors'].each {|e| errors[e['code']] = e['message']}
+      end
+      
+      new_component_set = compute_component_set(opts[:enabled])
+      if new_component_set.sort != self.components.sort
+        begin
+          response = RestClient.send(:put, uri+'/components/components?handlerName=/lucid', new_component_set.to_json, :content_type => :json)
+        rescue => exception
+          JSON.parse(exception.response)['errors'].each {|e| errors[e['code']] = e['message']}
+        end
+      end
+      raise LucidWorks::AclConfigInvalid.new(errors) unless errors.empty?
+    end
   end
 end

data/lib/lucid_works/datasource/schedule.rb

@@ -44,9 +44,9 @@ module LucidWorks
       #
       def frequency=(frequency)
         self.period = case frequency
-        when 'hourly' then 1.hours.seconds
-        when 'daily' then 1.days.seconds
-        when 'weekly' then 1.weeks.seconds
+        when 'hourly' then 1.hours.seconds.to_i
+        when 'daily' then 1.days.seconds.to_i
+        when 'weekly' then 1.weeks.seconds.to_i
         else raise "unknown frequency"
         end
       end

data/lib/lucid_works/datasource.rb

@@ -32,12 +32,12 @@ module LucidWorks
       # common
       attributes :name, :crawler
       attribute :type, :string, :values => TYPES
-      attributes :crawl_depth, :max_docs,     :type => :integer
+      attribute :crawl_depth, :integer, :nil_when_blank => true
+      attribute :max_docs, :integer
       attributes :max_bytes,   :commit_within, :type => :integer, :omit_when_blank => true
       attribute :commit_within_min, :custom
       attribute :commit_on_finish, :boolean
-      attribute :include_paths
-      attribute :exclude_paths
+      attributes :include_paths, :exclude_paths, :type => :list, :separator => "\n"
       attribute :mapping, :string, :omit_when_blank => true # Hash
       attribute :bounds, :string, :values => BOUNDS
       # web
@@ -95,7 +95,6 @@ module LucidWorks
     end
 
     validates_presence_of :type, :crawler, :name
-    validates_presence_of :crawl_depth, :if => lambda { |d| %w{web file}.include?(d.type) }
     validates_numericality_of :max_bytes, :allow_blank => true
     validates_presence_of :url, :if => lambda { |d| d.type == 'web' }
 

data/lib/lucid_works/datasource_property.rb

@@ -2,17 +2,19 @@ module LucidWorks
 
   class DatasourceProperty
 
-    attr_reader :description, :name, :allowed_values, :type, :default_value, :required, :read_only
+    attr_reader :description, :name, :allowed_values, :type, :default_value, :required, :read_only, :advanced
     alias :read_only? :read_only
+    alias :advanced? :advanced
 
     def initialize(attributes = {})
       @description    = attributes['description']
       @name           = attributes['name']
-      @allowed_values = attributes['allowedValues']
+      @allowed_values = attributes['allowed_values']
       @type           = attributes['type']
-      @default_value  = attributes['defaultValues']
+      @default_value  = attributes['default_value']
       @required       = attributes['required']
       @read_only      = attributes['read_only']
+      @advanced       = attributes['advanced']
     end
   end
-end
+end

data/lib/lucid_works/exceptions.rb

@@ -4,4 +4,8 @@ module LucidWorks
 
   class ResourceNotFound < Exception ; end
   class RecordInvalid < Exception ; end
+  class AclConfigInvalid < Exception
+    attr_accessor :messages;
+    def initialize(messages); @messages = messages; end
+  end
 end

data/lib/lucid_works/field.rb

@@ -22,50 +22,12 @@ module LucidWorks
                  :use_in_find_similar,
                  :type => :boolean
       attribute :default_boost, :integer
-      attributes :field_type, :short_field_boost, :term_vectors, :default_value, :copy_fields, :type => :string
+      attributes :field_type, :short_field_boost, :term_vectors, :default_value, :type => :string
+      attribute :copy_fields, :list
 
       attribute :index_term_freq_and_pos, :custom, :values => INDEXING_OPTIONS
     end
 
-    TYPES = [
-      'string',
-      'boolean',
-      'binary',
-      'int',
-      'float',
-      'long',
-      'double',
-      'tint',
-      'tfloat',
-      'tlong',
-      'tdouble',
-      'uri',
-      'date',
-      'tdate',
-      'text_ws',
-      'text_en',
-      'text_porter_en',
-      'textTight',
-      'text_cjk',
-      'text_da',
-      'text_de',
-      'text_es',
-      'text_fr',
-      'text_it',
-      'text_nl',
-      'text_pt',
-      'text_ru',
-      'text_se',
-      'text_fi',
-      'random',
-      'comma-separated',
-      'textSpell',
-      'payloads',
-      'point',
-      'location',
-      'geohash'
-    ]
-    
     BOOST_VALUES = [
       'none',
       'moderate',

data/lib/lucid_works/gem_version.rb

@@ -1,3 +1,3 @@
 module LucidWorks
-  VERSION = "0.7.2"
+  VERSION = "0.7.9"
 end

data/lib/lucid_works/schema/attribute.rb

@@ -2,7 +2,7 @@ module LucidWorks
   class Schema
 
     class Attribute
-      ATTRIBUTES_TYPES = [ :string, :integer, :boolean, :iso8601, :custom ]
+      ATTRIBUTES_TYPES = [ :string, :integer, :boolean, :iso8601, :custom, :list ]
       RESERVED_ATTRIBUTE_NAMES = %{ class nil? send caller object_id }
 
       attr_reader :schema, :name, :values, :origin

data/lib/lucid_works/schema/list_attribute.rb

@@ -0,0 +1,44 @@
+module LucidWorks
+  class Schema
+
+    class ListAttribute < Attribute
+
+      attr_reader :separator
+      
+      def initialize(schema, name, options={})
+        @separator = options[:separator] || " "
+        super
+      end
+
+      def type
+        :list
+      end
+
+      def create_accessors_for_attribute(klass) # :nodoc:
+        super
+
+        klass.class_eval <<-EOF, __FILE__, __LINE__+1
+          def #{name}
+            list = @attributes[:#{name}]
+            list.nil? ? "" : list.join(self.class.schema[:#{name}].separator)
+          end
+
+          def #{name}=(new_value)
+            if new_value.kind_of?(Array)
+              @attributes[:#{name}] = new_value
+            elsif new_value.kind_of?(String)
+              separator = self.class.schema[:#{name}].separator
+              separator = /[\\r\\n]+/ if separator == "\n"  # Special case
+              @attributes[:#{name}] = new_value.split(separator)
+            elsif new_value.nil?
+              @attributes[:#{name}] = []
+            else
+              raise "Can't interpret \#{new_value.inspect} as a #{name}"
+            end
+            @attributes[:#{name}]
+          end
+        EOF
+      end
+    end
+  end
+end

data/lib/lucid_works.rb

@@ -30,14 +30,15 @@ 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/list_attribute'
 require 'lucid_works/schema/string_attribute'
 
+require 'lucid_works/activity'
 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'
 require 'lucid_works/crawler'

data/spec/lib/lucid_works/collection/acl_config_spec.rb

@@ -0,0 +1,165 @@
+require 'spec_helper'
+
+describe "LucidWorks::Collection ACL configuration utility methods" do
+  before :all do
+    @server = connect_to_live_server
+    @server.reset_collections!
+  end
+  
+  describe "ACL filtering configuration" do
+    before :all do
+      @collection = @server.create_collection(:name => 'collection_for_acl_config_testing', :parent => @server)
+      @initial_components = [
+        "filterbyrole",
+        "query",
+        "mlt",
+        "stats",
+        "feedback",
+        "highlight",
+        "facet",
+        "spellcheck",
+        "debug"
+      ]
+    end
+    
+    describe '#assert_components_include_ad_xor_role' do
+      before do
+        @collection_for_xor = @server.collection('collection_for_acl_config_testing')
+      end
+      it "should not raise an exception for a new collection" do
+        lambda {@collection_for_xor.assert_components_include_ad_xor_role}.should_not raise_error
+      end
+      it "should raise an exception if both are present" do;
+        @collection_for_xor.stub(:components).and_return(@initial_components + [LucidWorks::Collection::AD_FILTERING])
+        lambda {@collection_for_xor.assert_components_include_ad_xor_role}.should raise_error
+      end
+      it "should raise an exception if neither are present" do
+        @collection_for_xor.stub(:components).and_return(@initial_components[1..-1])
+        lambda {@collection_for_xor.assert_components_include_ad_xor_role}.should raise_error
+      end
+    end
+    
+    describe "#filtering_enabled?" do
+      before do
+        @collection_for_enabled = @server.collection('collection_for_acl_config_testing')
+      end
+
+      it "should be false on a new collection" do
+        @collection_for_enabled.filtering_enabled?.should be_false
+      end
+      
+      it "should be true if AD_FILTERING is in the list" do
+        @collection_for_enabled.stub(:components).and_return(@initial_components[1..-1]+[LucidWorks::Collection::AD_FILTERING])
+        @collection_for_enabled.filtering_enabled?.should be_true
+      end
+    end
+      
+    describe "LucidWorks::Collection#components" do
+      it "should return a list of installed components" do        
+        @collection.components.should be_a(Array)
+        @collection.components.sort.should == @initial_components.sort
+      end
+    end
+    
+    describe '#filtering_settings' do
+      before do
+        @collection_for_settings = @server.collection('collection_for_acl_config_testing')
+      end
+      it "should return an empty hash for a new collection" do
+        @collection_for_settings.filtering_settings.should == {}
+      end
+    end
+    
+    describe '#compute_component_set' do
+      before do
+        @collection_for_component_set = @server.collection('collection_for_acl_config_testing')
+      end
+      
+      it "should put ACL_FILTERING at the front if enabling" do
+        initial_components = @initial_components.clone
+        enabled = 'true'
+        @collection_for_component_set.stub(:components).and_return(initial_components)
+        initial_components.first.should_not == LucidWorks::Collection::AD_FILTERING
+        @collection_for_component_set.compute_component_set(enabled).first.should == LucidWorks::Collection::AD_FILTERING
+      end
+      
+      it "should remove ROLE_FILTERING if enabling" do
+        initial_components = @initial_components.clone
+        enabled = 'true'
+        @collection_for_component_set.stub(:components).and_return(initial_components)
+        initial_components.include?(LucidWorks::Collection::ROLE_FILTERING).should be_true
+        @collection_for_component_set.compute_component_set(enabled).include?(LucidWorks::Collection::ROLE_FILTERING).should be_false
+      end
+      
+      it "should put ROLE_FILTERING at the front if disabling" do
+        initial_components = @initial_components.clone
+        initial_components.delete(LucidWorks::Collection::ROLE_FILTERING)
+        initial_components.unshift(LucidWorks::Collection::AD_FILTERING)
+        enabled = 'false'
+        @collection_for_component_set.stub(:components).and_return(initial_components)
+        initial_components.first.should == LucidWorks::Collection::AD_FILTERING
+        @collection_for_component_set.compute_component_set(enabled).first.should == LucidWorks::Collection::ROLE_FILTERING
+      end
+      
+      it "should remove ACL_FILTERING if disabling" do
+        initial_components = @initial_components.clone
+        enabled = 'false'
+        initial_components.delete(LucidWorks::Collection::ROLE_FILTERING)
+        initial_components.unshift(LucidWorks::Collection::AD_FILTERING)
+        @collection_for_component_set.stub(:components).and_return(initial_components)
+        initial_components.include?(LucidWorks::Collection::AD_FILTERING).should be_true
+        @collection_for_component_set.compute_component_set(enabled).include?(LucidWorks::Collection::AD_FILTERING).should be_false
+      end
+    end
+    
+    describe '#configure_filtering' do
+      before :all do
+        @collection_for_configure = @server.collection('collection_for_acl_config_testing')
+        @settings = {
+          "java.naming.provider.url"=>"ldap://184.72.197.18/", 
+          "java.naming.security.principal"=>"wma@corp.lucid.com", 
+          "java.naming.security.credentials"=>"secret", 
+        }
+      end
+      
+      it "should merge in the static settings and store all of the settings" do
+        final_settings = {
+          "provider.class"=>"com.lucid.security.ad.ADACLTagProvider",
+          "filterer.class"=>"com.lucid.security.WindowsACLQueryFilterer",
+          "provider.config"=>
+          {
+            "java.naming.provider.url"=>"ldap://184.72.197.18/",
+            "java.naming.security.principal"=>"wma@corp.lucid.com"
+          },
+          "filterer.config"=>{}
+        }
+        
+        @collection_for_configure.filtering_settings.should be_blank
+        @collection_for_configure.configure_filtering(:config => @settings, :enabled =>  'true')
+        @collection_for_configure.filtering_settings.should == final_settings
+      end
+      
+      it "should work again after the settings have been saved once and a PUT is now required" do
+        @collection_for_configure.filtering_settings.should_not be_blank
+        lambda {
+          @collection_for_configure.configure_filtering(:config => @settings, :enabled =>  'true')
+        }.should_not raise_error
+      end
+      
+      it "should add ldap:// to url if protocol not specified" do
+        settings = @settings.clone
+        settings['java.naming.provider.url'] = 'foo.com'
+        @collection_for_configure.configure_filtering(:config => settings, :enabled =>  'true')
+        @collection_for_configure.filtering_settings['provider.config']['java.naming.provider.url'].should == 'ldap://foo.com'
+      end
+      
+      it "should not add ldap:// to url if blank" do
+        settings = @settings.clone
+        settings['java.naming.provider.url'] = ''
+        lambda {
+          @collection_for_configure.configure_filtering(:config => settings, :enabled =>  'true')
+        }.should raise_error {|e| e.messages.keys.first.should =~ /url\.no_url/} # because url is required
+      end
+    end
+  end
+end

data/spec/lib/lucid_works/collection/activity_spec.rb

@@ -17,8 +17,13 @@ require 'spec_helper'
 describe LucidWorks::Activity do
   context "Functionality shared with Datasource scheduling" do
     before :all do
+      @system_tz = ENV['TZ']
       ENV['TZ'] = 'UTC'
     end
+    
+    after :all do
+      ENV['TZ'] = @system_tz
+    end
 
     before do
       @server = connect_to_live_server
@@ -278,7 +283,7 @@ describe LucidWorks::Activity do
     context 'sub-time convenience accessors' do
       describe '#hour' do
         it 'should return the hour component of the time' do
-          @schedule.start_time = Time.new(2011, 4, 15, 13, 11, 56)
+          @schedule.start_time = Time.parse("2011-04-15 13:11:56")
           @schedule.hour.should == 13
         end
 
@@ -290,7 +295,7 @@ describe LucidWorks::Activity do
 
       describe '#min' do
         it 'should return the minute component of the time' do
-          @schedule.start_time = Time.new(2011, 4, 15, 13, 11, 56)
+          @schedule.start_time = Time.parse("2011-04-15 13:11:56")
           @schedule.min.should == 11
         end
 
@@ -302,7 +307,7 @@ describe LucidWorks::Activity do
 
       describe '#day_of_week' do
         it 'should return the week component of the time' do
-          @schedule.start_time = Time.new(2011, 4, 15, 13, 11, 56)
+          @schedule.start_time = Time.parse("2011-04-15 13:11:56")
           @schedule.day_of_week.should == 4
         end
 
@@ -321,7 +326,7 @@ describe LucidWorks::Activity do
         end
 
         it 'should be true if period is standard but start_time is > 1 period from now' do
-          some_random_time = Time.new(2011, 4, 15, 13, 11, 56)
+          some_random_time = Time.parse("2011-04-15 13:11:56")
           more_than_a_day_later = some_random_time.advance(:days => 2) 
 
           Timecop.freeze   some_random_time do
@@ -347,7 +352,7 @@ describe LucidWorks::Activity do
         end
 
         it 'should be false if period is standard and start time is > 1 period in the past' do
-          some_random_time = Time.new(2011, 4, 15, 13, 11, 56)
+          some_random_time = Time.parse("2011-04-15 13:11:56")
           more_than_a_day_ago = some_random_time.advance(:days => -2) 
           Timecop.freeze some_random_time do
             @schedule.frequency = 'daily'

data/spec/lib/lucid_works/collection/prime_activities_spec.rb

@@ -22,8 +22,6 @@ describe "LucidWorks::Collection#prime_activities" do
       it "should produce activities of the appropriate type" do
         @collection.optimize_activity.should          be_a  LucidWorks::Activity
         @collection.optimize_activity.type.should     ==    'optimize'
-        @collection.spelling_activity.should          be_a  LucidWorks::Activity
-        @collection.spelling_activity.type.should     ==    'spelling'
         @collection.click_activity.should             be_a  LucidWorks::Activity
         @collection.click_activity.type.should        ==    'click'
         @collection.autocomplete_activity.should      be_a LucidWorks::Activity
@@ -36,14 +34,14 @@ describe "LucidWorks::Collection#prime_activities" do
     context "there are already some activities" do
       before :all do
         @collection = @server.create_collection(:name => 'collection_with_no_activities_2', :parent => @server)
-        spelling_activity = @collection.create_activity(:type => 'spelling', :start_time => 3600, :active => true)
-        spelling_activity.should be_a LucidWorks::Activity
+        optimize_activity = @collection.create_activity(:type => 'optimize', :start_time => 3600, :active => true)
+        optimize_activity.should be_a LucidWorks::Activity
       end
 
       it "should not create duplicates for existing types" do
         lambda {
           @collection.prime_activities
-        }.should change(@collection, :activities_count).by 3
+        }.should change(@collection, :activities_count).by (LucidWorks::Activity::TYPES.size - 1)
       end
     end
 
@@ -60,11 +58,9 @@ describe "LucidWorks::Collection#prime_activities" do
         end
 
         it "should have a virtual attribute for each activity type" do
-          @collection.activities!.count.should == 4
+          @collection.activities!.count.should == LucidWorks::Activity::TYPES.size
           @collection.optimize_activity.should          be_a  LucidWorks::Activity
           @collection.optimize_activity.type.should     ==    'optimize'
-          @collection.spelling_activity.should          be_a  LucidWorks::Activity
-          @collection.spelling_activity.type.should     ==    'spelling'
           @collection.click_activity.should             be_a  LucidWorks::Activity
           @collection.click_activity.type.should        ==    'click'
           @collection.autocomplete_activity.should      be_a LucidWorks::Activity

data/spec/lib/lucid_works/collection_spec.rb

@@ -116,7 +116,7 @@ describe LucidWorks::Collection do
         )
         activity.should be_persisted
         activity = LucidWorks::Activity.create(
-            :type => 'spelling',
+            :type => 'click',
             :start_time => 8600,
             :collection => @collection
         )
@@ -155,7 +155,7 @@ describe LucidWorks::Collection do
       LucidWorks::Activity.create(activity_params.merge(:parent => c))
       c.activities.size.should == 1
       c.prime_activities
-      c.activities.size.should == 4
+      c.activities.size.should == LucidWorks::Activity::TYPES.size
     end
     
     context "with a new collection with no activities" do
@@ -167,11 +167,11 @@ describe LucidWorks::Collection do
 
         @collection2.activities.size.should == 0
         @collection2.prime_activities
-        @collection2.activities.size.should == 4
+        @collection2.activities.size.should == LucidWorks::Activity::TYPES.size
       end
 
       it "should ensure at least one of each activity" do
-        %w(optimize spelling click autocomplete).each do |type|
+        %w(optimize click autocomplete).each do |type|
           @collection2.activities.find_all{|a| a.type == type}.size.should == 1
         end
       end
@@ -394,10 +394,9 @@ describe LucidWorks::Collection do
       end
 
       it "should pass thru pagination variables" do
-        @mock_rsolr_client.should_receive(:find)
-                          .with('/fake_access_path/solr/collection_to_search/select',
-                                :q => 'fake_query', :wt => :ruby, :page => 33, :per_page => 44)
-                          .and_return({})
+        @mock_rsolr_client.should_receive(:find).
+          with('/fake_access_path/solr/collection_to_search/select', :q => 'fake_query', :wt => :ruby, :page => 33, :per_page => 44).
+          and_return({})
 
         @collection.search(:q => 'fake_query', :wt => :ruby, :page => 33, :per_page => 44)
       end
@@ -408,10 +407,9 @@ describe LucidWorks::Collection do
         end
 
         it "should call RSolr.get to perform the search" do
-          @mock_rsolr_client.should_receive(:find)
-                            .with('/fake_access_path/solr/collection_to_search/select',
-                                  :q => 'fake_query', :wt => :xml, :page => 1, :per_page => 10)
-                            .and_return(@good_xml)
+          @mock_rsolr_client.should_receive(:find).
+            with('/fake_access_path/solr/collection_to_search/select', :q => 'fake_query', :wt => :xml, :page => 1, :per_page => 10).
+            and_return(@good_xml)
 
           @collection.search(:q => 'fake_query', :wt => :xml)
         end

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

@@ -15,9 +15,14 @@ require 'spec_helper'
 
 describe LucidWorks::Datasource::Schedule do
   before :all do
+    @system_tz = ENV['TZ']
     ENV['TZ'] = 'UTC'
   end
   
+  after :all do
+    ENV['TZ'] = @system_tz
+  end
+  
   before do
     @server = connect_to_live_server
     @schedule = LucidWorks::Datasource::Schedule.new(:parent => @server)
@@ -271,7 +276,7 @@ describe LucidWorks::Datasource::Schedule do
   context 'sub-time convenience accessors' do
     describe '#hour' do
       it 'should return the hour component of the time' do
-        @schedule.start_time = Time.new(2011, 4, 15, 13, 11, 56)
+        @schedule.start_time = Time.parse("2011-04-15 13:11:56")
         @schedule.hour.should == 13
       end
       
@@ -283,7 +288,7 @@ describe LucidWorks::Datasource::Schedule do
 
     describe '#min' do
       it 'should return the minute component of the time' do
-        @schedule.start_time = Time.new(2011, 4, 15, 13, 11, 56)
+        @schedule.start_time = Time.parse("2011-04-15 13:11:56")
         @schedule.min.should == 11
       end
       
@@ -295,7 +300,7 @@ describe LucidWorks::Datasource::Schedule do
 
     describe '#day_of_week' do
       it 'should return the week component of the time' do
-        @schedule.start_time = Time.new(2011, 4, 15, 13, 11, 56)
+        @schedule.start_time = Time.parse("2011-04-15 13:11:56")
         @schedule.day_of_week.should == 4
       end
       
@@ -314,7 +319,7 @@ describe LucidWorks::Datasource::Schedule do
       end
     
       it 'should be true if period is standard but start_time is > 1 period from now' do
-        some_random_time = Time.new(2011, 4, 15, 13, 11, 56)
+        some_random_time = Time.parse("2011-04-15 13:11:56")
         more_than_a_day_later = some_random_time.advance(:days => 2) 
         
         Timecop.freeze   some_random_time do
@@ -340,7 +345,7 @@ describe LucidWorks::Datasource::Schedule do
       end
       
       it 'should be false if period is standard and start time is > 1 period in the past' do
-        some_random_time = Time.new(2011, 4, 15, 13, 11, 56)
+        some_random_time = Time.parse("2011-04-15 13:11:56")
         more_than_a_day_ago = some_random_time.advance(:days => -2) 
         Timecop.freeze some_random_time do
           @schedule.frequency = 'daily'

data/spec/lib/lucid_works/patch_time_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'time'
 
 describe Time do
   describe ".iso8601" do
@@ -16,7 +17,9 @@ describe Time do
 
     context "when time is non-UTC" do
       it "should generate a time with a 4 digit timezone" do
-        Time.new(2011, 4, 15, 13, 11, 56, "-07:00").iso8601.should == "2011-04-15T13:11:56-0700"
+        # In Ruby 1.8.7, the Time class only lets you use your local (system) time, or UTC.
+        # Use the Time stdlib's parse method to pass a time zone.
+        Time.parse("2011-04-15 13:11:56 -07:00").iso8601.should == "2011-04-15T13:11:56-0700"
       end
     end
   end

data/spec/lib/lucid_works/schema_spec.rb

@@ -10,6 +10,8 @@ describe LucidWorks::Schema do
       attributes :anint, :baz, :type => :integer
       attribute :nullstring, :string, :nil_when_blank => true
       attribute :time, :iso8601
+      attribute :space_list, :list
+      attribute :comma_list, :list, :separator => ','
     end
   end
 
@@ -169,6 +171,35 @@ describe LucidWorks::Schema do
         @model.time.should == 12345678
       end
     end
+
+    context "for a list attribute with the default separator" do
+      it "setter should just store an array" do
+        @model.space_list = ['one', 'two']
+        @model.attributes[:space_list].should == ['one', 'two']
+      end
+
+      it "setter should convert a string to an array" do
+        @model.space_list = "three four"
+        @model.attributes[:space_list].should == ['three', 'four']
+      end
+
+      it "getter should convert array to space separated string" do
+        @model.attributes[:space_list] = ['seven', 'eight']
+        @model.space_list.should == 'seven eight'
+      end
+    end
+
+    context "for a list attribute with a , separator" do
+      it "setter should convert a string to an array" do
+        @model.comma_list = "five,six"
+        @model.attributes[:comma_list].should == ['five', 'six']
+      end
+
+      it "getter should convert array to , separated string" do
+        @model.attributes[:comma_list] = ['nine', 'ten']
+        @model.comma_list.should == 'nine,ten'
+      end
+    end
   end
 
   describe "#has_attribute?" do

metadata

@@ -2,7 +2,7 @@
 name: lucid_works
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.2
+  version: 0.7.9
 platform: ruby
 authors: 
 - Sam Pierson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-23 00:00:00 -04:00
+date: 2011-09-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -105,6 +105,7 @@ files:
 - .rspec
 - .rvmrc
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - NOTICE
 - README.rdoc
@@ -153,6 +154,7 @@ files:
 - lib/lucid_works/schema/custom_attribute.rb
 - lib/lucid_works/schema/integer_attribute.rb
 - lib/lucid_works/schema/iso8601_attribute.rb
+- lib/lucid_works/schema/list_attribute.rb
 - lib/lucid_works/schema/string_attribute.rb
 - lib/lucid_works/server.rb
 - lib/lucid_works/simple_naming.rb
@@ -171,6 +173,7 @@ files:
 - spec/lib/lucid_works/associations/has_one_spec.rb
 - spec/lib/lucid_works/associations_spec.rb
 - spec/lib/lucid_works/base_spec.rb
+- spec/lib/lucid_works/collection/acl_config_spec.rb
 - spec/lib/lucid_works/collection/activity/history_spec.rb
 - spec/lib/lucid_works/collection/activity/status_spec.rb
 - spec/lib/lucid_works/collection/activity_spec.rb
@@ -231,6 +234,7 @@ test_files:
 - spec/lib/lucid_works/associations/has_one_spec.rb
 - spec/lib/lucid_works/associations_spec.rb
 - spec/lib/lucid_works/base_spec.rb
+- spec/lib/lucid_works/collection/acl_config_spec.rb
 - spec/lib/lucid_works/collection/activity/history_spec.rb
 - spec/lib/lucid_works/collection/activity/status_spec.rb
 - spec/lib/lucid_works/collection/activity_spec.rb