active_leonardo 0.0.6.beta1 → 0.0.6.beta2

data/active_template.rb

@@ -38,6 +38,10 @@ if use_git
   EOS
 end
 
+gem "rack-mini-profiler"
+gem "turbolinks"
+gem "jquery-turbolinks"
+
 gem "activeadmin"
 gem "active_admin_editor"
 gem "meta_search"
@@ -125,7 +129,9 @@ rake "db:migrate"
 rake "db:seed"
 
 #rake "gems:unpack" if yes?("Unpack to vendor/gems ?")
-
-git :add => ".", :commit => "-m 'initial commit'" if use_git
+if use_git
+  git :add    => "."
+  git :commit => %Q{ -m 'Initial commit' }
+end
 
 puts "ENJOY!"

data/lib/generators/active_leonardo.rb

@@ -360,7 +360,7 @@ module ActiveLeonardo
     #product => "[:activespace, product]"
     def show_resource_path_test(resource=nil)
       resource ||= singular_table_name
-      "[:#{get_activespace}, #{resource}]"
+      "[:#{options[:activespace]}, #{resource}]"
     end
 
     #product => new_activespace_product_path

data/lib/generators/leolay/leolay_generator.rb

@@ -97,7 +97,7 @@ class LeolayGenerator < Rails::Generators::Base
   def setup_application
     application do
       <<-FILE.gsub(/^      /, '')
-        config.generators do |g|
+      config.generators do |g|
             g.stylesheets         false
             g.javascripts         true
             g.leosca_controller   :leosca_controller
@@ -245,25 +245,34 @@ class LeolayGenerator < Rails::Generators::Base
   def setup_javascript
     app_path = "app/assets/javascripts"
 
-    file = "#{app_path}/custom.js"
+    file = "#{app_path}/custom.js.coffee"
     copy_file file, file
 
-    file = "#{app_path}/application.js"
-    append_file file do
+    file = "#{app_path}/active_admin.js"
+    gsub_file file, "//= require active_admin/base" do
+      <<-FILE.gsub(/^    /, '')
+    //= require jquery
+      //= require jquery-ui
+      //= require jquery_ujs
+      //= require turbolinks
+      //= require jquery.turbolinks
+
+      //= require active_admin/base
+    FILE
+    end
+    inject_into_file file, :before => "\n//= require active_admin/base" do
       <<-FILE.gsub(/^      /, '')
+#{options[:auth_class].downcase} ||= #{auth_class}.new
+          can :manage, :all if #{options[:auth_class].downcase}.role? :admin
 
-      //= require custom
       FILE
     end
-
-    file = "#{app_path}/active_admin.js"
     append_file file do
       <<-FILE.gsub(/^      /, '')
 
       //= require custom
       FILE
     end
-
   end
 
   #def setup_stylesheets
@@ -306,7 +315,7 @@ class LeolayGenerator < Rails::Generators::Base
     <<-FILE.gsub(/^    /, '')
 
     require 'capybara/rspec'
-    require 'helpers/application_helpers_spec'
+    require 'helpers/application_helpers'
 
     Capybara.default_wait_time = 10 #default=2
     FILE
@@ -339,7 +348,7 @@ class LeolayGenerator < Rails::Generators::Base
     copy_file file, file
     file = "spec/support/devise.rb"
     copy_file file, file
-    file = "spec/helpers/application_helpers_spec.rb"
+    file = "spec/helpers/application_helpers.rb"
     copy_file file, file
 
   end

data/lib/generators/leolay/templates/app/assets/javascripts/custom.js.coffee

@@ -0,0 +1,2 @@
+# ActiveLeonardo
+# Use this file to add your javascript

data/lib/generators/leolay/templates/spec/helpers/{application_helpers_spec.rb → application_helpers.rb}

@@ -3,7 +3,7 @@ module ApplicationHelpers
     user = Factory(role)
     fill_in 'user_email', :with => user.email
     fill_in 'user_password', :with => user.password
-    click_button 'Sign in'
+    click_button 'Login'
   end
   def login_controller_as(role=:user)
     user = Factory(role)

data/lib/generators/leolay/templates/styles/active/stylesheets/app/stylesheet.css.scss

@@ -1,7 +1,9 @@
 @import "active_admin/mixins";
 @import "active_admin/base";
 @import "enviroment";
-@import "active_admin/pages/logged_out";
+#body {
+  @import "active_admin/pages/logged_out";
+}
 
 #header {
   #session {

data/lib/generators/leolay/templates/styles/active/views/layout/_session.html.erb

@@ -3,7 +3,7 @@
     <%= t("authentication.signed_in_as") %> <strong><%= current_user.email || "Guest" %></strong>. <%= t("authentication.not_you") %>
     <%= link_to t("authentication.sign_out"), destroy_user_session_path, :method => :delete %>
   <%- else -%>
-    <%= link_to t("authentication.sign_up"), new_user_registration_path %> -
+    <%#= link_to t("authentication.sign_up"), new_user_registration_path %> -
     <%= link_to t("authentication.sign_in"), new_user_session_path %>
   <%- end -%>
 </div>

data/lib/generators/rspec/leointegration/leointegration_generator.rb

@@ -22,9 +22,12 @@ module Rspec
       def generate_request_spec
         return unless options[:request_specs]
 
-        template 'request_spec.rb',
+        template 'feature.rb',
                   #File.join('spec/requests', class_path, base_namespaces, "#{table_name}_spec.rb")
-                  File.join('spec/requests', class_path, "#{table_name}_spec.rb")
+                  File.join('spec/features', class_path, "#{table_name}.rb")
+        template "#{options[:activespace]}/feature.rb",
+                 #File.join('spec/requests', class_path, base_namespaces, "#{table_name}_spec.rb")
+                 File.join('spec/features', options[:activespace], class_path, "#{table_name}.rb")
       end
 
     end

data/lib/generators/rspec/leointegration/templates/admin/feature.rb

@@ -0,0 +1,67 @@
+require 'spec_helper'
+<%- check_attr_to_have, check_attr_to_not_have = get_attr_to_match -%>
+
+feature "<%= options[:activespace].classify %>::<%= class_name.pluralize %>" do
+    scenario "displays <%= plural_table_name %>" do
+      <%= singular_table_name %> = Factory(:<%= singular_table_name %>)
+      visit <%= list_resources_path_test %>
+      <%= "login_view_as(:user_guest)" if authentication? -%>
+      #save_and_open_page #uncomment to debug
+      page.should <%= check_attr_to_have %>
+      assert page.find("tr#<%= singular_table_name %>_#{<%= singular_table_name %>.id}").visible?
+    end
+
+    scenario "creates a new <%= singular_table_name %>" do
+      <%= singular_table_name %> = Factory.build(:<%= singular_table_name %>)
+      visit <%= new_resource_path_test %>
+      <%= "login_view_as(:user_admin)" if authentication? %>
+<%= fill_form_with_values.join(CRLF) %>
+      click_button "Create #{I18n.t('models.<%= singular_table_name %>')}"
+      #save_and_open_page #uncomment to debug
+      page.should have_content(I18n.t(:created, :model => I18n.t('models.<%= singular_table_name %>')))
+      page.should <%= check_attr_to_have %>
+    end
+
+    scenario "edit a <%= singular_table_name %>" do
+      <%= singular_table_name %> = Factory(:<%= singular_table_name %>)
+      visit <%= list_resources_path_test %>
+      <%= "login_view_as(:user_manager)" if authentication? -%>
+      #save_and_open_page #uncomment to debug
+      page.should <%= check_attr_to_have %>
+      assert page.find("tr#<%= singular_table_name %>_#{<%= singular_table_name %>.id}").visible?
+      check("check#{<%= singular_table_name %>.id}")
+      click_link I18n.t(:edit)
+      page.should have_content(I18n.t(:edit))
+<%= fill_form_with_values("#{plural_table_name}_#_name").join(CRLF) %>
+      click_button I18n.t(:submit)
+      page.should have_content(I18n.t(:show))
+    end
+
+    scenario "destroy one <%= singular_table_name %>" do
+      <%= singular_table_name %> = Factory(:<%= singular_table_name %>)
+      visit <%= list_resources_path_test %>
+      <%= "login_view_as(:user_manager)" if authentication? -%>
+      #save_and_open_page #uncomment to debug
+      page.should <%= check_attr_to_have %>
+      assert page.find("tr#<%= singular_table_name %>_#{<%= singular_table_name %>.id}").visible?
+      click_link I18n.t(:delete)
+      #page.should have_no_content("<%= singular_table_name %>#{<%= singular_table_name %>.id}")
+      assert_not page.find("tr#<%= singular_table_name %>_#{<%= singular_table_name %>.id}")
+    end
+
+    scenario "destroy several <%= plural_table_name %>", :js => true do
+      <%= plural_table_name %> = FactoryGirl.create_list(:<%= singular_table_name %>, 2)
+      visit <%= list_resources_path_test %>
+      <%= "login_view_as(:user_manager)" if authentication? -%>
+      #save_and_open_page #uncomment to debug
+      <%= plural_table_name %>.each do |<%= singular_table_name %>|
+        page.should <%= check_attr_to_have %>
+        assert page.find("tr#<%= singular_table_name %>_#{<%= singular_table_name %>.id}").visible?
+        check "batch_action_item_#{<%= singular_table_name %>.id}"
+      end
+      click_link I18n.t('active_admin.batch_actions.action_label', :title => 'active_admin.batch_actions.labels.destroy')
+      <%= plural_table_name %>.each do |<%= singular_table_name %>|
+        page.should_not <%= check_attr_to_have %>
+      end
+    end
+end

data/lib/generators/rspec/leointegration/templates/feature.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+feature "<%= class_name.pluralize %>" do
+    scenario "When visit the index i should see some <%= plural_table_name %>" do
+      # Write some real scenario
+      visit <%= index_helper %>_path
+      response.status.should be(200)
+    end
+end

data/lib/generators/rspec/leosca/leosca_generator.rb

@@ -24,6 +24,10 @@ module Rspec
         template 'controller_spec.rb',
           #File.join('spec/controllers', base_namespaces, controller_class_path, "#{controller_file_name}_controller_spec.rb")
           File.join('spec/controllers', controller_class_path, "#{controller_file_name}_controller_spec.rb")
+
+        template "#{options[:activespace]}/controller_spec.rb",
+                 #File.join('spec/controllers', base_namespaces, controller_class_path, "#{controller_file_name}_controller_spec.rb")
+                 File.join('spec/controllers', options[:activespace], controller_class_path, "#{controller_file_name}_controller_spec.rb")
       end
 
       #Override
@@ -33,6 +37,10 @@ module Rspec
         template 'routing_spec.rb',
           #File.join('spec/routing', base_namespaces, controller_class_path, "#{controller_file_name}_routing_spec.rb")
           File.join('spec/routing', controller_class_path, "#{controller_file_name}_routing_spec.rb")
+
+        template "#{options[:activespace]}/routing_spec.rb",
+                 #File.join('spec/routing', base_namespaces, controller_class_path, "#{controller_file_name}_routing_spec.rb")
+                 File.join('spec/routing', options[:activespace], controller_class_path, "#{controller_file_name}_routing_spec.rb")
       end
 
       hook_for :integration_tool, :as => :leointegration

data/lib/generators/rspec/leosca/templates/admin/controller_spec.rb

@@ -0,0 +1,181 @@
+require 'spec_helper'
+
+# This spec was generated by rspec-rails when you ran the scaffold generator.
+# It demonstrates how one might use RSpec to specify the controller code that
+# was generated by Rails when you ran the scaffold generator.
+#
+# It assumes that the implementation code is generated by the rails scaffold
+# generator.  If you are using any extension libraries to generate different
+# controller code, this generated spec may or may not pass.
+#
+# It only uses APIs available in rails and/or rspec-rails.  There are a number
+# of tools you can use to make these specs even more expressive, but we're
+# sticking to rails and rspec-rails APIs to keep things simple and stable.
+#
+# Compared to earlier versions of this generator, there is very limited use of
+# stubs and message expectations in this spec.  Stubs are only used when there
+# is no simpler way to get a handle on the object needed for the example.
+# Message expectations are only used when there is no simpler way to specify
+# that an instance is receiving a specific message.
+
+describe <%= options[:activespace].classify %>::<%= controller_class_name %>Controller do
+
+<% unless options[:singleton] -%>
+  describe "GET index" do
+    it "assigns all <%= table_name.pluralize %> as @<%= table_name.pluralize %>" do
+      <%= "login_controller_as(:user)" if authentication? %>
+      <%= file_name %> = Factory(:<%= file_name %>)
+      get :index
+      assigns(:<%= table_name %>).should eq([<%= file_name %>])
+    end
+  end
+
+<% end -%>
+  describe "GET show" do
+    it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
+      <%= "login_controller_as(:user)" if authentication? %>
+      <%= file_name %> = Factory(:<%= file_name %>)
+      get :show, :id => <%= file_name %>.id.to_s
+      assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
+    end
+  end
+
+  describe "GET new" do
+    it "assigns a new <%= ns_file_name %> as @<%= ns_file_name %>" do
+      <%= "login_controller_as(:user)" if authentication? %>
+      get :new
+      assigns(:<%= ns_file_name %>).should be_a_new(<%= class_name %>)
+    end
+  end
+
+  describe "GET edit" do
+    it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
+      <%= "login_controller_as(:user)" if authentication? %>
+      <%= file_name %> = Factory(:<%= file_name %>)
+      get :edit, :id => <%= file_name %>.id.to_s
+      assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
+    end
+  end
+
+  describe "POST create" do
+    describe "with valid params" do
+      it "creates a new <%= class_name %>" do
+        <%= "login_controller_as(:user)" if authentication? %>
+        expect {
+          post :create, :<%= ns_file_name %> => Factory.attributes_for(:<%= file_name %>)
+        }.to change(<%= class_name %>, :count).by(1)
+      end
+
+      it "assigns a newly created <%= ns_file_name %> as @<%= ns_file_name %>" do
+        <%= "login_controller_as(:user)" if authentication? %>
+        post :create, :<%= ns_file_name %> => Factory.attributes_for(:<%= file_name %>)
+        assigns(:<%= ns_file_name %>).should be_a(<%= class_name %>)
+        assigns(:<%= ns_file_name %>).should be_persisted
+      end
+
+      it "redirects to the created <%= ns_file_name %>" do
+        <%= "login_controller_as(:user)" if authentication? %>
+        post :create, :<%= ns_file_name %> => Factory.attributes_for(:<%= file_name %>)
+        response.should redirect_to(<%= show_resource_path_test "#{class_name}.last" %>)
+      end
+    end
+
+    describe "with invalid params" do
+      it "assigns a newly created but unsaved <%= ns_file_name %> as @<%= ns_file_name %>" do
+        <%= "login_controller_as(:user)" if authentication? %>
+        # Trigger the behavior that occurs when invalid params are submitted
+        <%= class_name %>.any_instance.stub(:save).and_return(false)
+        post :create, :<%= ns_file_name %> => {}
+        assigns(:<%= ns_file_name %>).should be_a_new(<%= class_name %>)
+      end
+
+      it "re-renders the 'new' template" do
+        <%= "login_controller_as(:user)" if authentication? %>
+        # Trigger the behavior that occurs when invalid params are submitted
+        <%= class_name %>.any_instance.stub(:save).and_return(false)
+        post :create, :<%= ns_file_name %> => {}
+        response.should render_template("new")
+      end
+    end
+  end
+
+  describe "PUT update" do
+    describe "with valid params" do
+      it "updates the requested <%= ns_file_name %>" do
+        <%= "login_controller_as(:user)" if authentication? %>
+        <%= file_name %> = Factory(:<%= file_name %>)
+        # Assuming there are no other <%= table_name %> in the database, this
+        # specifies that the <%= class_name %> created on the previous line
+        # receives the :update_attributes message with whatever params are
+        # submitted in the request.
+        <%= class_name %>.any_instance.should_receive(:update_attributes).with(Factory.attributes_for(:<%= file_name %>))
+        put :update, :id => <%= file_name %>.id, :<%= ns_file_name %> => Factory.attributes_for(:<%= file_name %>)
+      end
+
+      it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
+        <%= "login_controller_as(:user)" if authentication? %>
+        <%= file_name %> = Factory(:<%= file_name %>)
+        put :update, :id => <%= file_name %>.id, :<%= ns_file_name %> => Factory.attributes_for(:<%= file_name %>)
+        assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
+      end
+
+      it "redirects to the <%= ns_file_name %>" do
+        <%= "login_controller_as(:user)" if authentication? %>
+        <%= file_name %> = Factory(:<%= file_name %>)
+        put :update, :id => <%= file_name %>.id, :<%= ns_file_name %> => Factory.attributes_for(:<%= file_name %>)
+        response.should redirect_to(<%= show_resource_path_test %>)
+      end
+    end
+
+    describe "with invalid params" do
+      it "assigns the <%= ns_file_name %> as @<%= ns_file_name %>" do
+        <%= "login_controller_as(:user)" if authentication? %>
+        <%= file_name %> = Factory(:<%= file_name %>)
+        # Trigger the behavior that occurs when invalid params are submitted
+        <%= class_name %>.any_instance.stub(:save).and_return(false)
+        put :update, :id => <%= file_name %>.id.to_s, :<%= ns_file_name %> => {}
+        assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
+      end
+
+      it "re-renders the 'edit' template" do
+        <%= "login_controller_as(:user)" if authentication? %>
+        <%= file_name %> = Factory(:<%= file_name %>)
+        # Trigger the behavior that occurs when invalid params are submitted
+        <%= class_name %>.any_instance.stub(:save).and_return(false)
+        put :update, :id => <%= file_name %>.id.to_s, :<%= ns_file_name %> => {}
+        response.should render_template("edit")
+      end
+    end
+  end
+
+  describe "DELETE destroy" do
+    describe "with authorization" do
+      it "destroys the requested <%= ns_file_name %>" do
+        <%= "login_controller_as(:user_manager)" if authentication? %>
+        <%= file_name %> = Factory(:<%= file_name %>)
+        expect {
+          delete :destroy, :id => <%= file_name %>.id.to_s
+        }.to change(<%= class_name %>, :count).by(-1)
+      end
+
+      it "redirects to the <%= table_name %> list" do
+        <%= "login_controller_as(:user_manager)" if authentication? %>
+        <%= file_name %> = Factory(:<%= file_name %>)
+        delete :destroy, :id => <%= file_name %>.id.to_s
+        response.should redirect_to(<%= list_resources_path_test %>)
+      end
+    end
+    <%- if authorization? -%>
+    describe "without authorization" do
+      it "destroys the requested <%= ns_file_name %>" do
+        <%= "login_controller_as(:user_guest)" if authentication? %>
+        <%= file_name %> = Factory(:<%= file_name %>)
+        expect {
+          delete :destroy, :id => <%= file_name %>.id.to_s
+        }.to change(<%= class_name %>, :count).by(0)
+      end
+    end
+    <%- end -%>
+  end
+
+end

data/lib/generators/rspec/leosca/templates/admin/edit_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+<% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
+describe "<%= ns_table_name %>/edit" do
+  before(:each) do
+    @<%= ns_file_name %> = assign(:<%= ns_file_name %>, stub_model(<%= class_name %><%= output_attributes.empty? ? '))' : ',' %>
+<% output_attributes.each_with_index do |attribute, attribute_index| -%>
+      :<%= attribute.name %> => <%= attribute.default.inspect %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
+<% end -%>
+<%= output_attributes.empty? ? "" : "    ))\n" -%>
+  end
+
+  it "renders the edit <%= ns_file_name %> form" do
+    render
+
+<% if webrat? -%>
+    rendered.should have_selector("form", :action => <%= ns_file_name %>_path(@<%= ns_file_name %>), :method => "post") do |form|
+<% for attribute in output_attributes -%>
+      form.should have_selector("<%= attribute.input_type -%>#<%= ns_file_name %>_<%= attribute.name %>", :name => "<%= ns_file_name %>[<%= attribute.name %>]")
+<% end -%>
+    end
+<% else -%>
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
+    assert_select "form", :action => <%= index_helper %>_path(@<%= ns_file_name %>), :method => "post" do
+<% for attribute in output_attributes -%>
+      assert_select "<%= attribute.input_type -%>#<%= ns_file_name %>_<%= attribute.name %>", :name => "<%= ns_file_name %>[<%= attribute.name %>]"
+<% end -%>
+    end
+<% end -%>
+  end
+end

data/lib/generators/rspec/leosca/templates/admin/index_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+<% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
+describe "<%= ns_table_name %>/index" do
+  before(:each) do
+    assign(:<%= table_name %>, [
+<% [1,2].each_with_index do |id, model_index| -%>
+      stub_model(<%= class_name %><%= output_attributes.empty? ? (model_index == 1 ? ')' : '),') : ',' %>
+<% output_attributes.each_with_index do |attribute, attribute_index| -%>
+        :<%= attribute.name %> => <%= value_for(attribute) %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
+<% end -%>
+<% if !output_attributes.empty? -%>
+      <%= model_index == 1 ? ')' : '),' %>
+<% end -%>
+<% end -%>
+    ])
+  end
+
+  it "renders a list of <%= ns_table_name %>" do
+    render
+<% unless webrat? -%>
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
+<% end -%>
+<% for attribute in output_attributes -%>
+<% if webrat? -%>
+    rendered.should have_selector("tr>td", :content => <%= value_for(attribute) %>.to_s, :count => 2)
+<% else -%>
+    assert_select "tr>td", :text => <%= value_for(attribute) %>.to_s, :count => 2
+<% end -%>
+<% end -%>
+  end
+end

data/lib/generators/rspec/leosca/templates/admin/new_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+<% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
+describe "<%= ns_table_name %>/new" do
+  before(:each) do
+    assign(:<%= ns_file_name %>, stub_model(<%= class_name %><%= output_attributes.empty? ? ').as_new_record)' : ',' %>
+<% output_attributes.each_with_index do |attribute, attribute_index| -%>
+      :<%= attribute.name %> => <%= attribute.default.inspect %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
+<% end -%>
+<%= !output_attributes.empty? ? "    ).as_new_record)\n  end" : "  end" %>
+
+  it "renders new <%= ns_file_name %> form" do
+    render
+
+<% if webrat? -%>
+    rendered.should have_selector("form", :action => <%= table_name %>_path, :method => "post") do |form|
+<% for attribute in output_attributes -%>
+      form.should have_selector("<%= attribute.input_type -%>#<%= ns_file_name %>_<%= attribute.name %>", :name => "<%= ns_file_name %>[<%= attribute.name %>]")
+<% end -%>
+    end
+<% else -%>
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
+    assert_select "form", :action => <%= index_helper %>_path, :method => "post" do
+<% for attribute in output_attributes -%>
+      assert_select "<%= attribute.input_type -%>#<%= ns_file_name %>_<%= attribute.name %>", :name => "<%= ns_file_name %>[<%= attribute.name %>]"
+<% end -%>
+    end
+<% end -%>
+  end
+end

data/lib/generators/rspec/leosca/templates/admin/routing_spec.rb

@@ -0,0 +1,39 @@
+require "spec_helper"
+
+<% module_namespacing do -%>
+describe <%= controller_class_name %>Controller do
+  describe "routing" do
+
+<% unless options[:singleton] -%>
+    it "routes to #index" do
+      get("/<%= options[:activespace] %>/<%= ns_table_name %>").should route_to("<%= options[:activespace] %>/<%= ns_table_name %>#index")
+    end
+
+<% end -%>
+    it "routes to #new" do
+      get("/<%= options[:activespace] %>/<%= ns_table_name %>/new").should route_to("<%= options[:activespace] %>/<%= ns_table_name %>#new")
+    end
+
+    it "routes to #show" do
+      get("/<%= options[:activespace] %>/<%= ns_table_name %>/1").should route_to("<%= options[:activespace] %>/<%= ns_table_name %>#show", :id => "1")
+    end
+
+    it "routes to #edit" do
+      get("/<%= options[:activespace] %>/<%= ns_table_name %>/1/edit").should route_to("<%= options[:activespace] %>/<%= ns_table_name %>#edit", :id => "1")
+    end
+
+    it "routes to #create" do
+      post("/<%= options[:activespace] %>/<%= ns_table_name %>").should route_to("<%= options[:activespace] %>/<%= ns_table_name %>#create")
+    end
+
+    it "routes to #update" do
+      put("/<%= options[:activespace] %>/<%= ns_table_name %>/1").should route_to("<%= options[:activespace] %>/<%= ns_table_name %>#update", :id => "1")
+    end
+
+    it "routes to #destroy" do
+      delete("/<%= options[:activespace] %>/<%= ns_table_name %>/1").should route_to("<%= options[:activespace] %>/<%= ns_table_name %>#destroy", :id => "1")
+    end
+
+  end
+end
+<% end -%>

data/lib/generators/rspec/leosca/templates/admin/show_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+<% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
+describe "<%= ns_table_name %>/show" do
+  before(:each) do
+    @<%= ns_file_name %> = assign(:<%= ns_file_name %>, stub_model(<%= class_name %><%= output_attributes.empty? ? '))' : ',' %>
+<% output_attributes.each_with_index do |attribute, attribute_index| -%>
+      :<%= attribute.name %> => <%= value_for(attribute) %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
+<% end -%>
+<% if !output_attributes.empty? -%>
+    ))
+<% end -%>
+  end
+
+  it "renders attributes in <p>" do
+    render
+<% unless webrat? -%>
+    # Run the generator again with the --webrat flag if you want to use webrat matchers
+<% end -%>
+<% for attribute in output_attributes -%>
+<% if webrat? -%>
+    rendered.should contain(<%= value_for(attribute) %>.to_s)
+<% else -%>
+    rendered.should match(/<%= eval(value_for(attribute)) %>/)
+<% end -%>
+<% end -%>
+  end
+end

data/lib/generators/rspec/leosca/templates/controller_spec.rb

@@ -18,14 +18,28 @@ require 'spec_helper'
 # Message expectations are only used when there is no simpler way to specify
 # that an instance is receiving a specific message.
 
+<% module_namespacing do -%>
 describe <%= controller_class_name %>Controller do
 
+  # This should return the minimal set of attributes required to create a valid
+  # <%= class_name %>. As you add validations to <%= class_name %>, be sure to
+  # update the return value of this method accordingly.
+  def valid_attributes
+    <%= formatted_hash(example_valid_attributes) %>
+  end
+
+  # This should return the minimal set of values that should be in the session
+  # in order to pass any filters (e.g. authentication) defined in
+  # <%= controller_class_name %>Controller. Be sure to keep this updated too.
+  def valid_session
+    {}
+  end
+
 <% unless options[:singleton] -%>
   describe "GET index" do
     it "assigns all <%= table_name.pluralize %> as @<%= table_name.pluralize %>" do
-      <%= "login_controller_as(:user)" if authentication? %>
-      <%= file_name %> = Factory(:<%= file_name %>)
-      get :index
+      <%= file_name %> = <%= class_name %>.create! valid_attributes
+      get :index, {}, valid_session
       assigns(:<%= table_name %>).should eq([<%= file_name %>])
     end
   end
@@ -33,26 +47,23 @@ describe <%= controller_class_name %>Controller do
 <% end -%>
   describe "GET show" do
     it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
-      <%= "login_controller_as(:user)" if authentication? %>
-      <%= file_name %> = Factory(:<%= file_name %>)
-      get :show, :id => <%= file_name %>.id.to_s
+      <%= file_name %> = <%= class_name %>.create! valid_attributes
+      get :show, {:id => <%= file_name %>.to_param}, valid_session
       assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
     end
   end
 
   describe "GET new" do
     it "assigns a new <%= ns_file_name %> as @<%= ns_file_name %>" do
-      <%= "login_controller_as(:user)" if authentication? %>
-      get :new
+      get :new, {}, valid_session
       assigns(:<%= ns_file_name %>).should be_a_new(<%= class_name %>)
     end
   end
 
   describe "GET edit" do
     it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
-      <%= "login_controller_as(:user)" if authentication? %>
-      <%= file_name %> = Factory(:<%= file_name %>)
-      get :edit, :id => <%= file_name %>.id.to_s
+      <%= file_name %> = <%= class_name %>.create! valid_attributes
+      get :edit, {:id => <%= file_name %>.to_param}, valid_session
       assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
     end
   end
@@ -60,40 +71,35 @@ describe <%= controller_class_name %>Controller do
   describe "POST create" do
     describe "with valid params" do
       it "creates a new <%= class_name %>" do
-        <%= "login_controller_as(:user)" if authentication? %>
         expect {
-          post :create, :<%= ns_file_name %> => Factory.attributes_for(:<%= file_name %>)
+          post :create, {:<%= ns_file_name %> => valid_attributes}, valid_session
         }.to change(<%= class_name %>, :count).by(1)
       end
 
       it "assigns a newly created <%= ns_file_name %> as @<%= ns_file_name %>" do
-        <%= "login_controller_as(:user)" if authentication? %>
-        post :create, :<%= ns_file_name %> => Factory.attributes_for(:<%= file_name %>)
+        post :create, {:<%= ns_file_name %> => valid_attributes}, valid_session
         assigns(:<%= ns_file_name %>).should be_a(<%= class_name %>)
         assigns(:<%= ns_file_name %>).should be_persisted
       end
 
       it "redirects to the created <%= ns_file_name %>" do
-        <%= "login_controller_as(:user)" if authentication? %>
-        post :create, :<%= ns_file_name %> => Factory.attributes_for(:<%= file_name %>)
-        response.should redirect_to(<%= show_resource_path_test "#{class_name}.last" %>)
+        post :create, {:<%= ns_file_name %> => valid_attributes}, valid_session
+        response.should redirect_to(<%= class_name %>.last)
       end
     end
 
     describe "with invalid params" do
       it "assigns a newly created but unsaved <%= ns_file_name %> as @<%= ns_file_name %>" do
-        <%= "login_controller_as(:user)" if authentication? %>
         # Trigger the behavior that occurs when invalid params are submitted
         <%= class_name %>.any_instance.stub(:save).and_return(false)
-        post :create, :<%= ns_file_name %> => {}
+        post :create, {:<%= ns_file_name %> => <%= formatted_hash(example_invalid_attributes) %>}, valid_session
         assigns(:<%= ns_file_name %>).should be_a_new(<%= class_name %>)
       end
 
       it "re-renders the 'new' template" do
-        <%= "login_controller_as(:user)" if authentication? %>
         # Trigger the behavior that occurs when invalid params are submitted
         <%= class_name %>.any_instance.stub(:save).and_return(false)
-        post :create, :<%= ns_file_name %> => {}
+        post :create, {:<%= ns_file_name %> => <%= formatted_hash(example_invalid_attributes) %>}, valid_session
         response.should render_template("new")
       end
     end
@@ -102,80 +108,61 @@ describe <%= controller_class_name %>Controller do
   describe "PUT update" do
     describe "with valid params" do
       it "updates the requested <%= ns_file_name %>" do
-        <%= "login_controller_as(:user)" if authentication? %>
-        <%= file_name %> = Factory(:<%= file_name %>)
+        <%= file_name %> = <%= class_name %>.create! valid_attributes
         # Assuming there are no other <%= table_name %> in the database, this
         # specifies that the <%= class_name %> created on the previous line
         # receives the :update_attributes message with whatever params are
         # submitted in the request.
-        <%= class_name %>.any_instance.should_receive(:update_attributes).with(Factory.attributes_for(:<%= file_name %>))
-        put :update, :id => <%= file_name %>.id, :<%= ns_file_name %> => Factory.attributes_for(:<%= file_name %>)
+        <%= class_name %>.any_instance.should_receive(:update_attributes).with(<%= formatted_hash(example_params_for_update) %>)
+        put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => <%= formatted_hash(example_params_for_update) %>}, valid_session
       end
 
       it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
-        <%= "login_controller_as(:user)" if authentication? %>
-        <%= file_name %> = Factory(:<%= file_name %>)
-        put :update, :id => <%= file_name %>.id, :<%= ns_file_name %> => Factory.attributes_for(:<%= file_name %>)
+        <%= file_name %> = <%= class_name %>.create! valid_attributes
+        put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => valid_attributes}, valid_session
         assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
       end
 
       it "redirects to the <%= ns_file_name %>" do
-        <%= "login_controller_as(:user)" if authentication? %>
-        <%= file_name %> = Factory(:<%= file_name %>)
-        put :update, :id => <%= file_name %>.id, :<%= ns_file_name %> => Factory.attributes_for(:<%= file_name %>)
-        response.should redirect_to(<%= show_resource_path_test %>)
+        <%= file_name %> = <%= class_name %>.create! valid_attributes
+        put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => valid_attributes}, valid_session
+        response.should redirect_to(<%= file_name %>)
       end
     end
 
     describe "with invalid params" do
       it "assigns the <%= ns_file_name %> as @<%= ns_file_name %>" do
-        <%= "login_controller_as(:user)" if authentication? %>
-        <%= file_name %> = Factory(:<%= file_name %>)
+        <%= file_name %> = <%= class_name %>.create! valid_attributes
         # Trigger the behavior that occurs when invalid params are submitted
         <%= class_name %>.any_instance.stub(:save).and_return(false)
-        put :update, :id => <%= file_name %>.id.to_s, :<%= ns_file_name %> => {}
+        put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => <%= formatted_hash(example_invalid_attributes) %>}, valid_session
         assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
       end
 
       it "re-renders the 'edit' template" do
-        <%= "login_controller_as(:user)" if authentication? %>
-        <%= file_name %> = Factory(:<%= file_name %>)
+        <%= file_name %> = <%= class_name %>.create! valid_attributes
         # Trigger the behavior that occurs when invalid params are submitted
         <%= class_name %>.any_instance.stub(:save).and_return(false)
-        put :update, :id => <%= file_name %>.id.to_s, :<%= ns_file_name %> => {}
+        put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => <%= formatted_hash(example_invalid_attributes) %>}, valid_session
         response.should render_template("edit")
       end
     end
   end
 
   describe "DELETE destroy" do
-    describe "with authorization" do
-      it "destroys the requested <%= ns_file_name %>" do
-        <%= "login_controller_as(:user_manager)" if authentication? %>
-        <%= file_name %> = Factory(:<%= file_name %>)
-        expect {
-          delete :destroy, :id => <%= file_name %>.id.to_s
-        }.to change(<%= class_name %>, :count).by(-1)
-      end
-
-      it "redirects to the <%= table_name %> list" do
-        <%= "login_controller_as(:user_manager)" if authentication? %>
-        <%= file_name %> = Factory(:<%= file_name %>)
-        delete :destroy, :id => <%= file_name %>.id.to_s
-        response.should redirect_to(<%= list_resources_path_test %>)
-      end
+    it "destroys the requested <%= ns_file_name %>" do
+      <%= file_name %> = <%= class_name %>.create! valid_attributes
+      expect {
+        delete :destroy, {:id => <%= file_name %>.to_param}, valid_session
+      }.to change(<%= class_name %>, :count).by(-1)
     end
-    <%- if authorization? -%>
-    describe "without authorization" do
-      it "destroys the requested <%= ns_file_name %>" do
-        <%= "login_controller_as(:user_guest)" if authentication? %>
-        <%= file_name %> = Factory(:<%= file_name %>)
-        expect {
-          delete :destroy, :id => <%= file_name %>.id.to_s
-        }.to change(<%= class_name %>, :count).by(0)
-      end
+
+    it "redirects to the <%= table_name %> list" do
+      <%= file_name %> = <%= class_name %>.create! valid_attributes
+      delete :destroy, {:id => <%= file_name %>.to_param}, valid_session
+      response.should redirect_to(<%= index_helper %>_url)
     end
-    <%- end -%>
   end
 
 end
+<% end -%>

data/lib/generators/rspec/leosca/templates/routing_spec.rb

@@ -6,32 +6,32 @@ describe <%= controller_class_name %>Controller do
 
 <% unless options[:singleton] -%>
     it "routes to #index" do
-      get("/<%= options[:activespace] %>/<%= ns_table_name %>").should route_to("<%= options[:activespace] %>/<%= ns_table_name %>#index")
+      get("/<%= ns_table_name %>").should route_to("<%= ns_table_name %>#index")
     end
 
 <% end -%>
     it "routes to #new" do
-      get("/<%= options[:activespace] %>/<%= ns_table_name %>/new").should route_to("<%= options[:activespace] %>/<%= ns_table_name %>#new")
+      get("/<%= ns_table_name %>/new").should route_to("<%= ns_table_name %>#new")
     end
 
     it "routes to #show" do
-      get("/<%= options[:activespace] %>/<%= ns_table_name %>/1").should route_to("<%= options[:activespace] %>/<%= ns_table_name %>#show", :id => "1")
+      get("/<%= ns_table_name %>/1").should route_to("<%= ns_table_name %>#show", :id => "1")
     end
 
     it "routes to #edit" do
-      get("/<%= options[:activespace] %>/<%= ns_table_name %>/1/edit").should route_to("<%= options[:activespace] %>/<%= ns_table_name %>#edit", :id => "1")
+      get("/<%= ns_table_name %>/1/edit").should route_to("<%= ns_table_name %>#edit", :id => "1")
     end
 
     it "routes to #create" do
-      post("/<%= options[:activespace] %>/<%= ns_table_name %>").should route_to("<%= options[:activespace] %>/<%= ns_table_name %>#create")
+      post("/<%= ns_table_name %>").should route_to("<%= ns_table_name %>#create")
     end
 
     it "routes to #update" do
-      put("/<%= options[:activespace] %>/<%= ns_table_name %>/1").should route_to("<%= options[:activespace] %>/<%= ns_table_name %>#update", :id => "1")
+      put("/<%= ns_table_name %>/1").should route_to("<%= ns_table_name %>#update", :id => "1")
     end
 
     it "routes to #destroy" do
-      delete("/<%= options[:activespace] %>/<%= ns_table_name %>/1").should route_to("<%= options[:activespace] %>/<%= ns_table_name %>#destroy", :id => "1")
+      delete("/<%= ns_table_name %>/1").should route_to("<%= ns_table_name %>#destroy", :id => "1")
     end
 
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: active_leonardo
 version: !ruby/object:Gem::Version 
-  hash: 746539005
+  hash: -335274718
   prerelease: 6
   segments: 
   - 0
   - 0
   - 6
   - beta
-  - 1
-  version: 0.0.6.beta1
+  - 2
+  version: 0.0.6.beta2
 platform: ruby
 authors: 
 - Marco Mastrodonato
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-03 00:00:00 Z
+date: 2013-01-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -106,7 +106,7 @@ files:
 - lib/generators/leolay/install_generator.rb
 - lib/generators/leolay/leolay_generator.rb
 - lib/generators/leolay/templates/app/admin/users.rb
-- lib/generators/leolay/templates/app/assets/javascripts/custom.js
+- lib/generators/leolay/templates/app/assets/javascripts/custom.js.coffee
 - lib/generators/leolay/templates/app/helpers/layout_helper.rb
 - lib/generators/leolay/templates/config/config.yml
 - lib/generators/leolay/templates/config/initializers/activeadmin_leonardo.rb
@@ -117,7 +117,7 @@ files:
 - lib/generators/leolay/templates/lib/development_mail_interceptor.rb
 - lib/generators/leolay/templates/lib/upd_array.rb
 - lib/generators/leolay/templates/spec/factories.rb
-- lib/generators/leolay/templates/spec/helpers/application_helpers_spec.rb
+- lib/generators/leolay/templates/spec/helpers/application_helpers.rb
 - lib/generators/leolay/templates/spec/support/devise.rb
 - lib/generators/leolay/templates/styles/active/images/logo.png
 - lib/generators/leolay/templates/styles/active/images/style/ico_v.png
@@ -139,8 +139,15 @@ files:
 - lib/generators/rails/leosca_controller/templates/controller.rb
 - lib/generators/rails/leosca_controller/USAGE
 - lib/generators/rspec/leointegration/leointegration_generator.rb
-- lib/generators/rspec/leointegration/templates/request_spec.rb
+- lib/generators/rspec/leointegration/templates/admin/feature.rb
+- lib/generators/rspec/leointegration/templates/feature.rb
 - lib/generators/rspec/leosca/leosca_generator.rb
+- lib/generators/rspec/leosca/templates/admin/controller_spec.rb
+- lib/generators/rspec/leosca/templates/admin/edit_spec.rb
+- lib/generators/rspec/leosca/templates/admin/index_spec.rb
+- lib/generators/rspec/leosca/templates/admin/new_spec.rb
+- lib/generators/rspec/leosca/templates/admin/routing_spec.rb
+- lib/generators/rspec/leosca/templates/admin/show_spec.rb
 - lib/generators/rspec/leosca/templates/controller_spec.rb
 - lib/generators/rspec/leosca/templates/edit_spec.rb
 - lib/generators/rspec/leosca/templates/index_spec.rb

data/lib/generators/leolay/templates/app/assets/javascripts/custom.js

@@ -1,10 +0,0 @@
-// Leonardo
-// Use this file to add your javascript
-
-$(document).ready(function() {
-    //Add this class to an input form to auto submit on change
-    $('.autosubmit').live('change', function() {
-      setTimeout("$('#"+this.id+"').parents('form:first').submit();", 300);
-      return false;
-    });
-});

data/lib/generators/rspec/leointegration/templates/request_spec.rb

@@ -1,70 +0,0 @@
-require 'spec_helper'
-<%- check_attr_to_have, check_attr_to_not_have = get_attr_to_match -%>
-
-describe "<%= class_name.pluralize %>" do
-  describe "GET /<%= table_name %>" do
-    it "displays <%= plural_table_name %>" do
-      <%= singular_table_name %> = Factory(:<%= singular_table_name %>)
-      visit <%= list_resources_path_test %>
-      <%= "login_view_as(:user_guest)" if authentication? -%>
-      #save_and_open_page #uncomment to debug
-      page.should <%= check_attr_to_have %>
-      assert page.find("#tr#{<%= singular_table_name %>.id}").visible?
-    end
-
-    describe "POST /<%= plural_table_name %>" do
-      it "creates a new <%= singular_table_name %>" do
-        <%= singular_table_name %> = Factory.build(:<%= singular_table_name %>)
-        visit <%= new_resource_path_test %>
-        <%= "login_view_as(:user_admin)" if authentication? %>
-<%= fill_form_with_values.join(CRLF) %>
-        click_button "Create #{I18n.t('models.<%= singular_table_name %>')}"
-        #save_and_open_page #uncomment to debug
-        page.should have_content(I18n.t(:created, :model => I18n.t('models.<%= singular_table_name %>')))
-        page.should <%= check_attr_to_have %>
-      end
-
-      it "edit a <%= singular_table_name %>" do
-        <%= singular_table_name %> = Factory(:<%= singular_table_name %>)
-        visit <%= list_resources_path_test %>
-        <%= "login_view_as(:user_manager)" if authentication? -%>
-        #save_and_open_page #uncomment to debug
-        page.should <%= check_attr_to_have %>
-        assert page.find("#tr#{<%= singular_table_name %>.id}").visible?
-        check("check#{<%= singular_table_name %>.id}")
-        click_link I18n.t(:edit)
-        page.should have_content(I18n.t(:edit))
-<%= fill_form_with_values("#{plural_table_name}_#_name").join(CRLF) %>
-        click_button I18n.t(:submit)
-        page.should have_content(I18n.t(:show))
-      end
-
-      it "destroy one <%= singular_table_name %>" do
-        <%= singular_table_name %> = Factory(:<%= singular_table_name %>)
-        visit <%= list_resources_path_test %>
-        <%= "login_view_as(:user_manager)" if authentication? -%>
-        #save_and_open_page #uncomment to debug
-        page.should <%= check_attr_to_have %>
-        assert page.find("tr#<%= singular_table_name %>#{<%= singular_table_name %>.id}").visible?
-        click_link I18n.t(:delete)
-        #page.should have_no_content("<%= singular_table_name %>#{<%= singular_table_name %>.id}")
-        assert_not page.find("tr#<%= singular_table_name %>#{<%= singular_table_name %>.id}")
-      end
-
-      it "destroy several <%= plural_table_name %>", :js => true do
-        <%= plural_table_name %> = FactoryGirl.create_list(:<%= singular_table_name %>, 2)
-        visit <%= list_resources_path_test %>
-        <%= "login_view_as(:user_manager)" if authentication? -%>
-        #save_and_open_page #uncomment to debug
-        <%= plural_table_name %>.each do |<%= singular_table_name %>|
-          page.should <%= check_attr_to_have %>
-          assert page.find("tr#<%= singular_table_name %>#{<%= singular_table_name %>.id}").visible?
-          check "batch_action_item_#{<%= singular_table_name %>.id}"
-        end
-        click_link I18n.t('active_admin.batch_actions.action_label', :title => 'active_admin.batch_actions.labels.destroy')
-        page.should_not have_content(I18n.t('active_admin.batch_actions.button_label'))
-      end
-    end
-
-  end
-end