stager 0.1.1 → 0.1.2

data/lib/generators/stager/scaffold/scaffold_generator.rb

@@ -98,7 +98,7 @@ module Stager
     
     def create_presenter
       unless options[:skip_presenter]
-        run "rails g exhibit:presenter #{scaffold_name} #{@namespaced_model ? nil : "--no_namespace"}"
+        invoke "exhibit:presenter", [scaffold_name, @namespaced_model ? nil : "--no_namespace"]
       end
     end
     
@@ -142,7 +142,7 @@ module Stager
       if form_partial?
         "= render(\"form\")"
       else
-        read_template("views/_form.html.#{view_language}")
+        read_template("views/_form.html.haml")
       end
     end
     
@@ -152,6 +152,18 @@ module Stager
       end.join("\n").strip
     end
     
+    def before_filter_actions
+      controller_actions.map { |action| %w(show edit update destroy).include?(action) ? ":#{action}" : nil }.compact.join(", ")
+    end
+    
+    def before_filter_actions?
+      available = false
+      %w(show edit update destroy).each do |name| 
+        available = true if action?(name)
+      end
+      available
+    end
+    
     def item_resource
       scaffold_name.underscore.gsub('/','_')
     end

data/lib/generators/stager/scaffold/templates/actions/destroy.rb

@@ -1,5 +1,4 @@
   def destroy
-    @<%= instance_name %> = <%= class_name %>.find(params[:id])
     @<%= instance_name %>.destroy
     redirect_to(<%= items_url %>, :notice => "Successfully destroyed <%= class_name.underscore.humanize.downcase %>.")
   end

data/lib/generators/stager/scaffold/templates/actions/edit.rb

@@ -1,3 +1,2 @@
   def edit
-    @<%= instance_name %> = <%= class_name %>.find(params[:id])
   end

data/lib/generators/stager/scaffold/templates/actions/show.rb

@@ -1,3 +1,2 @@
   def show
-    @<%= instance_name %> = <%= class_name %>.find(params[:id])
   end

data/lib/generators/stager/scaffold/templates/actions/update.rb

@@ -1,5 +1,4 @@
   def update
-    @<%= instance_name %> = <%= class_name %>.find(params[:id])
     if @<%= instance_name %>.update_attributes(params[:<%= instance_name %>])
       redirect_to(<%= item_url %>, :notice  => "Successfully updated <%= class_name.underscore.humanize.downcase %>.")
     else

data/lib/generators/stager/scaffold/templates/controller.rb

@@ -1,3 +1,15 @@
 class <%= plural_class_name %>Controller < ApplicationController
+<%- if before_filter_actions? -%>
+  before_filter :find_<%= singular_name %>, :only => [<%= before_filter_actions %>]
+<%- end -%>
+  
   <%= controller_methods :actions %>
+
+<%- if before_filter_actions? -%>
+private
+  
+  def find_<%= singular_name %>
+    @<%= instance_name %> = <%= class_name %>.find(params[:id])
+  end
+<%- end -%>
 end

data/lib/stager/version.rb

@@ -1,3 +1,3 @@
 module Stager
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stager
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Robin Brouwer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-08 00:00:00 +02:00
+date: 2011-10-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency