lucid_works 0.6.12 → 0.6.13

data/lib/lucid_works/datasource.rb

@@ -112,5 +112,13 @@ module LucidWorks
     def t_type
       I18n.t(type, :scope => 'activemodel.models.lucid_works.datasource.type')
     end
+
+    def progress
+      return nil if status.stopped?
+      return nil unless histories.size > 0
+      percent_done = status.elapsed_time.to_f / histories.last.duration
+      percent_done = nil if percent_done > 1.0
+      percent_done
+    end
   end
 end

data/lib/lucid_works/version.rb

@@ -1,5 +1,5 @@
 module LucidWorks
-  VERSION = "0.6.12"
+  VERSION = "0.6.13"
 
   class Version < Base
   end

data/spec/lib/lucid_works/datasource_spec.rb

@@ -296,15 +296,50 @@ describe LucidWorks::Datasource do
   end
 
   describe "#progress" do
+    before do
+      @datasource = LucidWorks::Datasource.new(
+        :collection => @collection,
+        :crawler => LucidWorks::Datasource::CRAWLERS['file'],
+        :type => 'file',
+        :name => "datasource we are going to get progress of",
+        :path => "/fake_ds_to_test_progress",
+        :crawl_depth => 2
+      )
+      @datasource.should be_valid
+    end
+
     context "when the datasource has no prior history" do
-      it "should return nil"
+      it "should return nil" do
+        @datasource.progress.should be_nil
+      end
     end
+    
     context "when the datasource has history" do
+      before do
+        mock_history = double("history", :duration => 4000)
+        @datasource.stub(:histories) { [mock_history] }
+      end
+
       context "and the most last crawl duration was longer then our current crawl duration" do
-        it "should return the fraction completed (between 0.0 and 1.0)"
+        before do
+          mock_status = double('status', :stopped? => false, :elapsed_time => 1000)
+          @datasource.stub(:status) { mock_status }
+        end
+
+        it "should return the fraction completed (between 0.0 and 1.0)" do
+          @datasource.progress.should == 0.25
+        end
       end
-      context "and the most recent crawl duration was no longer our current duration" do
-        it "should return nil"
+      
+      context "and the most recent crawl duration was shorter than our current duration" do
+        before do
+          mock_status = double('status', :stopped? => false, :elapsed_time => 5000)
+          @datasource.stub(:status) { mock_status }
+        end
+
+        it "should return nil" do
+          @datasource.progress.should be_nil
+        end
       end
     end
   end

metadata

@@ -2,7 +2,7 @@
 name: lucid_works
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.12
+  version: 0.6.13
 platform: ruby
 authors: 
 - Sam Pierson