padrino-gen 0.9.14 → 0.9.15

data/lib/padrino-gen/generators/components/orms/ohm.rb

@@ -0,0 +1,72 @@
+OHM = (<<-OHM) unless defined?(OHM)
+# Ohm does not have the concept of namespaces
+# This means that you will not be able to have
+# a distinct test,development or production database
+#
+# You can, however, run multiple redis servers on the same host
+# and point to them based on the environment:
+#
+# case Padrino.env
+#  when :development then Ohm.connect(:port => 6379)
+#  when :production then Ohm.connect(:port => 6380)
+#  when :test then Ohm.connect(:port => 6381)
+# end
+
+# Alternatively, you can try specifying a difference :db
+# which, outside of confirmation, appears to provide distinct
+# namespaces from testing
+# case Padrino.env
+#  when :development then Ohm.connect(:db => 0)
+#  when :production then Ohm.connect(:db => 1)
+#  when :test then Ohm.connect(:db => 2)
+# end
+OHM
+
+def setup_orm
+  ohm = OHM
+  require_dependencies 'json'
+  require_dependencies 'ohm', :require => 'ohm'
+  require_dependencies 'ohm-contrib', :require => 'ohm/contrib'
+  create_file("config/database.rb", ohm)
+  empty_directory('app/models')
+end
+
+OHM_MODEL = (<<-MODEL) unless defined?(OHM_MODEL)
+class !NAME! < Ohm::Model
+  include Ohm::Timestamping
+  include Ohm::Typecast
+
+  # Examples:
+  # attribute :name
+  # attribute :email, String 
+  # reference :venue, Venue
+  # set :participants, Person
+  # counter :votes
+  #
+  # index :name
+  #
+  # def validate
+  #   assert_present :name
+  # end
+
+  !FIELDS!
+end
+MODEL
+
+# options => { :fields => ["title:string", "body:string"], :app => 'app' }
+def create_model_file(name, options={})
+    model_path = destination_root(options[:app], 'models', "#{name.to_s.underscore}.rb")
+    field_tuples = options[:fields].collect { |value| value.split(":") }
+    column_declarations = field_tuples.collect { |field, kind| "attribute :#{field}, #{kind.camelize}" }.join("\n  ")
+    model_contents = OHM_MODEL.gsub(/!NAME!/, name.to_s.camelize)
+    model_contents.gsub!(/!FIELDS!/, column_declarations)
+    create_file(model_path, model_contents)
+end
+
+def create_model_migration(filename, name, fields)
+  # NO MIGRATION NEEDED
+end
+
+def create_migration_file(migration_name, name, columns)
+  # NO MIGRATION NEEDED
+end

data/lib/padrino-gen/generators/components/orms/sequel.rb

@@ -10,22 +10,23 @@ SEQUEL
 
 def setup_orm
   sequel = SEQUEL
-  require_dependencies 'sequel'  
+  db = @app_name.underscore
+  require_dependencies 'sequel'
   require_dependencies case options[:adapter]
   when 'mysql'
-    sequel.gsub!(/!DB_DEVELOPMENT!/, "\"mysql://localhost/#{name}_development\"")
-    sequel.gsub!(/!DB_PRODUCTION!/, "\"mysql://localhost/#{name}_production\"")
-    sequel.gsub!(/!DB_TEST!/,"\"mysql://localhost/#{name}_test\"")
+    sequel.gsub!(/!DB_DEVELOPMENT!/, "\"mysql://localhost/#{db}_development\"")
+    sequel.gsub!(/!DB_PRODUCTION!/, "\"mysql://localhost/#{db}_production\"")
+    sequel.gsub!(/!DB_TEST!/,"\"mysql://localhost/#{db}_test\"")
     'mysql'
   when 'postgres'
-    sequel.gsub!(/!DB_DEVELOPMENT!/, "\"postgres://localhost/#{name}_development\"")
-    sequel.gsub!(/!DB_PRODUCTION!/, "\"postgres://localhost/#{name}_production\"")
-    sequel.gsub!(/!DB_TEST!/,"\"postgres://localhost/#{name}_test\"")
+    sequel.gsub!(/!DB_DEVELOPMENT!/, "\"postgres://localhost/#{db}_development\"")
+    sequel.gsub!(/!DB_PRODUCTION!/, "\"postgres://localhost/#{db}_production\"")
+    sequel.gsub!(/!DB_TEST!/,"\"postgres://localhost/#{db}_test\"")
     'pg'
   else
-    sequel.gsub!(/!DB_DEVELOPMENT!/,"\"sqlite://\" + Padrino.root('db', \"#{name}_development.db\")")
-    sequel.gsub!(/!DB_PRODUCTION!/,"\"sqlite://\" + Padrino.root('db', \"#{name}_production.db\")")
-    sequel.gsub!(/!DB_TEST!/,"\"sqlite://\" + Padrino.root('db', \"#{name}_test.db\")")
+    sequel.gsub!(/!DB_DEVELOPMENT!/,"\"sqlite://\" + Padrino.root('db', \"#{db}_development.db\")")
+    sequel.gsub!(/!DB_PRODUCTION!/,"\"sqlite://\" + Padrino.root('db', \"#{db}_production.db\")")
+    sequel.gsub!(/!DB_TEST!/,"\"sqlite://\" + Padrino.root('db', \"#{db}_test.db\")")
     'sqlite3-ruby'
   end
   create_file("config/database.rb", sequel)
@@ -87,4 +88,4 @@ def create_migration_file(migration_name, name, columns)
     :add => Proc.new { |field, kind| "add_column :#{field}, #{kind.camelize}"  },
     :remove => Proc.new { |field, kind| "drop_column :#{field}" }
   )
-end
+end

data/lib/padrino-gen/generators/components/renderers/erubis.rb

@@ -0,0 +1,3 @@
+def setup_renderer
+    require_dependencies 'erubis'
+end

data/lib/padrino-gen/generators/components/renderers/liquid.rb

@@ -0,0 +1,4 @@
+def setup_renderer
+  require_dependencies 'liquid', :version => "= 2.1.2"
+  require_dependencies 'liquify'
+end

data/lib/padrino-gen/generators/components/stylesheets/compass.rb

@@ -6,7 +6,7 @@ COMPASS_INIT = (<<-COMPASS).gsub(/^ {10}/, '') unless defined?(COMPASS_INIT)
 module CompassInitializer
   def self.registered(app)
     require 'sass/plugin/rack'
-    
+
     Compass.configuration do |config|
       config.project_path = Padrino.root
       config.sass_dir = "app/stylesheets"
@@ -17,10 +17,10 @@ module CompassInitializer
       config.javascripts_dir = "public/javascripts"
       config.output_style = :compressed
     end
-    
+
     Compass.configure_sass_plugin!
     Compass.handle_configuration_change!
-    
+
     app.use Sass::Plugin::Rack
   end
 end

data/lib/padrino-gen/generators/components/stylesheets/compass/application.scss

@@ -29,7 +29,7 @@ body.bp {
 }
 
 form.bp {
-  @include blueprint-form; 
+  @include blueprint-form;
 }
 
 .two-col {

data/lib/padrino-gen/generators/components/stylesheets/less.rb

@@ -1,33 +1,22 @@
-LESS_INIT = (<<-LESS).gsub(/^ {10}/, '') unless defined?(LESS_INIT)
+LESS_INIT = (<<-LESS).gsub(/^ {6}/, '')
 # Enables support for Less template reloading for rack.
 # Store Less files by default within 'app/stylesheets/'
 # See http://github.com/kelredd/rack-less for more details.
-
-module LessInitializer
-  def self.registered(app)
-    require 'rack/less'
-    # optional - use as necessary
-    Rack::Less.configure do |config|
-      config.compress = true
-      # other configs ...
-    end
-    app.use Rack::Less,
-    :root      => app.root,
-    :source    => 'stylesheets/',
-    :public    => 'public/',
-    :hosted_at => '/stylesheets'
-  end
+require 'rack/less'
+# optional - use as necessary
+Rack::Less.configure do |config|
+  config.compress = true
+  # other configs ...
 end
-
+app.use Rack::Less,
+:root      => app.root,
+:source    => 'stylesheets/',
+:public    => 'public/',
+:hosted_at => '/stylesheets'
 LESS
 
-LESS_REGISTER = (<<-LESSR).gsub(/^ {10}/, '') unless defined?(LESS_REGISTER)
-  register LessInitializer\n
-LESSR
-
 def setup_stylesheet
   require_dependencies 'less', 'rack-less'
-  create_file destination_root('/lib/less_plugin.rb'), LESS_INIT
-  inject_into_file destination_root('/app/app.rb'), LESS_REGISTER, :after => "register Padrino::Helpers\n"
+  initializer :less, LESS_INIT
   empty_directory destination_root('/app/stylesheets')
 end

data/lib/padrino-gen/generators/components/stylesheets/sass.rb

@@ -1,25 +1,15 @@
-SASS_INIT = (<<-SASS).gsub(/^ {10}/, '') unless defined?(SASS_INIT)
+SASS_INIT = (<<-SASS).gsub(/^ {6}/, '')
 # Enables support for SASS template reloading in rack applications.
 # See http://nex-3.com/posts/88-sass-supports-rack for more details.
 # Store SASS files (by default) within 'app/stylesheets'
-
-module SassInitializer
-  def self.registered(app)
-    require 'sass/plugin/rack'
-    Sass::Plugin.options[:template_location] = Padrino.root("app/stylesheets")
-    Sass::Plugin.options[:css_location] = Padrino.root("public/stylesheets")
-    app.use Sass::Plugin::Rack
-  end
-end
+require 'sass/plugin/rack'
+Sass::Plugin.options[:template_location] = Padrino.root("app/stylesheets")
+Sass::Plugin.options[:css_location] = Padrino.root("public/stylesheets")
+app.use Sass::Plugin::Rack
 SASS
 
-SASS_REGISTER = (<<-SASSR).gsub(/^ {10}/, '') unless defined?(SASS_REGISTER)
-  register SassInitializer\n
-SASSR
-
 def setup_stylesheet
   require_dependencies 'haml'
-  create_file destination_root('/lib/sass_plugin.rb'), SASS_INIT
-  inject_into_file destination_root('/app/app.rb'), SASS_REGISTER, :after => "register Padrino::Helpers\n"
+  initializer :sass, SASS_INIT
   empty_directory destination_root('/app/stylesheets')
 end

data/lib/padrino-gen/generators/components/stylesheets/scss.rb

@@ -0,0 +1,16 @@
+SCSS_INIT = (<<-SCSS).gsub(/^ {6}/, '')
+# Enables support for SCSS template reloading in rack applications.
+# See http://nex-3.com/posts/88-sass-supports-rack for more details.
+# Store SCSS files (by default) within 'app/stylesheets'
+require 'sass/plugin/rack'
+Sass::Plugin.options[:syntax] = :scss
+Sass::Plugin.options[:template_location] = Padrino.root("app/stylesheets")
+Sass::Plugin.options[:css_location] = Padrino.root("public/stylesheets")
+app.use Sass::Plugin::Rack
+SCSS
+
+def setup_stylesheet
+  require_dependencies 'haml'
+  initializer :scss, SCSS_INIT
+  empty_directory destination_root('/app/stylesheets')
+end

data/lib/padrino-gen/generators/components/tests/riot.rb

@@ -3,35 +3,17 @@ PADRINO_ENV = 'test' unless defined?(PADRINO_ENV)
 require File.expand_path(File.dirname(__FILE__) + "/../config/boot")
 
 # Specify your app using the #app helper inside a context.
-# If you don't specify one, Riot::Rack will recursively look for a config.ru file.
 # Takes either an app class or a block argument.
 # app { Padrino.application }
 # app { CLASS_NAME.tap { |app| } }
 
 class Riot::Situation
   include Rack::Test::Methods
+  ##
+  # You can handle all padrino applications using instead:
+  #   Padrino.application
+  CLASS_NAME.tap { |app|  }
 
-  # The Rack app under test.
-  def app
-    defined?(@app) ? @app : build_app
-  end
-
-  private
-
-  def build_app
-    config_file = File.read(find_config_file)
-    Rack::Builder.new { instance_eval(config_file) }.to_app
-  end
-
-  def find_config_file
-    if Dir.glob("config.ru").length > 0
-      File.join(Dir.pwd,"config.ru")
-    elsif Dir.pwd != "/"
-      Dir.chdir("..") { find_config_file }
-    else
-      raise "Cannot find config.ru"
-    end
-  end
 end
 
 class Riot::Context
@@ -102,4 +84,4 @@ end
 def generate_model_test(name)
   riot_contents = RIOT_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize)
   create_file destination_root("test/models/#{name.to_s.underscore}_test.rb"), riot_contents, :skip => true
-end
+end

data/lib/padrino-gen/generators/controller.rb

@@ -41,7 +41,7 @@ module Padrino
           include_component_module_for(:test)
           generate_controller_test(name) if test?
         else
-          say "You are not at the root of a Padrino application! (config/boot.rb not found)" and return unless in_app_root?
+          say "You are not at the root of a Padrino application! (config/boot.rb not found)"
         end
       end
     end # Controller

data/lib/padrino-gen/generators/mailer.rb

@@ -18,6 +18,7 @@ module Padrino
       desc "Description:\n\n\tpadrino-gen mailer generates a new Padrino mailer"
 
       argument :name, :desc => "The name of your padrino mailer"
+      argument :actions, :desc => "The delivery actions to add to your mailer", :type => :array, :default => []
       class_option :root, :desc => "The root destination", :aliases => '-r', :default => ".", :type => :string
       class_option :app, :desc => "The application destination path", :aliases => '-a', :default => "/app", :type => :string
       class_option :destroy, :aliases => '-d', :default => false, :type => :boolean
@@ -32,12 +33,13 @@ module Padrino
           check_app_existence(app)
           self.behavior = :revoke if options[:destroy]
           @app_name = fetch_app_name(app)
+          @actions = actions.map{|a| a.to_sym}
           @short_name = name.to_s.gsub(/mailer/i, '').underscore.downcase
           @mailer_basename = @short_name.underscore
           template "templates/mailer.rb.tt", destination_root(app, "mailers", "#{@mailer_basename}.rb")
           empty_directory destination_root(app, 'views', 'mailers', @mailer_basename)
         else
-          say "You are not at the root of a Padrino application! (config/boot.rb not found)" and return unless in_app_root?
+          say "You are not at the root of a Padrino application! (config/boot.rb not found)"
         end
       end
     end # Mailer

data/lib/padrino-gen/generators/migration.rb

@@ -36,7 +36,7 @@ module Padrino
             raise SystemExit
           end
         else
-          say "You are not at the root of a Padrino application! (config/boot.rb not found)" and return unless in_app_root?
+          say "You are not at the root of a Padrino application! (config/boot.rb not found)"
         end
       end
     end # Migration

data/lib/padrino-gen/generators/model.rb

@@ -48,7 +48,7 @@ module Padrino
           generate_model_test(name) if test?
           create_model_migration(migration_name, name, fields) unless options[:skip_migration]
         else
-          say "You are not at the root of a Padrino application! (config/boot.rb not found)" and return unless in_app_root?
+          say "You are not at the root of a Padrino application! (config/boot.rb not found)"
         end
       end
     end # Model

data/lib/padrino-gen/generators/plugin.rb

@@ -0,0 +1,47 @@
+require 'padrino-core/cli/base' unless defined?(Padrino::Cli::Base)
+
+module Padrino
+  module Generators
+    class Plugin < Thor::Group
+      PLUGIN_URL = 'http://github.com/padrino/padrino-recipes/tree/master/plugins'
+      # Add this generator to our padrino-gen
+      Padrino::Generators.add_generator(:plugin, self)
+
+      # Define the source plugin root
+      def self.source_root; File.expand_path(File.dirname(__FILE__)); end
+      def self.banner; "padrino-gen plugin [plugin_identifier] [options]"; end
+
+      # Include related modules
+      include Thor::Actions
+      include Padrino::Generators::Actions
+      include Padrino::Generators::Runner
+
+      desc "Description:\n\n\tpadrino-gen plugin sets up a plugin within a Padrino application"
+
+      argument :plugin_file, :desc => "The name or path to the Padrino plugin", :optional => true
+
+      class_option :root, :desc => "The root destination", :aliases => '-r', :default => ".",   :type => :string
+      class_option :list, :desc => "list available plugins", :aliases => '-l', :default => false, :type => :boolean
+      class_option :destroy, :aliases => '-d', :default => false, :type => :boolean
+      # Show help if no argv given
+      require_arguments!
+
+      # Create the Padrino Plugin
+      def setup_plugin
+        if options[:list] # list method ran here
+          plugins = open(PLUGIN_URL).read.scan(%r{/plugins/(\w+)_plugin.rb}).uniq
+          say "Available plugins:", :green
+          say plugins.map { |plugin| "  - #{plugin}" }.join("\n")
+        else # executing the plugin instructions
+          if in_app_root?
+            self.behavior = :revoke if options[:destroy]
+            self.destination_root = options[:root]
+            execute_runner(:plugin, plugin_file)
+          else
+            say "You are not at the root of a Padrino application! (config/boot.rb not found)"
+          end
+        end
+      end
+    end # Plugins
+  end # Generators
+end # Padrino

data/lib/padrino-gen/generators/project.rb

@@ -14,26 +14,28 @@ module Padrino
       # Include related modules
       include Thor::Actions
       include Padrino::Generators::Actions
+      include Padrino::Generators::Runner
       include Padrino::Generators::Components::Actions
 
       desc "Description:\n\n\tpadrino-gen project generates a new Padrino project"
 
       argument :name, :desc => "The name of your padrino project"
 
-      class_option :app ,         :desc => "The application name",                                    :aliases => '-n', :default => nil,      :type => :string
-      class_option :run_bundle,   :desc => "Run bundle install",                                      :aliases => '-b', :default => false,    :type => :boolean
-      class_option :root,         :desc => "The root destination",                                    :aliases => '-r', :default => ".",      :type => :string
-      class_option :dev,          :desc => "Use padrino from a git checkout",                                           :default => false,    :type => :boolean
-      class_option :tiny,         :desc => "Generate tiny app skeleton",                              :aliases => '-i', :default => false,    :type => :boolean
-      class_option :adapter,      :desc => "SQL adapter for ORM (sqlite, mysql, postgres)",           :aliases => '-a', :default => "sqlite", :type => :string
+      class_option :app ,         :desc => "The application name",                          :aliases => '-n', :default => nil,      :type => :string
+      class_option :bundle,       :desc => "Run bundle install",                            :aliases => '-b', :default => false,    :type => :boolean
+      class_option :root,         :desc => "The root destination",                          :aliases => '-r', :default => ".",      :type => :string
+      class_option :dev,          :desc => "Use padrino from a git checkout",                                 :default => false,    :type => :boolean
+      class_option :tiny,         :desc => "Generate tiny app skeleton",                    :aliases => '-i', :default => false,    :type => :boolean
+      class_option :adapter,      :desc => "SQL adapter for ORM (sqlite, mysql, postgres)", :aliases => '-a', :default => "sqlite", :type => :string
+      class_option :template,     :desc => "Generate project from template",                :aliases => '-p', :default => nil,      :type => :string
 
       # Definitions for the available customizable components
-      component_option :orm,        "database engine",    :aliases => '-d', :choices => [:activerecord, :datamapper, :mongomapper, :mongoid, :sequel, :couchrest], :default => :none
+      component_option :orm,        "database engine",    :aliases => '-d', :choices => [:activerecord, :datamapper, :mongomapper, :mongoid, :sequel, :couchrest, :ohm, :mongomatic], :default => :none
       component_option :test,       "testing framework",  :aliases => '-t', :choices => [:rspec, :shoulda, :cucumber, :bacon, :testspec, :riot], :default => :none
       component_option :mock,       "mocking library",    :aliases => '-m', :choices => [:mocha, :rr], :default => :none
       component_option :script,     "javascript library", :aliases => '-s', :choices => [:jquery, :prototype, :rightjs, :mootools, :extcore, :dojo], :default => :none
-      component_option :renderer,   "template engine",    :aliases => '-e', :choices => [:haml, :erb], :default => :haml
-      component_option :stylesheet, "stylesheet engine",  :aliases => '-c', :choices => [:less, :sass, :compass], :default => :none
+      component_option :renderer,   "template engine",    :aliases => '-e', :choices => [:haml, :erb, :erubis, :liquid], :default => :haml
+      component_option :stylesheet, "stylesheet engine",  :aliases => '-c', :choices => [:less, :sass, :compass, :scss], :default => :none
 
       # Show help if no argv given
       require_arguments!
@@ -42,44 +44,59 @@ module Padrino
       def setup_project
         @app_name = (options[:app] || name).gsub(/\W/, "_").underscore.camelize
         self.destination_root = File.join(options[:root], name)
-        directory("project/", destination_root)
-        app_skeleton('app', options[:tiny])
-        store_component_config('.components')
-        template "templates/Gemfile.tt", destination_root("Gemfile")
+        if options[:template] # Run the template to create project
+          execute_runner(:template, options[:template])
+        else # generate project without template
+          directory("project/", destination_root)
+          app_skeleton('app', options[:tiny])
+          store_component_config('.components')
+          template "templates/Gemfile.tt", destination_root("Gemfile")
+        end
       end
 
       # For each component, retrieve a valid choice and then execute the associated generator
       def setup_components
+        return if options[:template]
+        @_components = options.dup.slice(*self.class.component_types)
         self.class.component_types.each do |comp|
-          choice = resolve_valid_choice(comp)
+          choice = @_components[comp] = resolve_valid_choice(comp)
           execute_component_setup(comp, choice)
         end
+        store_component_config('.components')
       end
 
       # Bundle all required components using bundler and Gemfile
       def bundle_dependencies
-        if options[:run_bundle]
-          say "Bundling application dependencies using bundler...", :yellow
-          in_root { run 'bundle install' }
+        if options[:bundle]
+          run_bundler
         end
       end
 
       # Finish message
-      def finish
-        unless options[:run_bundle]
-          say (<<-TEXT).gsub(/ {10}/,'')
+      def finish_message
+        if options[:bundle]
+          text = (<<-TEXT).gsub(/ {10}/,'')
 
           =================================================================
           #{name} is ready for development! Next, follow these steps:
           =================================================================
           1) cd #{name}
-          2) bundle install
           =================================================================
 
           TEXT
         else
-          say "Project '#{name}' has been generated and all dependencies bundled!"
+          text = (<<-TEXT).gsub(/ {10}/,'')
+
+          =================================================================
+          #{name} is ready for development! Next, follow these steps:
+          =================================================================
+          1) cd #{name}
+          2) bundle install
+          =================================================================
+
+          TEXT
         end
+        say(text)
       end
     end # Project
   end # Generators