lucid_works 0.6.18 → 0.6.19

data/lib/lucid_works/{collection/activity → activity}/history.rb

@@ -1,5 +1,5 @@
 module LucidWorks
-  class Collection::Activity
+  class Activity
     class History < Base
       belongs_to :activity
       self.collection_name = 'history' # i.e. not the plural 'histories'

data/lib/lucid_works/{collection/activity → activity}/status.rb

@@ -1,12 +1,12 @@
 module LucidWorks
-  class Collection::Activity
+  class Activity
     class Status < Base
       self.singleton = true
       belongs_to :activity
 
       schema do
         attribute :running, :boolean
-        attribute :type, :string, :values => LucidWorks::Collection::Activity::TYPES
+        attribute :type, :string, :values => LucidWorks::Activity::TYPES
       end
 
     end

data/lib/lucid_works/activity.rb

@@ -0,0 +1,190 @@
+require 'active_support/core_ext/numeric/time.rb'
+module LucidWorks
+
+  class Activity < Base
+    TYPES = %w{ optimize spelling click autocomplete}
+
+    # Unlike Datasource schedules, the API allows multiples of these
+    # So, to be honest with gem users, we can't really say this:
+      # self.singleton = true
+    belongs_to :collection
+    has_many   :histories, :class_name => :history
+    has_one    :status
+
+    schema do
+      attribute :period
+      attribute :start_time, :iso8601
+      attribute :active, :boolean
+      attribute :type, :string, :values => TYPES, :omit_during_update => true
+    end
+
+    validates_presence_of :type, :start_time
+    validates_numericality_of :period, :allow_blank => true
+
+    def frequency
+      case period
+      when 1.weeks.seconds then 'weekly'
+      when 1.days.seconds then 'daily'
+      when 1.hours.seconds then 'hourly'
+      when 0 then nil
+      else 'custom'
+      end
+    end
+    
+    #
+    # accepts hourly, daily, weekly, and sets period to respective # of seconds
+    #
+    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
+      else raise "unknown frequency"
+      end
+    end
+    
+    #
+    # predict when action will occur next if active at that time
+    #
+    def next_start
+      return start_time if (now = Time.now) <= start_time 
+      # require 'ruby-debug'; debugger
+      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
+        # for human purposes we wouldn't care if the result were as though the call 
+        # happened a millisecond later. But whatever.
+        last_interval_num # the next interval *is* the last interval if it is exactly now
+      else
+        last_interval_num + 1
+      end
+      start_time + period * next_interval_num
+    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)
+    # and time within the interval to run (e.g 5 past, or Tuesdays at 2:15)
+    # 
+    # We have to figure out when the actual start time will be because we are not asking 
+    # the user for this. It needs to be:
+    #   * at the requested time relative to the interval chosen
+    #   * as soon as possible
+    #   * in the future
+    #
+    # This is obvious to humans, but when computing it, you run into the following problem. It
+    # happens with all interval sizes, but for the sake of example, we'll use weekly:
+    #
+    # Problem 1) If today is Thursday, and the user asks for "weekly on Wednesdays," Wednesday has
+    # already happened this week. We have to make sure we pick the nearest wednesday that is in 
+    # the future
+    #
+    # Problem 2) If today is Tuesday, and the user asks for "weekly on Wednesdays,", the simple solution
+    # to problem 1 (start next week instead of this week) causes you to skip this Tuesday, even though
+    # it is valid and is what the user would expect
+    #
+    # The algorith to solve both problems at once is this: 
+    #    * From Time.now, back up to the beginning of the interval even if it is in the past. 
+    #    * Fast forward to the requested siimple start time
+    #    * If you are still in the past, advance by one interval
+    #
+    def schedule=(all_attributes)
+      # convert to format accepted by Time.advance
+      if all_attributes['start']
+        all_attributes['start'].to_options!
+        all_attributes['start'].each{|k,v| all_attributes['start'][k]=v.to_i}
+      end
+      
+      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 = now.beginning_of_week.advance(all_attributes['start'])
+          start < now ? start.advance(:weeks => 1) : start 
+        when 'daily'                                                       
+          start = now.beginning_of_day.advance(all_attributes['start'])
+          start < now ? start.advance(:days => 1) : start 
+        when 'hourly'                                                      
+          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"
+        end
+    end
+
+    #
+    # convenince method for setting the current value in a view selector
+    #
+    def hour
+      self.start_time.localtime.hour rescue nil
+    end
+    
+    #
+    # convenince method for setting the current value in a view selector
+    #
+    def min
+      self.start_time.localtime.min rescue nil
+    end
+    
+    #
+    # convenince method for setting the current value in a view selector
+    #
+    def day_of_week
+      # subract 1 because '%u' returns 1-7, and this is working with zero-indexed ruby arrays
+      self.start_time.localtime.strftime('%u').to_i - 1 rescue nil
+    end
+    
+    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 - Time.now) > self.period 
+    end
+    
+    #
+    # convenience method for detecting whether schedule can be represented in simple format
+    # or should be described as custom (meaning it is beyond the capabilities of the convenience methods)
+    #
+    def custom?
+      return false unless self.start_time
+      return true if self.frequency == 'custom'
+      return true if self.start_is_more_than_one_period_in_the_future?
+      return false
+    end
+
+    #
+    # convenience method for setting defaults in a UI that make sense for a user
+    #
+    def ui_appropriate_defaults!
+      if self.start_time.blank? || self.period == 0
+        self.active = true
+      end
+    end
+
+    def t_type
+      I18n.t(type, :scope => 'activemodel.models.lucid_works.collection.activity.type')
+    end
+
+    def start
+      self.start_time = 0
+      self.active = true
+      save
+    end
+
+    private
+
+    def exact(interval, period)
+      if period % (result = 1.send(interval))  == 0
+        period / result
+      else
+        false
+      end
+    end
+
+  end
+end

data/lib/lucid_works/gem_version.rb

@@ -1,3 +1,3 @@
 module LucidWorks
-  VERSION = "0.6.18"
+  VERSION = "0.6.19"
 end

data/lib/lucid_works/synonym.rb

@@ -0,0 +1,60 @@
+module LucidWorks
+  
+  class Synonym
+    include ActiveModel::Validations
+    include ActiveModel::Conversion
+    extend ActiveModel::Naming
+    extend SimpleNaming
+    
+    attr_reader :id, :collection, :persisted
+    attr_accessor :mapping
+    
+    validates_presence_of :mapping
+    validates_each :mapping, :allow_blank => true do |model, attr, value|
+      model.errors.add(attr, 'must be a comma-separated list') if value =~ /=>/ || value.split(',').size < 2
+    end
+    
+    def initialize(attributes = {})
+      @id = attributes[:id]
+      @collection = attributes[:collection]
+      @mapping = attributes[:mapping]
+      @persisted = attributes[:persisted] || false
+    end
+    
+    def persisted?
+      @persisted
+    end
+    
+    def save
+      return false unless valid?
+      if persisted?
+        settings.synonym_list[id] = mapping
+      else
+        settings.synonym_list << mapping
+        @id = settings.synonym_list.length - 1
+      end
+      settings.save
+      @persisted = true
+    rescue
+      false
+    end
+    
+    def update_attributes(attrs_and_values)
+      attrs_and_values.each do |attr,value|
+        self.send("#{attr}=", value)
+      end
+      save
+    end
+    
+    def destroy
+      settings.synonym_list.delete_at(id)
+      settings.save
+    end
+    
+    private
+    
+      def settings
+        collection.settings
+      end
+  end
+end

data/lib/lucid_works.rb

@@ -27,14 +27,12 @@ require 'lucid_works/base'
 require 'lucid_works/schema'
 
 require 'lucid_works/collection'
-require 'lucid_works/collection/activity'
-require 'lucid_works/collection/activity/status'
-require 'lucid_works/collection/activity/history'
-#require 'lucid_works/collection/activity/schedule'
 require 'lucid_works/collection/info'
 require 'lucid_works/collection/index'
 require 'lucid_works/collection/settings'
-require 'lucid_works/collection/synonym'
+require 'lucid_works/activity'
+require 'lucid_works/activity/status'
+require 'lucid_works/activity/history'
 require 'lucid_works/crawler'
 require 'lucid_works/datasource'
 require 'lucid_works/datasource/index'
@@ -44,6 +42,7 @@ require 'lucid_works/datasource/schedule'
 require 'lucid_works/datasource/crawldata'
 require 'lucid_works/datasource/job'
 require 'lucid_works/field'
+require 'lucid_works/synonym'
 require 'lucid_works/logs'
 require 'lucid_works/logs/query'
 require 'lucid_works/logs/query/summary'

data/spec/lib/lucid_works/collection/activity/history_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'active_support/core_ext'
 
-describe LucidWorks::Collection::Activity::History do
+describe LucidWorks::Activity::History do
   before :all do
     @server = connect_to_live_server
     @server.reset_collections!
@@ -23,7 +23,7 @@ describe LucidWorks::Collection::Activity::History do
     it "should subtract crawlStarted form crawlStopped and return the difference in seconds" do
       include ActiveSupport::Duration
 
-      history = LucidWorks::Collection::Activity::History.new(:parent => @activity)
+      history = LucidWorks::Activity::History.new(:parent => @activity)
       now = Time.now
       history.stub(:activity_started) { now.advance(:seconds => -15) }
       history.stub(:activity_finished) { now.advance(:seconds => -10) }

data/spec/lib/lucid_works/collection/activity/status_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe LucidWorks::Collection::Activity::Status do
+describe LucidWorks::Activity::Status do
   before :all do
     @server = connect_to_live_server
     @server.reset_collections!
@@ -11,7 +11,7 @@ describe LucidWorks::Collection::Activity::Status do
   describe "find" do
     it "should retrieve status" do
       status = @activity.status
-      status.should be_a LucidWorks::Collection::Activity::Status
+      status.should be_a LucidWorks::Activity::Status
 
       status.running.should be_false
       status.type.should == 'optimize' 

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

@@ -14,7 +14,7 @@ require 'spec_helper'
   end
 
 
-describe LucidWorks::Collection::Activity do
+describe LucidWorks::Activity do
   context "Functionality shared with Datasource scheduling" do
     before :all do
       ENV['TZ'] = 'UTC'

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

@@ -20,13 +20,13 @@ describe "LucidWorks::Collection#prime_activities" do
       end 
 
       it "should produce activities of the appropriate type" do
-        @collection.optimize_activity.should          be_a  LucidWorks::Collection::Activity
+        @collection.optimize_activity.should          be_a  LucidWorks::Activity
         @collection.optimize_activity.type.should     ==    'optimize'
-        @collection.spelling_activity.should          be_a  LucidWorks::Collection::Activity
+        @collection.spelling_activity.should          be_a  LucidWorks::Activity
         @collection.spelling_activity.type.should     ==    'spelling'
-        @collection.click_activity.should             be_a  LucidWorks::Collection::Activity
+        @collection.click_activity.should             be_a  LucidWorks::Activity
         @collection.click_activity.type.should        ==    'click'
-        @collection.autocomplete_activity.should      be_a LucidWorks::Collection::Activity
+        @collection.autocomplete_activity.should      be_a LucidWorks::Activity
         @collection.autocomplete_activity.type.should ==    'autocomplete'
       end
     end
@@ -37,7 +37,7 @@ describe "LucidWorks::Collection#prime_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::Collection::Activity
+        spelling_activity.should be_a LucidWorks::Activity
       end
 
       it "should not create duplicates for existing types" do
@@ -61,13 +61,13 @@ describe "LucidWorks::Collection#prime_activities" do
 
         it "should have a virtual attribute for each activity type" do
           @collection.activities!.count.should == 4
-          @collection.optimize_activity.should          be_a  LucidWorks::Collection::Activity
+          @collection.optimize_activity.should          be_a  LucidWorks::Activity
           @collection.optimize_activity.type.should     ==    'optimize'
-          @collection.spelling_activity.should          be_a  LucidWorks::Collection::Activity
+          @collection.spelling_activity.should          be_a  LucidWorks::Activity
           @collection.spelling_activity.type.should     ==    'spelling'
-          @collection.click_activity.should             be_a  LucidWorks::Collection::Activity
+          @collection.click_activity.should             be_a  LucidWorks::Activity
           @collection.click_activity.type.should        ==    'click'
-          @collection.autocomplete_activity.should      be_a LucidWorks::Collection::Activity
+          @collection.autocomplete_activity.should      be_a LucidWorks::Activity
           @collection.autocomplete_activity.type.should ==    'autocomplete'
         end
 

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

@@ -1,7 +1,6 @@
 require 'spec_helper'
-require 'lucid_works/collection/synonym'
 
-describe LucidWorks::Collection::Synonym do
+describe LucidWorks::Synonym do
   before do
     @server = connect_to_live_server.tap {|server| server.reset_collections! }
     load_collection
@@ -14,15 +13,15 @@ describe LucidWorks::Collection::Synonym do
   
   describe "naming support" do
     it "demodulizes names" do
-      LucidWorks::Collection::Synonym.model_name.singular.should == "synonym"
-      LucidWorks::Collection::Synonym.model_name.plural.should == "synonyms"
-      LucidWorks::Collection::Synonym.model_name.collection.should == "synonyms"
+      LucidWorks::Synonym.model_name.singular.should == "synonym"
+      LucidWorks::Synonym.model_name.plural.should == "synonyms"
+      LucidWorks::Synonym.model_name.collection.should == "synonyms"
     end
   end
   
   describe "conversion support" do
     it "can be converted to a key" do
-      synonym = LucidWorks::Collection::Synonym.new(:collection => @collection, :mapping => "car, auto")
+      synonym = LucidWorks::Synonym.new(:collection => @collection, :mapping => "car, auto")
       synonym.save
       synonym.to_key.should == [8]
     end
@@ -30,19 +29,19 @@ describe LucidWorks::Collection::Synonym do
   
   describe "validations" do
     it "requires a mapping" do
-      synonym = LucidWorks::Collection::Synonym.new(:mapping => "")
+      synonym = LucidWorks::Synonym.new(:mapping => "")
       synonym.should_not be_valid
       synonym.errors[:mapping].should == ["can't be blank"]
     end
     
     it "requires the mapping to be a list" do
-      synonym = LucidWorks::Collection::Synonym.new(:mapping => "car")
+      synonym = LucidWorks::Synonym.new(:mapping => "car")
       synonym.should_not be_valid
       synonym.errors[:mapping].should == ["must be a comma-separated list"]
     end
     
     it "does not allow '=>' style mappings (for now)" do
-      synonym = LucidWorks::Collection::Synonym.new(:mapping => "car => auto")
+      synonym = LucidWorks::Synonym.new(:mapping => "car => auto")
       synonym.should_not be_valid
       synonym.errors[:mapping].should == ["must be a comma-separated list"]
     end
@@ -50,7 +49,7 @@ describe LucidWorks::Collection::Synonym do
     
   describe :save do
     context "when valid" do
-      subject { LucidWorks::Collection::Synonym.new(:collection => @collection, :mapping => "car, auto") }
+      subject { LucidWorks::Synonym.new(:collection => @collection, :mapping => "car, auto") }
       
       it "gets saved in the collection settings" do
         subject.save
@@ -73,7 +72,7 @@ describe LucidWorks::Collection::Synonym do
     end
     
     context "when invalid" do
-      subject { LucidWorks::Collection::Synonym.new(:collection => @collection, :mapping => "car") }
+      subject { LucidWorks::Synonym.new(:collection => @collection, :mapping => "car") }
   
       it "doesn't get saved in the collection settings" do
         subject.save
@@ -91,7 +90,7 @@ describe LucidWorks::Collection::Synonym do
     end
   
     context "when orphan" do
-      subject { LucidWorks::Collection::Synonym.new(:mapping => "car, auto") }
+      subject { LucidWorks::Synonym.new(:mapping => "car, auto") }
       
       it "returns false" do
         subject.save.should be(false)

data/spec/lib/lucid_works/collection_spec.rb

@@ -94,13 +94,13 @@ describe LucidWorks::Collection do
 
     context "for a collection with some activities" do
       before do
-        activity = LucidWorks::Collection::Activity.create(
+        activity = LucidWorks::Activity.create(
             :type => 'optimize',
             :start_time => 8600,
             :collection => @collection
         )
         activity.should be_persisted
-        activity = LucidWorks::Collection::Activity.create(
+        activity = LucidWorks::Activity.create(
             :type => 'spelling',
             :start_time => 8600,
             :collection => @collection
@@ -112,7 +112,7 @@ describe LucidWorks::Collection do
         activities = @collection.activities
         activities.count.should == 2
         activities.each do |activity|
-          activity.should be_a(LucidWorks::Collection::Activity)
+          activity.should be_a(LucidWorks::Activity)
         end
       end
     end
@@ -122,7 +122,7 @@ describe LucidWorks::Collection do
     before do
       @collection = @server.collection('collection1')
       # require 'ruby-debug'; debugger
-      # activity = LucidWorks::Collection::Activity.create(
+      # activity = LucidWorks::Activity.create(
       #     :type => 'optimize',
       #     :start_time => 8600,
       #     :collection => @collection
@@ -137,7 +137,7 @@ describe LucidWorks::Collection do
                                         :template => @template,
                                         :parent => @server)
 
-      LucidWorks::Collection::Activity.create(activity_params.merge(:parent => c))
+      LucidWorks::Activity.create(activity_params.merge(:parent => c))
       c.activities.size.should == 1
       c.prime_activities
       c.activities.size.should == 4

metadata

@@ -2,7 +2,7 @@
 name: lucid_works
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.18
+  version: 0.6.19
 platform: ruby
 authors: 
 - Sam Pierson
@@ -111,19 +111,18 @@ files:
 - Rakefile
 - config/locales/en.yml
 - lib/lucid_works.rb
+- lib/lucid_works/activity.rb
+- lib/lucid_works/activity/history.rb
+- lib/lucid_works/activity/status.rb
 - lib/lucid_works/associations.rb
 - lib/lucid_works/associations/has_many.rb
 - lib/lucid_works/associations/has_one.rb
 - lib/lucid_works/associations/proxy.rb
 - lib/lucid_works/base.rb
 - lib/lucid_works/collection.rb
-- lib/lucid_works/collection/activity.rb
-- lib/lucid_works/collection/activity/history.rb
-- lib/lucid_works/collection/activity/status.rb
 - lib/lucid_works/collection/index.rb
 - lib/lucid_works/collection/info.rb
 - lib/lucid_works/collection/settings.rb
-- lib/lucid_works/collection/synonym.rb
 - lib/lucid_works/crawler.rb
 - lib/lucid_works/datasource.rb
 - lib/lucid_works/datasource/crawldata.rb
@@ -145,6 +144,7 @@ files:
 - lib/lucid_works/schema.rb
 - lib/lucid_works/server.rb
 - lib/lucid_works/simple_naming.rb
+- lib/lucid_works/synonym.rb
 - lib/lucid_works/utils.rb
 - lib/lucid_works/version.rb
 - lucid_works.gemspec

data/lib/lucid_works/collection/activity.rb

@@ -1,191 +0,0 @@
-require 'active_support/core_ext/numeric/time.rb'
-module LucidWorks
-  class Collection
-    class Activity < Base
-      TYPES = %w{ optimize spelling click autocomplete}
-
-      # Unlike Datasource schedules, the API allows multiples of these
-      # So, to be honest with gem users, we can't really say this:
-        # self.singleton = true
-      belongs_to :collection
-      has_many   :histories, :class_name => :history
-      has_one    :status
-
-      schema do
-        attribute :period
-        attribute :start_time, :iso8601
-        attribute :active, :boolean
-        attribute :type, :string, :values => TYPES, :omit_during_update => true
-      end
-
-      validates_presence_of :type, :start_time
-      validates_numericality_of :period, :allow_blank => true
-
-      def frequency
-        case period
-        when 1.weeks.seconds then 'weekly'
-        when 1.days.seconds then 'daily'
-        when 1.hours.seconds then 'hourly'
-        when 0 then nil
-        else 'custom'
-        end
-      end
-      
-      #
-      # accepts hourly, daily, weekly, and sets period to respective # of seconds
-      #
-      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
-        else raise "unknown frequency"
-        end
-      end
-      
-      #
-      # predict when action will occur next if active at that time
-      #
-      def next_start
-        return start_time if (now = Time.now) <= start_time 
-        # require 'ruby-debug'; debugger
-        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
-          # for human purposes we wouldn't care if the result were as though the call 
-          # happened a millisecond later. But whatever.
-          last_interval_num # the next interval *is* the last interval if it is exactly now
-        else
-          last_interval_num + 1
-        end
-        start_time + period * next_interval_num
-      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)
-      # and time within the interval to run (e.g 5 past, or Tuesdays at 2:15)
-      # 
-      # We have to figure out when the actual start time will be because we are not asking 
-      # the user for this. It needs to be:
-      #   * at the requested time relative to the interval chosen
-      #   * as soon as possible
-      #   * in the future
-      #
-      # This is obvious to humans, but when computing it, you run into the following problem. It
-      # happens with all interval sizes, but for the sake of example, we'll use weekly:
-      #
-      # Problem 1) If today is Thursday, and the user asks for "weekly on Wednesdays," Wednesday has
-      # already happened this week. We have to make sure we pick the nearest wednesday that is in 
-      # the future
-      #
-      # Problem 2) If today is Tuesday, and the user asks for "weekly on Wednesdays,", the simple solution
-      # to problem 1 (start next week instead of this week) causes you to skip this Tuesday, even though
-      # it is valid and is what the user would expect
-      #
-      # The algorith to solve both problems at once is this: 
-      #    * From Time.now, back up to the beginning of the interval even if it is in the past. 
-      #    * Fast forward to the requested siimple start time
-      #    * If you are still in the past, advance by one interval
-      #
-      def schedule=(all_attributes)
-        # convert to format accepted by Time.advance
-        if all_attributes['start']
-          all_attributes['start'].to_options!
-          all_attributes['start'].each{|k,v| all_attributes['start'][k]=v.to_i}
-        end
-        
-        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 = now.beginning_of_week.advance(all_attributes['start'])
-            start < now ? start.advance(:weeks => 1) : start 
-          when 'daily'                                                       
-            start = now.beginning_of_day.advance(all_attributes['start'])
-            start < now ? start.advance(:days => 1) : start 
-          when 'hourly'                                                      
-            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"
-          end
-      end
-
-      #
-      # convenince method for setting the current value in a view selector
-      #
-      def hour
-        self.start_time.localtime.hour rescue nil
-      end
-      
-      #
-      # convenince method for setting the current value in a view selector
-      #
-      def min
-        self.start_time.localtime.min rescue nil
-      end
-      
-      #
-      # convenince method for setting the current value in a view selector
-      #
-      def day_of_week
-        # subract 1 because '%u' returns 1-7, and this is working with zero-indexed ruby arrays
-        self.start_time.localtime.strftime('%u').to_i - 1 rescue nil
-      end
-      
-      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 - Time.now) > self.period 
-      end
-      
-      #
-      # convenience method for detecting whether schedule can be represented in simple format
-      # or should be described as custom (meaning it is beyond the capabilities of the convenience methods)
-      #
-      def custom?
-        return false unless self.start_time
-        return true if self.frequency == 'custom'
-        return true if self.start_is_more_than_one_period_in_the_future?
-        return false
-      end
-
-      #
-      # convenience method for setting defaults in a UI that make sense for a user
-      #
-      def ui_appropriate_defaults!
-        if self.start_time.blank? || self.period == 0
-          self.active = true
-        end
-      end
-
-      def t_type
-        I18n.t(type, :scope => 'activemodel.models.lucid_works.collection.activity.type')
-      end
-
-      def start
-        self.start_time = 0
-        self.active = true
-        save
-      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/collection/synonym.rb

@@ -1,63 +0,0 @@
-module LucidWorks
-  
-  class Collection
-    
-    class Synonym
-      include ActiveModel::Validations
-      include ActiveModel::Conversion
-      extend ActiveModel::Naming
-      extend SimpleNaming
-      
-      attr_reader :id, :collection, :persisted
-      attr_accessor :mapping
-      
-      validates_presence_of :mapping
-      validates_each :mapping, :allow_blank => true do |model, attr, value|
-        model.errors.add(attr, 'must be a comma-separated list') if value =~ /=>/ || value.split(',').size < 2
-      end
-      
-      def initialize(attributes = {})
-        @id = attributes[:id]
-        @collection = attributes[:collection]
-        @mapping = attributes[:mapping]
-        @persisted = attributes[:persisted] || false
-      end
-      
-      def persisted?
-        @persisted
-      end
-      
-      def save
-        return false unless valid?
-        if persisted?
-          settings.synonym_list[id] = mapping
-        else
-          settings.synonym_list << mapping
-          @id = settings.synonym_list.length - 1
-        end
-        settings.save
-        @persisted = true
-      rescue
-        false
-      end
-      
-      def update_attributes(attrs_and_values)
-        attrs_and_values.each do |attr,value|
-          self.send("#{attr}=", value)
-        end
-        save
-      end
-      
-      def destroy
-        settings.synonym_list.delete_at(id)
-        settings.save
-      end
-      
-      private
-      
-        def settings
-          collection.settings
-        end
-    end
-  end
-end