comfortable_mexican_sofa 1.9.3 → 1.10.0

data/lib/generators/comfy/cms/README

@@ -13,5 +13,5 @@ Hey! Everything is almost done. Please don't forget to
   
   * run migrations -> `rake db:migrate`
   
-After that go to http://your-awesome-app/cms-admin to start populating content.
+After that go to http://your-awesome-app/admin to start populating content.
 Default username and password are: username // password

data/lib/generators/comfy/cms/cms_generator.rb

@@ -1,8 +1,9 @@
+require 'rails/generators/active_record'
+
 module Comfy
   module Generators
     class CmsGenerator < Rails::Generators::Base
       
-      require 'rails/generators/active_record'
       include Rails::Generators::Migration
       include Thor::Actions
       
@@ -26,11 +27,10 @@ module Comfy
       end
       
       def generate_routing
-        route "
-  ComfortableMexicanSofa::Routing.admin(:path => '/cms-admin')
-  
-  # Make sure this routeset is defined last
-  ComfortableMexicanSofa::Routing.content(:path => '/', :sitemap => false)"
+        route_string  = "  ComfortableMexicanSofa::Routing.admin :path => '/admin'\n\n"
+        route_string << "  # Make sure this routeset is defined last\n"
+        route_string << "  ComfortableMexicanSofa::Routing.content :path => '/', :sitemap => false\n"
+        route route_string[2..-1]
       end
       
       def generate_cms_seeds

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

@@ -0,0 +1,69 @@
+require 'rails/generators/generated_attribute'
+require 'rails/generators/active_record'
+
+module Comfy
+  module Generators
+    class ScaffoldGenerator < Rails::Generators::NamedBase
+      
+      include Rails::Generators::Migration
+      
+      no_tasks do 
+        attr_accessor :model_attrs
+      end
+      
+      source_root File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
+      
+      argument :model_args, :type => :array, :default => [], :banner => 'attribute:type'
+      
+      def initialize(*args, &block)
+        super
+        @model_attrs = []
+        model_args.each do |arg|
+          next unless arg.include?(':')
+          @model_attrs << Rails::Generators::GeneratedAttribute.new(*arg.split(':')) 
+        end
+      end
+      
+      def self.next_migration_number(dirname)
+        ActiveRecord::Generators::Base.next_migration_number(dirname)
+      end
+      
+      def generate_model
+        migration_template 'migration.rb', "db/migrate/create_#{file_name.pluralize}.rb"
+        template 'model.rb', "app/models/#{file_name}.rb"
+        template 'tests/model.rb', "test/models/#{file_name}_test.rb"
+        template 'tests/fixture.yml', "test/fixtures/#{file_name.pluralize}.yml"
+      end
+      
+      def generate_controller
+        template 'controller.rb', "app/controllers/admin/#{file_name.pluralize}_controller.rb"
+        template 'tests/controller.rb', "test/controllers/admin/#{file_name.pluralize}_controller_test.rb"
+      end
+      
+      def generate_views
+        template 'views/index.haml', "app/views/admin/#{file_name.pluralize}/index.html.haml"
+        template 'views/show.haml', "app/views/admin/#{file_name.pluralize}/show.html.haml"
+        template 'views/new.haml', "app/views/admin/#{file_name.pluralize}/new.html.haml"
+        template 'views/edit.haml', "app/views/admin/#{file_name.pluralize}/edit.html.haml"
+        template 'views/_form.haml', "app/views/admin/#{file_name.pluralize}/_form.html.haml"
+      end
+      
+      def generate_route
+        route_string  = "  namespace :admin do\n"
+        route_string << "    resources :#{file_name.pluralize}\n"
+        route_string << "  end\n"
+        route route_string[2..-1]
+      end
+      
+      def generate_navigation_link
+        partial_path = 'app/views/admin/cms/partials/_navigation_inner.html.haml'
+        unless File.exist?(File.join(destination_root, partial_path))
+          create_file partial_path
+        end
+        append_file partial_path do
+          "\n%li= active_link_to '#{class_name.pluralize}', admin_#{file_name.pluralize}_path\n"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,62 @@
+class Admin::<%= class_name.pluralize %>Controller < Admin::Cms::BaseController
+
+  before_action :build_<%= file_name %>,  :only => [:new, :create]
+  before_action :load_<%= file_name %>,   :only => [:show, :edit, :update, :destroy]
+
+  def index
+    @<%= file_name.pluralize %> = <%= class_name %>.page(params[:page])
+  end
+
+  def show
+    render
+  end
+
+  def new
+    render
+  end
+
+  def edit
+    render
+  end
+
+  def create
+    @<%= file_name %>.save!
+    flash[:success] = '<%= class_name.titleize %> created'
+    redirect_to :action => :show, :id => @<%= file_name %>
+  rescue ActiveRecord::RecordInvalid
+    flash.now[:error] = 'Failed to create <%= class_name.titleize %>'
+    render :action => :new
+  end
+
+  def update
+    @<%= file_name %>.update_attributes!(<%= file_name %>_params)
+    flash[:success] = '<%= class_name.titleize %> updated'
+    redirect_to :action => :show, :id => @<%= file_name %>
+  rescue ActiveRecord::RecordInvalid
+    flash.now[:error] = 'Failed to update <%= class_name.titleize %>'
+    render :action => :edit
+  end
+
+  def destroy
+    @<%= file_name %>.destroy
+    flash[:success] = '<%= class_name.titleize %> deleted'
+    redirect_to :action => :index
+  end
+
+protected
+
+  def build_<%= file_name %>
+    @<%= file_name %> = <%= class_name %>.new(<%= file_name %>_params)
+  end
+
+  def load_<%= file_name %>
+    @<%= file_name %> = <%= class_name %>.find(params[:id])
+  rescue ActiveRecord::RecordNotFound
+    flash[:error] = '<%= class_name.titleize %> not found'
+    redirect_to :action => :index
+  end
+
+  def <%= file_name %>_params
+    params.fetch(:<%= file_name %>, {}).permit(<%= model_attrs.collect{|attr| ":#{attr.name}"}.join(', ') %>)
+  end
+end

data/lib/generators/comfy/scaffold/templates/migration.rb

@@ -0,0 +1,12 @@
+class Create<%= class_name.pluralize %> < ActiveRecord::Migration
+
+  def change
+    create_table :<%= file_name.pluralize %> do |t|
+    <%- model_attrs.each do |attr| -%>
+      t.<%= attr.type %> :<%= attr.name %>
+    <%- end -%>
+      t.timestamps
+    end
+  end
+
+end

data/lib/generators/comfy/scaffold/templates/model.rb

@@ -0,0 +1,21 @@
+class <%= class_name %> < ActiveRecord::Base
+
+  # -- Relationships --------------------------------------------------------
+
+
+  # -- Callbacks ------------------------------------------------------------
+
+
+  # -- Validations ----------------------------------------------------------
+
+
+  # -- Scopes ---------------------------------------------------------------
+
+
+  # -- Class Methods --------------------------------------------------------
+
+
+  # -- Instance Methods -----------------------------------------------------
+
+
+end

data/lib/generators/comfy/scaffold/templates/tests/controller.rb

@@ -0,0 +1,102 @@
+require_relative '../../test_helper'
+
+class Admin::<%= class_name.pluralize %>ControllerTest < ActionController::TestCase
+
+  def setup
+    # TODO: login as admin user
+    @<%= file_name %> = <%= file_name.pluralize %>(:default)
+  end
+
+  def test_get_index
+    get :index
+    assert_response :success
+    assert assigns(:<%= file_name.pluralize %>)
+    assert_template :index
+  end
+
+  def test_get_show
+    get :show, :id => @<%= file_name %>
+    assert_response :success
+    assert assigns(:<%= file_name %>)
+    assert_template :show
+  end
+
+  def test_get_show_failure
+    get :show, :id => 'invalid'
+    assert_response :redirect
+    assert_redirected_to :action => :index
+    assert_equal '<%= class_name.titleize %> not found', flash[:error]
+  end
+
+  def test_get_new
+    get :new
+    assert_response :success
+    assert assigns(:<%= file_name %>)
+    assert_template :new
+    assert_select 'form[action=/admin/<%= file_name.pluralize %>]'
+  end
+
+  def test_get_edit
+    get :edit, :id => @<%= file_name %>
+    assert_response :success
+    assert assigns(:<%= file_name %>)
+    assert_template :edit
+    assert_select "form[action=/admin/<%= file_name.pluralize %>/#{@<%= file_name %>.id}]"
+  end
+
+  def test_creation
+    assert_difference '<%= class_name %>.count' do
+      post :create, :<%= file_name %> => {
+      <%- model_attrs.each do |attr| -%>
+        :<%= attr.name %> => 'test <%= attr.name %>',
+      <%- end -%>
+      }
+      <%= file_name %> = <%= class_name %>.last
+      assert_response :redirect
+      assert_redirected_to :action => :show, :id => <%= file_name %>
+      assert_equal '<%= class_name.titleize %> created', flash[:success]
+    end
+  end
+
+  def test_creation_failure
+    assert_no_difference '<%= class_name %>.count' do
+      post :create, :<%= file_name %> => { }
+      assert_response :success
+      assert_template :new
+      assert_equal 'Failed to create <%= class_name.titleize %>', flash[:error]
+    end
+  end
+
+  def test_update
+    put :update, :id => @<%= file_name %>, :<%= file_name %> => {
+    <%- if attr = model_attrs.first -%>
+      :<%= attr.name %> => 'Updated'
+    <%- end -%>
+    }
+    assert_response :redirect
+    assert_redirected_to :action => :show, :id => @<%= file_name %>
+    assert_equal '<%= class_name.titleize %> updated', flash[:success]
+    @<%= file_name %>.reload
+    assert_equal 'Updated', @<%= file_name %>.<%= attr.try(:name) || 'attribute' %>
+  end
+
+  def test_update_failure
+    put :update, :id => @<%= file_name %>, :<%= file_name %> => {
+      :<%= attr.try(:name) || 'attribute' %> => ''
+    }
+    assert_response :success
+    assert_template :edit
+    assert_equal 'Failed to update <%= class_name.titleize %>', flash[:error]
+    @<%= file_name %>.reload
+    refute_equal '', @<%= file_name %>.<%= attr.try(:name) || 'attribute' %>
+  end
+
+  def test_destroy
+    assert_difference '<%= class_name %>.count', -1 do
+      delete :destroy, :id => @<%= file_name %>
+      assert_response :redirect
+      assert_redirected_to :action => :index
+      assert_equal '<%= class_name.titleize %> deleted', flash[:success]
+    end
+  end
+end

data/lib/generators/comfy/scaffold/templates/tests/fixture.yml

@@ -0,0 +1,4 @@
+default:
+<%- model_attrs.each do |attr| -%>
+  <%= attr.name %>: default <%= attr.name %>
+<%- end -%>

data/lib/generators/comfy/scaffold/templates/tests/model.rb

@@ -0,0 +1,27 @@
+require_relative '../test_helper'
+
+class <%= class_name %>Test < ActiveSupport::TestCase
+
+  def test_fixtures_validity
+    <%= class_name %>.all.each do |<%= file_name %>|
+      assert <%= file_name %>.valid?, <%= file_name %>.errors.inspect
+    end
+  end
+
+  def test_validation
+    <%= file_name %> = <%= class_name %>.new
+    assert <%= file_name %>.invalid?
+    assert_errors_on <%= file_name %>, <%= model_attrs.collect{|attr| ":#{attr.name}"}.join(', ') %>
+  end
+
+  def test_creation
+    assert_difference '<%= class_name %>.count' do
+      <%= class_name %>.create(
+      <%- model_attrs.each do |attr| -%>
+        :<%= attr.name %> => 'test <%= attr.name %>',
+      <%- end -%>
+      )
+    end
+  end
+
+end

data/lib/generators/comfy/scaffold/templates/views/_form.haml

@@ -0,0 +1,6 @@
+<%- model_attrs.each do |attr| -%>
+= form.text_field :<%= attr.name %>
+<%- end -%>
+
+.form-actions
+  = form.submit :class => 'btn btn-primary'

data/lib/generators/comfy/scaffold/templates/views/edit.haml

@@ -0,0 +1,5 @@
+.page-header
+  %h2 Edit <%= class_name.titleize %>
+
+= comfy_form_for [:admin, @<%= file_name %>] do |form|
+  = render form

data/lib/generators/comfy/scaffold/templates/views/index.haml

@@ -0,0 +1,23 @@
+.page-header
+  = link_to 'New <%= class_name.titleize %>', new_admin_<%= file_name %>_path, :class => 'btn pull-right'
+  %h2= '<%= class_name.pluralize.titleize %>'
+
+= paginate @<%= file_name.pluralize %>
+
+%table.table.table-hover.table-bordered
+  %tr
+  <%- model_attrs.each_with_index do |attr, index| -%>
+    %th<%= '.main' if index == 0 %> <%= attr.name.titleize %>
+  <%- end -%>
+    %th
+  - @<%= file_name.pluralize %>.each do |<%= file_name %>|
+    %tr
+    <%- model_attrs.each_with_index do |attr, index| -%>
+      %td<%= '.main' if index == 0 %>= <%= file_name%>.<%= attr.name %>
+    <%- end -%>
+      %td
+        .btn-group
+          = link_to 'Edit', edit_admin_<%= file_name %>_path(<%= file_name %>), :class => 'btn btn-small'
+          = link_to 'Delete', admin_<%= file_name %>_path(<%= file_name %>), :method => :delete, :data => { :confirm => 'Are you sure?' }, :class => 'btn btn-small btn-danger'
+
+= paginate @<%= file_name.pluralize %>

data/lib/generators/comfy/scaffold/templates/views/new.haml

@@ -0,0 +1,5 @@
+.page-header
+  %h2 New <%= class_name.titleize %>
+
+= comfy_form_for [:admin, @<%= file_name %>] do |form|
+  = render form

data/lib/generators/comfy/scaffold/templates/views/show.haml

@@ -0,0 +1,4 @@
+.page-header
+  %h2 <%= class_name.titleize %>
+  
+= debug @<%= file_name %>

data/test/controllers/{cms_admin → admin/cms}/base_controller_test.rb

@@ -1,11 +1,11 @@
-require_relative '../../test_helper'
+require_relative '../../../test_helper'
 
-class CmsAdmin::BaseControllerTest < ActionController::TestCase
+class Admin::Cms::BaseControllerTest < ActionController::TestCase
 
   def test_get_jump
     get :jump
     assert_response :redirect
-    assert_redirected_to cms_admin_site_pages_path(cms_sites(:default))
+    assert_redirected_to admin_cms_site_pages_path(cms_sites(:default))
   end
   
   def test_get_jump_with_redirect_setting

data/test/controllers/{cms_admin → admin/cms}/categories_controller_test.rb

@@ -1,6 +1,6 @@
-require_relative '../../test_helper'
+require_relative '../../../test_helper'
 
-class CmsAdmin::CategoriesControllerTest < ActionController::TestCase
+class Admin::Cms::CategoriesControllerTest < ActionController::TestCase
   
   def test_get_edit
     xhr :get, :edit, :site_id => cms_sites(:default), :id => cms_categories(:default)

data/test/controllers/{cms_admin → admin/cms}/files_controller_test.rb

@@ -1,6 +1,6 @@
-require_relative '../../test_helper'
+require_relative '../../../test_helper'
 
-class CmsAdmin::FilesControllerTest < ActionController::TestCase
+class Admin::Cms::FilesControllerTest < ActionController::TestCase
   
   def test_get_index
     get :index, :site_id => cms_sites(:default)
@@ -61,7 +61,7 @@ class CmsAdmin::FilesControllerTest < ActionController::TestCase
     assert_response :success
     assert assigns(:file)
     assert_template :new
-    assert_select "form[action=/cms-admin/sites/#{site.id}/files][enctype=multipart/form-data]"
+    assert_select "form[action=/admin/sites/#{site.id}/files][enctype=multipart/form-data]"
   end
   
   def test_get_edit
@@ -70,7 +70,7 @@ class CmsAdmin::FilesControllerTest < ActionController::TestCase
     assert_response :success
     assert assigns(:file)
     assert_template :edit
-    assert_select "form[action=/cms-admin/sites/#{file.site.id}/files/#{file.id}]"
+    assert_select "form[action=/admin/sites/#{file.site.id}/files/#{file.id}]"
   end
   
   def test_get_edit_failure