zscaffold_admin 0.0.2 → 0.0.3

data/lib/generators/scaffold_admin/install_generator.rb

@@ -30,17 +30,17 @@ module ScaffoldAdmin
     end
 
     def inject_code_helper
-      path = IO.readlines("#{Rails.root}/config/routes.rb")
+      path = IO.readlines("config/routes.rb")
       content = File.open(File.expand_path("../templates/code_application_helper.rb", __FILE__), 'r') {|file| file.read}
       sentinel = /module ApplicationHelper/
       app = /::Application/
       engine = /::Engine/
-      application = path.first.gsub(/::(.*)/, "").gsub("\n", "").underscore
+      application = path.first.gsub(/::(.*)/, "").chomp.underscore
       
       if path.first =~ app
-        inject_into_file "#{Rails.root}/app/helpers/application_helper.rb", "\n#{content}\n", { :after => sentinel, :verbose => false }
+        inject_into_file "app/helpers/application_helper.rb", "\n#{content}\n", { :after => sentinel, :verbose => false }
       elsif path.first =~ engine
-        inject_into_file "#{Rails.root}/app/helpers/#{application}/application_helper.rb", "\n#{content}\n", { :after => sentinel, :verbose => false }
+        inject_into_file "app/helpers/#{application}/application_helper.rb", "\n#{content}\n", { :after => sentinel, :verbose => false }
       end      
     end
       

data/lib/generators/scaffold_admin/scaffold_admin_generator.rb

@@ -39,9 +39,9 @@ class ScaffoldAdminGenerator < Rails::Generators::Base
   def create_migration
     migration_number = Time.now.strftime('%Y%m%d%H%M%S')
     if namespace_name
-      template 'migration.rb', "db/migrate/#{migration_number}_create_#{namespace_underscore}_#{plural_name}.rb"
+      migration_template "migration.rb", "db/migrate/create_#{namespace_underscore}_#{plural_name}.rb"
     else
-      template 'migration.rb', "db/migrate/#{migration_number}_create_#{plural_name}.rb"
+      migration_template "migration.rb", "db/migrate/create_#{plural_name}.rb"
     end
   end
   
@@ -106,4 +106,14 @@ class ScaffoldAdminGenerator < Rails::Generators::Base
     end
   end
   
+  # FIXME: Should be proxied to ActiveRecord::Generators::Base
+  # Implement the required interface for Rails::Generators::Migration.
+  def self.next_migration_number(dirname) #:nodoc:
+    if ActiveRecord::Base.timestamped_migrations
+      Time.now.utc.strftime("%Y%m%d%H%M%S")
+    else
+      "%.3d" % (current_migration_number(dirname) + 1)
+    end
+   end
+  
 end

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

@@ -2,7 +2,10 @@
 module <%= module_name %>
 <%- end -%>
 class <%= plural_class %>Controller < ApplicationController    
-  layout 'admin'
+  
+  before_filter :init, :only => [:show, :edit, :update, :destroy]
+  
+  layout 'admin'   
   respond_to :html, :xml, :js
 
   def index
@@ -11,9 +14,7 @@ class <%= plural_class %>Controller < ApplicationController
     respond_with @<%= plural_name %>
   end
     
-  def show
-    @<%= singular_name %> = <%= class_name %>.where(:id => params[:id]).first
-    
+  def show   
     respond_with @<%= singular_name %>
   end
 
@@ -24,7 +25,6 @@ class <%= plural_class %>Controller < ApplicationController
   end
 
   def edit
-    @<%= singular_name %> = <%= class_name %>.where(:id => params[:id]).first
     respond_with @<%= singular_name %>
   end
 
@@ -39,9 +39,7 @@ class <%= plural_class %>Controller < ApplicationController
     end
   end
 
-  def update
-    @<%= singular_name %> = <%= class_name %>.where(:id => params[:id]).first
-  
+  def update 
     if @<%= singular_name %>.update_attributes params[:<%= singular_name %>]
       flash[:notice] = I18n.t :<%= singular_name %>_updated
       respond_with @<%= singular_name %>
@@ -51,11 +49,14 @@ class <%= plural_class %>Controller < ApplicationController
   end
 
   def destroy
-    @<%= singular_name %> = <%= class_name %>.where(:id => params[:id]).first
     @<%= singular_name %>.destroy
     
     respond_with @<%= singular_name %>
   end
+  
+  def init
+    @<%= singular_name %> = <%= class_name %>.where(:id => params[:id]).first
+  end
     
 end
 <%- if namespace_name -%>  

data/lib/generators/scaffold_admin/templates/layouts/admin.html.erb

@@ -49,7 +49,7 @@
       <%= render :partial => 'shared/menu'%>
     <footer>
 			<hr />
-			<p><strong>Copyright &copy; 2011 Cidadelas</strong></p>
+			<p><strong>MIT-LICENSE</strong></p>
 			<p>Theme by <a href="http://www.medialoot.com">MediaLoot</a></p>
 		</footer>
 	</aside><!-- end of sidebar -->

data/lib/generators/scaffold_admin/templates/views/_form.html.erb

@@ -14,7 +14,7 @@
   
   <%- model_attributes.each do |attribute| -%>
   <fieldset>
-    <label><b><%%= I18n.t :<%= attribute.name %> %></label></b>
+    <label><b><%%= I18n.t :<%= attribute.name %> %></b></label>
     <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %>
   </fieldset>
   <%- end -%>

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Vagner Zampieri
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-04 00:00:00 -03:00
+date: 2011-08-15 00:00:00 -03:00
 default_executable: 
 dependencies: []