padrino-gen 0.16.2 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f23d1c3fcf2f3fb73ac268383f3ad934b9cb3a19044fb26e5a1768fb0057034
-  data.tar.gz: 3f8c4eed5f141cdcff42e93236666fe67765ed906a1eeee3e4d77181b4b6a472
+  metadata.gz: e4f2cbd5e5e7dbfaa0374bb83fad39536738fa404938ba59aa1296c65797a20c
+  data.tar.gz: b10595d8cc86921a9c6682cfa633ecacbf9df607925903270ee57c67ca4e2d4e
 SHA512:
-  metadata.gz: 123166a6d9ef6c9c27d0b12d464380a53ec631e1ac06379f7a6685d6710d834f56f63cb5f044747186d82359aea9370caa45b29e52fd514d6eb82d5794c91270
-  data.tar.gz: 0c9b6c6c90a123b81afdd15311ceba558afd10519506aa416abcddb52c83e0146338946d79a8ba5651f93e23d2d59c593e50d25cdf4e696fd73e3809e165aba4
+  metadata.gz: 513c6bfd2e9d9b8dde54280fd54fe33fb9f675fb213d14d3a14367f93ceaaf3395d060be2f42655fedeee875b0e0de2721caadcbba0ffffa7ede97e2f7bf50a5
+  data.tar.gz: ddef4dd75dbe398a17faec64813e8d5f798969770148d9a9595aa327748db9ab603b2a49633ee7d74040d5d96b86acaddc69630fd561b39a9a8ede6cf302643c

data/README.rdoc

@@ -30,7 +30,7 @@ setup performed for the default components.
 
 You can define specific components to be used:
 
-  $ padrino-gen project demo_project -t rspec -r haml -m rr -s jquery -d datamapper
+  $ padrino-gen project demo_project -t rspec -r haml -m rr -s jquery -d sequel
 
 You can also instruct the generator to skip a certain component to avoid using one at all (or to use your own):
 
@@ -40,10 +40,10 @@ The available components and their default options are listed below:
 
 test::       none  (default), bacon, shoulda, cucumber, rspec, minitest, testunit
 renderer::   none  (default), slim, erb, erubis, liquid, haml
-stylesheet:: none  (default), less, compass, sass, scss
+stylesheet:: none  (default), tailwind, less, sass, scss
 mock::       none  (default), mocha, rr
-script::     none  (default), jquery, prototype, mootools, extcore, dojo
-orm::        none  (default), datamapper, mongomapper, mongoid, activerecord, minirecord, sequel, couchrest, ohm, mongomatic, ripple, dynamoid
+script::     none  (default), jquery, prototype, mootools, dojo, vite
+orm::        none  (default), mongoid, activerecord, minirecord, sequel, ohm, dynamoid
 
 In addition, you can generate projects based on existing templates:
 
@@ -56,9 +56,9 @@ To learn more about the project generator, check out the guide to
 
 Padrino provides support for plugins to be executed within your application. For example:
 
-  $ padrino-gen plugin hoptoad
+  $ padrino-gen plugin bulma
 
-would install the hoptoad middleware into your application automatically.
+would download the Bulma stylesheet into your application's public/stylesheets.
 
 To learn more about the plugin system, check out the guide to
 {Padrino Generators}[http://padrinorb.com/guides/generators/plugins/].

data/lib/padrino-gen/command.rb

@@ -13,6 +13,6 @@ module Padrino
   #
   def self.bin_gen(*args)
     @_padrino_gen_bin ||= [Padrino.ruby_command, File.expand_path('../../bin/padrino-gen', __dir__)]
-    system(*@_padrino_gen_bin, *args)
+    system(*@_padrino_gen_bin, *args.map { |arg| arg.is_a?(Symbol) ? arg.to_s : arg })
   end
 end

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

@@ -61,7 +61,7 @@ module Padrino
         path = File.expand_path(__dir__ + "/components/#{component.to_s.pluralize}/#{choice}.rb")
         say_status :apply, "#{component.to_s.pluralize}/#{choice}"
         shell.padding += 1
-        instance_eval(File.read(path))
+        instance_eval(File.read(path, encoding: 'UTF-8'))
         shell.padding -= 1
       end
 
@@ -152,11 +152,35 @@ module Padrino
         choice = options[component]
         until valid_choice?(component, choice)
           say("Option for --#{component} '#{choice}' is not available.", :red)
-          choice = ask("Please enter a valid option for #{component}:", limited_to: choices)
+          choice = ask_valid_option(component, choices, "Please enter a valid option for #{component}:")
         end
         choice
       end
 
+      ##
+      # Asks once for one of the valid choices of an option; callers re-ask while the answer is invalid.
+      # Thor's limited_to: would repeat the prompt forever at the end of input (no terminal, empty pipe),
+      # so that case raises instead.
+      #
+      # @param [Symbol] option
+      #   The name of the option.
+      # @param [Array<String>] choices
+      #   The valid choices for the option.
+      # @param [String] statement
+      #   The prompt to show.
+      #
+      # @return [String] The answer entered.
+      #
+      # @example
+      #   ask_valid_option(:adapter, %w[mysql sqlite], 'Please, choose a proper adapter:')
+      #
+      def ask_valid_option(option, choices, statement)
+        answer = ask("#{statement} [#{choices.join(', ')}]")
+        raise "No input left to choose a valid --#{option}; pass one of: #{choices.join(', ')}" if answer.nil?
+
+        answer
+      end
+
       ##
       # Returns true if the option passed is a valid choice for component.
       #
@@ -215,6 +239,14 @@ module Padrino
         File.exist?(destination_root('config/boot.rb'))
       end
 
+      ##
+      # Says that the generator must run at the root of a Padrino application and exits with status 1.
+      #
+      def exit_outside_app_root!
+        say 'You are not at the root of a Padrino application! (config/boot.rb not found)'
+        exit 1
+      end
+
       ##
       # Returns true if constant name already exists.
       #
@@ -315,6 +347,18 @@ module Padrino
         gem_names.reverse_each { |lib| insert_into_gemfile(lib, options) }
       end
 
+      ##
+      # Returns true if the project runs on Falcon, which serves each request in
+      # a fiber. Uses the --server option when generating a project, and the
+      # project's Gemfile when adding a component later.
+      #
+      def falcon_server?
+        return options[:server] == 'falcon' if options[:server]
+
+        gemfile = destination_root('Gemfile')
+        File.exist?(gemfile) && File.read(gemfile).match?(/^\s*gem ['"]falcon['"]/)
+      end
+
       ##
       # Inserts a required gem into the Gemfile to add the bundler dependency.
       #
@@ -347,7 +391,7 @@ module Padrino
       #   method hook to call from Padrino, i.e :after_load, :before_load.
       #
       # @example
-      #   insert_hook("DataMapper.finalize", :after_load)
+      #   insert_hook("SomeORM.finalize", :after_load)
       #
       def insert_hook(include_text, where)
         inject_into_file('config/boot.rb', "  #{include_text}\n", after: "Padrino.#{where} do\n")
@@ -436,11 +480,44 @@ module Padrino
       #
       def run_bundler
         say 'Bundling application dependencies using bundler...', :yellow
-        in_root { run 'bundle install --binstubs' }
+        in_root do
+          with_project_bundle_env do
+            run 'bundle install'
+            run 'bundle binstubs --all'
+          end
+        end
       end
 
+      # The variables Bundler sets up for its children (Bundler::EnvironmentPreserver::BUNDLER_KEYS).
+      BUNDLER_ENV_KEYS = %w[BUNDLE_BIN_PATH BUNDLE_GEMFILE BUNDLE_LOCKFILE BUNDLER_VERSION BUNDLER_SETUP GEM_HOME
+                            GEM_PATH MANPATH PATH RB_USER_INSTALL RUBYLIB RUBYOPT].freeze
+
       ##
-      # Raise SystemExit if the app does not exist.
+      # Runs the block with the environment for a command run on the project: the project's Gemfile
+      # and lockfile, and none of the Bundler setup (RUBYOPT=-rbundler/setup, BUNDLE_GEMFILE...) that a
+      # caller's `bundle exec` or binstub exported. Other variables are passed on as they are. With
+      # +setup+, the command loads the project's bundle first, as `bundle exec` would in the project.
+      #
+      # @param [Boolean] setup
+      #   Whether the command requires bundler/setup.
+      #
+      def with_project_bundle_env(setup: false)
+        saved = ENV.to_h
+        if defined?(Bundler) && Bundler.respond_to?(:original_env)
+          original = Bundler.original_env
+          BUNDLER_ENV_KEYS.each { |key| original.key?(key) ? ENV[key] = original[key] : ENV.delete(key) }
+          ENV.keys.grep(/\ABUNDLER_ORIG_/).each { |key| ENV.delete(key) }
+        end
+        ENV['BUNDLE_GEMFILE'] = destination_root('Gemfile')
+        ENV['BUNDLE_LOCKFILE'] = destination_root('Gemfile.lock')
+        ENV['RUBYOPT'] = ['-rbundler/setup', ENV['RUBYOPT']].compact.join(' ') if setup
+        yield
+      ensure
+        ENV.replace(saved) if saved
+      end
+
+      ##
+      # Exits with status 1 if the app does not exist.
       #
       # @param [String] app
       #   Directory name of application.
@@ -456,7 +533,7 @@ module Padrino
         say "Unable to locate '#{app.underscore.camelize}' application        "
         say '================================================================='
         say
-        raise SystemExit
+        exit 1
       end
 
       ##
@@ -598,6 +675,13 @@ module Padrino
           @require_arguments
         end
 
+        ##
+        # Tells Thor to exit with status 1 when it rejects the arguments, e.g. a missing required argument.
+        #
+        def exit_on_failure?
+          true
+        end
+
         ##
         # Returns the compiled list of component types which can be specified.
         #

data/lib/padrino-gen/generators/app/app.rb.tt

@@ -4,7 +4,8 @@ module <%= @project_name %>
     register Padrino::Mailer
     register Padrino::Helpers
 <% end -%>
-    enable :sessions
+    set :sessions, same_site: :lax
+    # set :sessions, same_site: :lax, secure: true # Send the session cookie over HTTPS only
 
     ##
     # Caching support.

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

@@ -43,7 +43,7 @@ module Padrino
             elsif !options[:force]
               say "#{@app_name} already exists."
               say 'Please, change the name.'
-              return
+              exit 1
             end
           end
 
@@ -67,7 +67,7 @@ module Padrino
           say "This application has been mounted to /#{@app_name.downcase}"
           say "You can configure a different path by editing 'config/apps.rb'"
         else
-          say 'You are not at the root of a Padrino application! (config/boot.rb not found)'
+          exit_outside_app_root!
         end
       end
     end

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

@@ -17,6 +17,7 @@ module Padrino
       # custom generators, so is necessary know who are.
       #
       def load_boot
+        saved_env = { 'BUNDLE_GEMFILE' => ENV['BUNDLE_GEMFILE'], 'PADRINO_LOG_LEVEL' => ENV['PADRINO_LOG_LEVEL'] }
         ENV['PADRINO_LOG_LEVEL'] ||= 'test'
         ENV['BUNDLE_GEMFILE'] = File.join(options[:root], 'Gemfile') if options[:root]
         boot = options[:root] ? File.join(options[:root], 'config/boot.rb') : 'config/boot.rb'
@@ -29,8 +30,7 @@ module Padrino
         puts "=> Problem loading #{boot}"
         puts ["=> #{e.message}", *e.backtrace].join("\n  ")
       ensure
-        ENV.delete('BUNDLE_GEMFILE')
-        ENV.delete('PADRINO_LOG_LEVEL')
+        ENV.update(saved_env) # restores the caller's values, or removes the ones it didn't have
       end
 
       ##
@@ -43,10 +43,14 @@ module Padrino
         generator_class = Padrino::Generators.mappings[generator_kind]
 
         if generator_class
-          args = ARGV.empty? && generator_class.require_arguments? ? ['-h'] : ARGV
-          generator_class.start(args)
+          if ARGV.empty? && generator_class.require_arguments?
+            generator_class.start(['-h'])
+            exit 1
+          end
+          generator_class.start(ARGV)
         else
           puts "Please specify generator to use (#{Padrino::Generators.mappings.keys.join(', ')})"
+          exit 1 unless generator_kind == :help
         end
       end
     end

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

@@ -41,6 +41,7 @@ module Padrino
             exit
           end
 
+          missing_app = false
           self.class.component_types.each do |comp|
             next if @_components[comp].empty?
 
@@ -53,6 +54,7 @@ module Padrino
             if comp.to_s == 'test' && !already_exists?(@app_name, @project_name)
               say "#{@project_name}::#{@app_name} does not exist."
               say 'Please, change app name.'
+              missing_app = true
               next
             end
 
@@ -63,8 +65,9 @@ module Padrino
               inject_into_file destination_root('Rakefile'), "PadrinoTasks.use(#{choice.to_sym.inspect})\n", before: 'PadrinoTasks.init'
             end
           end
+          exit 1 if missing_app
         else
-          say 'You are not at the root of a Padrino application! (config/boot.rb not found)'
+          exit_outside_app_root!
         end
       end
     end

data/lib/padrino-gen/generators/components/actions.rb

@@ -28,8 +28,8 @@ module Padrino
             return if migration_exist?(filename)
             model_name = name.to_s.pluralize
             field_tuples = columns.map { |value| value.split(':') }
-            field_tuples.map! { |field, kind| kind =~ /datetime/i ? [field, 'DateTime'] : [field, kind] }
-            column_declarations = field_tuples.map(&options[:column_format]).join("\n      ")
+            field_tuples.map! { |field, kind, index| [field, kind =~ /datetime/i ? 'DateTime' : kind, index] }
+            column_declarations = field_tuples.flat_map(&options[:column_format]).join("\n      ")
             contents = options[:base].dup.gsub(/\s{4}!UP!\n/m, options[:up]).gsub(/!DOWN!\n/m, options[:down])
             contents = contents.gsub(/!NAME!/, model_name.underscore.camelize).gsub(/!TABLE!/, model_name.underscore)
             contents = contents.gsub(/!FILENAME!/, filename.underscore).gsub(/!FILECLASS!/, filename.underscore.camelize)
@@ -70,9 +70,9 @@ module Padrino
             migration_scan = filename.underscore.camelize.scan(/(Add|Remove).*?(?:(?:To|From).+?)*(?:To|From)((?:To|From)?.*?)$/).flatten
             direction, table_name = migration_scan[0].downcase, migration_scan[1].downcase.pluralize if migration_scan.any?
             tuples = direction ? columns.map { |value| value.split(':') } : []
-            tuples.map! { |field, kind| kind =~ /datetime/i ? [field, 'DateTime'] : [field, kind] }
-            add_columns    = tuples.map(&options[:add]).join("\n      ")
-            remove_columns = tuples.map(&options[:remove]).join("\n      ")
+            tuples.map! { |field, kind, index| [field, kind =~ /datetime/i ? 'DateTime' : kind, index] }
+            add_columns    = tuples.flat_map(&options[:add]).join("\n      ")
+            remove_columns = tuples.flat_map(&options[:remove]).join("\n      ")
             forward_text = change_format.gsub(/!TABLE!/, table_name).gsub(/!COLUMNS!/, add_columns) if tuples.any?
             back_text    = change_format.gsub(/!TABLE!/, table_name).gsub(/!COLUMNS!/, remove_columns) if tuples.any?
             contents = options[:base].dup.gsub(/\s{4}!UP!\n/m,   (direction == 'add' ? forward_text.to_s : back_text.to_s))

data/lib/padrino-gen/generators/components/mocks/mocha.rb

@@ -1,10 +1,19 @@
 def setup_mock
   require_dependencies 'mocha', group: 'test', require: false
 
-  if options[:test].to_s == 'rspec'
+  test = options[:test].to_s
+  test = fetch_component_choice(:test).to_s if test.empty?
+  case test
+  when 'rspec'
     inject_into_file 'spec/spec_helper.rb', "  conf.mock_with :mocha\n", after: "RSpec.configure do |conf|\n"
+  when 'minitest'
+    inject_into_file 'test/test_config.rb', "require 'mocha/minitest'\n", after: "require_relative '../config/boot'\n"
+  when 'testunit'
+    inject_into_file 'test/test_config.rb', "require 'mocha/test_unit'\n", after: "require_relative '../config/boot'\n"
+  when 'shoulda'
+    inject_into_file 'test/test_config.rb', "require 'mocha/test_unit'\n", after: "require \"test/unit\"\n"
   else
-    inject_into_file 'test/test_config.rb', "require 'mocha/api'\n", after: "require_relative '../config/boot')\n"
-    insert_mocking_include 'Mocha::API'
+    say "Mocha is in the Gemfile but not set up for the '#{test}' test component. To use it, require mocha/api " \
+        'and call mocha_setup, mocha_verify and mocha_teardown around each test: https://github.com/freerange/mocha#readme', :yellow
   end
 end

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

@@ -112,7 +112,7 @@ CONNECTION_POOL_MIDDLEWARE = <<~MIDDLEWARE
 MIDDLEWARE
 
 def setup_orm
-  ar = AR
+  ar = AR.dup
   db = @project_name.underscore
 
   begin
@@ -138,15 +138,24 @@ def setup_orm
       ar.sub!(/!DB_TEST!/, SQLITE.sub(/!DB_NAME!/, "Padrino.root('db', '#{db}_test.db')"))
       require_dependencies 'sqlite3'
     else
-      say "Failed to generate `config/database.rb` for ORM adapter `#{options[:adapter]}`", :red
+      say "Failed to generate `config/database.rb` for ORM adapter `#{adapter}`", :red
       raise ArgumentError
     end
   rescue ArgumentError
-    adapter = ask('Please, choose a proper adapter:', limited_to: %w[mysql mysql2 mysql-gem postgres sqlite])
+    adapter = ask_valid_option(:adapter, %w[mysql mysql2 mysql-gem postgres sqlite], 'Please, choose a proper adapter:')
     retry
   end
 
   require_dependencies 'activerecord', require: 'active_record', version: '>= 3.1'
+
+  if falcon_server?
+    ar = <<~FIBER + ar
+      # Falcon serves each request in a fiber, so keep Active Record state per fiber.
+      ActiveSupport::IsolatedExecutionState.isolation_level = :fiber
+
+    FIBER
+  end
+
   create_file('config/database.rb', ar)
   middleware :connection_pool_management, CONNECTION_POOL_MIDDLEWARE
 end
@@ -201,11 +210,33 @@ AR_MODEL_DOWN_MG = <<~MIGRATION unless defined?(AR_MODEL_DOWN_MG)
   drop_table :!TABLE!
 MIGRATION
 
+def ar_reference?(kind)
+  %w[references belongs_to].include?(kind.underscore)
+end
+
+# A third field segment, as in user_id:integer:index or email:string:uniq, adds an index.
+def ar_add_column(field, kind, index)
+  if ar_reference?(kind)
+    index_option = { 'index' => ', index: true', 'uniq' => ', index: { unique: true }' }[index]
+    return "t.#{kind.underscore} :#{field}#{index_option}"
+  end
+
+  columns = ["t.#{kind.underscore.gsub(/_/, '')} :#{field}"]
+  columns << "t.index :#{field}" if index == 'index'
+  columns << "t.index :#{field}, unique: true" if index == 'uniq'
+  columns
+end
+
+# Removing a column also removes its indexes.
+def ar_remove_column(field, kind)
+  ar_reference?(kind) ? "t.remove_references :#{field}" : "t.remove :#{field}"
+end
+
 def create_model_migration(migration_name, name, columns)
   output_model_migration(
     migration_name, name, columns,
     base: AR_MIGRATION,
-    column_format: proc { |field, kind| "t.#{kind.underscore.gsub(/_/, '')} :#{field}" },
+    column_format: proc { |field, kind, index| ar_add_column(field, kind, index) },
     up: AR_MODEL_UP_MG,
     down: AR_MODEL_DOWN_MG
   )
@@ -222,7 +253,7 @@ def create_migration_file(migration_name, name, columns)
     migration_name, name, columns,
     base: AR_MIGRATION,
     change_format: AR_CHANGE_MG,
-    add: proc { |field, kind| "t.#{kind.underscore.gsub(/_/, '')} :#{field}" },
-    remove: proc { |field, _kind| "t.remove :#{field}" }
+    add: proc { |field, kind, index| ar_add_column(field, kind, index) },
+    remove: proc { |field, kind| ar_remove_column(field, kind) }
   )
 end

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

@@ -109,7 +109,7 @@ CONNECTION_POOL_MIDDLEWARE = <<~MIDDLEWARE
 MIDDLEWARE
 
 def setup_orm
-  ar = MR
+  ar = MR.dup
   db = @project_name.underscore
 
   begin
@@ -135,15 +135,24 @@ def setup_orm
       ar.gsub!(/!DB_TEST!/, SQLITE.gsub(/!DB_NAME!/, "Padrino.root('db', '#{db}_test.db')"))
       require_dependencies 'sqlite3'
     else
-      say "Failed to generate `config/database.rb` for ORM adapter `#{options[:adapter]}`", :red
+      say "Failed to generate `config/database.rb` for ORM adapter `#{adapter}`", :red
       raise ArgumentError
     end
   rescue ArgumentError
-    adapter = ask('Please, choose a proper adapter:', limited_to: %w[mysql mysql2 mysql-gem postgres sqlite])
+    adapter = ask_valid_option(:adapter, %w[mysql mysql2 mysql-gem postgres sqlite], 'Please, choose a proper adapter:')
     retry
   end
 
   require_dependencies 'mini_record'
+
+  if falcon_server?
+    ar = <<~FIBER + ar
+      # Falcon serves each request in a fiber, so keep Active Record state per fiber.
+      ActiveSupport::IsolatedExecutionState.isolation_level = :fiber
+
+    FIBER
+  end
+
   create_file('config/database.rb', ar)
   insert_hook('ActiveRecord::Base.auto_upgrade!', :after_load)
   middleware :connection_pool_management, CONNECTION_POOL_MIDDLEWARE

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

@@ -56,7 +56,16 @@ MONGO
 
 def setup_orm
   require_dependencies 'mongoid', version: '>= 3.0.0'
-  create_file('config/database.rb', MONGOID.gsub(/!NAME!/, @project_name.underscore))
+  mongoid = MONGOID.gsub(/!NAME!/, @project_name.underscore)
+  if falcon_server?
+    mongoid = <<~FIBER + mongoid
+      # Falcon serves each request in a fiber, so keep Mongoid state per fiber
+      # (supported by Mongoid 9.1+ on Ruby 3.2+).
+      Mongoid::Config.isolation_level = :fiber if RUBY_VERSION >= '3.2' && Mongoid::Config.respond_to?(:isolation_level=)
+
+    FIBER
+  end
+  create_file('config/database.rb', mongoid)
 end
 
 MONGOID_MODEL = <<~MODEL unless defined?(MONGOID_MODEL)

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

@@ -8,7 +8,7 @@ SEQUEL = <<~SEQUEL unless defined?(SEQUEL)
 SEQUEL
 
 def setup_orm
-  sequel = SEQUEL
+  sequel = SEQUEL.dup
   db = @project_name.underscore
   require_dependencies 'sequel'
 
@@ -35,14 +35,22 @@ def setup_orm
       sequel.gsub!(/!DB_TEST!/,       "\"sqlite://db/#{db}_test.db\"")
       require_dependencies 'sqlite3'
     else
-      say "Failed to generate `config/database.rb` for ORM adapter `#{options[:adapter]}`", :red
+      say "Failed to generate `config/database.rb` for ORM adapter `#{adapter}`", :red
       raise ArgumentError
     end
   rescue ArgumentError
-    adapter = ask('Please, choose a proper adapter:', limited_to: %w[mysql mysql2 mysql-gem postgres sqlite])
+    adapter = ask_valid_option(:adapter, %w[mysql mysql2 mysql-gem postgres sqlite], 'Please, choose a proper adapter:')
     retry
   end
 
+  if falcon_server?
+    sequel = <<~FIBER + sequel
+      # Falcon serves each request in a fiber, so give each fiber its own connection.
+      Sequel.extension :fiber_concurrency
+
+    FIBER
+  end
+
   create_file('config/database.rb', sequel)
   empty_directory('db/migrate')
 end

data/lib/padrino-gen/generators/components/scripts/dojo.rb

@@ -1,7 +1,7 @@
 def setup_script
   begin
-    get('https://raw.github.com/padrino/padrino-static/master/js/dojo.js',  destination_root('/public/javascripts/dojo.js'))
-    get('https://raw.github.com/padrino/padrino-static/master/ujs/dojo.js', destination_root('/public/javascripts/dojo-ujs.js'))
+    get('https://raw.githubusercontent.com/padrino/padrino-static/master/js/dojo.js',  destination_root('/public/javascripts/dojo.js'))
+    get('https://raw.githubusercontent.com/padrino/padrino-static/master/ujs/dojo.js', destination_root('/public/javascripts/dojo-ujs.js'))
   rescue StandardError
     copy_file('templates/static/js/dojo.js',  destination_root('/public/javascripts/dojo.js'))
     copy_file('templates/static/ujs/dojo.js', destination_root('/public/javascripts/dojo-ujs.js'))

data/lib/padrino-gen/generators/components/scripts/jquery.rb

@@ -1,7 +1,7 @@
 def setup_script
   begin
-    get('https://raw.github.com/padrino/padrino-static/master/js/jquery.js',  destination_root('/public/javascripts/jquery.js'))
-    get('https://raw.github.com/padrino/padrino-static/master/ujs/jquery.js', destination_root('/public/javascripts/jquery-ujs.js'))
+    get('https://raw.githubusercontent.com/padrino/padrino-static/master/js/jquery.js',  destination_root('/public/javascripts/jquery.js'))
+    get('https://raw.githubusercontent.com/padrino/padrino-static/master/ujs/jquery.js', destination_root('/public/javascripts/jquery-ujs.js'))
   rescue StandardError
     copy_file('templates/static/js/jquery.js',  destination_root('/public/javascripts/jquery.js'))
     copy_file('templates/static/ujs/jquery.js', destination_root('/public/javascripts/jquery-ujs.js'))

data/lib/padrino-gen/generators/components/scripts/mootools.rb

@@ -1,7 +1,7 @@
 def setup_script
   begin
-    get('https://raw.github.com/padrino/padrino-static/master/js/mootools.js',  destination_root('/public/javascripts/mootools.js'))
-    get('https://raw.github.com/padrino/padrino-static/master/ujs/mootools.js', destination_root('/public/javascripts/mootools-ujs.js'))
+    get('https://raw.githubusercontent.com/padrino/padrino-static/master/js/mootools.js',  destination_root('/public/javascripts/mootools.js'))
+    get('https://raw.githubusercontent.com/padrino/padrino-static/master/ujs/mootools.js', destination_root('/public/javascripts/mootools-ujs.js'))
   rescue StandardError
     copy_file('templates/static/js/mootools.js',  destination_root('/public/javascripts/mootools.js'))
     copy_file('templates/static/ujs/mootools.js', destination_root('/public/javascripts/mootools-ujs.js'))

data/lib/padrino-gen/generators/components/scripts/prototype.rb

@@ -1,8 +1,8 @@
 def setup_script
   begin
-    get('https://raw.github.com/padrino/padrino-static/master/js/protopak.js',   destination_root('/public/javascripts/protopak.js'))
-    get('https://raw.github.com/padrino/padrino-static/master/js/lowpro.js',     destination_root('/public/javascripts/lowpro.js'))
-    get('https://raw.github.com/padrino/padrino-static/master/ujs/prototype.js', destination_root('/public/javascripts/prototype-ujs.js'))
+    get('https://raw.githubusercontent.com/padrino/padrino-static/master/js/protopak.js',   destination_root('/public/javascripts/protopak.js'))
+    get('https://raw.githubusercontent.com/padrino/padrino-static/master/js/lowpro.js',     destination_root('/public/javascripts/lowpro.js'))
+    get('https://raw.githubusercontent.com/padrino/padrino-static/master/ujs/prototype.js', destination_root('/public/javascripts/prototype-ujs.js'))
   rescue StandardError
     copy_file('templates/static/js/protopak.js',   destination_root('/public/javascripts/protopak.js'))
     copy_file('templates/static/js/lowpro.js',     destination_root('/public/javascripts/lowpro.js'))