lucid_works 0.6.10 → 0.6.11

data/Gemfile

@@ -8,4 +8,6 @@ group :development do
   gem 'rspec'
   gem 'autotest'
   gem "autotest-fsevent"
+  gem 'timecop'
+  gem 'tzinfo'
 end

data/lib/lucid_works/collection.rb

@@ -2,6 +2,7 @@ module LucidWorks
 
   class Collection < Base
 
+    belongs_to :server
     has_many :datasources, :fields, :activities
     has_one  :info, :settings
     has_one  :index, :has_content => false
@@ -23,21 +24,21 @@ module LucidWorks
       build_index.destroy(:params => {:key => 'iaccepttherisk'})
     end
 
-    # Setup the Collection with an RSolr object that it can use to search.
-    # Must be provided with the URL of a Solr instance (excluding the /solr/... path)
-    def rsolr_connect(solr_url, default_search_params={})
-      @default_search_params = default_search_params
-      @path_prefix = URI.parse(solr_url).path
-      @rsolr ||= RSolr.connect :url => solr_url.dup
+    def rsolr
+      unless @rsolr
+        server_uri = self.server.host
+        @path_prefix = URI.parse(server_uri).path # The API key
+        @rsolr = RSolr.connect :url => server_uri.dup
+      end
+      @rsolr
     end
 
     # Perform a Solr search using RSolr
     def search(search_params={}, options={})
-      params = @default_search_params.merge(search_params)
       page = options[:page] ||= 1
       per_page = options[:per_page] ||= 10
-      resp = @rsolr.paginate page, per_page, "#{@path_prefix}/solr/#{name}/select", :params => params
-      if params[:wt] == :xml
+      resp = rsolr.paginate page, per_page, "#{@path_prefix}/solr/#{name}/select", :params => search_params
+      if search_params[:wt] == :xml
         data = Nokogiri.XML(resp)
         raise "search received bad XML" unless data.root
       else

data/lib/lucid_works/datasource.rb

@@ -78,6 +78,10 @@ module LucidWorks
       self.deleteAfter = days.blank? ? nil : days.to_i.days.milliseconds
     end
 
+    def document_count
+      collection.search(:wt => :ruby, :q => "data_source:#{id}", :rows => 0)['response']['numFound']
+    end
+
     def empty!
       build_index.destroy
     end

data/lib/lucid_works/datasource/schedule.rb

@@ -55,9 +55,9 @@ module LucidWorks
       # predict when action will occur next if active at that time
       #
       def next_start
-        return start_time if reference_time <= start_time 
+        return start_time if (now = Time.now) <= start_time 
         # require 'ruby-debug'; debugger
-        time_since_start = reference_time - start_time
+        time_since_start = now - start_time
         last_interval_num = (time_since_start / period).to_i
         next_interval_num =  if (time_since_start % period) == 0
           # this is sort of a stupid condition b/c time precision is millisecond or less
@@ -70,12 +70,6 @@ module LucidWorks
         start_time + period * next_interval_num
       end
       
-      #
-      # Provide ability to override "now" explicitly for testing purposes
-      #
-      def reference_time=(time); @reference_time = time; end
-      def reference_time; @reference_time || Time.now.localtime; end
-      
       #
       # phantom attribute for compiling real start time and frequency from appropriate form data
       # Allows the user to specify a schedule simply with repeat interval (hourly, daily, weekly)
@@ -112,19 +106,20 @@ module LucidWorks
         
         self.active = all_attributes['active']  if all_attributes.keys.include?('active')
         
+        now = Time.now
         self.frequency = all_attributes['frequency']
         self.start_time = 
           case all_attributes['frequency']
           when 'weekly'
             # require 'ruby-debug'; debugger
-            start = self.reference_time.beginning_of_week.advance(all_attributes['start'])
-            start < self.reference_time ? start.advance(:weeks => 1) : start 
+            start = now.beginning_of_week.advance(all_attributes['start'])
+            start < now ? start.advance(:weeks => 1) : start 
           when 'daily'                                                       
-            start = self.reference_time.beginning_of_day.advance(all_attributes['start'])
-            start < self.reference_time ? start.advance(:days => 1) : start 
+            start = now.beginning_of_day.advance(all_attributes['start'])
+            start < now ? start.advance(:days => 1) : start 
           when 'hourly'                                                      
-            start = self.reference_time.change(:min => 0).advance(all_attributes['start'])
-            start < self.reference_time ? start.advance(:hours => 1) : start 
+            start = now.change(:min => 0).advance(all_attributes['start'])
+            start < now ? start.advance(:hours => 1) : start 
           else
             puts "*** frequency: <#{all_attributes[:frequency]}>"
             raise "unexpected frequency encountered"
@@ -156,7 +151,7 @@ module LucidWorks
       def start_is_more_than_one_period_in_the_future?
         # This works fine with start times that are multiple periods in the past
         # because that gives a negative difference, and period is always >= 0
-          (self.start_time - self.reference_time) > self.period 
+          (self.start_time - Time.now) > self.period 
       end
       
       #

data/lib/lucid_works/version.rb

@@ -1,3 +1,3 @@
 module LucidWorks
-  VERSION = "0.6.10"
+  VERSION = "0.6.11"
 end

data/spec/lib/lucid_works/collection_spec.rb

@@ -286,60 +286,51 @@ describe LucidWorks::Collection do
     end
   end
 
-  describe "#rsolr_connect" do
+  describe "#rsolr" do
     before :each do
-      @collection = LucidWorks::Collection.new(:parent => @server)
+      @collection = LucidWorks::Collection.new(:name => "collection_to_search", :parent => @server)
+      mock_server = double('server', :host => 'fake_url')
+      @collection.stub(:server) { mock_server }
     end
 
     it "should call RSolr.connect" do
       RSolr.should_receive(:connect).with(:url => 'fake_url')
-      @collection.rsolr_connect('fake_url')
+      @collection.rsolr
     end
 
     it "should return an RSolr::Client" do
-      @collection.rsolr_connect('fake_url').should be_a(RSolr::Client)
+      @collection.rsolr.should be_a(RSolr::Client)
     end
-    
+
     it "should not call RSolr.connect again if it is called again" do
       mock_rsolr_client = double("RSolr::Client")
       RSolr.should_receive(:connect).once.and_return(mock_rsolr_client)
-      @collection.rsolr_connect('fake_uri')
-      @collection.rsolr_connect('fake_uri')
+      @collection.rsolr
+      @collection.rsolr
     end
   end
   
-  describe "search" do
+  describe "#search" do
     context "using faked out Solr" do
       before do
         @collection = LucidWorks::Collection.new(:name => "collection_to_search", :parent => @server)
+        mock_server = double('server', :host => 'http://fake-solr-host.com/fake_access_path')
+        @collection.stub(:server) { mock_server }
         @mock_rsolr_client = double("RSolr::Client")
         RSolr.stub(:connect) { @mock_rsolr_client }
       end
 
-      it "should use default search params stored by #rsolr_connect" do
-        @mock_rsolr_client.should_receive(:paginate)
-                          .with(1, 10, '/fake_access_path/solr/collection_to_search/select',
-                                :params => {:q => 'baz', :foo => :bar})
-                          .and_return({})
-
-        @collection.rsolr_connect('http://fake-solr-host.com/fake_access_path', :foo => :bar)
-        @collection.search :q => 'baz'
-      end
-
       it "should respect pagination variables" do
         @mock_rsolr_client.should_receive(:paginate)
                           .with(33, 44, '/fake_access_path/solr/collection_to_search/select',
                                 :params => {:q => 'fake_query', :wt => :ruby})
                           .and_return({})
 
-        @collection.rsolr_connect('http://fake-solr-host.com/fake_access_path', :wt => :ruby)
-        @collection.search({:q => 'fake_query'}, :page => 33, :per_page => 44)
+        @collection.search({:q => 'fake_query', :wt => :ruby}, :page => 33, :per_page => 44)
       end
 
       context "when requesting an XML response" do
         before do
-          @default_search_params = {:wt => :xml}
-          @collection.rsolr_connect('http://fake-solr-host.com/fake_access_path', @default_search_params)
           @good_xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<response>FooBar</response>\n</xml>"
         end
 
@@ -349,12 +340,12 @@ describe LucidWorks::Collection do
                                   :params => {:q => 'fake_query', :wt => :xml})
                             .and_return(@good_xml)
 
-          @collection.search(:q => 'fake_query')
+          @collection.search(:q => 'fake_query', :wt => :xml)
         end
 
         it "should parse the XML results" do
           @mock_rsolr_client.stub(:paginate) { @good_xml }
-          results = @collection.search(:q => 'fake_query')
+          results = @collection.search(:q => 'fake_query', :wt => :xml)
           results.should be_a(Nokogiri::XML::Document)
           results.root.children.first.text.should == "FooBar"
         end
@@ -366,7 +357,7 @@ describe LucidWorks::Collection do
 
           it "should raise an error" do
             lambda {
-              @collection.search
+              @collection.search(:wt => :xml)
             }.should raise_error
           end
         end
@@ -384,10 +375,8 @@ describe LucidWorks::Collection do
         end
 
         it "should raise an error (until I decide what the right answer is)" do
-          collection = LucidWorks::Collection.new(:name => "collection1", :parent => @server)
-          collection.rsolr_connect(@server.instance_variable_get(:'@host'))
           lambda {
-            collection.search @query_params
+            @collection.search @query_params
           }.should raise_error
         end
       end

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

@@ -14,6 +14,10 @@ require 'spec_helper'
   end
 
 describe LucidWorks::Datasource::Schedule do
+  before :all do
+    ENV['TZ'] = 'UTC'
+  end
+  
   before do
     @server = connect_to_live_server
     @schedule = LucidWorks::Datasource::Schedule.new(:parent => @server)
@@ -49,9 +53,10 @@ describe LucidWorks::Datasource::Schedule do
   describe '#next_start' do
     context 'start_time is in the future' do
       it 'should return start_time' do
-        @schedule.reference_time = Time.now.utc
-        @schedule.start_time = @schedule.reference_time + 30.minutes
-        @schedule.next_start.should == @schedule.start_time
+        Timecop.freeze(now = Time.now.utc) do
+          @schedule.start_time = now + 30.minutes
+          @schedule.next_start.should == @schedule.start_time
+        end
       end
     end
     
@@ -69,10 +74,11 @@ describe LucidWorks::Datasource::Schedule do
       describe 'and it is an exact multiple of self.periods until now' do
         it 'should return now' do
           # get current time after rounding error
-          @schedule.reference_time = @now
-          @schedule.start_time = @now - 30.minutes
-          @schedule.period = 10.minutes
-          @schedule.next_start.should == @now
+          Timecop.freeze(@now) do
+            @schedule.start_time = @now - 30.minutes
+            @schedule.period = 10.minutes
+            @schedule.next_start.should == @now
+          end
         end
       end
       
@@ -155,29 +161,30 @@ describe LucidWorks::Datasource::Schedule do
     context 'supplied start time has elapsed w/rt current interval' do
       describe 'with hourly frequency' do
         it "should advance the start time" do
-          half_past_midnight = Time.iso8601("2011-05-09T00:30:00Z")
+          half_past_midnight = Time.iso8601("2011-05-09T00:30:00Z").in_time_zone('Eastern Time (US & Canada)')
           hourly_at_quarter_past = {"frequency"=>"hourly", "start"=>{"minutes"=>"15"}}
-          quarter_past_1_am = Time.iso8601('2011-05-09T01:15:00Z')
+          quarter_past_1_am = Time.iso8601('2011-05-09T01:15:00Z').in_time_zone('Eastern Time (US & Canada)')
           
-          @schedule.reference_time =          half_past_midnight
-          @schedule.start_time.should_not ==  quarter_past_1_am
+          Timecop.freeze                        half_past_midnight do
+            @schedule.start_time.should_not ==  quarter_past_1_am
           
-          @schedule.schedule =                hourly_at_quarter_past
-          @schedule.start_time.should ==      quarter_past_1_am
+            @schedule.schedule =                hourly_at_quarter_past
+            @schedule.start_time.should ==      quarter_past_1_am
+          end
         end
       end
       
       describe 'with daily frequency' do
         it "should advance the start time" do
-          today_at_noon = Time.iso8601("2011-05-09T12:00:00Z")
-          tomorrow_at_eleven_am = Time.iso8601('2011-05-10T11:00:00Z')
+          today_at_noon = Time.iso8601("2011-05-09T12:00:00Z").in_time_zone('Eastern Time (US & Canada)')
+          tomorrow_at_eleven_am = Time.iso8601('2011-05-10T11:00:00Z').in_time_zone('Eastern Time (US & Canada)')
           daily_at_11_am = {"frequency"=>"daily", "start"=>{"hours" => "11", "minutes"=>"00"}}
+          Timecop.freeze                      today_at_noon do
+            @schedule.start_time.should_not ==  tomorrow_at_eleven_am
           
-          @schedule.reference_time =          today_at_noon
-          @schedule.start_time.should_not ==  tomorrow_at_eleven_am
-          
-          @schedule.schedule =                daily_at_11_am
-          @schedule.start_time.should ==      tomorrow_at_eleven_am
+            @schedule.schedule =                daily_at_11_am
+            @schedule.start_time.should ==      tomorrow_at_eleven_am
+          end
         end
       end
       
@@ -192,11 +199,12 @@ describe LucidWorks::Datasource::Schedule do
             friday_of_this_week.weekday.should ==     'Friday'
             wednesday_of_next_week.weekday.should ==  'Wednesday'
           
-          @schedule.reference_time =          friday_of_this_week
-          @schedule.start_time.should_not ==  wednesday_of_next_week
+          Timecop.freeze                        friday_of_this_week do
+            @schedule.start_time.should_not ==  wednesday_of_next_week
           
-          @schedule.schedule =                weekly_on_wednesday
-          @schedule.start_time.should ==      wednesday_of_next_week
+            @schedule.schedule =                weekly_on_wednesday
+            @schedule.start_time.should ==      wednesday_of_next_week
+          end
         end
       end
     end
@@ -208,14 +216,14 @@ describe LucidWorks::Datasource::Schedule do
           three_quarters_past_midnight =      Time.iso8601('2011-05-09T00:45:00Z')
           hourly_at_three_quarters_past =     {"frequency"=>"hourly", "start"=>{"minutes"=>"45"}}
           
-          @schedule.reference_time =          half_past_midnight
+          Timecop.freeze                        half_past_midnight do
+            @schedule.start_time.should_not ==  three_quarters_past_midnight
+            @schedule.frequency.should_not == 'hourly'
           
-          @schedule.start_time.should_not ==  three_quarters_past_midnight
-          @schedule.frequency.should_not == 'hourly'
-          
-          @schedule.schedule =                hourly_at_three_quarters_past
-          @schedule.start_time.should ==      three_quarters_past_midnight
-          @schedule.frequency.should == 'hourly'
+            @schedule.schedule =                hourly_at_three_quarters_past
+            @schedule.start_time.should ==      three_quarters_past_midnight
+            @schedule.frequency.should == 'hourly'
+          end
         end
       end
       
@@ -225,13 +233,14 @@ describe LucidWorks::Datasource::Schedule do
           today_at_1pm =                      Time.iso8601('2011-05-09T13:00:00Z')
           daily_at_1pm =                      {"frequency"=>"daily", "start"=>{"hours" => "13", "minutes"=>"00"}}
 
-          @schedule.reference_time =          today_at_noon
-          @schedule.start_time.should_not ==  today_at_1pm
-          @schedule.frequency.should_not == 'daily'
+          Timecop.freeze                        today_at_noon do
+            @schedule.start_time.should_not ==  today_at_1pm
+            @schedule.frequency.should_not == 'daily'
 
-          @schedule.schedule =                daily_at_1pm
-          @schedule.start_time.should ==      today_at_1pm
-          @schedule.frequency.should == 'daily'
+            @schedule.schedule =                daily_at_1pm
+            @schedule.start_time.should ==      today_at_1pm
+            @schedule.frequency.should == 'daily'
+          end
         end
       end
       
@@ -246,13 +255,14 @@ describe LucidWorks::Datasource::Schedule do
             wednesday_of_this_week.weekday.should ==  'Wednesday'
             thursday_of_this_week.weekday.should ==   'Thursday'
           
-          @schedule.reference_time =          wednesday_of_this_week
-          @schedule.start_time.should_not ==  thursday_of_this_week
-          @schedule.frequency.should_not == 'weekly'
+          Timecop.freeze                        wednesday_of_this_week do
+            @schedule.start_time.should_not ==  thursday_of_this_week
+            @schedule.frequency.should_not == 'weekly'
 
-          @schedule.schedule =                weekly_on_thursday
-          @schedule.start_time.should ==      thursday_of_this_week
-          @schedule.frequency.should == 'weekly'
+            @schedule.schedule =                weekly_on_thursday
+            @schedule.start_time.should ==      thursday_of_this_week
+            @schedule.frequency.should == 'weekly'
+          end
         end
       end
     end
@@ -307,11 +317,12 @@ describe LucidWorks::Datasource::Schedule do
         some_random_time = Time.new(2011, 4, 15, 13, 11, 56)
         more_than_a_day_later = some_random_time.advance(:days => 2) 
         
-        @schedule.reference_time = some_random_time
-        @schedule.frequency = 'daily'
-        @schedule.start_time = more_than_a_day_later
+        Timecop.freeze   some_random_time do
+          @schedule.frequency = 'daily'
+          @schedule.start_time = more_than_a_day_later
 
-        @schedule.should be_custom
+          @schedule.should be_custom
+        end
       end
     end
     
@@ -319,22 +330,24 @@ describe LucidWorks::Datasource::Schedule do
       it 'should be false if period is standard and start_time is within period from now' do
         half_past_midnight = Time.iso8601("2011-05-09T00:30:00Z")
         a_standard_schedule = {"frequency"=>"hourly", "start"=>{"minutes"=>"15"}}
-        a_standard_reference_time = Time.iso8601('2011-05-09T01:15:00Z')
+        some_random_specific_time = Time.iso8601('2011-05-09T01:15:00Z')
         
-        @schedule.reference_time =          a_standard_reference_time        
-        @schedule.schedule =                a_standard_schedule
+        Timecop.freeze                        some_random_specific_time do
+          @schedule.schedule =                a_standard_schedule
         
-        @schedule.should_not be_custom
+          @schedule.should_not be_custom
+        end
       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)
         more_than_a_day_ago = some_random_time.advance(:days => -2) 
-        @schedule.reference_time = some_random_time
-        @schedule.frequency = 'daily'
-        @schedule.start_time = more_than_a_day_ago
+        Timecop.freeze some_random_time do
+          @schedule.frequency = 'daily'
+          @schedule.start_time = more_than_a_day_ago
 
-        @schedule.should_not be_custom
+          @schedule.should_not be_custom
+        end
       end
 
     end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'lucid_works'
+require 'timecop'
 
 def connect_to_live_server
   server_uri = ENV['LUCIDWORKS_SERVER_URI']

metadata

@@ -2,7 +2,7 @@
 name: lucid_works
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.10
+  version: 0.6.11
 platform: ruby
 authors: 
 - Sam Pierson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-19 00:00:00 -07:00
+date: 2011-05-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency