rails-scheduler 0.0.6 → 0.0.7

data/lib/scheduler/model.rb

@@ -24,92 +24,90 @@ module Scheduler
       }
     end
 
-    module InstanceMethods
-      def frequency_sym
-        Scheduler::FREQUENCIES[frequency]
-      end
+    def frequency_sym
+      Scheduler::FREQUENCIES[frequency]
+    end
 
-      # Get [ 0, 1, 6 ] (monday, tuesday, sunday) from byte
-      def week_days
-        7.times.map{ |i|
-          days[i] > 0 ?
-          i :
-          nil
-        }.compact
-      end
+    # Get [ 0, 1, 6 ] (monday, tuesday, sunday) from byte
+    def week_days
+      7.times.map{ |i|
+        days[i] > 0 ?
+        i :
+        nil
+      }.compact
+    end
 
-      def week_day
-        week_days.first
-      end
+    def week_day
+      week_days.first
+    end
 
-      def week_days_sym
-        week_days.map{ |d|
-          Date::DAYS_INTO_WEEK.invert[d]
-        }
-      end
+    def week_days_sym
+      week_days.map{ |d|
+        Date::DAYS_INTO_WEEK.invert[d]
+      }
+    end
 
-      def week_day_sym
-        week_days_sym.first
-      end
+    def week_day_sym
+      week_days_sym.first
+    end
 
-      # Convert [ 0, 1, 6 ] (monday, tuesday, sunday) to byte
-      def week_days= ds
-        self.days =
-          ds.map{ |d| 2 ** d.to_i }.inject(0, &:+)
-      end
+    # Convert [ 0, 1, 6 ] (monday, tuesday, sunday) to byte
+    def week_days= ds
+      self.days =
+        ds.map{ |d| 2 ** d.to_i }.inject(0, &:+)
+    end
 
-      def week_day= day
-        self.week_days = Array.wrap(day)
-      end
+    def week_day= day
+      self.week_days = Array.wrap(day)
+    end
 
-      def week_day_order
-        interval_flag
-      end
+    def week_day_order
+      interval_flag
+    end
 
-      def week_day_order_sym
-        index = interval_flag
-        index -= 1 if index > 0
+    def week_day_order_sym
+      index = interval_flag
+      index -= 1 if index > 0
 
-        Scheduler::ORDER[index]
-      end
+      Scheduler::ORDER[index]
+    end
 
-      def week_day_order= order
-        self.interval_flag = order
-      end
+    def week_day_order= order
+      self.interval_flag = order
+    end
 
-      # Array including all the dates this Scheduler has ocurrences
-      # between st and en
-      def ocurrences(st, en = nil)
-        recurrence ?
-          recurrence.events(:starts => st, :until => en) :
-          (start_at.to_date..end_at.to_date).to_a
-      end
+    # Array including all the dates this Scheduler has ocurrences
+    # between st and en
+    def ocurrences(st, en = nil)
+      recurrence ?
+        recurrence.events(:starts => st, :until => en) :
+        (start_at.to_date..end_at.to_date).to_a
+    end
 
-      def recurrence
-        case frequency_sym
-        when :weekly
-          Recurrence.new({ :every    => :week,
-                           :starts   => start_date.to_date,
-                           :until    => end_date.try(:to_date),
-                           :interval => interval,
-                           :on       => week_days_sym })
-        when :monthly
-          Recurrence.new({ :every    => :month,
-                           :starts   => start_date.to_date,
-                           :until    => end_date.try(:to_date),
-                           :interval => interval,
-                           :on       => week_day_order_sym,
-                           :weekday => week_day_sym })
-        end
+    def recurrence
+      case frequency_sym
+      when :weekly
+        Recurrence.new({ :every    => :week,
+                         :starts   => start_date.to_date,
+                         :until    => end_date.try(:to_date),
+                         :interval => interval,
+                         :on       => week_days_sym })
+      when :monthly
+        Recurrence.new({ :every    => :month,
+                         :starts   => start_date.to_date,
+                         :until    => end_date.try(:to_date),
+                         :interval => interval,
+                         :on       => week_day_order_sym,
+                         :weekday => week_day_sym })
       end
+    end
 
-      protected
+    protected
 
-      def fill_scheduler_dates
-        self.start_date ||= start_at
+    def fill_scheduler_dates
+      self.start_date ||= start_at
 
-        self.end_date = end_at if frequency == 0
-      end
+      self.end_date = end_at if frequency == 0
     end
   end
 end

data/lib/scheduler/version.rb

@@ -1,3 +1,3 @@
 module Scheduler
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-scheduler
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-23 00:00:00.000000000Z
+date: 2012-01-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &88829830 !ruby/object:Gem::Requirement
+  requirement: &72880910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *88829830
+  version_requirements: *72880910
 - !ruby/object:Gem::Dependency
   name: recurrence
-  requirement: &88829580 !ruby/object:Gem::Requirement
+  requirement: &72880630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *88829580
+  version_requirements: *72880630
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &88829380 !ruby/object:Gem::Requirement
+  requirement: &72880420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *88829380
+  version_requirements: *72880420
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &88829040 !ruby/object:Gem::Requirement
+  requirement: &72880170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *88829040
+  version_requirements: *72880170
 description: ! 'Scheduler support: daily, weekly and montly repetitions'
 email:
 - atapiador@dit.upm.es
@@ -135,7 +135,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 49323343
+      hash: -203957359
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 49323343
+      hash: -203957359
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.12