lucid_works 0.6.15 → 0.6.16

data/config/locales/en.yml

@@ -81,7 +81,7 @@ en:
             query_time_stopwords: Include stop words in searches
             query_time_synonyms: Use synomyms
             search_server_list: Search server list
-            show_similar: Show similar
+            show_similar: Show "find similar" links
             spellcheck: Spell-check
             ssl: SSL
             stopword_list: Stopword list

data/lib/lucid_works/collection/activity.rb

@@ -176,33 +176,6 @@ module LucidWorks
         save
       end
 
-      def human_readable_period
-        case
-        when result = exact('weeks', period)  then [result, 'weeks']
-        when result = exact('days', period)   then [result, 'days']
-        when hours = exact('hours', period)   then [hours, 'hours']
-        when period < 1.hours                then [1, 'hours']
-        else [(period / 1.hours).round, 'hours']
-        end
-      end
-
-      def human_readable_period=(params)
-        number, type, junk = params
-        raise "invalid parameters #{number.class}, #{type.class}, #{junk.nil? ? 'nothing extra' : extra.class}" unless number.is_a?(Fixnum) && type.is_a?(String) && junk.nil?
-        raise "invalid parameters #{type}" unless %(hours days weeks).include?(type.to_s)
-        number = number.to_i
-        self.period = number * 1.send(type).to_i
-        [number, type]
-      end
-
-      def ruby_start_time
-        Time.iso8601 self.start_time
-      end
-
-      def ruby_start_time=(time_value)
-        self.start_time = time_value.iso8601
-      end
- 
       private
 
       def exact(interval, period)

data/lib/lucid_works/collection.rb

@@ -24,15 +24,30 @@ module LucidWorks
       build_index.destroy(:params => {:key => 'iaccepttherisk'})
     end
 
+    # Sometimes we want to use the raw Rsolr class, instead of Rsolr::Ext
     def rsolr
       unless @rsolr
         server_uri = self.server.host
         @path_prefix = URI.parse(server_uri).path # The API key
-        @rsolr = RSolr::Ext.connect :url => server_uri.dup
+        @rsolr = RSolr.connect :url => server_uri.dup
       end
       @rsolr
     end
 
+    def rsolr_ext
+      unless @rsolr_ext
+        server_uri = self.server.host
+        @path_prefix = URI.parse(server_uri).path # The API key
+        @rsolr_ext = RSolr::Ext.connect :url => server_uri.dup
+      end
+      @rsolr_ext
+    end
+
+    # Lower level access to rsolr, for things like autocomplete queries
+    def rsolr_get(path_suffix, search_params)
+      rsolr.get "#{@path_prefix}/solr/#{name}/#{path_suffix}", :params => search_params
+    end
+
     # Perform a Solr search using RSolr
     def search(search_params={})
       search_params[:page] ||= 1

data/lib/lucid_works/gem_version.rb

@@ -0,0 +1,3 @@
+module LucidWorks
+  VERSION = "0.6.16"
+end

data/lib/lucid_works/version.rb

@@ -1,6 +1,4 @@
 module LucidWorks
-  VERSION = "0.6.15"
-
   class Version < Base
   end
 end

data/lucid_works.gemspec

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "lucid_works" # load all of LucidWorks as lucid_works/version.rb contains a model too
+require "lucid_works/gem_version"
 
 Gem::Specification.new do |s|
   s.name        = "lucid_works"

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

@@ -388,128 +388,4 @@ describe LucidWorks::Collection::Activity do
       end
     end
   end
-  
-#   context "Custom Activity schedule functionality" do
-#     before :all do
-#       @server = connect_to_live_server
-#       @server.reset_collections!
-#       @collection = @server.collections!.first
-#     end
-# 
-#     def activity_count
-#       @collection.activities!.size
-#     end
-# 
-#     class LucidWorks::Collection::Activity
-#       def history_size
-#         self.histories!.size
-#       end
-#     end
-# 
-#     describe "CRUD" do
-#       describe ".create"do
-#         context "with invalid parameters" do
-#           before do
-#             @activity_params = {:type => 'bogus', :start_time => 8600}
-#           end
-# 
-#           it "should not create, and should add errors to model" do
-#             a = nil
-#             lambda {
-#               a = LucidWorks::Collection::Activity.create(@activity_params.merge(:parent => @collection))
-#             }.should_not change(self, :activity_count)
-#             a.should_not be_persisted
-#             a.errors[:type].should_not be_blank
-#           end
-#         end
-# 
-#         context "with valid parameters" do
-#           before do
-#             @activity_params = {:type => 'optimize', :start_time => 8600}
-#           end
-#           it "should create a new activity" do
-#             a = nil
-#             lambda {
-#               a = LucidWorks::Collection::Activity.create(@activity_params.merge(:parent => @collection))
-#             }.should change(self, :activity_count).by(1)
-#             a.should be_persisted
-#             a.errors[:type].should be_blank
-#           end
-#         end
-# 
-#         describe ".find" do
-#           before do
-#             @activity = LucidWorks::Collection::Activity.create(
-#                 :type => 'optimize',
-#                 :start_time => 8600,
-#                 :collection => @collection
-#             )
-#             @activity.should be_persisted
-#           end
-# 
-#           it "should return a valid activity" do
-#             a = LucidWorks::Collection::Activity.find(@activity.id, :parent => @collection)
-#             a.should be_a(LucidWorks::Collection::Activity)
-#           end
-#         
-#           %w{ type period start_time }.each do |attr|
-#             it "should have a value for #{attr}" do
-#               @activity.send(attr.to_sym).should_not be_nil
-#             end
-#           end
-#         end
-# 
-#         describe "#start" do
-#           before do
-#             @activity = LucidWorks::Collection::Activity.first(:parent => @collection)
-#           end
-# 
-#           # can't check #running? b/c w/out a big index, operation is done faster than we can check
-# 
-#           it "should create a new history" do
-#             lambda {
-#               @collection.activities!.first.start
-#             }.should change(@activity, :history_size).by(1)
-#           end
-#         end
-# 
-#         describe "#human_readable_period" do
-#           it "should return hours if divisible by 1.hours but not by 1.days or 1.weeks" do
-#             activity = LucidWorks::Collection::Activity.new(:period => 3600*2, :parent => @collection)
-#             activity.human_readable_period.should == [2, 'hours']
-#           end
-#           it "should return nearest hours if not divisible by 1.hours"do
-#             activity = LucidWorks::Collection::Activity.new(:period => 3600*2.4, :parent => @collection)
-#             activity.human_readable_period.should == [2, 'hours']
-#             activity = LucidWorks::Collection::Activity.new(:period => 3600*4.6, :parent => @collection)
-#             activity.human_readable_period.should == [5, 'hours']
-#             activity = LucidWorks::Collection::Activity.new(:period => 3600*10.01, :parent => @collection)
-#             activity.human_readable_period.should == [10, 'hours']
-#           end
-#           it "should return 1 hours if < 1.hours"do
-#             activity = LucidWorks::Collection::Activity.new(:period => 3599, :parent => @collection)
-#             activity.human_readable_period.should == [1, 'hours']
-#           end
-#           it "should return days if divisible by 1.days but not 1.weeks" do
-#             activity = LucidWorks::Collection::Activity.new(:period => 3600*48, :parent => @collection)
-#             activity.human_readable_period.should == [2, 'days']
-#           end
-#           it "should return weeks if divisible by 1.weeks" do
-#             activity = LucidWorks::Collection::Activity.new(:period => 3600*24*7, :parent => @collection)
-#             activity.human_readable_period.should == [1, 'weeks']                    
-#           end
-#         end
-# 
-#         describe "#human_readable_period=" do
-#           it "should set correct period if given a number and hours/days/weeks" do
-#             activity = LucidWorks::Collection::Activity.new(:parent => @collection)
-#             activity.human_readable_period = [2, 'hours']
-#             activity.period.should == 3600*2
-#             activity.human_readable_period = [2, 'days']
-#             activity.period.should == 3600*2*24
-#           end
-#         end
-#       end
-#     end
-#   end
 end

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

@@ -72,7 +72,7 @@ describe "LucidWorks::Collection#prime_activities" do
         end
 
         it "should have start times at least an hour apart for each activity" do
-          start_times = @collection.activities!.map(&:start_time).map{|t| Time.iso8601 t}.sort
+          start_times = @collection.activities!.map(&:start_time).sort
           last_time = nil
           start_times.each do |time|
             (last_time = time) && next unless last_time

metadata

@@ -1,105 +1,101 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: lucid_works
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.6.16
   prerelease: 
-  version: 0.6.15
 platform: ruby
-authors: 
+authors:
 - Sam Pierson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-08 00:00:00 -04:00
+date: 2011-06-12 00:00:00.000000000 +01:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2168834560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "3"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activemodel
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2168834560
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: &2168834060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "3"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rest-client
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2168834060
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &2168833600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.6.1
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2168833600
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &2168833220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rsolr
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2168833220
+- !ruby/object:Gem::Dependency
+  name: rsolr
+  requirement: &2168832760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rsolr-ext
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2168832760
+- !ruby/object:Gem::Dependency
+  name: rsolr-ext
+  requirement: &2168832340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2168832340
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &2168831920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: *2168831920
 description: Ruby wrapper for the LucidWorks REST API
-email: 
+email:
 - sam.pierson@lucidimagination.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .autotest
 - .gitignore
 - .rspec
@@ -134,6 +130,7 @@ files:
 - lib/lucid_works/datasource/status.rb
 - lib/lucid_works/exceptions.rb
 - lib/lucid_works/field.rb
+- lib/lucid_works/gem_version.rb
 - lib/lucid_works/logs.rb
 - lib/lucid_works/logs/index.rb
 - lib/lucid_works/logs/index/summary.rb
@@ -168,34 +165,31 @@ 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