RubyGems - fetty-generators - Versions diffs - 2.0.3 → 2.0.4 - Mend

fetty-generators 2.0.3 → 2.0.4

Files changed (37) hide show

data/lib/generators/fetty/views/USAGE CHANGED

@@ -3,3 +3,13 @@ Description:
 	helper which will give some structure to starting your Rails app.
 	Also able to convert your template views from ERB to HAML.
+Example:
+  to generate default layout:
+	rails g fetty:views layout
+  to convert all your views from erb to haml:
+	rails g fetty:views erb_to_haml

data/lib/generators/fetty/views/templates/application.css CHANGED

@@ -1,3 +1,4 @@
 body {
   background-color: #D0D0D0;
   font-family: Verdana, Helvetica, Arial;
@@ -36,6 +37,10 @@ input.hint {
 	float: right;
 }
+#messagebox {
+	float: right;
+}
 #flash_notice {
     background-color: #CCEECC;
     color: #006600;

data/lib/generators/fetty/views/templates/application.html.erb CHANGED

@@ -1,23 +1,27 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title><%= content_for?(:title) ? yield(:title) : "Untitled" %></title>
-    <%= stylesheet_link_tag 'application' %>
-    <%= javascript_include_tag :defaults %>
-    <%= csrf_meta_tag %>
-    <%= yield(:head) %>
+    <title><%%= content_for?(:title) ? yield(:title) : "Untitled" %></title>
+    <%%= stylesheet_link_tag 'application' %>
+<%- unless rails_3_1? -%>
+    <%%= javascript_include_tag :defaults %>
+<%- else -%>
+    <%%= javascript_include_tag 'application' %>
+<%- end -%>
+    <%%= csrf_meta_tag %>
+    <%%= yield(:head) %>
   </head>
   <body>
-    <div id="container">
-      <% flash.each do |name, msg| %>
-	    <%= content_tag(:div, :id => "flash_#{name}", :class => "flash closable") do %>
-	    	<%=h msg %>
-	    	<%= content_tag(:span, "[close]", :title => "close", :class => "closelink") %>
-	    <% end %>
-	  <% end %>
+	<div id="container">
+		<%% flash.each do |name, msg| %>
+			<%%= content_tag(:div, :id => "flash_#{name}", :class => "flash closable") do %>
+				<%%=h msg %>
+				<%%= content_tag(:span, "[close]", :title => "close", :class => "closelink") %>
+			<%% end %>
+		<%% end %>
-      <%= content_tag :h1, yield(:title) if show_title? %>
-      <%= yield %>
-    </div>
+		<%%= content_tag :h1, yield(:title) if show_title? %>
+		<%%= yield %>
+	</div>
   </body>
 </html>

data/lib/generators/fetty/views/templates/application.js CHANGED

@@ -1,5 +1,3 @@
-// Place your application-specific JavaScript functions and classes here
-// This file is automatically included by javascript_include_tag :defaults
 // jQuery Input Hints plugin
 jQuery.fn.inputHints=function() {

data/lib/generators/fetty/views/views_generator.rb CHANGED

@@ -20,14 +20,14 @@ module Fetty
 private
       def generate_layout
-        copy_file 'application.html.erb', "app/views/layouts/application.html.erb"
-        copy_file 'application.css', "public/stylesheets/application.css"
+        template 'application.html.erb', "app/views/layouts/application.html.erb"
+        copy_file 'application_helper.rb', 'app/helpers/application_helper.rb'
         copy_file 'layout_helper.rb', 'app/helpers/layout_helper.rb'
         copy_file 'error_messages_helper.rb', 'app/helpers/error_messages_helper.rb'
-        copy_file 'application.js', 'public/javascripts/application.js'
-        copy_file 'application_helper.rb', 'app/helpers/application_helper.rb'
-        copy_file 'down_arrow.gif', 'public/images/down_arrow.gif'
-        copy_file 'up_arrow.gif', 'public/images/up_arrow.gif'
+        copy_asset 'application.css', 'public/stylesheets/application.css'
+        copy_asset 'application.js', 'public/javascripts/application.js'
+        copy_asset 'down_arrow.gif', 'public/images/down_arrow.gif'
+        copy_asset 'up_arrow.gif', 'public/images/up_arrow.gif'
       rescue Exception => e
         raise e
       end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fetty-generators
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-08-19 00:00:00.000000000Z
+date: 2011-10-22 00:00:00.000000000Z
 dependencies: []
 description: This generators provide you to easily setup your Rails 3 application,
   create authentication, messages, admin style scaffolding and many more
@@ -41,7 +41,6 @@ files:
 - lib/generators/fetty/authentication/templates/spec/routing/sessions_routing_spec.rb
 - lib/generators/fetty/authentication/templates/spec/routing/users_routing_spec.rb
 - lib/generators/fetty/authentication/templates/spec/support/user_factories.rb
-- lib/generators/fetty/authentication/templates/views/layouts/application.html.erb
 - lib/generators/fetty/authentication/templates/views/reset_passwords/edit.html.erb
 - lib/generators/fetty/authentication/templates/views/reset_passwords/new.html.erb
 - lib/generators/fetty/authentication/templates/views/sessions/new.html.erb
@@ -84,16 +83,12 @@ files:
 - lib/generators/fetty/scaffold/templates/models/active_record/migration.rb
 - lib/generators/fetty/scaffold/templates/models/active_record/model.rb
 - lib/generators/fetty/scaffold/templates/models/mongoid/model.rb
-- lib/generators/fetty/scaffold/templates/test/rspec/controller.rb
-- lib/generators/fetty/scaffold/templates/test/rspec/factories.rb
-- lib/generators/fetty/scaffold/templates/test/rspec/helper.rb
-- lib/generators/fetty/scaffold/templates/test/rspec/model.rb
-- lib/generators/fetty/scaffold/templates/test/rspec/request.rb
-- lib/generators/fetty/scaffold/templates/test/rspec/routing.rb
-- lib/generators/fetty/scaffold/templates/test/test_unit/controller.rb
-- lib/generators/fetty/scaffold/templates/test/test_unit/fixtures.yml
-- lib/generators/fetty/scaffold/templates/test/test_unit/helper.rb
-- lib/generators/fetty/scaffold/templates/test/test_unit/model.rb
+- lib/generators/fetty/scaffold/templates/spec/controller.rb
+- lib/generators/fetty/scaffold/templates/spec/factories.rb
+- lib/generators/fetty/scaffold/templates/spec/helper.rb
+- lib/generators/fetty/scaffold/templates/spec/model.rb
+- lib/generators/fetty/scaffold/templates/spec/request.rb
+- lib/generators/fetty/scaffold/templates/spec/routing.rb
 - lib/generators/fetty/scaffold/templates/views/_form.html.erb
 - lib/generators/fetty/scaffold/templates/views/_table.html.erb
 - lib/generators/fetty/scaffold/templates/views/edit.html.erb
@@ -109,6 +104,7 @@ files:
 - lib/generators/fetty/setup/templates/env.rb
 - lib/generators/fetty/setup/templates/escape_utils.rb
 - lib/generators/fetty/setup/templates/file_uploader.rb
+- lib/generators/fetty/setup/templates/Guardfile
 - lib/generators/fetty/setup/templates/image_uploader.rb
 - lib/generators/fetty/setup/templates/spec_helper.rb
 - lib/generators/fetty/setup/USAGE
@@ -147,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fetty-generators
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key:
 specification_version: 3
 summary: Simple generators to start your Rails project

data/lib/generators/fetty/authentication/templates/views/layouts/application.html.erb DELETED

@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title><%= content_for?(:title) ? yield(:title) : "Untitled" %></title>
-    <%= stylesheet_link_tag 'application' %>
-    <%= javascript_include_tag :defaults %>
-    <%= csrf_meta_tag %>
-    <%= yield(:head) %>
-  </head>
-  <body>
-    <div id="container">
-      <% flash.each do |name, msg| %>
-	    <%= content_tag(:div, :id => "flash_#{name}", :class => "flash closable") do %>
-	    	<%=h msg %>
-	    	<%= content_tag(:span, "[close]", :title => "close", :class => "closelink") %>
-	    <% end %>
-	  <% end %>
-		<div id='loginbox'>
-			<% if user_signed_in? %>
-				Signed in as <%= link_to current_user.username, user_path(current_user) %> Not You?
-				<%= link_to 'Sign out', session_path, :method => :delete %>
-			<% else %>
-				<%= link_to 'Sign up', new_user_path %> or <%= link_to 'Sign in', new_session_path %>
-			<% end %>
-		</div>
-      <%= content_tag :h1, yield(:title) if show_title? %>
-      <%= yield %>
-    </div>
-  </body>
-</html>

data/lib/generators/fetty/scaffold/templates/test/test_unit/controller.rb DELETED

@@ -1,62 +0,0 @@
-require 'test_helper'
-class <%= controller_name %>Test < ActionController::TestCase
-<%- if action? :index -%>
-  def test_index
-    get :index
-    assert_template 'index'
-  end
-<%- end -%>
-<%- if action? :show -%>
-  def test_show
-    get :show, :id => <%= class_name %>.first
-    assert_template 'show'
-  end
-<%- end -%>
-<%- if action? :new -%>
-  def test_new
-    get :new
-    assert_template 'new'
-  end
-<%- end -%>
-<%- if action? :create -%>
-  def test_create_invalid
-    <%= class_name %>.any_instance.stub(:valid?).and_return(false)
-    post :create
-    assert_template 'new'
-  end
-  def test_create_valid
-    <%= class_name %>.any_instance.stubs(:valid?).returns(true)
-    post :create
-    assert_redirected_to <%= generate_route_link(:action => :show, :suffix => 'url', :object => "assigns(:#{singular_name})" ) %>
-  end
-<%- end -%>
-<%- if action? :edit -%>
-  def test_edit
-    get :edit, :id => <%= class_name %>.first
-    assert_template 'edit'
-  end
-<%- end -%>
-<%- if action? :update -%>
-  def test_update_invalid
-    <%= class_name %>.any_instance.stub(:valid?).and_return(false)
-    put :update, :id => <%= class_name %>.first
-    assert_template 'edit'
-  end
-  def test_update_valid
-    <%= class_name %>.any_instance.stub(:valid?).and_return(true)
-    put :update, :id => <%= class_name %>.first
-    assert_redirected_to <%= generate_route_link(:action => :show, :suffix => 'url', :object => "assigns(:#{singular_name})" ) %>
-  end
-<%- end -%>
-<%- if action? :destroy -%>
-  def test_destroy
-    <%= instance_name %> = <%= class_name %>.first
-    delete :destroy, :id => <%= instance_name %>
-    assert_redirected_to <%= generate_route_link(:action => :index, :suffix => 'url') %>
-    assert !<%= class_name %>.exists?(<%= instance_name %>.id)
-  end
-<%- end -%>
-end

data/lib/generators/fetty/scaffold/templates/test/test_unit/fixtures.yml DELETED

@@ -1,11 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-one:
-<%- for attribute in model_attributes -%>
-  <%= attribute.name %>: <%= attribute.default %>
-<%- end -%>
-two:
-<%- for attribute in model_attributes -%>
-  <%= attribute.name %>: <%= attribute.default %>
-<%- end -%>

data/lib/generators/fetty/scaffold/templates/test/test_unit/helper.rb DELETED

@@ -1,4 +0,0 @@
-require 'test_helper'
-class <%= helper_name %>Test < ActionView::TestCase
-end

data/lib/generators/fetty/scaffold/templates/test/test_unit/model.rb DELETED

@@ -1,7 +0,0 @@
-require 'test_helper'
-class <%= model_name %>Test < ActiveSupport::TestCase
-  def test_should_be_valid
-    assert true
-  end
-end