openhood-sinatra_app_gen 0.1.0 → 0.1.1

data/VERSION.yml

@@ -0,0 +1,4 @@
+--- 
+:patch: 1
+:major: 0
+:minor: 1

data/lib/generators/sinatra_app/sinatra_app_generator.rb

@@ -8,7 +8,7 @@ class SinatraAppGenerator < RubiGen::Base
     super
     usage if args.empty?
     @destination_root = File.expand_path(args.shift)
-    @name = base_name
+    @name = (args.shift || base_name).camelize
   end
 
   def template(m, filename)
@@ -49,7 +49,7 @@ class SinatraAppGenerator < RubiGen::Base
       <<-EOS
 Creates a new Sinatra / Sequel / rspec / cucumber app.
 
-USAGE: #{spec.name} module_name
+USAGE: #{spec.name} directory_name [module_name]
 
 EOS
     end

data/lib/generators/sinatra_app/templates/app.rb.erb

@@ -6,6 +6,7 @@ require "logger"
 require "haml"
 require "sequel"
 require "sequel/extensions/blank"
+require "sequel/extensions/inflector"
 require "sinatra/base"
 require "sinatra/async"
 require "sinatra/respond_to"
@@ -13,7 +14,7 @@ require "rack-flash"
 require "string_cleaner"
 require "lib/rack_fix" # until rack escape UTF-8 as expected
 
-module <%= name.camelize %>
+module <%= name %>
   class App < Sinatra::Base
 
     def self.base_path
@@ -47,13 +48,15 @@ module <%= name.camelize %>
       end
 
       # load helpers
-      Dir.glob(File.join(base_path, "helpers", "*.rb")).each do |h|
-        require h
-      end
       helpers do
         alias_method :h, :escape_html
         def config
-          <%= name.camelize %>::App.config
+          <%= name %>::App.config
+        end
+        Dir.glob(File.join(base_path, "helpers", "*.rb")).each do |h|
+          require h
+          module_name = "#{File.basename(h, ".rb").camelize}Helper"
+          include Blog.const_get(module_name) if Blog.const_defined?(module_name)
         end
       end
 
@@ -71,5 +74,5 @@ end
 
 # define default port if launched directly via "ruby app.rb"
 if $0 == __FILE__
-  <%= name.camelize %>::App.run! :host => "localhost", :port => 4567
+  <%= name %>::App.run! :host => "localhost", :port => 4567
 end

data/lib/generators/sinatra_app/templates/features/support/env.rb.erb

@@ -19,14 +19,14 @@ Webrat.configure do |config|
 end
 
 # Set the Sinatra environment
-<%= name.camelize %>::App.configure do |c|
+<%= name %>::App.configure do |c|
   c.set     :environment, :test
   c.disable :run
   c.enable  :raise_errors
   c.disable :logging
 end
 
-class <%= name.camelize %>World
+class <%= name %>World
   include Rack::Test::Methods
   include Webrat::Methods
   include Webrat::Matchers
@@ -34,12 +34,12 @@ class <%= name.camelize %>World
   Webrat::Methods.delegate_to_session :response
   
   def app
-    <%= name.camelize %>::App
+    <%= name %>::App
   end
 end
 
 # Cucumber world setup
-World { <%= name.camelize %>World.new }
+World { <%= name %>World.new }
 
 Before do
   Sequel::Model.db.tables.each do |table_name|

data/lib/generators/sinatra_app/templates/geminstaller.yml.erb

@@ -11,6 +11,7 @@ gems:
   - name: kamk-pg
   - name: sequel
   - name: cucumber
+    verison: ">= 0.3.98"
   - name: rack-test
     version: ">= 0.4.1"
   - name: webrat

data/lib/generators/sinatra_app/templates/spec/spec_helper.rb.erb

@@ -9,7 +9,7 @@ require "sequel/extensions/migration"
 require "rspec_sequel_matchers"
 
 # Set the Sinatra environment
-<%= name.camelize %>::App.configure do |c|
+<%= name %>::App.configure do |c|
   c.set     :environment, :test
   c.disable :run
   c.enable  :raise_errors

data/sinatra_app_gen.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_app_gen}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jonathan Tron", "Joseph Halter"]
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".gitignore",
      "Rakefile",
-     "VERSION",
+     "VERSION.yml",
      "bin/sinatra_app",
      "lib/generators/sinatra_app/sinatra_app_generator.rb",
      "lib/generators/sinatra_app/templates/Rakefile.erb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: openhood-sinatra_app_gen
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Jonathan Tron
@@ -54,7 +54,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Rakefile
-- VERSION
+- VERSION.yml
 - bin/sinatra_app
 - lib/generators/sinatra_app/sinatra_app_generator.rb
 - lib/generators/sinatra_app/templates/Rakefile.erb
@@ -69,6 +69,7 @@ files:
 - sinatra_app_gen.gemspec
 has_rdoc: true
 homepage: http://github.com/openhood/sinatra_app_gen
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -89,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Creates a new Sinatra / Sequel / rspec / cucumber app.

data/VERSION

@@ -1 +0,0 @@
-0.1.0