rails-scheduler 0.0.7 → 0.0.8

data/README.rdoc

@@ -1,5 +1,7 @@
 = Rails Scheduler
 
+{<img src="https://gemnasium.com/atd/rails-scheduler.png" />}[https://gemnasium.com/atd/rails-scheduler]
+
 This project provides your Rails application with support for scheduled events
 
 * Provide any model with database-stored scheduler (weekly, monthly, etc..)

data/config/locales/en.yml

@@ -6,18 +6,32 @@ en:
           message: "Event does not have recurrence"
           option:  "one-off"
       daily:
+        description:
+          one: "Every day"
+          other: "Every %{count} days"
         form:
           option:  "daily"
       weekly:
-         form:
-           every_week: "Every %{form_field} week(s) on the following days:"
-           option: "weekly"
+        description:
+          one: "Every %{week_days}"
+          other: "Every %{week_days} on %{count} weeks"
+        form:
+          every_week: "Every %{form_field} week(s) on the following days:"
+          option: "weekly"
       monthly:
-         form:
-           option: "monthly"
-           week_day: "The %{order_field} %{week_field} of every %{interval_field} month(s)"
-           week_day_order_option:
-             "1": "first"
-             "2": "second"
-             "3": "third"
-             "-1": "last"
+        description:
+          one: "The %{week_day_order} %{week_day} of the month"
+          other: "The %{week_day_order} %{week_day} of every %{count} months"
+          week_day_order:
+            "1": "first"
+            "2": "second"
+            "3": "third"
+            "-1": "last"
+        form:
+          option: "monthly"
+          week_day: "The %{order_field} %{week_field} of every %{interval_field} month(s)"
+          week_day_order_option:
+            "1": "first"
+            "2": "second"
+            "3": "third"
+            "-1": "last"

data/config/locales/es.yml

@@ -6,18 +6,32 @@ es:
           message: "La actividad no se volverá a repetir"
           option:  "ninguna"
       daily:
+        description:
+          one: "Todos los días"
+          other: "Cada %{count} días"
         form:
           option:  "diaria"
       weekly:
-         form:
-           every_week: "Cada %{form_field} semana(s) en los siguientes días:"
-           option: "semanal"
+        description:
+          one: "Todos los %{week_days}"
+          other: "Los %{week_days} de cada %{count} semanas"
+        form:
+          every_week: "Cada %{form_field} semana(s) en los siguientes días:"
+          option: "semanal"
       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"
+        description:
+          one: "El %{week_day_order} %{ week_day } del mes"
+          other: "El %{week_day_order} %{ week_day } de cada %{count} meses"
+          week_day_order:
+            "1": "primer"
+            "2": "segundo"
+            "3": "tercer"
+            "-1": "último"
+        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/lib/scheduler/model.rb

@@ -28,6 +28,24 @@ module Scheduler
       Scheduler::FREQUENCIES[frequency]
     end
 
+    def frequency_description
+      return "" if frequency_sym == :one_off
+
+      options = { :count => interval }
+
+      case frequency_sym
+      when :weekly
+        options[:week_days] = week_days_in_words
+      when :monthly
+        options[:week_day] = week_days_in_words
+        options[:week_day_order] =
+          I18n.t("scheduler.frequency.monthly.description.week_day_order.#{ week_day_order }")
+      end
+
+      I18n.t "scheduler.frequency.#{ frequency_sym }.description", options
+
+    end
+
     # Get [ 0, 1, 6 ] (monday, tuesday, sunday) from byte
     def week_days
       7.times.map{ |i|
@@ -37,6 +55,12 @@ module Scheduler
       }.compact
     end
 
+    def week_days_in_words
+      week_days.map { |d|
+        I18n.l Date.today.beginning_of_week + d, :format => "%A"
+      }.to_sentence
+    end
+
     def week_day
       week_days.first
     end

data/lib/scheduler/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-scheduler
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-25 00:00:00.000000000Z
+date: 2012-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &72880910 !ruby/object:Gem::Requirement
+  requirement: &82128310 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *72880910
+  version_requirements: *82128310
 - !ruby/object:Gem::Dependency
   name: recurrence
-  requirement: &72880630 !ruby/object:Gem::Requirement
+  requirement: &82127830 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *72880630
+  version_requirements: *82127830
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &72880420 !ruby/object:Gem::Requirement
+  requirement: &82127460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72880420
+  version_requirements: *82127460
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &72880170 !ruby/object:Gem::Requirement
+  requirement: &82126740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72880170
+  version_requirements: *82126740
 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: -203957359
+      hash: 498138989
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -144,10 +144,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -203957359
+      hash: 498138989
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Provide a Rails application with support for scheduled events