actic 0.0.5 → 0.0.5.1

data/lib/app/controllers/alarms_controller.rb

@@ -5,31 +5,32 @@ class AlarmsController < ApplicationController
   respond_to :json, :html
 
   def index
-    respond_with(@base_model, (@alarms = @base_model.alarms.all))
+    @alarms = @base_model.alarms.all
+    respond_with(polymorphic_url(@base_model.class))
   end
 
   def show
-    respond_with(@base_model, (@alarm = @base_model.alarms.find(params[:id])))
+    respond_with(polymorphic_url([@base_model, (@alarm = @base_model.alarms.find(params[:id]))]))
   end
 
   def new
-    respond_with(@base_model, (@alarm = @base_model.alarms.new))
+    respond_with(polymorphic_url([@base_model, (@alarm = @base_model.alarms.new)]))
   end
 
   def edit
-    respond_with(@base_model, (@alarm = @base_model.alarms.find(params[:id])))
+    respond_with(polymorphic_url([@base_model, (@alarm = @base_model.alarms.find(params[:id]))]))
   end
 
   def create
     @alarm = @base_model.alarms.create(params[:alarm])
     flash[:notice] = "Alarm successfully created" if @alarm.save
-    respond_with(@base_model, @alarm)
+    respond_with([@base_model, @alarm])
   end
 
   def update
     @alarm = @base_model.alarms.find(params[:id])
     @alarm.update_attributes(params[:base_model])
-    respond_with(@base_model, @alarm)
+    respond_with(polymorphic_url([@base_model, @alarm]))
   end
 
   def destroy
@@ -45,9 +46,9 @@ class AlarmsController < ApplicationController
   private
 
   def get_base_model
-  [[:calendar_id, Calendar], [:event_id, Event]].each { |c|
+  [['calendar_id', Calendar], ['event_id', Event]].each { |c|
     if params.keys.include?(c[0])
-      @base_model = c[1].find(c[0])
+      @base_model = c[1].find(params[c[0]])
       break
     end
   }

data/lib/config/routes.rb

@@ -1,5 +1,5 @@
 Rails.application.routes.draw do #|map|
-   resources :calendars, :shallow => true do
+   resources :calendars do
      resources :events do
        resources :alarms
      end
@@ -8,8 +8,8 @@ Rails.application.routes.draw do #|map|
      resources :todos
    end
 
- #  resources :events do
- #    resources :alarms
- #  end
+   resources :events do
+     resources :alarms
+   end
 
 end

metadata

@@ -6,7 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - 5
-  version: 0.0.5
+  - 1
+  version: 0.0.5.1
 platform: ruby
 authors: 
 - Steve A Martin
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-28 00:00:00 +00:00
+date: 2010-12-29 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -144,6 +145,11 @@ files:
 - lib/app/models/patterns/r_rule.rb
 - lib/app/models/sub_calendar.rb
 - lib/app/models/todo.rb
+- lib/app/views/alarms/_form.html.haml
+- lib/app/views/alarms/edit.html.haml
+- lib/app/views/alarms/index.html.haml
+- lib/app/views/alarms/new.html.haml
+- lib/app/views/alarms/show.html.haml
 - lib/app/views/calendars/_form.html.haml
 - lib/app/views/calendars/edit.html.haml
 - lib/app/views/calendars/index.html.haml
@@ -186,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -38276750148363735
+      hash: 3940276186545721090
       segments: 
       - 0
       version: "0"
@@ -195,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -38276750148363735
+      hash: 3940276186545721090
       segments: 
       - 0
       version: "0"