dust-generators 0.1.4 → 0.1.5

data/lib/dust/version.rb

@@ -2,7 +2,7 @@ class Dust
   module Version
     MAJOR = 0
     MINOR = 1
-    PATCH = 4
+    PATCH = 5
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/rails_generators/dust_scaffold/templates/actions/create.rb

@@ -1,7 +1,7 @@
   def create
     @<%= singular_name %> = <%= class_name %>.new(params[:<%= singular_name %>])
     if @<%= singular_name %>.save
-      flash[:notice] = "Successfully created <%= name.underscore.humanize.downcase %>."
+      flash[:notice] = "Successfully created <%= model_name.underscore.humanize.downcase %>."
       redirect_to <%= item_path('url') %>
     else
       render :action => 'new'

data/rails_generators/dust_scaffold/templates/actions/destroy.rb

@@ -1,6 +1,6 @@
   def destroy
     @<%= singular_name %> = <%= class_name %>.find(params[:id])
     @<%= singular_name %>.destroy
-    flash[:notice] = "Successfully destroyed <%= name.underscore.humanize.downcase %>."
+    flash[:notice] = "Successfully destroyed <%= model_name.underscore.humanize.downcase %>."
     redirect_to <%= items_path('url') %>
   end

data/rails_generators/dust_scaffold/templates/actions/index.rb

@@ -1,3 +1,3 @@
   def index
-    @<%= plural_name %> = <%= class_name %>.all
+    @<%= plural_name %> = <%= class_name %>.page(params[:search], params[:page]) 
   end

data/rails_generators/dust_scaffold/templates/actions/update.rb

@@ -1,7 +1,7 @@
   def update
     @<%= singular_name %> = <%= class_name %>.find(params[:id])
     if @<%= singular_name %>.update_attributes(params[:<%= singular_name %>])
-      flash[:notice] = "Successfully updated <%= name.underscore.humanize.downcase %>."
+      flash[:notice] = "Successfully updated <%= model_name.underscore.humanize.downcase %>."
       redirect_to <%= item_path('url') %>
     else
       render :action => 'edit'

data/rails_generators/dust_scaffold/templates/controller.rb

@@ -1,3 +1,9 @@
 class <%= plural_class_name %>Controller < ApplicationController
-  <%= controller_methods :actions %>
+  
+	filter_resource_access
+
+	layout 'cms'
+	
+	<%= controller_methods :actions %>
+	
 end

data/rails_generators/dust_scaffold/templates/fixtures.yml

@@ -1,9 +1,9 @@
 one:
-<%- for attribute in attributes -%>
+<%- for attribute in model_attributes -%>
   <%= attribute.name %>: <%= attribute.default %>
 <%- end -%>
 
 two:
-<%- for attribute in attributes -%>
+<%- for attribute in model_attributes -%>
   <%= attribute.name %>: <%= attribute.default %>
 <%- end -%>

data/rails_generators/dust_scaffold/templates/migration.rb

@@ -1,7 +1,7 @@
 class Create<%= plural_class_name %> < ActiveRecord::Migration
   def self.up
     create_table :<%= plural_name %> do |t|
-    <%- for attribute in attributes -%>
+    <%- for attribute in model_attributes -%>
       t.<%= attribute.type %> :<%= attribute.name %>
     <%- end -%>
     <%- unless options[:skip_timestamps] -%>
@@ -9,7 +9,9 @@ class Create<%= plural_class_name %> < ActiveRecord::Migration
     <%- end -%>
     end
   end
-  
+
+	CmsMenuItem.create({:title =>"<%= plural_class_name %>", :controller_name => "<%= plural_name %>", :url => "/<%= plural_name %>"})
+
   def self.down
     drop_table :<%= plural_name %>
   end

data/rails_generators/dust_scaffold/templates/model.rb

@@ -1,3 +1,37 @@
 class <%= class_name %> < ActiveRecord::Base
-  attr_accessible <%= attributes.map { |a| ":#{a.name}" }.join(", ") %>
+  attr_accessible <%= model_attributes.map { |a| ":#{a.name}" }.join(", ") %>
+
+	<%- first_attribute = model_attributes.first -%>
+	def self.page(search, page)
+		paginate :per_page => 10, :page => page,
+              :order => 'name',
+              :conditions => ["<%= first_attribute.name %> LIKE ? OR content LIKE ?", "%#{search}%", "%#{search}%"]
+  end
+
+	has_one :menu_item, :as => :linkable, :dependent => :destroy
+	
+	after_create :create_menu_item
+	after_update :update_menu_item
+	
+	def update_menu_item
+		@menu_item = self.menu_item
+		if @menu_item == nil
+			self.create_menu_item
+		else
+		@menu_item.update_attributes(
+			:title => self.<%= first_attribute.name %>,
+			:url => "/#{self.<%= first_attribute.name %>}",
+			:active => self.<%= first_attribute.name %>
+		)
+		end
+	end
+	
+	def create_menu_item
+		@menu_item = self.build_menu_item(
+			:title => self.<%= first_attribute.name %>,
+			:url => "/#{<%= first_attribute.name %>}",
+			:active => self.<%= first_attribute.name %>
+		)
+		@menu_item.save
+	end
 end

data/rails_generators/dust_scaffold/templates/tests/rspec/actions/create.rb

@@ -3,7 +3,7 @@
     post :create
     response.should render_template(:new)
   end
-  
+
   it "create action should redirect when model is valid" do
     <%= class_name %>.any_instance.stubs(:valid?).returns(true)
     post :create

data/rails_generators/dust_scaffold/templates/tests/rspec/actions/update.rb

@@ -3,7 +3,7 @@
     put :update, :id => <%= class_name %>.first
     response.should render_template(:edit)
   end
-  
+
   it "update action should redirect when model is valid" do
     <%= class_name %>.any_instance.stubs(:valid?).returns(true)
     put :update, :id => <%= class_name %>.first

data/rails_generators/dust_scaffold/templates/tests/rspec/controller.rb

@@ -1,8 +1,8 @@
 require File.dirname(__FILE__) + '/../spec_helper'
- 
+
 describe <%= plural_class_name %>Controller do
   fixtures :all
-  integrate_views
-  
+  render_views
+
   <%= controller_methods 'tests/rspec/actions' %>
 end

data/rails_generators/dust_scaffold/templates/tests/shoulda/actions/create.rb

@@ -4,7 +4,7 @@
       post :create
       assert_template 'new'
     end
-    
+
     should "redirect when model is valid" do
       <%= class_name %>.any_instance.stubs(:valid?).returns(true)
       post :create

data/rails_generators/dust_scaffold/templates/tests/shoulda/actions/update.rb

@@ -4,7 +4,7 @@
       put :update, :id => <%= class_name %>.first
       assert_template 'edit'
     end
-  
+
     should "redirect when model is valid" do
       <%= class_name %>.any_instance.stubs(:valid?).returns(true)
       put :update, :id => <%= class_name %>.first

data/rails_generators/dust_scaffold/templates/tests/testunit/actions/create.rb

@@ -3,7 +3,7 @@
     post :create
     assert_template 'new'
   end
-  
+
   def test_create_valid
     <%= class_name %>.any_instance.stubs(:valid?).returns(true)
     post :create

data/rails_generators/dust_scaffold/templates/tests/testunit/actions/update.rb

@@ -3,7 +3,7 @@
     put :update, :id => <%= class_name %>.first
     assert_template 'edit'
   end
-  
+
   def test_update_valid
     <%= class_name %>.any_instance.stubs(:valid?).returns(true)
     put :update, :id => <%= class_name %>.first

data/rails_generators/dust_scaffold/templates/views/erb/_form.html.erb

@@ -1,10 +1,16 @@
-<%% form_for @<%= singular_name %> do |f| %>
+<%%= content_for :head do -%>
+	<%%= javascript_include_tag :ckeditor %>
+<%% end -%>
+
+<%%= form_for @<%= singular_name %>, :validations => true do |f| %>
   <%%= f.error_messages %>
-<%- for attribute in attributes -%>
-  <p>
+<%- for attribute in model_attributes -%>
+  <div class="item">
     <%%= f.label :<%= attribute.name %> %><br />
-    <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %>
-  </p>
+    <%%= f.<%= attribute.field_type %> :<%= attribute.name %>, :class => 'field' %>
+  </div>
 <%- end -%>
-  <p><%%= f.submit %></p>
+ <div class="item">
+ 	 <p><%%= f.submit %></p>
+ </div>
 <%% end %>

data/rails_generators/dust_scaffold/templates/views/erb/_search.html.erb

@@ -0,0 +1,6 @@
+<div id="searchbox">
+	<%%= form_tag <%= plural_name %>_path, :method => 'get' do %>
+		<%%= text_field_tag :search, params[:search], :class => "input-text", :placeholder => 'Search <%= plural_name.capitalize %>' %>
+  	<%%= image_submit_tag "admin/blank.png", :class => "image-submit"%>
+	<%% end %>
+</div>

data/rails_generators/dust_scaffold/templates/views/erb/edit.html.erb

@@ -1,14 +1,4 @@
 <%% title "Edit <%= singular_name.titleize %>" %>
+<%% heading "Edit <%= singular_name.titleize %>" %>
 
-<%= render_form %>
-
-<%- if actions? :show, :index -%>
-<p>
-<%- if action? :show -%>
-  <%%= link_to "Show", @<%= singular_name %> %> |
-<%- end -%>
-<%- if action? :index -%>
-  <%%= link_to "View All", <%= plural_name %>_path %>
-<%- end -%>
-</p>
-<%- end -%>
+<%= render_form %>

data/rails_generators/dust_scaffold/templates/views/erb/index.html.erb

@@ -1,29 +1,24 @@
 <%% title "<%= plural_name.titleize %>" %>
+<%- first_attribute = model_attributes.first -%>
+<div class="button_bar">
+	<%%= render :partial => 'search' %>
+	<%%= link_to 'new page', new_<%= singular_name %>_path, :class => 'newfile tip', :title => "New <%= singular_name.titleize %>" %>
+</div>
 
-<table>
-  <tr>
-  <%- for attribute in attributes -%>
-    <th><%= attribute.column.human_name.titleize %></th>
-  <%- end -%>
-  </tr>
-  <%% for <%= singular_name %> in @<%= plural_name %> %>
-    <tr>
-    <%- for attribute in attributes -%>
-      <td><%%=h <%= singular_name %>.<%= attribute.name %> %></td>
-    <%- end -%>
-    <%- if action? :show -%>
-      <td><%%= link_to "Show", <%= singular_name %> %></td>
-    <%- end -%>
-    <%- if action? :edit -%>
-      <td><%%= link_to "Edit", edit_<%= singular_name %>_path(<%= singular_name %>) %></td>
-    <%- end -%>
-    <%- if action? :destroy -%>
-      <td><%%= link_to "Destroy", <%= singular_name %>, :confirm => 'Are you sure?', :method => :delete %></td>
-    <%- end -%>
-    </tr>
-  <%% end %>
-</table>
+<%%= will_paginate @<%= plural_name %> %>
 
-<%- if action? :new -%>
-<p><%%= link_to "New <%= singular_name.titleize %>", new_<%= singular_name %>_path %></p>
-<%- end -%>
+<%% @<%= plural_name %>.each do |<%= singular_name %>| %>
+	<div class="item">
+		<div style='float:right'> 
+			<%%= link_to '', edit_<%= singular_name %>_path(<%= singular_name %>), :class => 'edit tip', :title => "Edit This Item" %>
+			<%%= link_to '', <%= singular_name %>, :confirm => 'Are you sure?', :method => :delete, :class => 'destroy tip', :title => "Destroy This Item"  %>						
+		</div>
+		
+		<h3><%%= link_to <%= singular_name %>.<%= first_attribute.name %>, <%= singular_name %> %></h3>
+		<p>
+			<%%= link_to "Preview <%= singular_name.titleize %>", <%= singular_name %>, :class => 'remote_iframe' %>
+		</p>
+	</div>
+<%% end -%>
+
+<%%= will_paginate @<%= plural_name %> %>

data/rails_generators/dust_scaffold/templates/views/erb/new.html.erb

@@ -1,7 +1,5 @@
 <%% title "New <%= singular_name.titleize %>" %>
+<%% heading "New <%= singular_name.titleize %>" %>
 
 <%= render_form %>
 
-<%- if action? :index -%>
-<p><%%= link_to "Back to List", <%= plural_name %>_path %></p>
-<%- end -%>

data/rails_generators/dust_scaffold/templates/views/erb/show.html.erb

@@ -1,20 +1,23 @@
 <%% title "<%= singular_name.titleize %>" %>
+<%- first_attribute = model_attributes.first -%>
 
-<%- for attribute in attributes -%>
-<p>
-  <strong><%= attribute.column.human_name.titleize %>:</strong>
-  <%%=h @<%= singular_name %>.<%= attribute.name %> %>
-</p>
-<%- end -%>
-
-<p>
-<%- if action? :edit -%>
-  <%%= link_to "Edit", edit_<%= singular_name %>_path(@<%= singular_name %>) %> |
-<%- end -%>
-<%- if action? :destroy -%>
-  <%%= link_to "Destroy", @<%= singular_name %>, :confirm => 'Are you sure?', :method => :delete %> |
-<%- end -%>
-<%- if action? :index -%>
-  <%%= link_to "View All", <%= plural_name %>_path %>
-<%- end -%>
-</p>
+<div class="item">
+	<div style='float:right'> 
+		<%- if action? :edit -%>
+			<%%=link_to '', edit_<%= singular_name %>_path(@<%= singular_name %>), :class => 'edit tip', :title => "Edit This Item" %>
+		<%- end -%>
+		<%- if action? :destroy -%>
+			<%%=link_to "", @<%= singular_name %>, :confirm => 'Are you sure?', :method => :delete, :class => 'destroy tip', :title => "Destroy This Item"  %>						
+		<%- end -%>
+	</div>
+	<h3><%%= link_to @<%= singular_name %>.<%= first_attribute.name %>, @<%= singular_name %> %></h3>
+	<p>
+		<%%= link_to "Preview <%= singular_name.titleize %>", @<%= singular_name %>, :class => 'remote_iframe' %>
+	</p>
+	<%- for attribute in model_attributes -%>
+	<p>
+	  <strong><%= attribute.human_name.titleize %>:</strong>
+	  <%%= @<%= singular_name %>.<%= attribute.name %> %>
+	</p>
+	<%- end -%>
+</div>

data/rails_generators/dust_scaffold/templates/views/haml/_form.html.haml

@@ -1,6 +1,6 @@
 - form_for @<%= singular_name %> do |f|
   = f.error_messages
-  <%- for attribute in attributes -%>
+  <%- for attribute in model_attributes -%>
   %p
     = f.label :<%= attribute.name %>
     %br

data/rails_generators/dust_scaffold/templates/views/haml/index.html.haml

@@ -2,13 +2,13 @@
 
 %table
   %tr
-    <%- for attribute in attributes -%>
-    %th <%= attribute.column.human_name %>
+    <%- for attribute in model_attributes -%>
+    %th <%= attribute.human_name %>
     <%- end -%>
   - for <%= singular_name %> in @<%= plural_name %>
     %tr
-      <%- for attribute in attributes -%>
-      %td= h <%= singular_name %>.<%= attribute.name %>
+      <%- for attribute in model_attributes -%>
+      %td= <%= singular_name %>.<%= attribute.name %>
       <%- end -%>
       <%- if action? :show -%>
       %td= link_to 'Show', <%= singular_name %>

data/rails_generators/dust_scaffold/templates/views/haml/show.html.haml

@@ -1,9 +1,9 @@
 - title "<%= singular_name.titleize %>"
 
-<%- for attribute in attributes -%>
+<%- for attribute in model_attributes -%>
 %p
-  %strong <%= attribute.column.human_name.titleize %>:
-  =h @<%= singular_name %>.<%= attribute.name %>
+  %strong <%= attribute.human_name.titleize %>:
+  = @<%= singular_name %>.<%= attribute.name %>
 <%- end -%>
 
 %p

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dust-generators
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - rossnelson
@@ -283,6 +283,7 @@ files:
 - rails_generators/dust_scaffold/templates/tests/testunit/controller.rb
 - rails_generators/dust_scaffold/templates/tests/testunit/model.rb
 - rails_generators/dust_scaffold/templates/views/erb/_form.html.erb
+- rails_generators/dust_scaffold/templates/views/erb/_search.html.erb
 - rails_generators/dust_scaffold/templates/views/erb/edit.html.erb
 - rails_generators/dust_scaffold/templates/views/erb/index.html.erb
 - rails_generators/dust_scaffold/templates/views/erb/new.html.erb