tempatra 0.0.4 → 0.1.0

data/CHANGELOG

@@ -0,0 +1,11 @@
+0.1.0
+
+* Upgraded Compass to ~> 0.10.2
+* Upgraded jQuery to 1.4.2
+* Upgraded Haml to ~> 3.0.9
+* Upgraded RDiscount to ~> 1.6.3.2
+* Upgraded Cucumber to ~> 0.7.3
+* Upgraded RubiGen to ~> 1.5.5
+* Upgraded Sinatra to ~> 1.0
+* Switched to Capybara ~> 0.3.8 from Webrat
+* Restyled generated homepage (thanks to Stewart Laufer)

data/README.md

@@ -1,7 +1,7 @@
 Tempatra
 ========
 
-A RubiGen Sinatra application generator providing Blueprint CSS, jQuery, Haml, Sass, Compass, RSpec, Cucumber, and Webrat.
+A RubiGen Sinatra application generator providing Blueprint CSS, jQuery, Haml, Sass, Compass, RSpec, Cucumber, and Capybara.
 
 Installation
 ------------
@@ -64,7 +64,7 @@ Aaron Quint's [sinatra-gen](http://github.com/quirkey/sinatra-gen) is a Sinatra
 Authors
 -------
 
-Stewart Laufer (theIV)
+Stewart Laufer (theIV)  
 Olivier Lauzon (olauzon)
 
 

data/Rakefile

@@ -5,24 +5,23 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "tempatra"
-    gem.summary = %Q{A RubiGen based Sinatra application generator.}
-    gem.description = %Q{A Sinatra application generator using Blueprint CSS, jQuery, Haml, Sass, Compass, RSpec, Cucumber, and Webrat.}
+    gem.summary = %Q{A basic Sinatra application generator.}
+    gem.description = %Q{A basic Sinatra application generator providing Blueprint CSS, jQuery, Haml, Sass, Compass, RSpec, Cucumber, and Capybara.}
     gem.email = "olauzon@gmail.com"
     gem.homepage = "http://github.com/olauzon/tempatra"
-    gem.authors = ["Olivier Lauzon"]
+    gem.authors = ["Olivier Lauzon", "Stewart Laufer"]
 
-    gem.add_dependency('compass', '>= 0.8.17')
-    gem.add_dependency('cucumber', '>= 0.4.4')
-    gem.add_dependency('haml', '>= 2.2.13')
-    gem.add_dependency('rack-test', '>= 0.5.2')
-    gem.add_dependency('rake', '>= 0.8.7')
-    gem.add_dependency('rdiscount', '>= 1.5.5')
-    gem.add_dependency('rspec')
-    gem.add_dependency('rubigen', '>= 1.5.2')
-    gem.add_dependency('sinatra', '>= 0.9.4')
-    gem.add_dependency('thin', '>= 1.2.3')
-    gem.add_dependency('webrat', '>= 0.5.3')
-    gem.add_dependency('shotgun', '>= 0.4')
+    gem.add_dependency('compass',   '~> 0.10.2')
+    gem.add_dependency('cucumber',  '~> 0.7.3')
+    gem.add_dependency('haml',      '~> 3.0.9')
+    gem.add_dependency('rack-test', '~> 0.5.3')
+    gem.add_dependency('rdiscount', '~> 1.6.3.2')
+    gem.add_dependency('rspec',     '>= 1.2.6')
+    gem.add_dependency('rubigen',   '~> 1.5.5')
+    gem.add_dependency('sinatra',   '~> 1.0')
+    gem.add_dependency('shotgun',   '>= 0.6')
+    gem.add_dependency('thin',      '>= 1.2.3')
+    gem.add_dependency('capybara',  '~> 0.3.8')
 
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
     gem.files = FileList[ 'app_generators/**/*',

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.1.0

data/app_generators/tempatra/tempatra_generator.rb

@@ -37,13 +37,13 @@ class TempatraGenerator < RubiGen::Base
       BASEDIRS.each { |path| m.directory path }
 
       # Root
-      m.template  "_gems"         , ".gems"
-      m.template  "_gitignore"    , ".gitignore"
-      m.template  "config.rb.erb" , "config.rb"
-      m.template  "config.ru.erb" , "config.ru"
-      m.template  "config.yml.erb", "config.yml"
-      m.template  "Rakefile.erb"  , "Rakefile"
-      m.template  "README.md.erb" , "README.md"
+      m.template  "_gems"               , ".gems"
+      m.template  "_gitignore"          , ".gitignore"
+      m.template  "compass.config.erb"  , "compass.config"
+      m.template  "config.ru.erb"       , "config.ru"
+      m.template  "config.yml.erb"      , "config.yml"
+      m.template  "Rakefile.erb"        , "Rakefile"
+      m.template  "README.md.erb"       , "README.md"
 
       # Sinatra
       m.template  "lib/tempatra.rb.erb" , "lib/#{app_file_name}.rb"
@@ -53,8 +53,8 @@ class TempatraGenerator < RubiGen::Base
       m.template  "views/index.haml.erb"  , "views/index.haml"
 
       # jQuery
-      m.template  "public/javascripts/jquery-1.3.2.min.js",
-                  "public/javascripts/jquery-1.3.2.min.js"
+      m.template  "public/javascripts/jquery-1.4.2.min.js",
+                  "public/javascripts/jquery-1.4.2.min.js"
 
       m.template  "public/javascripts/application.js.erb",
                   "public/javascripts/application.js"
@@ -63,8 +63,8 @@ class TempatraGenerator < RubiGen::Base
       m.template  "features/homepage.feature.erb",
                   "features/homepage.feature"
 
-      m.template  "features/step_definitions/webrat_steps.rb",
-                  "features/step_definitions/webrat_steps.rb"
+      m.template  "features/step_definitions/web_steps.rb",
+                  "features/step_definitions/web_steps.rb"
 
       m.template  "features/support/env.rb.erb",
                   "features/support/env.rb"
@@ -101,9 +101,9 @@ class TempatraGenerator < RubiGen::Base
       # Compass
       compass = which "compass"
       unless File.exist?(File.expand_path(@destination_root) + '/public/images/grid.png')
-        m.run("#{compass} --force --grid-img --images-dir public/images")
+        m.run("#{compass} grid-img 30+10x22 public/images/grid.png --force")
       end
-      m.run("#{compass}") if compile
+      m.run("#{compass} --trace compile") if compile
 
       # Git
       if heroku || git_init
@@ -132,13 +132,13 @@ class TempatraGenerator < RubiGen::Base
     $ cd #{app_name}
 
     To run your application
-    $ thin start -p 4567 -R config.ru
+    $ shotgun --server=thin -p 4567 config.ru
     (Then go to http://localhost:4567/ with your browser)
 
     You can continuously compile your Sass stylesheets with Compass
     $ compass --watch
 
-    And of course, use autospec
+    Use autospec
     $ autospec
 
 
@@ -154,7 +154,7 @@ protected
     ----------------------
     Tempatra
 
-    A Sinatra application generator using Blueprint CSS, jQuery, Haml, Sass, Compass, RSpec, Cucumber, and Webrat.
+    A basic Sinatra application generator providing Blueprint CSS, jQuery, Haml, Sass, Compass, RSpec, Cucumber, and Capybara.
 
     Usage: tempatra your-app-name [options]
     EOS

data/app_generators/tempatra/templates/README.md.erb

@@ -8,10 +8,10 @@ Run your application:
 
 Then go to [http://localhost:4567/](http://localhost:4567/) with your browser.
 
-You can continuously compile your Sass stylesheets with Compass (in another terminal):
+You can continuously compile your Sass stylesheets with Compass (in another terminal or screen):
 
     $ compass --watch
 
-And of course, use autospec (in yet another terminal):
+And of course, use autospec (in yet another terminal or screen):
 
     $ autospec

data/app_generators/tempatra/templates/Rakefile.erb

@@ -35,5 +35,5 @@ end
 require 'cucumber/rake/task'
 Cucumber::Rake::Task.new(:cucumber, 'Run all Cucumber features') do |t|
   t.fork = true # You may get faster startup if you set this to false
-  t.cucumber_opts = "--tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
+  t.cucumber_opts = "--guess --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
 end

data/app_generators/tempatra/templates/_gems

@@ -1,3 +1,4 @@
-rdiscount
-haml --version '>= 2.2.3'
-compass --version '>= 0.8.17'
+rdiscount   --version '~> 1.6.3.2'
+sinatra     --version '~> 1.0'
+haml        --version '~> 3.0.9'
+compass     --version '~> 0.10.2'

data/app_generators/tempatra/templates/_gitignore

@@ -1,4 +1,6 @@
-*.sw?
+*.swo
+*.swp
+.sass-cache
 coverage/*
 views/stylesheets/.sass-cache
 webrat.*

data/app_generators/tempatra/templates/config.ru.erb

@@ -4,5 +4,8 @@
 require File.join(File.dirname(__FILE__), 'lib', '<%= app_file_name %>.rb')
 
 disable :run
-set :environment, :development
+
+# Uncomment to run in development mode on Heroku
+#set :environment, :development
+
 run <%= module_name %>

data/app_generators/tempatra/templates/features/homepage.feature.erb

@@ -1,3 +1,5 @@
+Feature: Viewing the homepage
+
   Scenario: Viewing the homepage
     Given I am on "the homepage"
     Then I should see "<%= app_full_name %>"

data/app_generators/tempatra/templates/features/step_definitions/web_steps.rb

@@ -0,0 +1,267 @@
+# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
+# It is recommended to regenerate this file in the future when you upgrade to a 
+# newer version of cucumber-rails. Consider adding your own code to a new file 
+# instead of editing this one. Cucumber will automatically load all features/**/*.rb
+# files.
+
+
+require 'uri'
+require 'cgi'
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
+
+module WithinHelpers
+  def with_scope(locator)
+    locator ? within(locator) { yield } : yield
+  end
+end
+World(WithinHelpers)
+
+Given /^(?:|I )am on (.+)$/ do |page_name|
+  visit path_to(page_name)
+end
+
+When /^(?:|I )go to (.+)$/ do |page_name|
+  visit path_to(page_name)
+end
+
+When /^(?:|I )press "([^\"]*)"(?: within "([^\"]*)")?$/ do |button, selector|
+  with_scope(selector) do
+    click_button(button)
+  end
+end
+
+When /^(?:|I )follow "([^\"]*)"(?: within "([^\"]*)")?$/ do |link, selector|
+  with_scope(selector) do
+    click_link(link)
+  end
+end
+
+When /^(?:|I )fill in "([^\"]*)" with "([^\"]*)"(?: within "([^\"]*)")?$/ do |field, value, selector|
+  with_scope(selector) do
+    fill_in(field, :with => value)
+  end
+end
+
+When /^(?:|I )fill in "([^\"]*)" for "([^\"]*)"(?: within "([^\"]*)")?$/ do |value, field, selector|
+  with_scope(selector) do
+    fill_in(field, :with => value)
+  end
+end
+
+# Use this to fill in an entire form with data from a table. Example:
+#
+#   When I fill in the following:
+#     | Account Number | 5002       |
+#     | Expiry date    | 2009-11-01 |
+#     | Note           | Nice guy   |
+#     | Wants Email?   |            |
+#
+# TODO: Add support for checkbox, select og option
+# based on naming conventions.
+#
+When /^(?:|I )fill in the following(?: within "([^\"]*)")?:$/ do |selector, fields|
+  with_scope(selector) do
+    fields.rows_hash.each do |name, value|
+      When %{I fill in "#{name}" with "#{value}"}
+    end
+  end
+end
+
+When /^(?:|I )select "([^\"]*)" from "([^\"]*)"(?: within "([^\"]*)")?$/ do |value, field, selector|
+  with_scope(selector) do
+    select(value, :from => field)
+  end
+end
+
+When /^(?:|I )check "([^\"]*)"(?: within "([^\"]*)")?$/ do |field, selector|
+  with_scope(selector) do
+    check(field)
+  end
+end
+
+When /^(?:|I )uncheck "([^\"]*)"(?: within "([^\"]*)")?$/ do |field, selector|
+  with_scope(selector) do
+    uncheck(field)
+  end
+end
+
+When /^(?:|I )choose "([^\"]*)"(?: within "([^\"]*)")?$/ do |field, selector|
+  with_scope(selector) do
+    choose(field)
+  end
+end
+
+When /^(?:|I )attach the file "([^\"]*)" to "([^\"]*)"(?: within "([^\"]*)")?$/ do |path, field, selector|
+  with_scope(selector) do
+    attach_file(field, path)
+  end
+end
+
+Then /^(?:|I )should see JSON:$/ do |expected_json|
+  require 'json'
+  expected = JSON.pretty_generate(JSON.parse(expected_json))
+  actual   = JSON.pretty_generate(JSON.parse(response.body))
+  expected.should == actual
+end
+
+Then /^(?:|I )should see "([^\"]*)"(?: within "([^\"]*)")?$/ do |text, selector|
+  with_scope(selector) do
+    if page.respond_to? :should
+      page.should have_content(text)
+    else
+      assert page.has_content?(text)
+    end
+  end
+end
+
+Then /^(?:|I )should see \/([^\/]*)\/(?: within "([^\"]*)")?$/ do |regexp, selector|
+  regexp = Regexp.new(regexp)
+  with_scope(selector) do
+    if page.respond_to? :should
+      page.should have_xpath('//*', :text => regexp)
+    else
+      assert page.has_xpath?('//*', :text => regexp)
+    end
+  end
+end
+
+Then /^(?:|I )should not see "([^\"]*)"(?: within "([^\"]*)")?$/ do |text, selector|
+  with_scope(selector) do
+    if page.respond_to? :should
+      page.should have_no_content(text)
+    else
+      assert page.has_no_content?(text)
+    end
+  end
+end
+
+Then /^(?:|I )should not see \/([^\/]*)\/(?: within "([^\"]*)")?$/ do |regexp, selector|
+  regexp = Regexp.new(regexp)
+  with_scope(selector) do
+    if page.respond_to? :should
+      page.should have_no_xpath('//*', :text => regexp)
+    else
+      assert page.has_no_xpath?('//*', :text => regexp)
+    end
+  end
+end
+
+Then /^the "([^\"]*)" field(?: within "([^\"]*)")? should contain "([^\"]*)"$/ do |field, selector, value|
+  with_scope(selector) do
+    field = find_field(field)
+    field_value = (field.tag_name == 'textarea') ? field.text : field.value
+    if field_value.respond_to? :should
+      field_value.should =~ /#{value}/
+    else
+      assert_match(/#{value}/, field_value)
+    end
+  end
+end
+
+Then /^the "([^\"]*)" field(?: within "([^\"]*)")? should not contain "([^\"]*)"$/ do |field, selector, value|
+  with_scope(selector) do
+    field = find_field(field)
+    field_value = (field.tag_name == 'textarea') ? field.text : field.value
+    if field_value.respond_to? :should_not
+      field_value.should_not =~ /#{value}/
+    else
+      assert_no_match(/#{value}/, field_value)
+    end
+  end
+end
+
+Then /^the "([^\"]*)" checkbox(?: within "([^\"]*)")? should be checked$/ do |label, selector|
+  with_scope(selector) do
+    field_checked = find_field(label)['checked']
+    if field_checked.respond_to? :should
+      field_checked.should == 'checked'
+    else
+      assert_equal 'checked', field_checked
+    end
+  end
+end
+
+Then /^the "([^\"]*)" checkbox(?: within "([^\"]*)")? should not be checked$/ do |label, selector|
+  with_scope(selector) do
+    field_checked = find_field(label)['checked']
+    if field_checked.respond_to? :should_not
+      field_checked.should_not == 'checked'
+    else
+      assert_not_equal 'checked', field_checked
+    end
+  end
+end
+ 
+Then /^(?:|I )should be on (.+)$/ do |page_name|
+  current_path = URI.parse(current_url).path
+  if current_path.respond_to? :should
+    current_path.should == path_to(page_name)
+  else
+    assert_equal path_to(page_name), current_path
+  end
+end
+
+Then /^(?:|I )should have the following query string:$/ do |expected_pairs|
+  query = URI.parse(current_url).query
+  actual_params = query ? CGI.parse(query) : {}
+  expected_params = {}
+  expected_pairs.rows_hash.each_pair{|k,v| expected_params[k] = v.split(',')} 
+  
+  if actual_params.respond_to? :should
+    actual_params.should == expected_params
+  else
+    assert_equal expected_params, actual_params
+  end
+end
+
+Then /^show me the page$/ do
+  save_and_open_page
+end
+
+When /^I uncheck "([^\"]*)"$/ do |field|
+  uncheck(field) 
+end
+
+When /^I choose "([^\"]*)"$/ do |field|
+  choose(field)
+end
+
+When /^I attach the file at "([^\"]*)" to "([^\"]*)"$/ do |path, field|
+  attach_file(field, path)
+end
+
+Then /^I should see "([^\"]*)"$/ do |text|
+  body.should contain(text)
+end
+
+Then /^I should not see "([^\"]*)"$/ do |text|
+  body.should_not contain(text)
+end
+
+Then /^the "([^\"]*)" field should contain "([^\"]*)"$/ do |field, value|
+  field_labeled(field).value.should =~ /#{value}/
+end
+
+Then /^the "([^\"]*)" field should not contain "([^\"]*)"$/ do |field, value|
+  field_labeled(field).value.should_not =~ /#{value}/
+end
+    
+Then /^the "([^\"]*)" checkbox should be checked$/ do |label|
+  field_labeled(label).should be_checked
+end
+
+Then /^I should be on (.+)$/ do |page_name|
+  URI.parse(current_url).path.should == path_to(page_name)
+end
+
+When /^I view the page$/ do
+  save_and_open_page
+end
+
+def response
+  last_response
+end
+
+def body
+  response.body
+end