recurs 0.0.4.3 → 0.0.4.4

data/MIT-lICENCE

@@ -0,0 +1,20 @@
+Copyright (c) 2010 Steve Martin
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/features/generators.feature

@@ -15,6 +15,7 @@ Feature:
     gem 'rails', '3.0.0'
     gem 'sqlite3-ruby', :require => 'sqlite3'
     gem 'recurs' #, :path => '../../../'
+    gem 'haml'
     """
     #And I run "bundle install"
     And I run "rails generate recurs_widget Event"
@@ -110,8 +111,8 @@ Feature:
 
   %table
     %tr
-      %th Starts on
-      %th Ends on date
+      %th Start date
+      %th End date
       %th Recurrence
       %th Summary
       %th
@@ -120,8 +121,8 @@ Feature:
 
     - @events.each do |event|
       %tr
-        %td= event.starts_at
-        %td= event.ends_at
+        %td= event.dtstart
+        %td= event.dtend
         %td= event.rrule
         %td= event.summary
         %td= link_to 'Show', event
@@ -163,7 +164,7 @@ Feature:
       @event = Event.new
       if flash[:repeats]
         flash[:scheme] = flash[:repeats]
-        @event_template = Event.scheme(flash[:repeats]).call
+        @recurs_template = Event.scheme(flash[:repeats]).call
       end
 
       respond_to do |format|
@@ -181,10 +182,11 @@ Feature:
     # POST /events.xml
     def create
       unless flash[:repeats]
+        flash[:dtstart] = params[:event][:dtstart]
         flash[:repeats] = params[:event][:repeats].to_i
         redirect_to new_event_path
       else
-        #@event = Event.new(params[:event])
+        @event = Event.new(params[:event])
         Event.scheme(flash[:scheme]).call(:set => params[:event])
       end
     end

data/lib/generators/templates/views/_form

@@ -9,7 +9,7 @@
   .field
   .field
     = f.label :repeats
-    = f.select :repeats, Event.schemes
+    = f.select :repeats, Event.indexed_schemes
 
   - if flash[:interval]
     .field

data/lib/generators/templates/views/index

@@ -2,8 +2,8 @@
 
 %table
   %tr
-    %th Starts on
-    %th Ends on date
+    %th Start date
+    %th End date
     %th Recurrence
     %th Summary
     %th
@@ -12,8 +12,8 @@
 
   - @<%= dname %>s.each do |<%= dname %>|
     %tr
-      %td= <%= dname %>.starts_at
-      %td= <%= dname %>.ends_at
+      %td= <%= dname %>.dtstart
+      %td= <%= dname %>.dtend
       %td= <%= dname %>.rrule
       %td= <%= dname %>.summary
       %td= link_to 'Show', <%= dname %>

data/lib/recurs.rb

@@ -84,9 +84,9 @@ module Recurs
 
       def rule(repeats, args = {})
         @@rule = ""
-        @@rule = "RRULE" if (args[:rule] == 'r')
-        @@rule = "EXRULE" if (args[:rule] == 'e')
-        @@rule += ":FREQ=#{repeats.to_s.upcase}"
+        @@rule = "RRULE:" if (args[:rule] == 'r')
+        @@rule = "EXRULE:" if (args[:rule] == 'e')
+        @@rule += "FREQ=#{repeats.to_s.upcase}"
         interval(args)
         args.each { |ar|
           unless [:rule, :by_set_pos, :by_week_at, :count, :occurrences, :until, :ends_at, :repeats_every, :interval].include? ar[0]
@@ -204,9 +204,14 @@ module Recurs
       def schemes
         Recurs::Rules.schemes
       end
+
+    def indexed_schemes
+      self.schemes.map {|r| [r, self.schemes.find_index(r)]}
+    end
     end
 
     module InstanceMethods
+      attr_accessor :repeats, :dtstart, :dtend
       def initialize
         @rrules  ||= []
         @exrules ||= []

data/lib/recurs/version.rb

@@ -1,3 +1,3 @@
 module Recurs
-  VERSION = "0.0.4.3"
+  VERSION = "0.0.4.4"
 end

data/recurs.gemspec

@@ -15,12 +15,14 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "recurs"
   s.add_dependency('ri_cal', '>= 0.8.7')
   s.add_dependency('actic')
+  s.add_dependency('haml')
 
   s.add_development_dependency 'rspec', '~> 2.3.0'
   s.add_development_dependency 'aruba', '~> 0.2.7'
   s.add_development_dependency('rake')
   s.add_development_dependency('cucumber')
 
+
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/spec/models/instance_spec.rb

@@ -13,6 +13,9 @@ describe Event do
 
   it "should act as recurring" do
     @event.recurs
+    @event.repeats
+    @event.dtstart
+    @event.dtend
   end
 
   it "should have the schemes" do
@@ -27,14 +30,25 @@ describe Event do
 
   end
 
+  it "should have indexed schemes" do
+    Event.indexed_schemes.should == [["Daily",0],
+      ["Every Weekday ( Mon - Fri )",1],
+      ["Every Mon, Wed, Fri",2],
+      ["Every Tues, Thurs",3],
+      ["Every Weekend",4],
+      ["Weekly",5],
+      ["Monthly",6],
+      ["Yearly",7]]
+  end
+
   it "should add an rrule" do
     @event.add_rrule(:daily).should == "RRULE:FREQ=DAILY"
     @event.recurs.should == "RRULE:FREQ=DAILY"
   end
 
   it "should add a non specific rule" do
-    @event.add_rule(:daily).should == ":FREQ=DAILY"
-    @event.recurs.should == ":FREQ=DAILY"
+    @event.add_rule(:daily).should == "FREQ=DAILY"
+    @event.recurs.should == "FREQ=DAILY"
   end
 
   it "should add an exrule" do

data/spec/models/parser_spec.rb

@@ -25,7 +25,7 @@ describe Recurs::Parser do
   end
 
   it "should swicth off rule type" do
-    Recurs::Parser.rule(:daily).should == ":FREQ=DAILY"
+    Recurs::Parser.rule(:daily).should == "FREQ=DAILY"
   end
 
  it "should create a daily recurrence with a two day interval" do
@@ -108,5 +108,9 @@ describe Recurs::Parser do
     Recurs::Parser.rrule(:weekly, :count => 3, :by_day => ['fer', 0]).should == "RRULE:FREQ=WEEKLY;BYDAY=SU;COUNT=3"
     Recurs::Parser.rrule(:yearly, :by_month => :january).should == "RRULE:FREQ=YEARLY;BYMONTH=1"
  end  
-  
+
+  it "should have bare rulses ( nor rrule or exrule )" do
+        Recurs::Parser.rule(:yearly, :by_month => :january).should == "FREQ=YEARLY;BYMONTH=1"
+  end
+
 end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - 4
-  - 3
-  version: 0.0.4.3
+  - 4
+  version: 0.0.4.4
 platform: ruby
 authors: 
 - Steve Caney Martin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-16 00:00:00 +00:00
+date: 2010-12-20 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,9 +47,22 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: haml
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -60,11 +73,11 @@ dependencies:
         - 0
         version: 2.3.0
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: aruba
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -75,11 +88,11 @@ dependencies:
         - 7
         version: 0.2.7
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -88,11 +101,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -101,7 +114,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 description: Specifiy you're recurrence pattern in symbols and strings and get an ical format recurrence string
 email: 
 - steve@shakewell.co.uk
@@ -115,6 +128,7 @@ files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
+- MIT-lICENCE
 - README
 - Rakefile
 - features/generators.feature