lucid_works 0.6.0 → 0.6.1

data/config/locales/en.yml

@@ -5,6 +5,8 @@ en:
       lucid_works:
         collection:
           activity:
+            one: Activity
+            other: Activities
             type:
               optimize: Optimize
               spelling: Spelling

data/lib/lucid_works/collection.rb

@@ -46,7 +46,7 @@ module LucidWorks
     end
 
     def prime_activities
-      self.activities!
+      self.activities!.sort!{|a,b|a.id <=> b.id}
       num_created = 0
       activities_to_return = %w(optimize spelling click autocomplete).map do |type|
         if act = self.activities.detect{|act| act.type == type}

data/lib/lucid_works/collection/activity.rb

@@ -1,3 +1,4 @@
+require 'active_support/core_ext/numeric/time.rb'
 module LucidWorks
   class Collection < Base
     class Activity < Base
@@ -17,7 +18,7 @@ module LucidWorks
       validates_numericality_of :period, :allow_blank => true
 
       def t_type
-        I18n.t(type, :scope => 'activemodel.models.lucid_works.datasource.type')
+        I18n.t(type, :scope => 'activemodel.models.lucid_works.collection.activity.type')
       end
 
       def start
@@ -26,8 +27,43 @@ 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)
+        if period % (result = 1.send(interval))  == 0
+          period / result
+        else
+          false
+        end
+      end
+
     end
   end
 end

data/lib/lucid_works/version.rb

@@ -1,3 +1,3 @@
 module LucidWorks
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

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

@@ -83,6 +83,43 @@ describe LucidWorks::Collection::Activity do
           }.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

metadata

@@ -2,7 +2,7 @@
 name: lucid_works
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors: 
 - Sam Pierson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-25 00:00:00 -07:00
+date: 2011-04-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency