controller_scaffolding 1.4.0 → 1.4.1

data/test/dummy/spec/requests/people_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "People" do
 	before(:all) do
-    cmd_str = 'rails g controller_scaffolding people index new create edit update destroy' 
+    cmd_str = 'rails g controller_scaffolding people index new create edit update destroy restless_action' 
     cmd_str << ' --template-engine=haml --quiet --force --skip-assets --skip-test-framework --skip-helper --skip-datepicker' 
 		puts "\n#{cmd_str}"
   	%x(#{cmd_str})
@@ -13,7 +13,7 @@ describe "People" do
   end
 
   after(:all) do
-  	cmd_str = 'rails d controller_scaffolding people index new create edit update destroy' 
+  	cmd_str = 'rails d controller_scaffolding people index new create edit update destroy restless_action' 
     cmd_str << ' --template-engine=haml --quiet --force --skip-assets --skip-test-framework --skip-helper --skip-datepicker' 
     puts "\n#{cmd_str}"
     %x(#{cmd_str})
@@ -285,5 +285,14 @@ describe "People" do
     #TODO: it has the correct field types (may be tough to test)
   end
 
+  #This is really more of a controller test to make sure the custom action was added, but I don't feel like
+  # adding any controller specs right now
+  describe "Restless Action" do
+    before { visit 'people/restless_action' }
+    it "renders the restless_action template which was generated by the view.html template" do
+      page.should have_content("Find me in app/views/people/restless_action.html.haml")
+      page.should have_content("(Generated by the view.html.haml controller_scaffolding template)")
+    end
+  end
 
 end

data/test/lib/generators/all_actions_generator_test.rb

@@ -9,7 +9,6 @@ class AllActionsGeneratorTest < Rails::Generators::TestCase
   
   def setup
     @contr_name = "people"
-    @actions = %w(index new create edit update destroy)
     @opts = %w(--force --quiet --template-engine=haml)
     @args = [@contr_name] | @opts #Not passing any actions in!
     prepare_destination
@@ -29,7 +28,7 @@ class AllActionsGeneratorTest < Rails::Generators::TestCase
       
   	run_generator @args
   	assert_file "app/controllers/#{@contr_name}_controller.rb" do |p_ctrl|
-  		@actions.each do |a|
+  		%w(index new create edit update destroy).each do |a|
 	  		assert_instance_method a, p_ctrl do |action|
 	  			assert_match(/\.paginate\(per_page: @per_page, page: @page\)/, action) if a == "index"
 			  end

data/test/lib/generators/ext_controller_scaffolding_generator_test.rb

@@ -41,12 +41,14 @@ class ExtControllerScaffoldingGeneratorTest < Rails::Generators::TestCase
 
   test "Routes were added properly" do
     assert_file "config/routes.rb" do |routes|
+      assert_no_match %r(get '#{@contr_name}/custom_action', to: '#{@contr_name}#custom_action'), routes
       assert_no_match %r(resources :#{@contr_name}), routes
     end
 
     run_generator @args
 
     assert_file "config/routes.rb" do |routes|
+      assert_match %r(get '#{@contr_name}/custom_action', to: '#{@contr_name}#custom_action'), routes
       assert_match %r(resources :#{@contr_name}), routes
     end
   end

data/test/lib/tmp/app/models/dinosaur.rb

@@ -1,4 +1,8 @@
 class Dinosaur < ActiveRecord::Base
 
+	extend SqlSearchableSortable
+
 	sql_searchable :name  #, :age, :good_dino
+
+	sql_sortable :name, :age, :good_dino
 end

data/test/lib/tmp/config/locales/en.yml

@@ -1,19 +1,6 @@
----
+
 en:
-  will_paginate:
-    models:
-      people:
-        zero: People
-        one: Person
-        other: People
-      dinosaurs:
-        zero: Dinosaurs
-        one: Dinosaur
-        other: Dinosaurs
-    page_entries_info:
-      multi_page_html: Displaying <b>%{from}&nbsp;-&nbsp;%{to}</b> of <b>%{count}</b>
-        %{model}
-      single_page_html:
-        zero: No %{model} found
-        one: Displaying <b>1</b> %{model}
-        other: Displaying <b>all&nbsp;%{count}</b> %{model}
+
+
+  
+

data/test/test_helper.rb

@@ -10,12 +10,12 @@ require 'generators/haml/controller/controller_scaffolding_generator'
 Rails.backtrace_cleaner.remove_silencers!
 
 # Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+#Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 # Load fixtures from the engine
-if ActiveSupport::TestCase.method_defined?(:fixture_path=)
-  ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
-end
+# if ActiveSupport::TestCase.method_defined?(:fixture_path=)
+#   ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
+# end
 
 #TODO: SHould add a helper for this to Rails::Generators::TestCase
 # so you could do like: stage_rails_files("../dummy_test_files", "app", "config", ...)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: controller_scaffolding
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - John O'Malley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-21 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails