rails-scheduler 0.0.1 → 0.0.2

data/.travis.yml

@@ -0,0 +1,7 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+env:
+  - DB=mysql
+before_script:
+  - "mysql -e 'create database scheduler_test;'"

data/app/assets/javascripts/scheduler.js

@@ -0,0 +1,28 @@
+//= require jquery
+
+var Scheduler = Scheduler || {};
+
+Scheduler.form = {};
+
+Scheduler.form.init = function(form, startDate) {
+  Scheduler.form.current = form;
+
+  Scheduler.form.showFrequency(form.find("select.scheduler-frequency").val());
+
+  form.on("change", "select.scheduler-frequency", function(){
+    Scheduler.form.showFrequency($(this).val());
+  });
+
+  if (startDate) {
+    // check day of week
+    dayOfWeek = (startDate.getDay() + 6) % 7; // monday is 0 in Rails
+    form.find('#event_interval_days_' + dayOfWeek).attr('checked','checked');
+  }
+}
+
+Scheduler.form.showFrequency = function(value) {
+  form = Scheduler.form.current;
+
+  form.find("#scheduler-options").children("div").hide();
+  form.find("#scheduler-frequency-" + value ).show();
+}

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

@@ -0,0 +1,34 @@
+<div class="scheduler_form">
+  <%= f.label :frequency %>
+  <%= f.select :frequency, Scheduler.frequency_options, {}, :class => 'scheduler-frequency' %>
+
+  <div id="scheduler-options">
+    <div id="scheduler-frequency-0">
+      <%= t 'scheduler.frequency.one_off.form.message' %>
+    </div>
+  
+    <div id="scheduler-frequency-1">
+      Comming soon..
+    </div>
+
+    <div id="scheduler-frequency-2">
+      <span id="scheduler-weekly-week">
+      <%= raw t('scheduler.frequency.weekly.form.every_week',
+                :form_field => f.number_field(:interval, :size => 1)) %>
+      </span>
+
+      <div id="scheduler-weekly-days">
+        <% 7.times do |d| %>
+          <%= check_box_tag "#{ f.object_name }[interval_days][]",
+                            d,
+                            f.object.interval_days.include?(d),
+                            :id => "event_interval_days_#{ d }" %>
+          <span><%= I18n.l Date.today.beginning_of_week + d, :format => "%a" %></span>
+        <% end %>
+      </div>
+    </div>
+
+    <div id="scheduler-frequency-3">
+      Comming soon..
+    </div>
+</div>

data/config/locales/es.yml

@@ -0,0 +1,17 @@
+es:
+  scheduler:
+    frequency:
+      one_off:
+        form:
+          message: "La actividad no se volverá a repetir"
+          option:  "ninguna"
+      daily:
+        form:
+          option:  "diaria"
+      weekly:
+         form:
+           every_week: "Cada %{form_field} semana(s) en los siguientes días:"
+           option: "semanal"
+      monthly:
+         form:
+           option: "mensual"

data/db/migrate/20111204155637_add_scheduler.rb

@@ -5,9 +5,9 @@ class AddScheduler < ActiveRecord::Migration
       t.datetime :end_at
       t.date     :start_date
       t.date     :end_date
-      t.integer  :frequency
+      t.integer  :frequency, :default => 0
       t.integer  :interval
-      t.integer  :interval_flag
+      t.integer  :interval_flag, :default => 0
     end
   end
 

data/lib/rails-scheduler.rb

@@ -1,9 +1,10 @@
-require "scheduler/version"
+require 'scheduler/version'
+require 'recurrence'
 
 module Scheduler
   autoload :ActiveRecord, 'scheduler/active_record'
   autoload :Model,        'scheduler/model'
-  # Your code goes here...
 end
 
+require 'scheduler'
 require 'scheduler/engine'

data/lib/scheduler.rb

@@ -0,0 +1,11 @@
+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
+end

data/lib/scheduler/engine.rb

@@ -1,4 +1,4 @@
-module Schedule
+module Scheduler
   class Engine < ::Rails::Engine #:nodoc:
 
     initializer "scheduler.active_record" do

data/lib/scheduler/model.rb

@@ -5,14 +5,68 @@ module Scheduler
     included do
       validates_presence_of :start_at, :end_at
 
-      before_validation :fill_start_date
+      before_validation :fill_scheduler_dates
+
+      validates_presence_of :interval,
+                            :if => lambda { |record|
+        [ :weekly ].include? record.frequency_sym
+      }
+      
+      validates_numericality_of :interval_flag,
+                                :greater_than => 0,
+                                :if => lambda { |record|
+        [ :weekly ].include? record.frequency_sym
+      }
+
+      scope :between, lambda { |start_time, end_time|
+        where('start_date <= ?', end_time).
+        where(arel_table[:end_date].eq(nil).or(arel_table[:end_date].gteq(start_time)))
+      }
     end
 
     module InstanceMethods
+      def frequency_sym
+        Scheduler::FREQUENCIES[frequency]
+      end
+
+      # Get [ 0, 1, 6 ] (monday, tuesday, sunday) from byte
+      def interval_days
+        7.times.map{ |i|
+          interval_flag[i] > 0 ?
+          i :
+          nil
+        }.compact
+      end
+
+      def interval_days_sym
+        interval_days.map{ |d|
+          Date::DAYS_INTO_WEEK.invert[d]
+        }
+      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, &:+)
+      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       => interval_days_sym })
+        end
+      end
+
       protected
 
-      def fill_start_date
+      def fill_scheduler_dates
         self.start_date ||= start_at
+
+        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.1"
+  VERSION = "0.0.2"
 end

data/rails-scheduler.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "rails", "~> 3.1.0"
+  s.add_dependency "recurrence", '~> 1.2.0'
 
   s.add_development_dependency "mysql2"
   s.add_development_dependency "factory_girl"

data/test/dummy/config/initializers/session_store.rb

@@ -1,6 +1,6 @@
 # Be sure to restart your server when you modify this file.
 
-Dummy::Application.config.session_store :cookie_store, key: '_dummy_session'
+Dummy::Application.config.session_store :cookie_store, :key => '_dummy_session'
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information

data/test/dummy/config/initializers/wrap_parameters.rb

@@ -5,7 +5,7 @@
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
 ActiveSupport.on_load(:action_controller) do
-  wrap_parameters format: [:json]
+  wrap_parameters :format => [:json]
 end
 
 # Disable root element in JSON by default.

data/test/unit/event_test.rb

@@ -8,4 +8,26 @@ class EventTest < ActiveSupport::TestCase
   test "fills start_date" do
     assert Factory(:event).start_date.present?
   end
+
+  test "interval_days" do
+    e = Factory(:event)
+
+    battery = {
+      0   => [],
+      1   => [0],
+      2   => [1],
+      3   => [0, 1],
+      4   => [2],
+      5   => [0, 2],
+      127 => [0, 1, 2, 3, 4, 5, 6]
+    }
+
+    battery.each_pair do |flag, days|
+      e.interval_flag = flag
+      assert e.interval_days.eql?(days)
+
+      e.interval_days = days
+      assert e.interval_flag.eql?(flag)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-scheduler
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-04 00:00:00.000000000Z
+date: 2011-12-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &79996150 !ruby/object:Gem::Requirement
+  requirement: &69827090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,21 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *79996150
+  version_requirements: *69827090
+- !ruby/object:Gem::Dependency
+  name: recurrence
+  requirement: &69822940 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *69822940
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &79995940 !ruby/object:Gem::Requirement
+  requirement: &69821950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79995940
+  version_requirements: *69821950
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &79995710 !ruby/object:Gem::Requirement
+  requirement: &69821140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79995710
+  version_requirements: *69821140
 description: ! 'Scheduler support: daily, weekly and montly repetitions'
 email:
 - atapiador@dit.upm.es
@@ -52,12 +63,17 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
+- app/assets/javascripts/scheduler.js
+- app/views/scheduler/_form.html.erb
+- config/locales/es.yml
 - db/migrate/20111204155637_add_scheduler.rb
 - lib/rails-scheduler.rb
+- lib/scheduler.rb
 - lib/scheduler/active_record.rb
 - lib/scheduler/engine.rb
 - lib/scheduler/migrations.rb
@@ -117,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -384905603
+      hash: -654998783
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -126,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -384905603
+      hash: -654998783
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10