sinatra_more 0.3.0 → 0.3.1

data/README.rdoc

@@ -45,13 +45,13 @@ of tools, helpers and components that will make Sinatra suitable for more comple
 
 Here is a small list of what sinatra_more contains:
 
+* Code generators for creating new sinatra applications (using <tt>sinatra_gen</tt> on command line)
 * Generic view and tag helpers (<tt>tag</tt>, <tt>content_tag</tt>, <tt>input_tag</tt>, ...)
 * Asset tag helpers (<tt>link_to</tt>, <tt>image_tag</tt>, <tt>javascript_include_tag</tt>, ...)
 * Full form helpers and builders support (<tt>form_tag</tt>, <tt>form_for</tt>, <tt>field_set_tag</tt>, <tt>text_field</tt>, ...)
 * Generally useful formatting extensions (<tt>relative_time_ago</tt>, <tt>js_escape_html</tt>, <tt>sanitize_html</tt>)
 * Simple 'mailer' support for sinatra (akin to <tt>ActionMailer</tt> but simpler and powered by <tt>pony</tt>)
 * Plug and play setup for the excellent Warden authentication system
-* Code generators for creating new sinatra applications (COMING SOON)
 
 Keep in mind, the user will be able to pull in these components seperately and leave out those that are not required.
 
@@ -347,6 +347,8 @@ I hope to create or merge in an even better 'default' form_builder in the near f
   * Escapes html to allow passing information to javascript. Used for passing data inside an ajax .js.erb template
   * <tt>escape_javascript("<h1>Hey</h1>")</tt>
 
+See the wiki article for additional information: <http://wiki.github.com/nesquena/sinatra_more/markupplugin>
+
 === RenderPlugin
 
 This component provides a number of rendering helpers for sinatra, making the process
@@ -398,6 +400,8 @@ This works as you would expect and also supports the collection counter inside t
   
 And that concludes the render plugin for now but I am open to adding more methods as time progresses.
 
+See the wiki article for additional information: <http://wiki.github.com/nesquena/sinatra_more/renderplugin>
+
 === WardenPlugin
 
 This component provides out-of-the-box support for Warden authentication. With this
@@ -467,6 +471,8 @@ Eventually I plan to vendor that gem or just remove support for this piece of my
 If anybody has any thoughts on this or the warden integration in general, please let me know. 
 Nonetheless, there is a certain convenience for me having access to a plug-and-play warden solution directly from this gem.
 
+See the wiki article for additional information: <http://wiki.github.com/nesquena/sinatra_more/wardenplugin>
+
 === MailerPlugin
 
 This component uses an enhanced version of the excellent <tt>pony</tt> library (vendored) for a powerful but simple
@@ -540,6 +546,8 @@ or perhaps we want to have a short body without the need for a template file:
       body    "This is a short body defined right in the mailer itself"
     end
   end
+
+See the wiki article for additional information: <http://wiki.github.com/nesquena/sinatra_more/mailerplugin>
   
 == Sinatra Generators
 
@@ -568,7 +576,7 @@ There is also support for aliases for each component within the command:
   
 The available components and their default options are listed below:
 
-* test:     <tt>bacon</tt>  (default), <tt>shoulda</tt>, <tt>rspec</tt>, <tt>testspec</tt>,<tt>riot</tt>
+* test:     <tt>bacon</tt>  (default), <tt>shoulda</tt>, <tt>rspec</tt>, <tt>testspec</tt>, <tt>riot</tt>
 * renderer: <tt>erb</tt>    (default), <tt>haml</tt>
 * mock:     <tt>mocha</tt>  (default), <tt>rr</tt>
 * script:   <tt>jquery</tt> (default), <tt>prototype</tt>, <tt>rightjs</tt>
@@ -584,6 +592,8 @@ We are planning to add additional generator actions such as:
 * Model generator (working for any of the available orms listed)
 * Routes generator 
 * Migrations generator
+
+See the wiki article for additional information: <http://wiki.github.com/nesquena/sinatra_more/generator>
   
 == Acknowledgements
 

data/TODO

@@ -1,20 +1,16 @@
 = UNFINISHED
 
+* Add support for model, routes, migration generator types based on components
 * Add support for fields_for tag in formbuilder
 * Add support for button tag method, mail_to helper
 * Add support for check_box_group, radio_button_group which create a set of checkboxes or radio buttons
-* Look into creating sinatra generators using rubigen (http://github.com/drnic/rubigen)
-  * http://github.com/quirkey/sinatra-gen
-  * test generators
-  * add support for model, routes, migration generator types
 * Become total warden solution (basically just require warden gem installed, do everything else)
   * Look into removing overlapping methods and simply leverage sinatra_warden
   * Take advantage of shared strategies: http://github.com/hassox/warden_strategies/tree/master/lib/
-  * Make warden password strategy support a callback which explains what to do with username, password
-  * WardenPlugin.authenticate_callback { |username, password| User.authenticate(username, password) }
 
 = COMPLETED
 
+* Created application generator using thor
 * Add support for a MailerPlugin which will make sending emails a breeze (http://github.com/hiroshi/pony)
 * Add support for missing formbuilder fields (select, and standard_form_builder methods i.e check_box_group)
 * Add support for missing formhelpers/fields (radio_button_tag, select_tag)

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/bin/sinatra_gen

@@ -2,4 +2,5 @@
 
 %w[rubygems activesupport thor].each { |gem| require gem }
 require File.dirname(__FILE__) + "/../generators/skeleton_generator"
-SinatraMore::SkeletonGenerator.start
+arguments = ARGV.any? ? ARGV : ['-h']
+SinatraMore::SkeletonGenerator.start(arguments)

data/generators/generator_actions.rb

@@ -58,9 +58,10 @@ module SinatraMore
       # Defines a class option to allow a component to be chosen and add to component type list
       # Also builds the available_choices hash of which component choices are supported
       # component_option :test, "Testing framework", :aliases => '-t', :choices => [:bacon, :shoulda]
-      def component_option(name, description, options = {})
+      def component_option(name, caption, options = {})
         (@available_choices ||= Hash.new({}))[name] = options[:choices]
-        class_option name, :default => options[:choices].first, :aliases => options[:aliases]
+        description = "The #{caption} component (#{options[:choices].join(', ')})"
+        class_option name, :default => options[:choices].first, :aliases => options[:aliases], :desc => description
       end
 
       # Returns the compiled list of component types which can be specified

data/generators/skeleton_generator.rb

@@ -6,21 +6,24 @@ module SinatraMore
   class SkeletonGenerator < Thor::Group
     # Define the source template root
     def self.source_root; File.dirname(__FILE__); end
+    def self.banner; "sinatra_gen [app_name] [path] [options]"; end
 
     # Include related modules
     include Thor::Actions
     include SinatraMore::GeneratorActions
     include SinatraMore::ComponentActions
+    
+    desc "Description:\n\n\tsinatra_gen is the sinatra_more generators which generate or build on Sinatra applications."
 
     argument :name, :desc => "The name of your sinatra app"
     argument :path, :desc => "The path to create your app"
 
     # Definitions for the available customizable components
-    component_option :orm,      "Database engine",    :aliases => '-d', :choices => [:sequel, :datamapper, :mongomapper, :activerecord]
-    component_option :test,     "Testing framework",  :aliases => '-t', :choices => [:bacon, :shoulda, :rspec, :testspec, :riot]
-    component_option :mock,     "Mocking library",    :aliases => '-m', :choices => [:mocha, :rr]
-    component_option :script,   "Javascript library", :aliases => '-s', :choices => [:jquery, :prototype, :rightjs]
-    component_option :renderer, "Template Engine",    :aliases => '-r', :choices => [:erb, :haml]
+    component_option :orm,      "database engine",    :aliases => '-d', :choices => [:sequel, :datamapper, :mongomapper, :activerecord]
+    component_option :test,     "testing framework",  :aliases => '-t', :choices => [:bacon, :shoulda, :rspec, :testspec, :riot]
+    component_option :mock,     "mocking library",    :aliases => '-m', :choices => [:mocha, :rr]
+    component_option :script,   "javascript library", :aliases => '-s', :choices => [:jquery, :prototype, :rightjs]
+    component_option :renderer, "template engine",    :aliases => '-r', :choices => [:erb, :haml]
 
     # Copies over the base sinatra starting application
     def setup_skeleton

data/sinatra_more.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_more}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Esquenazi"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_more
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Nathan Esquenazi