recurs 0.0.4.2 → 0.0.4.3

data/features/generators.feature

@@ -5,6 +5,8 @@ Feature:
 
   Scenario: The recurs generators create a recurs scaffold
     for each model that I generate with a recurs generator
+    #Given I run "rake build"
+    #And I run "gem install pkg/recurs-0.0.4.2.gem"
     Given I run "rails new test_app"
     And I cd to "test_app"
     And a file named "Gemfile" with:
@@ -14,19 +16,224 @@ Feature:
     gem 'sqlite3-ruby', :require => 'sqlite3'
     gem 'recurs' #, :path => '../../../'
     """
-    And I run "bundle install"
+    #And I run "bundle install"
     And I run "rails generate recurs_widget Event"
-    Then the output should contain:
-      """
-        create  app/models/event.rb
-
-      """
+   # Then the output should contain:
+   #   """
+   #     create  app/models/event.rb
+   #     create  db/migrate
+   #
+   #   """
+    And the following directories should exist:
+      | db/migrate |
     And the following files should exist:
       | app/models/event.rb |
       | app/views/events/index.html.haml |
       | app/views/events/new.html.haml |
       | app/views/events/edit.html.haml |
       | app/views/events/_form.html.haml |
-      | app/views/events/schemes/_form.html.haml |
-    And the following files should not exist:
-    And I run "rake db:migrate"
+      | app/views/events/schemes/_monthly.html.haml |
+      | app/views/events/schemes/_set_points.html.haml |
+      | app/views/events/schemes/_standard.html.haml |
+      | app/views/events/schemes/_weekly.html.haml |
+      | app/controllers/events_controller.rb |
+    And the file "app/models/event.rb" should contain exactly:
+  """
+  class Event < ActiveRecord::Base
+    acts_as_recurring
+  end
+  """
+
+
+    And the file "app/views/events/new.html.haml" should contain exactly:
+  """
+  %h1 New event
+
+  = render 'form'
+
+  = link_to 'Back', events_path
+  """
+
+
+
+    And the file "app/views/events/_form.html.haml" should contain exactly:
+  """
+  = form_for @event do |f|
+    -if @event.errors.any?
+      #errorExplanation
+        %h2= "#{pluralize(@event.errors.count, "error")} prohibited this recurrence from being saved:"
+        %ul
+          - @event.errors.full_messages.each do |msg|
+            %li= msg
+
+    .field
+    .field
+      = f.label :repeats
+      = f.select :repeats, Event.schemes
+
+    - if flash[:interval]
+      .field
+        = f.label :repeats_every
+        = f.select :interval, 1..52, :class => :left
+        = @recurs_template[1]
+
+      = render :partial => "recurrences/schemes/#{@recurs_template[0]}"
+
+      .field
+        = f.label :starts_at
+        = f.datetime_select :starts_at
+      .field
+        = f.label :ends_at
+        = f.datetime_select :ends_at
+      .field
+        = f.label :never_ends
+        = f.check_box :never_ends
+      .field
+        = f.label :summary
+        = f.text_field :summary
+    .actions
+      = f.submit 'Save'
+  """
+    And the file "app/views/events/edit.html.haml" should contain exactly:
+  """
+  %h1 Edit event
+
+  = render 'form'
+
+  = link_to 'Show', @event
+  \|
+  = link_to 'Back', events_path
+  """
+    And the file "app/views/events/index.html.haml" should contain exactly:
+  """
+  %h1 Listing events
+
+  %table
+    %tr
+      %th Starts on
+      %th Ends on date
+      %th Recurrence
+      %th Summary
+      %th
+      %th
+      %th
+
+    - @events.each do |event|
+      %tr
+        %td= event.starts_at
+        %td= event.ends_at
+        %td= event.rrule
+        %td= event.summary
+        %td= link_to 'Show', event
+        %td= link_to 'Edit', edit_event_path(event)
+        %td= link_to 'Destroy', event, :confirm => 'Are you sure?', :method => :delete
+
+  %br
+
+  = link_to 'New event', new_event_path
+  """
+    And the file "app/controllers/events_controller.rb" should contain exactly:
+  """
+  class EventsController < ApplicationController
+    # GET /events
+    # GET /events.xml
+    def index
+      @events = Event.all
+
+      respond_to do |format|
+        format.html # index.html.erb
+        format.xml  { render :xml => @events }
+      end
+    end
+
+    # GET /events/1
+    # GET /events/1.xml
+    def show
+      @event = Event.find(params[:id])
+
+      respond_to do |format|
+        format.html # show.html.erb
+        format.xml  { render :xml => @event }
+      end
+    end
+
+    # GET /events/new
+    # GET /events/new.xml
+    def new
+      @event = Event.new
+      if flash[:repeats]
+        flash[:scheme] = flash[:repeats]
+        @event_template = Event.scheme(flash[:repeats]).call
+      end
+
+      respond_to do |format|
+        format.html # new.html.erb
+        format.xml  { render :xml => @event }
+      end
+    end
+
+    # GET /events/1/edit
+    def edit
+      @event = Event.find(params[:id])
+    end
+
+    # POST /events
+    # POST /events.xml
+    def create
+      unless flash[:repeats]
+        flash[:repeats] = params[:event][:repeats].to_i
+        redirect_to new_event_path
+      else
+        #@event = Event.new(params[:event])
+        Event.scheme(flash[:scheme]).call(:set => params[:event])
+      end
+    end
+
+    # PUT /events/1
+    # PUT /events/1.xml
+    def update
+      @event = Event.find(params[:id])
+
+      respond_to do |format|
+        if @event.update_attributes(params[:event])
+          format.html { redirect_to(@event, :notice => 'Event was successfully updated.') }
+          format.xml  { head :ok }
+        else
+          format.html { render :action => "edit" }
+          format.xml  { render :xml => @event.errors, :status => :unprocessable_entity }
+        end
+      end
+    end
+
+    # DELETE /events/1
+    # DELETE /events/1.xml
+    def destroy
+      @event = Event.find(params[:id])
+      @event.destroy
+
+      respond_to do |format|
+        format.html { redirect_to(events_url) }
+        format.xml  { head :ok }
+      end
+    end
+  end
+  """
+    And the file "config/routes.rb" should contain "resources :events"
+    And the file that's name includes "create_events.rb" in "db/migrate" should contain exactly:
+  """
+  class CreateEvents < ActiveRecord::Migration
+    def self.up
+      create_table(:events) do |t|
+
+        t.timestamps
+      end
+
+    end
+
+    def self.down
+      drop_table :events
+    end
+  end
+  """
+    #And the following files should not exist:
+    #And I run "rake db:migrate"

data/features/step_definitions/aruba_steps.rb

@@ -266,6 +266,16 @@ Then /^the file "([^"]*)" should contain exactly:$/ do |file, exact_content|
   check_exact_file_content(file, exact_content)
 end
 
+Then /^the migration file create_"([^"]*)"s.rb should contain exactly:$/ do |file, exact_content|
+  found = Dir.entries("#{current_dir}/db/migrate").select {|f| f if f.match(/\n*_create_#{file}s.rb/) }
+  check_exact_file_content("#{current_dir}/db/migrate/#{found.first}", exact_content)
+end
+
+Then /^the file that's name includes "([^"]*)" in "([^"]*)" should contain exactly:$/ do |file, folder, exact_content|
+  found = Dir.entries("#{current_dir}/#{folder}").select {|f| f if f.match(/\S*#{file}\S*/) }
+  check_exact_file_content("#{current_dir}/#{folder}/#{found.first}", exact_content)
+end
+
 Then /^the file "([^"]*)" should match \/([^\/]*)\/$/ do |file, partial_content|
   check_file_content(file, /#{partial_content}/, true)
 end

data/features/support/aruba.rb

@@ -49,6 +49,14 @@ module Aruba
       end
     end
 
+    def check_exact_migration_file_content(file, exact_content)
+      #in_current_dir do
+      #prep_for_fs_check do
+        found = Dir.entries("#{current_dir}/db/migrate").select {|f| f if f.match(/\n*_create_#{file}s.rb/) }
+        check_exact_file_content("#{current_dir}/db/migrate/#{found}", exact_content)
+      #end
+    end
+
     def check_file_presence(paths, expect_presence)
       prep_for_fs_check do
         paths.each do |path|

data/lib/generators/recurs_widget_generator.rb

@@ -1,26 +1,42 @@
-module Recurs
-class WidgetGenerator < Rails::Generators::Base
+#module
+#require 'rails/generators/migration'
+require 'rails/generators/active_record'
+class RecursWidgetGenerator < Rails::Generators::Base
+  include Rails::Generators::Migration
+  #include Actic::Generator
   source_root File.expand_path("../templates", __FILE__)
   argument :name, :type => :string, :default => "event"
+  argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
 
   def create_instance_model
-    template "instance.rb.tmpl", "app/models/#{name}.rb"
+    template "instance.rb.tmpl", "app/models/#{name.downcase}.rb"
     #create_file "app/models#{model_name}"
   end
 
   def create_instance_views
     ['index', 'show', 'edit', 'new', '_form'].each {|v|
-    template "views/#{v}", "app/views/#{name.downcase}/#{v}.html.haml"
+    template "views/#{v}", "app/views/#{name.downcase}s/#{v}.html.haml"
+    }
+    ['_monthly', '_set_points', '_standard', '_weekly'].each {|v|
+    template "views/schemes/#{v}", "app/views/#{name.downcase}s/schemes/#{v}.html.haml"
     }
   end
 
   def create_instance_route
-    insert_into_file 'config/routes.rb'
+    insert_into_file 'config/routes.rb', "resources :#{name.downcase}s", :after => "Application.routes.draw do\n"
   end
 
   def create_instance_controller
+    template "controller.rb.tmpl", "app/controllers/#{name.downcase}s_controller.rb"
+  end
+
+  def self.next_migration_number(dirname)
+    ActiveRecord::Generators::Base.next_migration_number(dirname)
+  end
 
+  def create_migration_file
+    migration_template 'migration.rb.tmpl', "db/migrate/create_#{name.downcase}s.rb"
   end
 
 end
-end
+#end

data/lib/generators/templates/controller.rb.tmpl

@@ -0,0 +1,83 @@
+class <%= name %>sController < ApplicationController
+  # GET /<%= dname = name.downcase %>s
+  # GET /<%= dname %>s.xml
+  def index
+    @<%= dname %>s = <%= name %>.all
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.xml  { render :xml => @<%= dname %>s }
+    end
+  end
+
+  # GET /<%= dname %>s/1
+  # GET /<%= dname %>s/1.xml
+  def show
+    @<%= dname %> = <%= name %>.find(params[:id])
+
+    respond_to do |format|
+      format.html # show.html.erb
+      format.xml  { render :xml => @<%= dname %> }
+    end
+  end
+
+  # GET /<%= dname %>s/new
+  # GET /<%= dname %>s/new.xml
+  def new
+    @<%= dname %> = <%= name %>.new
+    if flash[:repeats]
+      flash[:scheme] = flash[:repeats]
+      @<%= dname %>_template = <%= name %>.scheme(flash[:repeats]).call
+    end
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.xml  { render :xml => @<%= dname %> }
+    end
+  end
+
+  # GET /<%= dname %>s/1/edit
+  def edit
+    @<%= dname %> = <%= name %>.find(params[:id])
+  end
+
+  # POST /<%= dname %>s
+  # POST /<%= dname %>s.xml
+  def create
+    unless flash[:repeats]
+      flash[:repeats] = params[:<%= dname %>][:repeats].to_i
+      redirect_to new_<%= dname %>_path
+    else
+      #@<%= dname %> = <%= name %>.new(params[:<%= dname %>])
+      <%= name %>.scheme(flash[:scheme]).call(:set => params[:<%= dname %>])
+    end
+  end
+
+  # PUT /<%= dname %>s/1
+  # PUT /<%= dname %>s/1.xml
+  def update
+    @<%= dname %> = <%= name %>.find(params[:id])
+
+    respond_to do |format|
+      if @<%= dname %>.update_attributes(params[:<%= dname %>])
+        format.html { redirect_to(@<%= dname %>, :notice => '<%= name %> was successfully updated.') }
+        format.xml  { head :ok }
+      else
+        format.html { render :action => "edit" }
+        format.xml  { render :xml => @<%= dname %>.errors, :status => :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /<%= dname %>s/1
+  # DELETE /<%= dname %>s/1.xml
+  def destroy
+    @<%= dname %> = <%= name %>.find(params[:id])
+    @<%= dname %>.destroy
+
+    respond_to do |format|
+      format.html { redirect_to(<%= dname %>s_url) }
+      format.xml  { head :ok }
+    end
+  end
+end

data/lib/generators/templates/migration.rb.tmpl

@@ -0,0 +1,17 @@
+class Create<%= name.camelize %>s < ActiveRecord::Migration
+  def self.up
+    create_table(:<%= name.downcase %>s) do |t|
+<% if attributes %>
+<% for attribute in attributes -%>
+      t.<%= attribute[:type] %> :<%= attribute[:name] %>
+<% end -%>
+<% end -%>
+      t.timestamps
+    end
+
+  end
+
+  def self.down
+    drop_table :<%= name.downcase %>s
+  end
+end

data/lib/generators/templates/views/_form

@@ -0,0 +1,35 @@
+= form_for @<%= dname = name.downcase %> do |f|
+  -if @<%= dname %>.errors.any?
+    #errorExplanation
+      %h2= "#{pluralize(@<%= dname %>.errors.count, "error")} prohibited this recurrence from being saved:"
+      %ul
+        - @<%= dname %>.errors.full_messages.each do |msg|
+          %li= msg
+
+  .field
+  .field
+    = f.label :repeats
+    = f.select :repeats, Event.schemes
+
+  - if flash[:interval]
+    .field
+      = f.label :repeats_every
+      = f.select :interval, 1..52, :class => :left
+      = @recurs_template[1]
+
+    = render :partial => "recurrences/schemes/#{@recurs_template[0]}"
+
+    .field
+      = f.label :starts_at
+      = f.datetime_select :starts_at
+    .field
+      = f.label :ends_at
+      = f.datetime_select :ends_at
+    .field
+      = f.label :never_ends
+      = f.check_box :never_ends
+    .field
+      = f.label :summary
+      = f.text_field :summary
+  .actions
+    = f.submit 'Save'

data/lib/generators/templates/views/edit

@@ -0,0 +1,7 @@
+%h1 Edit <%= name.downcase %>
+
+= render 'form'
+
+= link_to 'Show', @<%= name.downcase %>
+\|
+= link_to 'Back', <%= name.downcase %>s_path

data/lib/generators/templates/views/index

@@ -0,0 +1,25 @@
+%h1 Listing <%= dname = name.downcase %>s
+
+%table
+  %tr
+    %th Starts on
+    %th Ends on date
+    %th Recurrence
+    %th Summary
+    %th
+    %th
+    %th
+
+  - @<%= dname %>s.each do |<%= dname %>|
+    %tr
+      %td= <%= dname %>.starts_at
+      %td= <%= dname %>.ends_at
+      %td= <%= dname %>.rrule
+      %td= <%= dname %>.summary
+      %td= link_to 'Show', <%= dname %>
+      %td= link_to 'Edit', edit_<%= dname %>_path(<%= dname %>)
+      %td= link_to 'Destroy', <%= dname %>, :confirm => 'Are you sure?', :method => :delete
+
+%br
+
+= link_to 'New <%= dname %>', new_<%= dname %>_path

data/lib/generators/templates/views/new

@@ -0,0 +1,5 @@
+%h1 New <%= name.downcase %>
+
+= render 'form'
+
+= link_to 'Back', <%= name.downcase %>s_path

data/lib/recurs.rb

@@ -8,7 +8,7 @@ module Recurs
   module Parser
 
     def self.included(base)
-      base.send :extend, ClassMethods
+      base.send :extend, ModelMethods
     end
 
     class << self
@@ -192,9 +192,17 @@ module Recurs
 
     end
 
-    module ClassMethods
+    module ModelMethods
       def acts_as_recurring
         send :include, InstanceMethods
+        send :extend, ModelClassMethods
+      end
+
+    end
+
+    module ModelClassMethods
+      def schemes
+        Recurs::Rules.schemes
       end
     end
 

data/lib/recurs/version.rb

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

data/spec/models/instance_spec.rb

@@ -15,6 +15,18 @@ describe Event do
     @event.recurs
   end
 
+  it "should have the schemes" do
+    Event.schemes.should == ["Daily",
+      "Every Weekday ( Mon - Fri )",
+      "Every Mon, Wed, Fri",
+      "Every Tues, Thurs",
+      "Every Weekend",
+      "Weekly",
+      "Monthly",
+      "Yearly"]
+
+  end
+
   it "should add an rrule" do
     @event.add_rrule(:daily).should == "RRULE:FREQ=DAILY"
     @event.recurs.should == "RRULE:FREQ=DAILY"

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - 4
-  - 2
-  version: 0.0.4.2
+  - 3
+  version: 0.0.4.3
 platform: ruby
 authors: 
 - Steve Caney Martin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-15 00:00:00 +00:00
+date: 2010-12-16 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -124,6 +124,16 @@ files:
 - lib/generators/recurs_widget_generator.rb
 - lib/generators/templates/controller.rb.tmpl
 - lib/generators/templates/instance.rb.tmpl
+- lib/generators/templates/migration.rb.tmpl
+- lib/generators/templates/views/_form
+- lib/generators/templates/views/edit
+- lib/generators/templates/views/index
+- lib/generators/templates/views/new
+- lib/generators/templates/views/schemes/_monthly
+- lib/generators/templates/views/schemes/_set_points
+- lib/generators/templates/views/schemes/_standard
+- lib/generators/templates/views/schemes/_weekly
+- lib/generators/templates/views/show
 - lib/recurs.rb
 - lib/recurs/consts.rb
 - lib/recurs/rules.rb