fetty-generators 2.0.3 → 2.0.4

data/lib/generators/fetty.rb

@@ -39,17 +39,6 @@ protected
         return false
       end
       
-      def destroy(path)
-        begin
-          if file_exists?(path)
-            print_notes("Destroying #{path}")
-            FileUtils.rm_r(destination_path(path), :force => true)
-          end
-        rescue Exception => e
-          raise e
-        end
-      end
-      
       def extract(filepath,destinationpath,foldername)
         begin
           print_notes("Extracting #{filepath}")
@@ -152,12 +141,6 @@ protected
         raise e
       end
       
-      def using_test_unit?
-        folder_exists?("tests")
-      rescue Exception => e
-        raise e
-      end
-      
       def using_rspec?
         gemfile_included?("rspec") && folder_exists?("spec")
       rescue Exception => e
@@ -182,6 +165,46 @@ protected
         raise e
       end
       
+      def rails_3_1?
+        Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR >= 1
+      end
+
+      def copy_asset(source, *args, &block)
+        if rails_3_1?
+          if args.first =~ /^public/
+            args.first.gsub!(/^public/,"app/assets")
+          end
+          if args.first.include?("javascripts/application.js") or args.first.include?("stylesheets/application.css")
+            last_line = IO.readlines(args.first).last
+            content = IO.read(File.expand_path(find_in_source_paths(source.to_s)))
+            content.gsub!(/images/,"assets")
+            inject_into_file args.first, :after => last_line do
+              content
+            end
+            return
+          end
+        end
+        copy_file(source, *args, &block)
+      end
+      
+      def remove_asset(path, config={})
+        if rails_3_1?
+          if path =~ /^public/
+            path.gsub!(/^public/,"app/assets")
+          end
+        end
+        remove_asset(path, config)
+      end
+      
+      def gem_group(*names, &block)
+        name = names.map(&:inspect).join(", ")
+        log :gemfile, "group #{name}"
+        append_file "Gemfile", "\n## MARK THIS IS GROUP ##\n", :force => true, :verbose => false
+        yield
+        gsub_file 'Gemfile', /## MARK THIS IS GROUP ##/m, "group #{name} do", :verbose => false
+        append_file "Gemfile", "end\n", :force => true, :verbose => false
+      end
+      
     end
   end
 end

data/lib/generators/fetty/authentication/USAGE

@@ -1,4 +1,9 @@
 Description:
-	The fetty:authentication generator creates a basic messaging system
+	The fetty:authentication generator creates a basic authentication system
 	between user in your app.
 
+To Install:
+	rails g fetty:authentication
+
+To Remove:
+	rails g fetty:authentication --destroy

data/lib/generators/fetty/authentication/authentication_generator.rb

@@ -24,8 +24,7 @@ module Fetty
             edit_application_controller
             must_load_lib_directory
             add_routes
-            copy_file "views/layouts/application.html.erb", "app/views/layouts/application.html.erb"
-            generate_test_unit if using_test_unit?
+            insert_links_on_layout
             generate_specs if using_rspec?
             print_notes "Make sure you have defined root_url in your 'config/routes.rb.'"
           else
@@ -38,6 +37,21 @@ module Fetty
       
 private
       
+      def insert_links_on_layout
+        inject_into_file "app/views/layouts/application.html.erb", :before => "<%= content_tag :h1, yield(:title) if show_title? %>" do
+          "\n\t <div id='loginbox'>" +
+          "\n\t   <% if user_signed_in? %>" +
+          "\n\t     Signed in as <%= link_to current_user.username, user_path(current_user) %> Not You?" +
+          "\n\t     <%= link_to 'Sign out', session_path, :method => :delete %>" +
+          "\n\t   <% else %>" +
+          "\n\t     <%= link_to 'Sign up', new_user_path %> or <%= link_to 'Sign in', new_session_path %>" +
+          "\n\t   <% end %>" +
+          "\n\t </div>\n"
+        end
+      rescue  Exception => e
+        raise e
+      end
+      
       def generate_users
         copy_file "controllers/users_controller.rb", "app/controllers/users_controller.rb"
         copy_file "helpers/users_helper.rb", "app/helpers/users_helper.rb"
@@ -105,10 +119,6 @@ private
          end
       end
       
-      def generate_test_unit
-        
-      end
-      
       def generate_specs
         copy_file "spec/controllers/users_controller_spec.rb", "spec/controllers/users_controller_spec.rb"
         copy_file "spec/models/user_spec.rb", "spec/models/user_spec.rb"
@@ -144,10 +154,6 @@ private
           gsub_file 'app/controllers/application_controller.rb', /include SessionsAuthentication.*:authenticate_user!/m, ''
           gsub_file 'config/routes.rb', /resources :users.*(\s*end){3}/m, ''
           
-          if using_test_unit?
-            
-          end
-          
           if using_rspec?
             remove_file 'spec/controllers/users_controller_spec.rb'
             remove_file 'spec/models/user_spec.rb'

data/lib/generators/fetty/authentication/templates/controllers/sessions_controller.rb

@@ -2,6 +2,9 @@ class SessionsController < ApplicationController
   skip_before_filter :authenticate_user!, :except => [:destroy]
   
   def new
+    if user_signed_in?
+      redirect_to redirect_to_target_or_default_url, :alert => "You already sign-in!"
+    end
   end
   
   def create

data/lib/generators/fetty/authentication/templates/controllers/users_controller.rb

@@ -16,7 +16,11 @@ class UsersController < ApplicationController
   end
   
   def new
-    @user = User.new
+    unless user_signed_in?
+      @user = User.new
+    else
+      redirect_to redirect_to_target_or_default_url, :alert => "You already sign-up! Please log-out first."
+    end
   end
   
   def create

data/lib/generators/fetty/authentication/templates/lib/users_authentication.rb

@@ -69,7 +69,7 @@ module UsersAuthentication
     private
     
     def generate_token
-      ActiveSupport::SecureRandom.urlsafe_base64
+      SecureRandom.urlsafe_base64
     end
     
     def encrypt_password(pass)

data/lib/generators/fetty/authentication/templates/spec/controllers/sessions_controller_spec.rb

@@ -2,16 +2,26 @@ require 'spec_helper'
 
 describe SessionsController do
   
+  def stub_authenticate_user
+    controller.stub(:authenticate_user!).and_return(true)
+  end
+  
   describe "GET new" do
     it "should render sign-in page" do
       get :new
       response.should be_success
     end
+    
+    it "should not render sign-in page if already sign-in" do
+      controller.stub(:user_signed_in?).and_return(true)
+      get :new
+      flash[:alert].should_not be_nil
+    end
   end
   
   describe "POST create" do
     describe "with valid params" do
-      it "should authenticate user" do
+      it "should authenticate user and redirect to root_path" do
         user = Factory(:user, :email => "some@email.com", :password => "secret", :password_confirmation => "secret")
         User.stub(:authenticate!).with("some@email.com", "secret").and_return(user)
         post :create, :login => "some@email.com", :password => "secret"
@@ -49,7 +59,7 @@ describe SessionsController do
   end
   
   describe "DELETE destroy" do
-    it "should destroy session or cookies" do
+    it "should destroy session or cookies and redirect to root_path" do
       stub_authenticate_user
       delete :destroy
       assigns(:current_user).should be_nil

data/lib/generators/fetty/authentication/templates/spec/controllers/users_controller_spec.rb

@@ -2,6 +2,10 @@ require 'spec_helper'
 
 describe UsersController do
   
+  def stub_authenticate_user
+    controller.stub(:authenticate_user!).and_return(true)
+  end
+  
   def test_assigns_user_object(action)
     user = Factory(:user)
     User.stub(:find).with(user.id.to_s).and_return(user)
@@ -26,9 +30,16 @@ describe UsersController do
   end
   
   describe "GET new" do
-    it "assigns a new user as @user" do
+    it "should render sign-up page and assigns a new user as @user" do
       get :new
       assigns(:user).should be_a_new(User)
+      response.should be_success
+    end
+    
+    it "should not render sign-up page if user already sign-in" do
+      controller.stub(:user_signed_in?).and_return(true)
+      get :new
+      flash[:alert].should_not be_nil
     end
   end
   
@@ -126,7 +137,7 @@ describe UsersController do
     end
     
     describe "with valid params" do
-      it "should activate user with given id and token" do
+      it "should activate user with given id and token and redirect to root_path" do
         User.stub(:activate!).with(@user.id.to_s, @user.token).and_return(@user)
         get :activate, :id => @user.id.to_s, :token => @user.token
         assigns(:user).should be_a(User)

data/lib/generators/fetty/messages/USAGE

@@ -2,3 +2,8 @@ Description:
 	The fetty:messages generator creates a basic messaging system
 	between user in your app.
 
+To Install:
+	rails g fetty:messages
+
+To Remove:
+	rails g fetty:messages --destroy

data/lib/generators/fetty/messages/messages_generator.rb

@@ -28,7 +28,7 @@ module Fetty
               copy_assets
               must_load_lib_directory
               add_routes
-              generate_test_unit if using_test_unit?
+              insert_links_on_layout
               generate_specs if using_rspec?
             else
               raise "Sorry, fetty:messages only works with ActiveRecord !!"
@@ -43,6 +43,18 @@ module Fetty
       
 private 
       
+      def insert_links_on_layout
+        inject_into_file "app/views/layouts/application.html.erb", :before => "<%= content_tag :h1, yield(:title) if show_title? %>" do
+          "\n\t <div id='messagebox'>" +
+          "\n\t   <% if user_signed_in? %>" +
+          "\n\t     <%= link_to \"inbox(\#{current_user.inbox(:opened => false).count})\", messages_path(:inbox), :id => 'inbox-link' %>" +
+          "\n\t   <% end %>" +
+          "\n\t </div>\n"
+        end
+      rescue  Exception => e
+        raise e
+      end
+      
       def copy_models_and_migrations
         copy_file "models/#{@orm}/message.rb", "app/models/message.rb"
         migration_template "models/active_record/create_messages.rb", "db/migrate/create_messages.rb" unless using_mongoid?
@@ -70,10 +82,10 @@ private
       end
       
       def copy_assets
-        copy_file 'assets/stylesheets/messages.css', 'public/stylesheets/messages.css'
-        copy_file 'assets/stylesheets/token-input-facebook.css', 'public/stylesheets/token-input-facebook.css'
-        copy_file 'assets/javascripts/messages.js', 'public/javascripts/messages.js'
-        copy_file 'assets/javascripts/jquery.tokeninput.js', 'public/javascripts/jquery.tokeninput.js'
+        copy_asset 'assets/stylesheets/messages.css', 'public/stylesheets/messages.css'
+        copy_asset 'assets/stylesheets/token-input-facebook.css', 'public/stylesheets/token-input-facebook.css'
+        copy_asset 'assets/javascripts/messages.js', 'public/javascripts/messages.js'
+        copy_asset 'assets/javascripts/jquery.tokeninput.js', 'public/javascripts/jquery.tokeninput.js'
       end
       
       def add_routes
@@ -90,10 +102,6 @@ private
         end
       end
       
-      def generate_test_unit
-        
-      end
-      
       def generate_specs
         copy_file "spec/controllers/messages_controller_spec.rb", "spec/controllers/messages_controller_spec.rb"
         copy_file "spec/models/message_spec.rb", "spec/models/message_spec.rb"
@@ -111,10 +119,10 @@ private
           remove_file "app/controllers/messages_controller.rb"
           remove_file "app/helpers/messages_helper.rb"
           remove_dir "app/views/messages"
-          remove_file 'public/stylesheets/messages.css'
-          remove_file 'public/stylesheets/token-input-facebook.css'
-          remove_file 'public/javascripts/messages.js'
-          remove_file 'public/javascripts/jquery.tokeninput.js'
+          remove_asset 'public/stylesheets/messages.css'
+          remove_asset 'public/stylesheets/token-input-facebook.css'
+          remove_asset 'public/javascripts/messages.js'
+          remove_asset 'public/javascripts/jquery.tokeninput.js'
           gsub_file 'config/routes.rb', /resources :messages.*:constraints => { :messagebox => \/inbox|outbox|trash\/ }(\s*end){2}/m, ''
           
           if using_rspec?

data/lib/generators/fetty/messages/templates/spec/controllers/messages_controller_spec.rb

@@ -1,6 +1,11 @@
 require 'spec_helper'
 
 describe MessagesController do
+  
+  def stub_authenticate_user
+    controller.stub(:authenticate_user!).and_return(true)
+  end
+  
   before(:each) do
     stub_authenticate_user
     @user = Factory(:user)

data/lib/generators/fetty/messages/templates/spec/support/message_factories.rb

@@ -1,7 +1,7 @@
 Factory.define :message do |f|
-  f.association :user, :factory => :user
-  f.association :sender_id, :factory => :user
-  f.association :recipient_id, :factory => :user
+  f.user_id 1
+  f.sender_id 1
+  f.recipient_id 2
   f.subject_id 1
   f.subject "testing"
   f.content "This is only test !!"

data/lib/generators/fetty/scaffold/USAGE

@@ -1,3 +1,16 @@
 Description:
 	The fetty:scaffold generator creates a basic scaffolding
 	using many useful gems.
+
+Additional field type:
+	- editor
+	- image
+	- file
+
+Example:
+
+	rails g fetty:scaffold post title:string content:text published:boolean
+
+  or with additional field type:
+
+	rails g fetty:scaffold post title:string content:editor photo:image attachment:file

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

@@ -45,7 +45,6 @@ module Fetty
           end
           
           if options.test?
-            generate_test_unit if using_test_unit?
             generate_specs if using_rspec?
           end
         else
@@ -109,22 +108,13 @@ private
         end
       end
       
-      def generate_test_unit
-        template "test/test_unit/controller.rb", "test/functional/#{plural_name}_controller_test.rb"
-        template "test/test_unit/fixtures.yml", "test/fixtures/#{plural_name}.yml"
-        template "test/test_unit/model.rb", "test/unit/#{singular_name}_test.rb"
-        template "test/test_unit/helper.rb", "test/unit/helpers/#{plural_name}_helper_test.rb"
-      rescue Exception => e
-        raise e
-      end
-      
       def generate_specs
-        template "test/rspec/controller.rb", "spec/controllers/#{plural_name}_controller_spec.rb"
-        template "test/rspec/model.rb", "spec/models/#{singular_name}_spec.rb"
-        template "test/rspec/helper.rb", "spec/helpers/#{plural_name}_helper_test.rb"
-        template "test/rspec/request.rb", "spec/requests/#{singular_name}_spec.rb.rb"
-        template "test/rspec/routing.rb", "spec/routing/#{plural_name}_routing_spec.rb"
-        template "test/rspec/factories.rb", "spec/support/#{singular_name}_factories.rb"
+        template "spec/controller.rb", "spec/controllers/#{plural_name}_controller_spec.rb"
+        template "spec/model.rb", "spec/models/#{singular_name}_spec.rb"
+        template "spec/helper.rb", "spec/helpers/#{plural_name}_helper_test.rb"
+        template "spec/request.rb", "spec/requests/#{singular_name}_spec.rb.rb"
+        template "spec/routing.rb", "spec/routing/#{plural_name}_routing_spec.rb"
+        template "spec/factories.rb", "spec/support/#{singular_name}_factories.rb"
       rescue Exception => e
         raise e
       end

data/lib/generators/fetty/scaffold/templates/{test/rspec → spec}/controller.rb

@@ -1,39 +1,57 @@
 require 'spec_helper'
 
 describe <%= controller_name %> do
-<% if action? :index %>
+  
+<%- if using_fetty_authentication? -%>
+  def stub_authenticate_user
+    controller.stub(:authenticate_user!).and_return(true)
+  end
+<%- end -%>
+  
+<%- if action? :index -%>
   describe "GET index" do
     it "should render index template" do
+      <%- if using_fetty_authentication? -%>
       stub_authenticate_user
+      <%- end -%>
       get :index
       response.should render_template(:index)
     end
   end
-<% end %>
-<% if action? :show %>
+<%- end -%>
+
+<%- if action? :show -%>
   describe "GET show" do
     it "should render show template" do
+      <%- if using_fetty_authentication? -%>
       stub_authenticate_user
+      <%- end -%>
       <%= instance_name %> = Factory(<%= instance_name(':') %>)
       get :show, :id => <%= instance_name %>.id.to_s
       response.should render_template(:show)
     end
   end
-<% end %>
-<% if action? :new %>
+<%- end -%>
+
+<%- if action? :new -%>
   describe "GET new" do
     it "should render new template" do
+      <%- if using_fetty_authentication? -%>
       stub_authenticate_user
+      <%- end -%>
       get :new
       response.should render_template(:new)
     end
   end
-<% end %>
-<% if action? :create %>
+<%- end -%>
+
+<%- if action? :create -%>
   describe "POST create" do
     describe "with valid params" do
       it "should redirect to show template" do
+        <%- if using_fetty_authentication? -%>
         stub_authenticate_user
+        <%- end -%>
         <%= class_name %>.any_instance.stub(:valid?).and_return(true)
         post :create, <%= instance_name(':') %> => Factory.attributes_for(<%= instance_name(':') %>)
         response.should redirect_to(<%= generate_route_link(:action => :show, :suffix => 'path', :object => "assigns(#{instance_name(':')})") %>)
@@ -42,29 +60,37 @@ describe <%= controller_name %> do
     
     describe "with invalid params" do
       it "should re-render new template" do
+        <%- if using_fetty_authentication? -%>
         stub_authenticate_user
+        <%- end -%>
         <%= class_name %>.any_instance.stub(:valid?).and_return(false)
         post :create, <%= instance_name(':') %> => nil
         response.should render_template(:new)
       end
     end
   end
-<% end %>
-<% if action? :edit %>
+<%- end -%>
+
+<%- if action? :edit -%>
   describe "GET edit" do
     it "should render edit template" do
+      <%- if using_fetty_authentication? -%>
       stub_authenticate_user
+      <%- end -%>
       <%= instance_name %> = Factory(<%= instance_name(':') %>)
       get :edit, :id => <%= instance_name %>.id.to_s
       response.should render_template(:edit)
     end
   end
-<% end %>
-<% if action? :update %>
+<%- end -%>
+
+<%- if action? :update -%>
   describe "PUT update" do
     describe "with valid params" do
       it "should redirect to show template" do
+        <%- if using_fetty_authentication? -%>
         stub_authenticate_user
+        <%- end -%>
         <%= instance_name %> = Factory(<%= instance_name(':') %>)
         <%= class_name %>.stub(:find).with(<%= instance_name %>.id.to_s).and_return(<%= instance_name %>)
         <%= class_name %>.any_instance.stub(:valid?).and_return(true)
@@ -75,7 +101,9 @@ describe <%= controller_name %> do
     
     describe "with invalid params" do
       it "should re-render edit template" do
+        <%- if using_fetty_authentication? -%>
         stub_authenticate_user
+        <%- end -%>
         <%= instance_name %> = Factory(<%= instance_name(':') %>)
         <%= class_name %>.stub(:find).with(<%= instance_name %>.id.to_s).and_return(<%= instance_name %>)
         <%= class_name %>.any_instance.stub(:valid?).and_return(false)
@@ -84,15 +112,18 @@ describe <%= controller_name %> do
       end
     end
   end
-<% end %>
-<% if action? :destroy %>
+<%- end -%>
+
+<%- if action? :destroy -%>
   describe "DELETE destroy" do
     it "should redirect to index template" do
+      <%- if using_fetty_authentication? -%>
       stub_authenticate_user
+      <%- end -%>
       <%= instance_name %> = Factory(<%= instance_name(':') %>)
       delete :destroy, :id => <%= instance_name %>.id.to_s
       response.should redirect_to(<%= generate_route_link(:action => :index, :suffix => 'path') %>)
     end
   end
-<% end %>
+<%- end -%>
 end