sinatra-gen 0.1.1 → 0.2.0

data/History.txt

@@ -1,3 +1,9 @@
+== 0.2.0 2008-12-23
+
+* 1 major enhancement
+	* application actions can now be specified 
+		on the command line. See README for more info.
+	
 == 0.1.1 2008-12-16
 
 * 1 major enhancement

data/README.rdoc

@@ -14,13 +14,41 @@ user into any specific frameworks/dev practices.
 
 Run:
 
-  sinatra-gen [appname] [options]
+  sinatra-gen [appname] [actions] [options]
   
 e.g.
 
-  sinatra-gen mysinatrapp --vendor --init --test=shoulda --views=haml
+  sinatra-gen mysinatrapp get:/ post:/:id --vendor --init --test=shoulda --views=haml
 
-Options (can also be obtained by running sinatra-gen with no arguments):
+=== Actions
+
+!! NEW as of 0.2.0 (12/23/08)
+
+For even faster app development you specify actions to include in your app when generating.
+Actions are written out as
+
+  http_method:path
+
+And are seperated by spaces. For example:
+
+  get:/ post:/:id put:/update/*
+  
+Will be added you your app as:
+
+  get '/' do
+  end
+  
+  post '/:id' do
+  end
+  
+  put '/update/*' do
+  end
+
+It will also generate test skeletons in the test framework of your choosing.
+
+=== Options 
+
+(can also be obtained by running sinatra-gen with no arguments):
 
 	-v, --version                    Show the sinatra-gen version number and quit.
 	-d, --vendor                     Extract the latest sinatra to vendor/sinatra
@@ -47,4 +75,8 @@ To run the app without using the vendor option, the sinatra gem must be installe
 
 == INSTALL:
 
-  sudo gem install sintra-gen
+  sudo gem install sintra-gen
+
+You can also install directly from github:
+
+  sudo gem install quirkey-sinatra-gen -s http://gems.github.com

data/app_generators/sinatra_app/sinatra_app_generator.rb

@@ -5,7 +5,7 @@ class SinatraAppGenerator < RubiGen::Base
 
   default_options :author => nil
 
-  attr_accessor :app_name, :vendor, :tiny, :git, :git_init, :test_framework, :view_framework, :install_scripts, :cap
+  attr_accessor :app_name, :vendor, :tiny, :git, :git_init, :test_framework, :view_framework, :install_scripts, :cap, :actions
 
   def initialize(runtime_args, runtime_options = {})
     super
@@ -13,6 +13,7 @@ class SinatraAppGenerator < RubiGen::Base
     @destination_root = File.expand_path(args.shift)
     self.app_name = base_name
     extract_options
+    parse_actions(args)
   end
 
   def manifest
@@ -102,6 +103,9 @@ EOS
       app_name.classify
     end
     
+    def parse_actions(*action_args)
+      @actions = action_args.flatten.collect { |a| a.split(':', 2) }
+    end
 
     # Installation skeleton.  Intermediate directories are automatically
     # created so don't sweat their absence here.

data/app_generators/sinatra_app/templates/app.rb.erb

@@ -12,6 +12,14 @@ set :public, 'public'
 set :views,  'views'
 <%- end -%>
 
+<%- unless actions.empty? -%>
+<%- actions.each do |meth, path| -%>
+<%= meth %> '<%= path %>' do
+end
+
+<%- end -%>
+<%- else -%>
 get '/' do
   <%= view_framework -%> :index
-end
+end
+<%- end -%>

data/app_generators/sinatra_app/templates/test/test_app_rspec.rb.erb

@@ -1,10 +1,19 @@
 require 'test_helper'
 
 describe '<%= klass_name %>' do
+
+  <%- unless actions.empty? -%>
+  <% actions.each do |meth, path| %>  
+  it 'should <%= meth %> <%= path %>' do
+    <%= meth %>_it '<%= path %>'
+    @response.should be_ok
+  end
   
+  <%- end -%>
+  <%- else -%>  
   it 'should load the index' do
     get_it '/'
     @response.should be_ok
   end
-  
+  <%- end -%>
 end

data/app_generators/sinatra_app/templates/test/test_app_shoulda.rb.erb

@@ -3,6 +3,20 @@ require 'test_helper'
 class <%= klass_name -%>Test < Test::Unit::TestCase
 
   context "<%= klass_name -%>" do
+    <%- unless actions.empty? -%>
+    <% actions.each do |meth, path| %>
+    context "<%= meth %> <%= path %>" do
+      setup do
+        <%= meth %>_it '<%= path %>'
+      end
+      
+      should "respond" do
+        assert @response.body
+      end
+    end
+    
+    <%- end -%>
+    <%- else -%>
     context "getting the index" do
       setup do
         get_it '/'
@@ -12,6 +26,7 @@ class <%= klass_name -%>Test < Test::Unit::TestCase
         assert @response.body
       end
     end
+    <%- end -%>
   end
 
 end

data/app_generators/sinatra_app/templates/test/test_app_spec.rb.erb

@@ -2,9 +2,19 @@ require 'test_helper'
 
 describe '<%= klass_name %>' do
   
+  <%- unless actions.empty? -%>
+  <% actions.each do |meth, path| %>  
+  it 'should <%= meth %> <%= path %>' do
+    <%= meth %>_it '<%= path %>'
+    should.be.ok
+  end
+  
+  <%- end -%>
+  <%- else -%>  
   it 'should load the index' do
     get_it '/'
     should.be.ok  
   end
+  <%- end -%>
   
 end

data/app_generators/sinatra_app/templates/test/test_app_unit.rb.erb

@@ -2,8 +2,17 @@ require 'test_helper'
 
 class <%= klass_name -%>Test < Test::Unit::TestCase
 
+  <%- unless actions.empty? -%>
+  <% actions.each do |meth, path| %>  
+  def test_<%= meth %>_<%= path.to_s.gsub(/[^a-z0-9\_]/, '') %>_should
+    <%= meth %>_it '<%= path %>'
+  end
+
+  <%- end -%>
+  <%- else -%>  
   def test_my_default
     get_it '/'
   end
+  <%- end -%>
 
 end

data/lib/sinatra-gen.rb

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module SinatraGen
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/sinatra-gen.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra-gen}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Quint"]
-  s.date = %q{2008-12-16}
+  s.date = %q{2008-12-23}
   s.default_executable = %q{sinatra-gen}
   s.description = %q{sinatra-gen generates a common file structure and basic app files for a web app utilizing the sinatra framework. For more information on sinatra, check out http://sinatra.rubyforge.org}
   s.email = ["aaron@quirkey.com"]

data/test/test_sinatra_app_generator.rb

@@ -11,20 +11,6 @@ class TestSinatraAppGenerator < Test::Unit::TestCase
     bare_teardown
   end
 
-  # Some generator-related assertions:
-  #   assert_generated_file(name, &block) # block passed the file contents
-  #   assert_directory_exists(name)
-  #   assert_generated_class(name, &block)
-  #   assert_generated_module(name, &block)
-  #   assert_generated_test_for(name, &block)
-  # The assert_generated_(class|module|test_for) &block is passed the body of the class/module within the file
-  #   assert_has_method(body, *methods) # check that the body has a list of methods (methods with parentheses not supported yet)
-  #
-  # Other helper methods are:
-  #   app_root_files - put this in teardown to show files generated by the test method (e.g. p app_root_files)
-  #   bare_setup - place this in setup method to create the APP_ROOT folder for each test
-  #   bare_teardown - place this in teardown method to destroy the TMP_ROOT or APP_ROOT folder after each test
-
   def test_generate_app_without_options
     run_generator('sinatra_app', [APP_ROOT], sources)
     assert_basic_paths_and_files
@@ -146,6 +132,28 @@ class TestSinatraAppGenerator < Test::Unit::TestCase
     assert_generated_file 'script/generate'
   end
   
+  def test_generate_app_with_actions_and_no_options
+    run_generator('sinatra_app', [APP_ROOT, 'get:/', 'post:/users/:id', 'put:/users/*'], sources)
+    assert_basic_paths_and_files
+    assert_generated_file 'app.rb' do |app_contents|
+      assert_match(/get '\/' do/, app_contents)
+      assert_match(/post '\/users\/\:id' do/, app_contents)
+      assert_match(/put '\/users\/\*' do/, app_contents)
+    end
+  end
+  
+  def test_generate_app_with_actions_and_options
+    run_generator('sinatra_app', [APP_ROOT, 'get:/', 'post:/users/:id', '--tiny', 'put:/users/*'], sources)
+    assert_generated_file   'config.ru'
+    assert_generated_file   'app.rb'
+    assert_generated_file   'Rakefile'
+    assert_generated_file 'app.rb' do |app_contents|
+      assert_match(/get '\/' do/, app_contents)
+      assert_match(/post '\/users\/\:id' do/, app_contents)
+      assert_match(/put '\/users\/\*' do/, app_contents)
+    end
+  end
+  
   private
   def assert_basic_paths_and_files
     assert_directory_exists 'lib'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-gen
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Aaron Quint
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-18 00:00:00 -05:00
+date: 2008-12-23 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency