actic 0.0.2.3 → 0.0.3

data/lib/app/controllers/calendars_controller.rb

@@ -1,24 +1,25 @@
 class CalendarsController < ApplicationController
+  respond_to :json, :html
   # GET /calendars
   # GET /calendars.xml
   def index
-    @calendars = Calendar.all
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.xml  { render :xml => @calendars }
-    end
+    respond_with(@calendars = Calendar.all)
+#    respond_to do |format|
+#      format.html # index.html.erb
+#      format.xml  { render :xml => @calendars }
+#    end
   end
 
   # GET /calendars/1
   # GET /calendars/1.xml
   def show
-    @calendar = Calendar.find(params[:id])
-
+    respond_with(@calendar = Calendar.find(params[:id]))
+=begin
     respond_to do |format|
       format.html # show.html.erb
       format.xml  { render :xml => @calendar }
     end
+=end
   end
 
   # GET /calendars/new

data/lib/app/controllers/events_controller.rb

@@ -0,0 +1,101 @@
+class EventsController < ApplicationController
+  before_filter :get_calendar
+    # GET /events/new
+  # GET /events/new.xml
+  def new
+    #@event = @calendar.events.new
+
+  #  respond_to do |format|
+  #   format.html # new.html.erb
+  #    format.xml  { render :xml => @event }
+  #  end
+  end
+
+  def index
+
+  end
+
+  private
+    def get_calendar
+      @calendar = Calendar.find(params[:calendar_id]) unless params[:calendar_id].nil?
+    end
+# GET /calendars
+  # GET /calendars.xml
+=begin
+  before_filter :get_calendar
+
+  def index
+    @events = @calendar.events.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 = @calendar.events.find(params[:id])
+
+    respond_to do |format|
+      format.html # show.html.erb
+      format.xml  { render :xml => @event }
+    end
+  end
+
+  # GET /events/1/edit
+  def edit
+    @event = @calendar.events.find(params[:id])
+  end
+
+  # POST /events
+  # POST /events.xml
+  def create
+    @event = @calendar.events.new(params[:event])
+
+    respond_to do |format|
+      if @event.save
+        format.html { redirect_to([@calendar,@event], :notice => 'Dummy resource was successfully created.') }
+        format.xml  { render :xml => [@calendar,@event], :status => :created, :location => @event }
+      else
+        format.html { render :action => "new" }
+        format.xml  { render :xml => @event.errors, :status => :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /events/1
+  # PUT /events/1.xml
+  def update
+    @event = @calendar.events.find(params[:id])
+
+    respond_to do |format|
+      if @event.update_attributes(params[:event])
+        format.html { redirect_to(@event, :notice => 'Dummy resource 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 = @calendar.events.find(params[:id])
+    @event.destroy
+
+    respond_to do |format|
+      format.html { redirect_to(events_url) }
+      format.xml  { head :ok }
+    end
+  end
+  
+  private
+    def get_calendar
+      @calendar = Calendar.find(params[:event_id]) unless params[:event_id].nil?
+    end  
+=end
+end

data/lib/app/models/calendar.rb

@@ -5,6 +5,19 @@ class Calendar < Component
   has_many :todos, :after_add => :add_component,  :after_remove => :reset_component
   has_many :alarms, :as => :owner, :after_add => :add_component,  :after_remove => :reset_component
   #has_many :components
+
+#  def as_json
+#    self.attributes
+#  end
+  def as_json(options = {})
+    r = {
+      :guid => "/calendars/#{self.id}",
+      :id => self.id,
+      :ical => self.ical
+    }
+    r
+  end
+
 end
 
 

data/lib/config/routes.rb

@@ -1,3 +1,5 @@
-Rails.application.routes.draw do |map|
-   resources :calendars#, :controller => '../app/controllers/calendars'#, :only => [:new, :create]
+Rails.application.routes.draw do #|map|
+   resources :calendars do
+     resources :events#, :controller => "Calendars::Events"
+   end#, :controller => '../app/controllers/calendars'#, :only => [:new, :create]
 end

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

@@ -1,7 +1,8 @@
-class CreateComponents < ActiveRecord::Migration
+class CreateActicComponents < ActiveRecord::Migration
   def self.up
     create_table :calendars do |t|
       t.string :ical
+      t.string :name
 
       t.timestamps
     end

metadata

@@ -5,9 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
   - 3
-  version: 0.0.2.3
+  version: 0.0.3
 platform: ruby
 authors: []
 
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-21 00:00:00 +00:00
+date: 2010-12-23 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,6 +71,34 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: inherited_resources
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 2
+        version: 1.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: factory_girl
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id006
 description: Actic is a calendaring engine for Rails3, it combines an iCal interface with ORM. It acts as a wrapper around the RiCal library
 email: 
 executables: []
@@ -84,6 +111,7 @@ files:
 - lib/actic/engine.rb
 - lib/actic.rb
 - lib/app/controllers/calendars_controller.rb
+- lib/app/controllers/events_controller.rb
 - lib/app/helpers/calendars_helper.rb
 - lib/app/models/alarm.rb
 - lib/app/models/calendar.rb
@@ -103,6 +131,11 @@ files:
 - lib/app/views/calendars/index.html.haml
 - lib/app/views/calendars/new.html.haml
 - lib/app/views/calendars/show.html.haml
+- lib/app/views/events/_form.html.haml
+- lib/app/views/events/edit.html.haml
+- lib/app/views/events/index.html.haml
+- lib/app/views/events/new.html.haml
+- lib/app/views/events/show.html.haml
 - lib/config/routes.rb
 - lib/generators/actic_install_generator.rb
 - lib/generators/templates/migration.rb.tmpl
@@ -123,7 +156,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 106874503336549993
+      hash: -2081845520581045814
       segments: 
       - 0
       version: "0"
@@ -132,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 106874503336549993
+      hash: -2081845520581045814
       segments: 
       - 0
       version: "0"