lazy-head-gen 0.1.3 → 0.2.0

data/Gemfile

@@ -6,11 +6,13 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.1.3"
+  gem "minitest", ">= 0"
+  gem 'turn', "~> 0.9.5"
+  gem "bundler"
   gem "jeweler", "~> 1.6.4"
-  gem "simplecov", :require => false
-  gem "rdoc"
+  gem "yard", "~> 0.6.0"
+  # gem 'ruby-debug'
+  # gem "simplecov"
 
   # From Padrino Framework
   if ENV['SINATRA_EDGE']
@@ -22,7 +24,6 @@ group :development do
   gem "grit",      ">= 2.4.1"
   gem "rack",      ">= 1.3.0"
   gem "rake",      ">= 0.8.7"
-  gem "yard",      ">= 0.7.2"
   gem "rack-test", ">= 0.5.0"
   gem "fakeweb",   ">= 1.2.8"
   gem "webrat",    ">= 0.5.1"
@@ -41,10 +42,7 @@ group :development do
     gem "jruby-openssl"
   end
   gem "mocha",    "~>0.10.0"
-  gem "minitest", "~>2.6.0"
   gem "lumberjack"
-
-  gem 'ruby-debug'
 end
 
-gem 'padrino'
+gem 'padrino'

data/Gemfile.lock

@@ -4,17 +4,18 @@ GEM
     activesupport (3.2.3)
       i18n (~> 0.6)
       multi_json (~> 1.0)
+    ansi (1.4.2)
     bcrypt-ruby (3.0.1)
     builder (3.0.0)
-    columnize (0.3.6)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     fakeweb (1.3.0)
     git (1.2.5)
-    grit (2.4.1)
+    grit (2.5.0)
       diff-lcs (~> 1.1)
       mime-types (~> 1.15)
-    haml (3.1.4)
+      posix-spawn (~> 0.3.6)
+    haml (3.1.6)
     http_router (0.10.2)
       rack (>= 1.0.0)
       url_mount (~> 0.2.1)
@@ -23,12 +24,10 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.6.6)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
+    json (1.7.3)
     lumberjack (1.0.2)
-    macaddr (1.5.0)
-      systemu (>= 2.4.0)
+    macaddr (1.6.1)
+      systemu (~> 2.5.0)
     mail (2.3.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -39,7 +38,7 @@ GEM
     mocha (0.10.5)
       metaclass (~> 0.0.1)
     multi_json (1.3.2)
-    nokogiri (1.5.2)
+    nokogiri (1.5.3)
     padrino (0.10.6)
       padrino-admin (= 0.10.6)
       padrino-cache (= 0.10.6)
@@ -68,40 +67,30 @@ GEM
       mail (~> 2.3.0)
       padrino-core (= 0.10.6)
     polyglot (0.3.3)
+    posix-spawn (0.3.6)
     rack (1.4.1)
     rack-protection (1.2.0)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
     rake (0.9.2.2)
-    rbx-require-relative (0.0.9)
-    rdoc (3.12)
-      json (~> 1.4)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    shoulda (2.11.3)
-    simplecov (0.6.2)
-      multi_json (~> 1.3)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
     sinatra (1.3.2)
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
-    slim (1.2.0)
+    slim (1.2.1)
       temple (~> 0.4.0)
       tilt (~> 1.3.3)
     system_timer (1.2.4)
-    systemu (2.5.0)
+    systemu (2.5.1)
     temple (0.4.0)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
+    turn (0.9.5)
+      ansi
     url_mount (0.2.1)
       rack
     uuid (2.3.5)
@@ -110,7 +99,7 @@ GEM
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
       rack-test (>= 0.5.3)
-    yard (0.7.5)
+    yard (0.6.8)
 
 PLATFORMS
   ruby
@@ -118,7 +107,7 @@ PLATFORMS
 DEPENDENCIES
   bcrypt-ruby
   builder (>= 2.1.2)
-  bundler (~> 1.1.3)
+  bundler
   erubis (>= 2.7.0)
   fakeweb (>= 1.2.8)
   grit (>= 2.4.1)
@@ -127,19 +116,16 @@ DEPENDENCIES
   jruby-openssl
   json (>= 1.5.3)
   lumberjack
-  minitest (~> 2.6.0)
+  minitest
   mocha (~> 0.10.0)
   nokogiri (>= 1.4.4)
   padrino
   rack (>= 1.3.0)
   rack-test (>= 0.5.0)
   rake (>= 0.8.7)
-  rdoc
-  ruby-debug
-  shoulda
-  simplecov
   slim (>= 0.9.2)
   system_timer (>= 1.0)
+  turn (~> 0.9.5)
   uuid (>= 2.3.1)
   webrat (>= 0.5.1)
-  yard (>= 0.7.2)
+  yard (~> 0.6.0)

data/README.md

@@ -1,12 +1,10 @@
-lazy-head-gen
-=============
+# lazy-head-gen
 
-Lazy Head Gen is simply a couple of extra generators for the excellent [Padrino](https://github.com/padrino/padrino-framework) framework.
+Lazy Head Gen provides a couple of extra generators for the excellent [Padrino](https://github.com/padrino/padrino-framework) framework.
 
-It is currently tied into assuming that you are using ActiveRecord and MiniTest, as that is what I normally use when developing at Head.
+It is assuming that you are using ActiveRecord and MiniTest, as that is the options we normally use when developing at [Head](http://www.headlondon.com).
 
-Installation:
--------------
+## Installation
 
 ```
 gem install lazy-head-gen
@@ -15,19 +13,17 @@ gem install lazy-head-gen
 In a Gemfile:
 
 ```ruby
-gem 'lazy-head-gen'
+gem 'lazy-head-gen', :group => [:development, :test]
 ```
 
 Padrino gotcha: You'll need to put the `gem 'lazy-head-gen'` requirement *after* `gem 'padrino'` in your Gemfile.
-Lazy Head Gen needs Padrino loaded before it can show up in a Gemfile.
+Lazy Head Gen needs Padrino loaded before it can work.
 
-Usage
------
+## Usage
 
 There are currently 2 extra generators, scaffold and admin_controller_tests.
 
-Scaffold
-========
+### Scaffold Generator
 
 To generate a new scaffold:
 
@@ -53,9 +49,7 @@ It will also add:
 * A reference to blueprints.rb to test_config.rb if required
 * Add a Product blueprint and it's properties to the blueprints.rb file
 
-
-Admin Controller Tests
-======================
+### Admin Controller Tests Generator
 
 To generate a new admin controller test:
 
@@ -71,145 +65,24 @@ For example to generate an admin controller test for products:
 padrino g admin_controller_tests products
 ```
 
-This will generate a fully tested admin controller test for the 7 CRUD routes.
-
-Other requirements
-------------------
-
-test_config.rb
-==============
+This will generate a fully tested admin controller test for the 6 CRUD routes of a standard Padrino admin controller.
 
-You will need to add the following code to your test_config.rb for the generated tests to work correctly.
-
-```
-# Allows testing as a logged in admin user
-#
-def login_as_admin(account)
-  post "/admin/sessions/create", {
-    :email => account.email, :password => "password"
-  }
-  follow_redirect!
-end
-
-# Standard assertions to test when a user is not logged in
-# and trys to view an admin page
-#
-def assert_not_logged_in
-  assert !ok?
-  assert_equal 302, status
-  assert_equal "http://example.org/admin/sessions/new", location
-end
-
-# Assertions to test when a user is not logged in
-# and trys to call a destroy action
-#
-def assert_destroy_not_logged_in
-  assert !ok?
-  assert_equal 405, status
-  assert_nil location
-end
-
-# Standard assertions to test when a user is logged in
-# and trys to view an admin page using GET
-#
-def assert_logged_in
-  assert ok?
-  assert_equal 200, status
-end
-
-# Returns a key and new value which is set depending
-# on the old values class.
-#
-def get_key_and_value(instance)
-  # Discount PK and Timestamps
-  keys = instance.attributes.keys.delete_if do |k|
-    ["id", "created_at", "updated_at"].include?(k) or instance.attributes[k].nil?
-  end
-
-  key = old_value = new_value = nil
-
-  if keys.length > 0
-    # Pick a key at random
-    key = keys[rand(keys.length)]
-    old_value = instance.attributes[key]
-
-    case old_value.class.name
-      when "Integer"
-        new_value = old_value + 1
-      when "Time"
-        new_value = old_value + 36000
-      when "String"
-        new_value = "This is a modified string"
-      when "TrueClass"
-        new_value = false
-      when "FalseClass"
-        new_value = true
-      else
-        puts old_value.class.name
-    end
-  end
-
-  return [key, new_value]
-end
-
-# Some shorthands for last_request and last_response varibles
-#
-def path
-  last_request.path
-end
-
-def session
-  last_request.env['rack.session']
-end
-
-def body
-  last_response.body
-end
-
-def status
-  last_response.status
-end
-
-def location
-  last_response.original_headers["Location"]
-end
-
-def ok?
-  last_response.ok?
-end
-```
+## Extras
 
-blueprints.rb
-=============
+### Built in assertions and test helpers
 
-If you already have a blueprints.rb file in your current Padrino project then you will need to add the following for some of the tests to work:
-
-```
-module Factory
-  class << self
-
-    def make_admin
-      account = Account.make(:admin)
-      account.save!
-      account
-    end
-
-  end
-end
-```
+TODO: Write about these
 
-Also the scaffold generator looks for *# END blueprints* as a marker to insert the generated models blueprint. This is a bit... well crap... but I currently haven't thought of another way to do it.
+### blueprints.rb
 
-To Do List
-----------
+If you already have a blueprints.rb file, the scaffold generator looks for *# END blueprints* as a marker to insert the generated models blueprint. This is a bit... well crap... but I currently haven't thought of another way to do it.
 
-* Finish writing up the Read Me
-* Get generators to check the test_config.rb to make sure that the test helpers have been added
-* Tighten up some of the other requirements, certainly the blueprint inserts
+## To Do List
 
+* Finish README
+* See if there is a better way to do the blueprint inserts
 
-Contributing to lazy-head-gen
------------------------------
+## Contributing to lazy-head-gen
 
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
@@ -219,8 +92,7 @@ Contributing to lazy-head-gen
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
-Copyright
----------
+## Copyright
 
-Copyright (c) 2012 Stuart Chinery, http://www.headlondon.com
+Copyright (c) 2012 [Stuart Chinery](http://www.headlondon.com/who-we-are#stuart-chinery), [headlondon.com](http://www.headlondon.com)
 See LICENSE.txt for further details.

data/Rakefile

@@ -32,12 +32,7 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+task :default => :test
 
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "diffrent #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require 'yard'
+YARD::Rake::YardocTask.new

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/lazy-head-gen.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "lazy-head-gen"
-  s.version = "0.1.3"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Stuart Chinery"]
-  s.date = "2012-05-02"
+  s.date = "2012-06-07"
   s.description = "Lazy Head Gen is simply a couple of extra generators for the excellent Padrino framework."
   s.email = "stuart.chinery@headlondon.com"
   s.extra_rdoc_files = [
@@ -53,17 +53,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<padrino>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.1.3"])
+      s.add_development_dependency(%q<minitest>, [">= 0"])
+      s.add_development_dependency(%q<turn>, ["~> 0.9.5"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
-      s.add_development_dependency(%q<rdoc>, [">= 0"])
+      s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_development_dependency(%q<json>, [">= 1.5.3"])
       s.add_development_dependency(%q<nokogiri>, [">= 1.4.4"])
       s.add_development_dependency(%q<grit>, [">= 2.4.1"])
       s.add_development_dependency(%q<rack>, [">= 1.3.0"])
       s.add_development_dependency(%q<rake>, [">= 0.8.7"])
-      s.add_development_dependency(%q<yard>, [">= 0.7.2"])
       s.add_development_dependency(%q<rack-test>, [">= 0.5.0"])
       s.add_development_dependency(%q<fakeweb>, [">= 1.2.8"])
       s.add_development_dependency(%q<webrat>, [">= 0.5.1"])
@@ -76,22 +75,19 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<system_timer>, [">= 1.0"])
       s.add_development_dependency(%q<jruby-openssl>, [">= 0"])
       s.add_development_dependency(%q<mocha>, ["~> 0.10.0"])
-      s.add_development_dependency(%q<minitest>, ["~> 2.6.0"])
       s.add_development_dependency(%q<lumberjack>, [">= 0"])
-      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
     else
       s.add_dependency(%q<padrino>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.1.3"])
+      s.add_dependency(%q<minitest>, [">= 0"])
+      s.add_dependency(%q<turn>, ["~> 0.9.5"])
+      s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
-      s.add_dependency(%q<rdoc>, [">= 0"])
+      s.add_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_dependency(%q<json>, [">= 1.5.3"])
       s.add_dependency(%q<nokogiri>, [">= 1.4.4"])
       s.add_dependency(%q<grit>, [">= 2.4.1"])
       s.add_dependency(%q<rack>, [">= 1.3.0"])
       s.add_dependency(%q<rake>, [">= 0.8.7"])
-      s.add_dependency(%q<yard>, [">= 0.7.2"])
       s.add_dependency(%q<rack-test>, [">= 0.5.0"])
       s.add_dependency(%q<fakeweb>, [">= 1.2.8"])
       s.add_dependency(%q<webrat>, [">= 0.5.1"])
@@ -104,23 +100,20 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<system_timer>, [">= 1.0"])
       s.add_dependency(%q<jruby-openssl>, [">= 0"])
       s.add_dependency(%q<mocha>, ["~> 0.10.0"])
-      s.add_dependency(%q<minitest>, ["~> 2.6.0"])
       s.add_dependency(%q<lumberjack>, [">= 0"])
-      s.add_dependency(%q<ruby-debug>, [">= 0"])
     end
   else
     s.add_dependency(%q<padrino>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.1.3"])
+    s.add_dependency(%q<minitest>, [">= 0"])
+    s.add_dependency(%q<turn>, ["~> 0.9.5"])
+    s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
-    s.add_dependency(%q<rdoc>, [">= 0"])
+    s.add_dependency(%q<yard>, ["~> 0.6.0"])
     s.add_dependency(%q<json>, [">= 1.5.3"])
     s.add_dependency(%q<nokogiri>, [">= 1.4.4"])
     s.add_dependency(%q<grit>, [">= 2.4.1"])
     s.add_dependency(%q<rack>, [">= 1.3.0"])
     s.add_dependency(%q<rake>, [">= 0.8.7"])
-    s.add_dependency(%q<yard>, [">= 0.7.2"])
     s.add_dependency(%q<rack-test>, [">= 0.5.0"])
     s.add_dependency(%q<fakeweb>, [">= 1.2.8"])
     s.add_dependency(%q<webrat>, [">= 0.5.1"])
@@ -133,9 +126,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<system_timer>, [">= 1.0"])
     s.add_dependency(%q<jruby-openssl>, [">= 0"])
     s.add_dependency(%q<mocha>, ["~> 0.10.0"])
-    s.add_dependency(%q<minitest>, ["~> 2.6.0"])
     s.add_dependency(%q<lumberjack>, [">= 0"])
-    s.add_dependency(%q<ruby-debug>, [">= 0"])
   end
 end
 

data/lib/lazy-head-gen.rb

@@ -3,4 +3,77 @@ begin
   Padrino::Generators.load_paths << Dir[File.dirname(__FILE__) + '/lazy-head-gen/{admin_controller_test,scaffold}.rb']
 rescue LoadError
   # Fail silently
+end
+
+module LazyHeadGen
+
+  # Allows testing as a logged in admin user
+  #
+  def login_as_admin(account)
+    post "/admin/sessions/create", {
+      :email => account.email, :password => "password"
+    }
+    follow_redirect!
+  end
+
+  # Standard assertions to test when an admin user is not logged in
+  # and trys to view an admin page
+  #
+  def assert_admin_not_logged_in
+    assert !ok?
+    assert_equal 302, status
+    assert_equal "http://example.org/admin/sessions/new", location
+  end
+
+  # Assertions to test when an admin user is not logged in
+  # and trys to call a destroy action
+  #
+  def assert_admin_destroy_not_logged_in
+    assert !ok?
+    assert_equal 405, status
+    assert_nil location
+  end
+
+  # Some shorthands for last_request and last_response varibles
+  #
+  def path
+    last_request.path
+  end
+
+  def session
+    last_request.env['rack.session']
+  end
+
+  def body
+    last_response.body
+  end
+
+  def status
+    last_response.status
+  end
+
+  def location
+    last_response.original_headers["Location"]
+  end
+
+  def ok?
+    last_response.ok?
+  end
+
+
+  # A factory which we can use to build objects which are a bit more complex or
+  # which require special setup which can't be done by Machinist without a bit of
+  # help.
+  #
+  module Factory
+    class << self
+
+      def make_admin
+        account = Account.make!
+        account.save!
+        account
+      end
+
+    end
+  end
 end

data/lib/lazy-head-gen/templates/admin_controller_test.rb.tt

@@ -12,7 +12,7 @@ describe "Admin::<%= @controller if @controller %>Controller" do
       end
 
       it "should not display the <%= @pluralized %> index page" do
-        assert_not_logged_in
+        assert_admin_not_logged_in
       end
     end
     # END GET index
@@ -24,7 +24,7 @@ describe "Admin::<%= @controller if @controller %>Controller" do
       end
 
       it "should not display the <%= @pluralized %> new page" do
-        assert_not_logged_in
+        assert_admin_not_logged_in
       end
     end
     # END GET new
@@ -36,7 +36,7 @@ describe "Admin::<%= @controller if @controller %>Controller" do
       end
 
       it "should not return the created text" do
-        assert_not_logged_in
+        assert_admin_not_logged_in
       end
     end
     # END POST create
@@ -49,7 +49,7 @@ describe "Admin::<%= @controller if @controller %>Controller" do
       end
 
       it "should not display the <%= @pluralized %> edit page" do
-        assert_not_logged_in
+        assert_admin_not_logged_in
       end
     end
     # END GET edit
@@ -62,7 +62,7 @@ describe "Admin::<%= @controller if @controller %>Controller" do
       end
 
       it "should not return the updated text" do
-        assert_not_logged_in
+        assert_admin_not_logged_in
       end
     end
     # END PUT update
@@ -75,7 +75,7 @@ describe "Admin::<%= @controller if @controller %>Controller" do
       end
 
       it "should not return the destroyed text" do
-        assert_destroy_not_logged_in
+        assert_admin_destroy_not_logged_in
       end
     end
     # END DELETE destroy
@@ -98,7 +98,8 @@ describe "Admin::<%= @controller if @controller %>Controller" do
       end
 
       it "should display the <%= @pluralized %> index page" do
-        assert_logged_in
+        assert ok?
+        assert_equal 200, status
         assert_equal "/admin/<%= @pluralized %>", path
       end
     end
@@ -111,7 +112,8 @@ describe "Admin::<%= @controller if @controller %>Controller" do
       end
 
       it "should display the <%= @pluralized %> new page" do
-        assert_logged_in
+        assert ok?
+        assert_equal 200, status
         assert_equal "/admin/<%= @pluralized %>/new", path
       end
     end
@@ -124,9 +126,12 @@ describe "Admin::<%= @controller if @controller %>Controller" do
         post "/admin/<%= @pluralized %>/create", :<%= @singular %> => <%= @model %>.make.attributes
       end
 
+      it "should redirect to the edit page" do
+        assert_equal status, 302
+        assert location.include?("/admin/<%= @pluralized %>/edit/#{<%= @model %>.last.to_param}")
+      end
+
       it "should create a <%= @singular %>" do
-        assert_equal 302, status
-        assert location.include?("/admin/<%= @pluralized %>/edit/")
         assert_equal @<%= @singular %>_count + 1, <%= @model %>.count
       end
     end
@@ -140,7 +145,8 @@ describe "Admin::<%= @controller if @controller %>Controller" do
       end
 
       it "should display the <%= @pluralized %> edit page" do
-        assert_logged_in
+        assert ok?
+        assert_equal 200, status
         assert_equal "/admin/<%= @pluralized %>/edit/#{@<%= @singular %>.to_param}", path
       end
     end
@@ -151,27 +157,18 @@ describe "Admin::<%= @controller if @controller %>Controller" do
       before do
         @<%= @singular %> = <%= @model %>.make!
         @<%= @singular %>_count = <%= @model %>.count
-        @<%= @singular %>_hash = {}
-
-        key_and_value = get_key_and_value(@<%= @singular %>)
-        if key_and_value[0] and key_and_value[1]
-          @key = key_and_value[0]
-          @value = key_and_value[1]
-          @<%= @singular %>_hash = <%= @model %>.make(@key => @value).attributes
-        end
-
-        put "/admin/<%= @pluralized %>/update/#{@<%= @singular %>.to_param}", :<%= @singular %> => @<%= @singular %>_hash
-
+        put "/admin/<%= @pluralized %>/update/#{@<%= @singular %>.to_param}"
         @updated_<%= @singular %> = <%= @model %>.find(@<%= @singular %>.to_param)
       end
 
-      it "should update a <%= @singular %>" do
+      it "should redirect to the edit page" do
         assert_equal status, 302
         assert location.include?("/admin/<%= @pluralized %>/edit/#{@<%= @singular %>.to_param}")
+      end
+
+      it "should update a <%= @singular %>" do
         assert_equal @updated_<%= @singular %>.id, @<%= @singular %>.id
         assert_equal @<%= @singular %>_count, <%= @model %>.count
-        # Only assert if the <%= @singular %> has a key other than id or timestamps
-        assert_equal @updated_<%= @singular %>.attributes[@key], @value if @key and @value
       end
     end
     # END PUT update
@@ -184,8 +181,11 @@ describe "Admin::<%= @controller if @controller %>Controller" do
         delete "/admin/<%= @pluralized %>/destroy/#{@<%= @singular %>.to_param}"
       end
 
-      it "should destroy a <%= @singular %>" do
+      it "should redirect to the index page" do
         assert_equal 302, status
+      end
+
+      it "should destroy a <%= @singular %>" do
         assert_equal @<%= @singular %>_count - 1, <%= @model %>.count
       end
     end

data/lib/lazy-head-gen/templates/blueprints.rb.tt

@@ -13,20 +13,4 @@ Account.blueprint do
 end
 
 
-# END blueprints
-
-# A factory which we can use to build objects which are a bit more complex or
-# which require special setup which can't be done by Machinist without a bit of
-# help.
-#
-module Factory
-  class << self
-
-    def make_admin
-      account = Account.make!
-      account.save!
-      account
-    end
-
-  end
-end
+# END blueprints

data/lib/lazy-head-gen/templates/controller.rb.tt

@@ -1,33 +1,54 @@
-<%= @app_name %>.controllers <%= ":#{@pluralized}" if @pluralized %> do
+<%= @app_name %>.controllers <%= ":#{@pluralized}" %> do
 
   get :index do
-    render "<%= @pluralized if @pluralized %>/index"
+    @<%= @pluralized %> = <%= @model %>.all
+    render "<%= @pluralized %>/index"
   end
 
   get :show, :with => :id do
-    render "<%= @pluralized if @pluralized %>/show"
+    @<%= @singular %> = <%= @model %>.find(params[:id])
+    render "<%= @pluralized %>/show"
   end
 
 <% if @create_full -%>
   get :new do
-    render "<%= @pluralized if @pluralized %>/new"
+     @<%= @singular %> = <%= @model %>.new
+    render "<%= @pluralized %>/new"
   end
 
   post :create do
-    "This is the create action"
+    @<%= @singular %> = <%= @model %>.new(params[:<%= @singular %>])
+    if @<%= @singular %>.save
+      flash[:notice] = '<%= @model %> was successfully created.'
+      redirect url(:<%= @pluralized %>, :show, :id => @<%= @singular %>.id)
+    else
+      render '<%= @pluralized %>/new'
+    end
   end
 
   get :edit, :with => :id do
-    render "<%= @pluralized if @pluralized %>/edit"
+    @<%= @singular %> = <%= @model %>.find(params[:id])
+    render "<%= @pluralized %>/edit"
   end
 
   put :update, :with => :id do
-    "This is the update action"
+    @<%= @singular %> = <%= @model %>.find(params[:id])
+    if @<%= @singular %>.update_attributes(params[:<%= @singular %>])
+      flash[:notice] = '<%= @model %> was successfully updated.'
+      redirect url(:<%= @pluralized %>, :show, :id => @<%= @singular %>.id)
+    else
+      render '<%= @pluralized %>/edit'
+    end
   end
 
   delete :destroy, :with => :id do
-
+    @<%= @singular %> = <%= @model %>.find(params[:id])
+    if @<%= @singular %>.destroy
+      flash[:notice] = '<%= @model %> was successfully destroyed.'
+    else
+      flash[:error] = 'Unable to destroy <%= @model %>!'
+    end
+    redirect url(:<%= @pluralized %>, :index)
   end
-
 <% end -%>
 end

data/lib/lazy-head-gen/templates/controller_test.rb.tt

@@ -17,7 +17,7 @@ describe "<%= @controller if @controller %>Controller" do
   # START GET show
   describe "GET show" do
     before do
-      @<%= @singular %> = <%= @model %>.make
+      @<%= @singular %> = <%= @model %>.make!
       get "/<%= @pluralized %>/show/#{@<%= @singular %>.to_param}"
     end
 
@@ -43,11 +43,17 @@ describe "<%= @controller if @controller %>Controller" do
   # START POST create
   describe "Post create" do
     before do
-      post "/<%= @pluralized %>/create", {}
+      @count = <%= @model %>.count
+      post "/<%= @pluralized %>/create", :<%= @singular %> => <%= @model %>.make.attributes
     end
 
-    it "should return the create text" do
-      assert_match "This is the create action", last_response.body
+    it "should redirect to the show page" do
+      assert_equal 302, status
+      assert location.include?("/<%= @pluralized %>/show/")
+    end
+
+    it "should create a new <%= @singular %>" do
+      assert_equal @count + 1, <%= @model %>.count
     end
   end
   # END POST create
@@ -55,7 +61,7 @@ describe "<%= @controller if @controller %>Controller" do
   # START GET edit
   describe "GET edit" do
     before do
-      @<%= @singular %> = <%= @model %>.make
+      @<%= @singular %> = <%= @model %>.make!
       get "/<%= @pluralized %>/edit/#{@<%= @singular %>.to_param}"
     end
 
@@ -68,12 +74,20 @@ describe "<%= @controller if @controller %>Controller" do
   # START PUT update
   describe "PUT update" do
     before do
-      @<%= @singular %> = <%= @singular %>.make
-      put "/<%= @pluralized %>/update/#{@<%= @singular %>.to_param}", {}
+      @<%= @singular %> = <%= @model %>.make!
+      @count = <%= @model %>.count
+      put "/<%= @pluralized %>/update/#{@<%= @singular %>.to_param}", :<%= @singular %> => <%= @model %>.make.attributes
+      @updated_<%= @singular %> = <%= @model %>.find(@<%= @singular %>.to_param)
+    end
+
+    it "should redirect to the show page" do
+      assert_equal 302, status
+      assert location.include?("/<%= @pluralized %>/show/")
     end
 
-    it "should return the update text" do
-      assert_match "This is the update action", body
+    it "should not create a new <%= @singular %>" do
+      assert_equal @count, <%= @model %>.count
+      assert_equal @updated_<%= @singular %>.id, @<%= @singular %>.id
     end
   end
   # END PUT update
@@ -81,12 +95,17 @@ describe "<%= @controller if @controller %>Controller" do
   # START DELETE destroy
   describe "on DELETE destroy" do
     before do
-      @<%= @singular %> = <%= @singular %>.make
-      get "/<%= @pluralized %>/destroy/#{@<%= @singular %>.to_param}"
+      @<%= @singular %> = <%= @model %>.make!
+      @count = <%= @model %>.count
+      delete "/<%= @pluralized %>/destroy/#{@<%= @singular %>.to_param}"
+    end
+
+    it "should redirect to the index page" do
+      assert_equal 302, status
     end
 
-    it "should return a status of 405" do
-      assert_equal 405, status
+    it "should delete the <%= @singular %>" do
+      assert_equal(@count - 1, <%= @model %>.count)
     end
   end
   # END DELETE destroy

data/test/helper.rb

@@ -1,6 +1,9 @@
 ENV['PADRINO_ENV'] = 'test'
 PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
 
+# require 'simplecov'
+# SimpleCov.start
+
 require File.expand_path('../load_paths', __FILE__)
 require 'minitest/autorun'
 require 'rack/test'
@@ -11,7 +14,8 @@ require 'padrino-core/support_lite' unless defined?(SupportLite)
 require 'padrino-admin'
 require File.dirname(__FILE__) + '/../lib/lazy-head-gen.rb'
 
-require 'ruby-debug'
+begin; require 'turn/autorun'; rescue LoadError; end
+# require 'ruby-debug'
 
 Padrino::Generators.load_components!
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lazy-head-gen
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Stuart Chinery
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-02 00:00:00 Z
+date: 2012-06-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -43,7 +43,7 @@ dependencies:
         - 0
         version: "0"
   version_requirements: *id002
-  name: shoulda
+  name: minitest
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -52,58 +52,60 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 49
         segments: 
-        - 1
-        - 1
-        - 3
-        version: 1.1.3
+        - 0
+        - 9
+        - 5
+        version: 0.9.5
   version_requirements: *id003
-  name: bundler
+  name: turn
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
-        - 1
-        - 6
-        - 4
-        version: 1.6.4
+        - 0
+        version: "0"
   version_requirements: *id004
-  name: jeweler
+  name: bundler
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 6
+        - 4
+        version: 1.6.4
   version_requirements: *id005
-  name: simplecov
+  name: jeweler
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
         - 0
-        version: "0"
+        - 6
+        - 0
+        version: 0.6.0
   version_requirements: *id006
-  name: rdoc
+  name: yard
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -188,22 +190,6 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 7
-        - 2
-        version: 0.7.2
-  version_requirements: *id012
-  name: yard
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -214,12 +200,12 @@ dependencies:
         - 5
         - 0
         version: 0.5.0
-  version_requirements: *id013
+  version_requirements: *id012
   name: rack-test
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -230,12 +216,12 @@ dependencies:
         - 2
         - 8
         version: 1.2.8
-  version_requirements: *id014
+  version_requirements: *id013
   name: fakeweb
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -246,12 +232,12 @@ dependencies:
         - 5
         - 1
         version: 0.5.1
-  version_requirements: *id015
+  version_requirements: *id014
   name: webrat
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -262,12 +248,12 @@ dependencies:
         - 2
         - 22
         version: 2.2.22
-  version_requirements: *id016
+  version_requirements: *id015
   name: haml
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -278,12 +264,12 @@ dependencies:
         - 7
         - 0
         version: 2.7.0
-  version_requirements: *id017
+  version_requirements: *id016
   name: erubis
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -294,12 +280,12 @@ dependencies:
         - 9
         - 2
         version: 0.9.2
-  version_requirements: *id018
+  version_requirements: *id017
   name: slim
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -310,12 +296,12 @@ dependencies:
         - 3
         - 1
         version: 2.3.1
-  version_requirements: *id019
+  version_requirements: *id018
   name: uuid
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -326,12 +312,12 @@ dependencies:
         - 1
         - 2
         version: 2.1.2
-  version_requirements: *id020
+  version_requirements: *id019
   name: builder
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id021 !ruby/object:Gem::Requirement 
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -340,12 +326,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id021
+  version_requirements: *id020
   name: bcrypt-ruby
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id022 !ruby/object:Gem::Requirement 
+  requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -355,12 +341,12 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  version_requirements: *id022
+  version_requirements: *id021
   name: system_timer
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id023 !ruby/object:Gem::Requirement 
+  requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -369,12 +355,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id023
+  version_requirements: *id022
   name: jruby-openssl
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id024 !ruby/object:Gem::Requirement 
+  requirement: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -385,28 +371,12 @@ dependencies:
         - 10
         - 0
         version: 0.10.0
-  version_requirements: *id024
+  version_requirements: *id023
   name: mocha
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id025 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
-        version: 2.6.0
-  version_requirements: *id025
-  name: minitest
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id026 !ruby/object:Gem::Requirement 
+  requirement: &id024 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -415,23 +385,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id026
+  version_requirements: *id024
   name: lumberjack
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id027 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id027
-  name: ruby-debug
-  prerelease: false
 description: Lazy Head Gen is simply a couple of extra generators for the excellent Padrino framework.
 email: stuart.chinery@headlondon.com
 executables: []