rails-scheduler 0.0.2 → 0.0.3

data/.gitignore

@@ -5,4 +5,4 @@ pkg/
 test/dummy/db/*.sqlite3
 test/dummy/log/*.log
 test/dummy/tmp/
-**/**/*.swp
+**.*swp

data/app/assets/javascripts/scheduler.js

@@ -14,9 +14,18 @@ Scheduler.form.init = function(form, startDate) {
   });
 
   if (startDate) {
+    var weekDay = (startDate.getDay() + 6) % 7; // monday is 0 in Rails
+    var weekDayOrder = Math.floor((startDate.getDate() - startDate.getDay() + 6) / 7);
+    if (weekDayOrder > 3) {
+      weekDayOrder = -1;
+    }
+
     // check day of week
-    dayOfWeek = (startDate.getDay() + 6) % 7; // monday is 0 in Rails
-    form.find('#event_interval_days_' + dayOfWeek).attr('checked','checked');
+    form.find('#event_week_days_' + weekDay).attr('checked','checked');
+
+    // init day of month
+    form.find('#event_week_day_order').val(weekDayOrder);
+    form.find('#event_week_day').val(weekDay);
   }
 }
 
@@ -24,5 +33,8 @@ Scheduler.form.showFrequency = function(value) {
   form = Scheduler.form.current;
 
   form.find("#scheduler-options").children("div").hide();
+  form.find("#scheduler-options").find("select,input").attr('disabled', 'disabled');
+
   form.find("#scheduler-frequency-" + value ).show();
+  form.find("#scheduler-frequency-" + value ).find("select,input").removeAttr('disabled');
 }

data/app/helpers/scheduler_helper.rb

@@ -0,0 +1,25 @@
+module SchedulerHelper
+  def frequency_options
+    Scheduler::FREQUENCIES.each_with_index.map{ |value, index|
+      [ I18n.t("scheduler.frequency.#{ value }.form.option"), index ]
+    }
+  end
+
+  def week_day_order_options
+    [1, 2, 3, -1 ].map do |d|
+      [
+        t("scheduler.frequency.monthly.form.week_day_order_option.#{ d }"),
+        d
+      ]
+    end
+  end
+
+  def week_day_options
+    7.times.map do |d|
+      [
+        l(Date.today.beginning_of_week + d, :format => "%A"),
+        d
+      ]
+    end
+  end
+end

data/app/views/scheduler/_form.html.erb

@@ -1,6 +1,6 @@
 <div class="scheduler_form">
   <%= f.label :frequency %>
-  <%= f.select :frequency, Scheduler.frequency_options, {}, :class => 'scheduler-frequency' %>
+  <%= f.select :frequency, frequency_options, {}, :class => 'scheduler-frequency' %>
 
   <div id="scheduler-options">
     <div id="scheduler-frequency-0">
@@ -19,16 +19,20 @@
 
       <div id="scheduler-weekly-days">
         <% 7.times do |d| %>
-          <%= check_box_tag "#{ f.object_name }[interval_days][]",
+          <%= check_box_tag "#{ f.object_name }[week_days][]",
                             d,
-                            f.object.interval_days.include?(d),
-                            :id => "event_interval_days_#{ d }" %>
+                            f.object.week_days.include?(d),
+                            :id => "event_week_days_#{ d }" %>
           <span><%= I18n.l Date.today.beginning_of_week + d, :format => "%a" %></span>
         <% end %>
       </div>
     </div>
 
     <div id="scheduler-frequency-3">
-      Comming soon..
+       <%= raw t('scheduler.frequency.monthly.form.week_day',
+                 :order_field => f.select(:week_day_order, week_day_order_options),
+                 :week_field  => f.select(:week_day, week_day_options),
+                 :interval_field => f.number_field(:interval, :size => 1))
+       %>
     </div>
 </div>

data/config/locales/es.yml

@@ -15,3 +15,9 @@ es:
       monthly:
          form:
            option: "mensual"
+           week_day: "El %{order_field} %{week_field} de cada %{interval_field} mes(es)"
+           week_day_order_option:
+             "1": "primer"
+             "2": "segundo"
+             "3": "tercer"
+             "-1": "último"

data/db/migrate/20111204155637_add_scheduler.rb

@@ -6,6 +6,7 @@ class AddScheduler < ActiveRecord::Migration
       t.date     :start_date
       t.date     :end_date
       t.integer  :frequency, :default => 0
+      t.integer  :days,      :default => 0
       t.integer  :interval
       t.integer  :interval_flag, :default => 0
     end

data/lib/scheduler.rb

@@ -1,11 +1,4 @@
 module Scheduler
   FREQUENCIES = [ :one_off, :daily, :weekly, :monthly ]
-
-  class << self
-    def frequency_options
-      FREQUENCIES.each_with_index.map{ |value, index|
-        [ I18n.t("scheduler.frequency.#{ value }.form.option"), index ]
-      }
-    end
-  end
+  ORDER = [ :first, :second, :third, :last ]
 end

data/lib/scheduler/model.rb

@@ -12,7 +12,7 @@ module Scheduler
         [ :weekly ].include? record.frequency_sym
       }
       
-      validates_numericality_of :interval_flag,
+      validates_numericality_of :days,
                                 :greater_than => 0,
                                 :if => lambda { |record|
         [ :weekly ].include? record.frequency_sym
@@ -30,24 +30,51 @@ module Scheduler
       end
 
       # Get [ 0, 1, 6 ] (monday, tuesday, sunday) from byte
-      def interval_days
+      def week_days
         7.times.map{ |i|
-          interval_flag[i] > 0 ?
+          days[i] > 0 ?
           i :
           nil
         }.compact
       end
 
-      def interval_days_sym
-        interval_days.map{ |d|
+      def week_day
+        week_days.first
+      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
+
       # Convert [ 0, 1, 6 ] (monday, tuesday, sunday) to byte
-      def interval_days= days
-        self.interval_flag =
-          days.map{ |d| 2 ** d.to_i }.inject(0, &:+)
+      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_order
+        interval_flag
+      end
+
+      def week_day_order_sym
+        index = interval_flag
+        index -= 1 if index > 0
+
+        Scheduler::ORDER[index]
+      end
+
+      def week_day_order= order
+        self.interval_flag = order
       end
 
       def recurrence
@@ -57,7 +84,14 @@ module Scheduler
                            :starts   => start_date.to_date,
                            :until    => end_date.try(:to_date),
                            :interval => interval,
-                           :on       => interval_days_sym })
+                           :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
 

data/lib/scheduler/version.rb

@@ -1,3 +1,3 @@
 module Scheduler
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-scheduler
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-18 00:00:00.000000000Z
+date: 2011-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &69827090 !ruby/object:Gem::Requirement
+  requirement: &68372130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *69827090
+  version_requirements: *68372130
 - !ruby/object:Gem::Dependency
   name: recurrence
-  requirement: &69822940 !ruby/object:Gem::Requirement
+  requirement: &68371640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *69822940
+  version_requirements: *68371640
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &69821950 !ruby/object:Gem::Requirement
+  requirement: &68371310 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69821950
+  version_requirements: *68371310
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &69821140 !ruby/object:Gem::Requirement
+  requirement: &68370910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69821140
+  version_requirements: *68370910
 description: ! 'Scheduler support: daily, weekly and montly repetitions'
 email:
 - atapiador@dit.upm.es
@@ -69,6 +69,7 @@ files:
 - README.rdoc
 - Rakefile
 - app/assets/javascripts/scheduler.js
+- app/helpers/scheduler_helper.rb
 - app/views/scheduler/_form.html.erb
 - config/locales/es.yml
 - db/migrate/20111204155637_add_scheduler.rb
@@ -133,7 +134,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -654998783
+      hash: 530319471
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -142,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -654998783
+      hash: 530319471
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10