melodiest 0.4.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93b02593c830fd50c38d34209b6f17ed12526729
-  data.tar.gz: 03253903a834bb4a6ecea68be9c3a10e2271025a
+  metadata.gz: eece355e0a6414d9bc928d73070eee099b9df27a
+  data.tar.gz: 18e71602d9b587def177b120c8bedf2947125d06
 SHA512:
-  metadata.gz: 591c75d518583203dbf71107496474c838c59c661871213a7c5cf8a6ceea1c3c4a8b6a080ed7fd8397c4a9f237faf3d2b672cafd0d4941429578956b782aa073
-  data.tar.gz: cb2ef996bafaa561fcac7a5fe5b81856a1a631339a7d75687c00fc33cebd90ed6c43bb6e6db68c14125c96c97b4c05ab27b0971332ced5686f5b73c4dc41bed6
+  metadata.gz: 34b276aab69efe0e3239d75441a06e82a86aabfd139fd6c2dfa46daed8c93f06d1e1020c569d5d6ad0b552d9487532e799ee4fdb164835347151a3bbcd6836a0
+  data.tar.gz: fbde39029c8854b4703a3a653499750e83faf28436e70c5000423a6e46a16cabe195731159393cdc4bb828dd0517c65d6dde102225f3fba2eb7a95e425b4fdbc

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+development:
+  * prevent tux to be required
+  * add sinatra assets pipeline extension
+  * restructure generated app
+  * use erb for app templates
+  * create Rakefile generator with and without database
+  * add new Sequel configuration when generating app with database
+  * add Sinatra::Cache extension
+  * remove Melodiest::Setting. Rename setup method to cookie_secret.
+  * restructure generated app
+  * add some configurations from h5bp
+
 0.4.0:
   * add SQL logger to development environment
   * generate public dir when running generator

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    melodiest (0.2.1)
+    melodiest (0.4.0)
       encrypted_cookie (= 0.0.4)
       sinatra (= 1.4.6)
       sinatra-contrib (= 1.4.2)
@@ -12,7 +12,7 @@ GEM
     backports (3.6.4)
     diff-lcs (1.2.5)
     encrypted_cookie (0.0.4)
-    multi_json (1.11.0)
+    multi_json (1.11.2)
     rack (1.6.0)
     rack-protection (1.5.3)
       rack

data/README.md

@@ -1,6 +1,8 @@
-# Melodiest
+# Background
 
-Melodiest is [Sinatra](http://www.sinatrarb.com/) application boilerplate. It provides generator and contains minimalist configuration to develop application with Sinatra.
+Melodiest is [Sinatra](http://www.sinatrarb.com/) application boilerplate. It provides generator and contains minimum configuration to develop application with Sinatra.
+The reason why I create Melodiest is because I want to create many small web application based on sinatra with other third party ruby gems as foundation.
+Originally, I wanted to name this project as Harmony or Melody, but because it was already taken I decided to name this project as Melodiest.
 
 ### Installation
 
@@ -36,13 +38,13 @@ melodiest -n my_app -d
 ### Melodiest::Application
 Because Melodiest is already required Sinatra, you don't have to require 'sinatra' anymore, just require 'melodiest'.
 
-`Melodiest::Application` is subclass from `Sinatra::Application` and by default is using configuration from `Melodiest::Setting.setup` method.
+`Melodiest::Application` is subclass from `Sinatra::Application`.
 
 ```ruby
 # my_app.rb
 
 class App < Melodiest::Application
-  setup 'this_is_secret_for_encrypted_cookie'
+  cookie_secret 'this_is_secret_for_encrypted_cookie'
   ...
 end
 ```
@@ -83,10 +85,6 @@ For complete example see [github.com/kuntoaji/todo_melodiest](https://github.com
   
   ```ruby
   class MyApp
-    get '/' do
-      "hello world!"
-    end
-
     get '/artists' do
       @artists = Artist.all
       erb :"artists/index"
@@ -122,11 +120,18 @@ For complete example see [github.com/kuntoaji/todo_melodiest](https://github.com
   10. run the server `bundle exec thin start`
   11. open url `localhost:3000/artists`
 
-### Default Configuration
+### List of Ruby Gems
 
+  * sinatra (required by default)
+  * sinatra-contrib (required by default)
+  * encrypted_cookie (required by default)
   * `Sinatra::Reloader` in development environment only
-  * `Thin` as default web server
+  * thin
   * `Rack::Session::EncryptedCookie`
   * `Rack::Csrf`
-  * `Sequel` ORM
-  * `sequel_pg` as PostgreSQL adapter
+  * sequel
+  * sequel_pg as PostgreSQL adapter
+  * sinatra-asset-pipeline
+  * uglifier
+  * tux for console
+  * `Sinatra::Cache` in production environment only

data/lib/melodiest.rb

@@ -1,10 +1,12 @@
 require 'sinatra/base'
 require 'encrypted_cookie'
-require 'melodiest/setting'
 
 module Melodiest
   class Application < Sinatra::Application
-    register Melodiest::Setting
+    def self.cookie_secret(secret)
+      use Rack::Session::EncryptedCookie,
+        secret: secret
+    end
 
     # http://www.sinatrarb.com/contrib/reloader.html
     configure :development do

data/lib/melodiest/command.rb

@@ -45,10 +45,10 @@ module Melodiest
       generator = Melodiest::Generator.new args[:name],
         destination: args[:target], with_database: args[:database]
 
+      generator.generate_rakefile
       generator.generate_gemfile
       generator.generate_bundle_config
       generator.generate_app
-      generator.copy_templates
 
       msg = "#{args[:name]} is successfully generated"
       msg << " in #{args[:target]}" if args[:target]

data/lib/melodiest/generator.rb

@@ -1,5 +1,6 @@
 require 'fileutils'
 require 'securerandom'
+require 'erb'
 require_relative 'version'
 
 module Melodiest
@@ -21,83 +22,66 @@ module Melodiest
       @destination = File.expand_path(destination)
     end
 
+    def generate_rakefile
+      gemfile = File.read File.expand_path("../templates/Rakefile.erb", __FILE__)
+      erb = ERB.new gemfile, 0, '-'
+
+      File.open "#{@destination}/Rakefile", "w" do |f|
+        f.write erb.result(binding)
+      end
+    end
+
     def generate_gemfile
+      gemfile = File.read File.expand_path("../templates/Gemfile.erb", __FILE__)
+      erb = ERB.new gemfile, 0, '-'
+
       File.open "#{@destination}/Gemfile", "w" do |f|
-        f.write("source 'https://rubygems.org'\n\n")
-        f.write("gem 'melodiest', '#{Melodiest::VERSION}'\n")
-        f.write("gem 'thin'\n")
-        f.write("gem 'tux'\n")
-        f.write("gem 'rack_csrf', require: 'rack/csrf'")
-
-        if @with_database
-          f.write("\ngem 'sequel'\n")
-          f.write("gem 'sequel_pg', require: 'sequel'")
-        end
+        f.write erb.result(binding)
       end
     end
 
     def generate_bundle_config
+      config_ru = File.read File.expand_path("../templates/config.ru.erb", __FILE__)
+      erb = ERB.new config_ru
+
       File.open "#{@destination}/config.ru", "w" do |f|
-        f.write("ENV['RACK_ENV'] ||= 'development'\n\n")
-        f.write("require 'rubygems'\n")
-        f.write("require 'bundler'\n\n")
-        f.write("Bundler.require :default, ENV['RACK_ENV'].to_sym\n\n")
-        f.write("require './#{@app_name}'\n")
-        f.write("run #{@app_class_name}\n")
+        f.write erb.result(binding)
       end
     end
 
     # https://github.com/sinatra/sinatra-book/blob/master/book/Organizing_your_application.markdown
     def generate_app
-      content = {}
-
-      if @with_database
-        content[:yaml] = "require 'yaml'\n\n"
-        content[:database] =  "  configure :development, :test do\n"
-        content[:database] << "    require 'logger'\n\n"
-        content[:database] << "    Sequel.connect YAML.load_file(File.expand_path(\"../config/database.yml\", __FILE__))[settings.environment.to_s],\n"
-        content[:database] << "      loggers: [Logger.new($stdout)]\n"
-        content[:database] << "  end\n\n"
-        content[:database] << "  configure :production do\n"
-        content[:database] << "    Sequel.connect YAML.load_file(File.expand_path(\"../config/database.yml\", __FILE__))['production']\n"
-        content[:database] << "  end\n"
-      else
-        content[:yaml] = nil
-        content[:database] =  "  configure do\n"
-        content[:database] << "    # Load up database and such\n"
-        content[:database] << "  end\n"
-      end
+      copy_templates
+      app = File.read File.expand_path("../templates/app.erb", __FILE__)
+      erb = ERB.new app, 0, '-'
 
       File.open "#{@destination}/#{@app_name}.rb", "w" do |f|
-        f.write(content[:yaml])
-        f.write("class #{app_class_name} < Melodiest::Application\n")
-        f.write("  setup '#{SecureRandom.hex(32)}'\n\n")
-        f.write("  set :app_file, __FILE__\n")
-        f.write("  set :views, Proc.new { File.join(root, \"app/views\") }\n\n")
-        f.write("  use Rack::Csrf, raise: true\n\n")
-        f.write(content[:database])
-        f.write("end\n\n")
-        f.write("%w{app/models app/routes}.each do |dir|\n")
-        f.write("  Dir[File.join(dir, '**/*.rb')].each do |file|\n")
-        f.write("    require_relative file\n")
-        f.write("  end\n")
-        f.write("end\n")
+        f.write erb.result(binding)
       end
 
-      FileUtils.mkdir "#{@destination}/public"
+      route = File.read File.expand_path("../templates/app/routes/home.erb", __FILE__)
+      erb = ERB.new route, 0, '-'
 
-      app_dir = "#{@destination}/app"
-      ["", "/routes", "/models", "/views"].each do |dir|
-        FileUtils.mkdir "#{app_dir}/#{dir}"
+      File.open "#{@destination}/app/routes/home.rb", "w" do |f|
+        f.write erb.result(binding)
       end
+
+      FileUtils.rm "#{@destination}/app/routes/home.erb"
     end
 
+    private
+
     def copy_templates
+      FileUtils.cp_r File.expand_path("../templates/assets", __FILE__), @destination
       FileUtils.cp_r File.expand_path("../templates/config", __FILE__), @destination
+      FileUtils.cp_r File.expand_path("../templates/public", __FILE__), @destination
+      FileUtils.cp_r File.expand_path("../templates/app", __FILE__), @destination
 
       if @with_database
-        FileUtils.cp File.expand_path("../templates/Rakefile", __FILE__), @destination
+        FileUtils.mkdir "#{@destination}/app/models"
         FileUtils.cp_r File.expand_path("../templates/db", __FILE__), @destination
+      else
+        FileUtils.rm "#{@destination}/config/database.yml.example"
       end
     end
   end

data/lib/melodiest/setting.rb

@@ -1,10 +1,6 @@
 module Melodiest
   module Setting
-    def setup(cookie_secret, options={})
-      {server: 'thin'}.merge(options).each do |key, value|
-        set key, value
-      end
-
+    def setup(cookie_secret)
       use Rack::Session::EncryptedCookie,
         secret: cookie_secret
     end

data/lib/melodiest/templates/Gemfile.erb

@@ -0,0 +1,16 @@
+source 'https://rubygems.org'
+
+gem 'melodiest', '<%= Melodiest::VERSION %>'
+gem 'thin'
+gem 'tux', require: false
+gem 'sinatra-asset-pipeline', require: 'sinatra/asset_pipeline'
+gem 'uglifier', require: false
+gem 'rack_csrf', require: 'rack/csrf'
+<% if @with_database -%>
+gem 'sequel'
+gem 'sequel_pg', require: 'sequel'
+
+group :production do
+  gem 'sinatra-cache'
+end
+<% end -%>

data/lib/melodiest/templates/Rakefile.erb

@@ -0,0 +1,23 @@
+require_relative 'config/boot'
+require_relative '<%= @app_name %>'
+require 'sinatra/asset_pipeline/task'
+
+Sinatra::AssetPipeline::Task.define! <%= @app_class_name %>
+<% if @with_database %>
+namespace :db do
+  desc "Run migrations"
+  task :migrate, [:version] do |t, args|
+    Sequel.extension :migration
+    db = Sequel.connect(YAML.load_file("#{Melodiest::ROOT}/config/database.yml")[ENV['RACK_ENV']])
+    migration_path = "#{Melodiest::ROOT}/db/migrations"
+
+    if args[:version]
+      puts "Migrating to version #{args[:version]}"
+      Sequel::Migrator.run(db, migration_path, target: args[:version].to_i)
+    else
+      puts "Migrating to latest"
+      Sequel::Migrator.run(db, migration_path)
+    end
+  end
+end
+<% end -%>

data/lib/melodiest/templates/app.erb

@@ -0,0 +1,47 @@
+<%= "require 'yaml'\n\n" if @with_database -%>
+class <%= @app_class_name %> < Melodiest::Application
+  cookie_secret '<%= SecureRandom.hex 32 %>'
+
+  set :app_file, __FILE__
+  set :views, Proc.new { File.join(root, "app/views") }
+  set :assets_css_compressor, :sass
+  set :assets_js_compressor, :uglifier
+
+  register Sinatra::AssetPipeline
+  use Rack::Csrf, raise: true
+
+<% if @with_database -%>
+  configure do
+    Sequel::Database.extension :pagination
+    Sequel::Model.plugin :timestamps
+    Sequel::Model.plugin :auto_validations,
+      not_null: :presence, unique_opts: { only_if_modified: true }
+  end
+
+  configure :development do
+    require 'logger'
+
+    Sequel.connect YAML.load_file(File.expand_path("../config/database.yml", __FILE__))['development'],
+      loggers: [Logger.new($stdout)]
+  end
+
+  configure :test do
+    Sequel.connect YAML.load_file(File.expand_path("../config/database.yml", __FILE__))['test']
+  end
+
+  configure :production do
+    # Serve assets via Nginx or Apache
+    disable :static
+
+    register Sinatra::Cache
+    set :cache_enabled, true
+    set :cache_output_dir, Proc.new { File.join(root, "public/cache") }
+
+    Sequel.connect YAML.load_file(File.expand_path("../config/database.yml", __FILE__))['production']
+  end
+<% else -%>
+  configure do
+    # Load up database and such
+  end
+<% end -%>
+end

data/lib/melodiest/templates/app/routes/home.erb

@@ -0,0 +1,6 @@
+class <%= @app_class_name %>
+  get '/' do
+    @home = "Hello World from app/routes/home.rb"
+    erb :"home/index"
+  end
+end

data/lib/melodiest/templates/app/views/home/index.erb

@@ -0,0 +1 @@
+<%= @home %>

data/lib/melodiest/templates/app/views/layout.erb

@@ -0,0 +1,22 @@
+<!doctype html>
+<html class="no-js" lang="id">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <title>My Title</title>
+    <meta name="description" content="my description">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <link rel="apple-touch-icon" href="apple-touch-icon.png">
+    <link rel="stylesheet" type="text/css" href="<%= stylesheet_path 'app' %>">
+
+    <script src="<%= javascript_path 'app' %>"></script>
+  </head>
+  <body>
+    <!--[if lt IE 8]>
+        <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
+    <![endif]-->
+
+    <%= yield %>
+  </body>
+</html>

data/lib/melodiest/templates/assets/javascripts/app.js

@@ -0,0 +1,2 @@
+//= require plugins
+//= require main

data/lib/melodiest/templates/assets/javascripts/main.js

@@ -0,0 +1 @@
+/* custom js */

data/lib/melodiest/templates/assets/javascripts/plugins.js

@@ -0,0 +1,24 @@
+// Avoid `console` errors in browsers that lack a console.
+(function() {
+    var method;
+    var noop = function () {};
+    var methods = [
+        'assert', 'clear', 'count', 'debug', 'dir', 'dirxml', 'error',
+        'exception', 'group', 'groupCollapsed', 'groupEnd', 'info', 'log',
+        'markTimeline', 'profile', 'profileEnd', 'table', 'time', 'timeEnd',
+        'timeline', 'timelineEnd', 'timeStamp', 'trace', 'warn'
+    ];
+    var length = methods.length;
+    var console = (window.console = window.console || {});
+
+    while (length--) {
+        method = methods[length];
+
+        // Only stub undefined methods.
+        if (!console[method]) {
+            console[method] = noop;
+        }
+    }
+}());
+
+// Place any jQuery/helper plugins in here.

data/lib/melodiest/templates/assets/stylesheets/app.css.scss

@@ -0,0 +1 @@
+//= require main

data/lib/melodiest/templates/assets/stylesheets/main.css.scss

@@ -0,0 +1,8 @@
+/* custom css */
+
+.browserupgrade {
+  margin: 0.2em 0;
+  background: #ccc;
+  color: #000;
+  padding: 0.2em 0;
+}

data/lib/melodiest/templates/config.ru.erb

@@ -0,0 +1,5 @@
+require File.expand_path('../config/boot.rb', __FILE__)
+require Melodiest::ROOT + '/<%= @app_name %>'
+require Melodiest::ROOT + '/config/application'
+
+run <%= @app_class_name %>

data/lib/melodiest/templates/config/application.rb

@@ -0,0 +1,7 @@
+%w{/app/models /app/helpers /app/routes}.each do |dir|
+  resource_dir = Melodiest::ROOT + dir
+
+  Dir[File.join(resource_dir, '**/*.rb')].each do |file|
+    require file
+  end
+end

data/lib/melodiest/templates/config/boot.rb

@@ -0,0 +1,10 @@
+ENV['RACK_ENV'] ||= 'development'
+
+require 'rubygems'
+require 'bundler'
+
+Bundler.require :default, ENV['RACK_ENV'].to_sym
+
+module Melodiest
+  ROOT = File.expand_path('../../', __FILE__)
+end

data/lib/melodiest/templates/public/404.html

@@ -0,0 +1,60 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Page Not Found</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <style>
+
+        * {
+            line-height: 1.2;
+            margin: 0;
+        }
+
+        html {
+            color: #888;
+            display: table;
+            font-family: sans-serif;
+            height: 100%;
+            text-align: center;
+            width: 100%;
+        }
+
+        body {
+            display: table-cell;
+            vertical-align: middle;
+            margin: 2em auto;
+        }
+
+        h1 {
+            color: #555;
+            font-size: 2em;
+            font-weight: 400;
+        }
+
+        p {
+            margin: 0 auto;
+            width: 280px;
+        }
+
+        @media only screen and (max-width: 280px) {
+
+            body, p {
+                width: 95%;
+            }
+
+            h1 {
+                font-size: 1.5em;
+                margin: 0 0 0.3em;
+            }
+
+        }
+
+    </style>
+</head>
+<body>
+    <h1>Page Not Found</h1>
+    <p>Sorry, but the page you were trying to view does not exist.</p>
+</body>
+</html>
+<!-- IE needs 512+ bytes: http://blogs.msdn.com/b/ieinternals/archive/2010/08/19/http-error-pages-in-internet-explorer.aspx -->

data/lib/melodiest/templates/public/browserconfig.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Please read: http://msdn.microsoft.com/en-us/library/ie/dn455106.aspx -->
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square70x70logo src="tile.png"/>
+            <square150x150logo src="tile.png"/>
+            <wide310x150logo src="tile-wide.png"/>
+            <square310x310logo src="tile.png"/>
+        </tile>
+    </msapplication>
+</browserconfig>

data/lib/melodiest/templates/public/crossdomain.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
+<cross-domain-policy>
+    <!-- Read this: www.adobe.com/devnet/articles/crossdomain_policy_file_spec.html -->
+
+    <!-- Most restrictive policy: -->
+    <site-control permitted-cross-domain-policies="none"/>
+
+    <!-- Least restrictive policy: -->
+    <!--
+    <site-control permitted-cross-domain-policies="all"/>
+    <allow-access-from domain="*" to-ports="*" secure="false"/>
+    <allow-http-request-headers-from domain="*" headers="*" secure="false"/>
+    -->
+</cross-domain-policy>

data/lib/melodiest/templates/public/humans.txt

@@ -0,0 +1,15 @@
+# humanstxt.org/
+# The humans responsible & technology colophon
+
+# TEAM
+
+    <name> -- <role> -- <twitter>
+
+# THANKS
+
+    <name>
+
+# TECHNOLOGY COLOPHON
+
+    HTML5, CSS3
+    jQuery, Modernizr

data/lib/melodiest/templates/public/robots.txt

@@ -0,0 +1,5 @@
+# www.robotstxt.org/
+
+# Allow crawling of all content
+User-agent: *
+Disallow:

data/lib/melodiest/version.rb

@@ -1,3 +1,3 @@
 module Melodiest
-  VERSION = '0.4.0'
+  VERSION = '1.0.0'
 end

data/spec/fixtures/app_routes_home.txt

@@ -0,0 +1,6 @@
+class MyApp
+  get '/' do
+    @home = "Hello World from app/routes/home.rb"
+    erb :"home/index"
+  end
+end

data/spec/fixtures/config_ru.txt

@@ -0,0 +1,5 @@
+require File.expand_path('../config/boot.rb', __FILE__)
+require Melodiest::ROOT + '/my_app'
+require Melodiest::ROOT + '/config/application'
+
+run MyApp

data/spec/fixtures/with_db/app.txt

@@ -0,0 +1,42 @@
+require 'yaml'
+
+class MyApp < Melodiest::Application
+  cookie_secret 'supersecretcookiefromgenerator'
+
+  set :app_file, __FILE__
+  set :views, Proc.new { File.join(root, "app/views") }
+  set :assets_css_compressor, :sass
+  set :assets_js_compressor, :uglifier
+
+  register Sinatra::AssetPipeline
+  use Rack::Csrf, raise: true
+
+  configure do
+    Sequel::Database.extension :pagination
+    Sequel::Model.plugin :timestamps
+    Sequel::Model.plugin :auto_validations,
+      not_null: :presence, unique_opts: { only_if_modified: true }
+  end
+
+  configure :development do
+    require 'logger'
+
+    Sequel.connect YAML.load_file(File.expand_path("../config/database.yml", __FILE__))['development'],
+      loggers: [Logger.new($stdout)]
+  end
+
+  configure :test do
+    Sequel.connect YAML.load_file(File.expand_path("../config/database.yml", __FILE__))['test']
+  end
+
+  configure :production do
+    # Serve assets via Nginx or Apache
+    disable :static
+
+    register Sinatra::Cache
+    set :cache_enabled, true
+    set :cache_output_dir, Proc.new { File.join(root, "public/cache") }
+
+    Sequel.connect YAML.load_file(File.expand_path("../config/database.yml", __FILE__))['production']
+  end
+end

data/spec/fixtures/with_db/gemfile.txt

@@ -0,0 +1,14 @@
+source 'https://rubygems.org'
+
+gem 'melodiest', '0.4.0'
+gem 'thin'
+gem 'tux', require: false
+gem 'sinatra-asset-pipeline', require: 'sinatra/asset_pipeline'
+gem 'uglifier', require: false
+gem 'rack_csrf', require: 'rack/csrf'
+gem 'sequel'
+gem 'sequel_pg', require: 'sequel'
+
+group :production do
+  gem 'sinatra-cache'
+end

data/{lib/melodiest/templates/Rakefile → spec/fixtures/with_db/rakefile.txt}

@@ -1,14 +1,15 @@
-require 'sequel'
-require 'yaml'
+require_relative 'config/boot'
+require_relative 'my_app'
+require 'sinatra/asset_pipeline/task'
 
-env = ENV['RACK_ENV'] || 'development'
+Sinatra::AssetPipeline::Task.define! MyApp
 
 namespace :db do
   desc "Run migrations"
   task :migrate, [:version] do |t, args|
     Sequel.extension :migration
-    db = Sequel.connect(YAML.load_file(File.expand_path("../config/database.yml", __FILE__))[env])
-    migration_path = File.expand_path("../db/migrations", __FILE__)
+    db = Sequel.connect(YAML.load_file("#{Melodiest::ROOT}/config/database.yml")[ENV['RACK_ENV']])
+    migration_path = "#{Melodiest::ROOT}/db/migrations"
 
     if args[:version]
       puts "Migrating to version #{args[:version]}"

data/spec/fixtures/without_db/app.txt

@@ -0,0 +1,15 @@
+class MyApp < Melodiest::Application
+  cookie_secret 'supersecretcookiefromgenerator'
+
+  set :app_file, __FILE__
+  set :views, Proc.new { File.join(root, "app/views") }
+  set :assets_css_compressor, :sass
+  set :assets_js_compressor, :uglifier
+
+  register Sinatra::AssetPipeline
+  use Rack::Csrf, raise: true
+
+  configure do
+    # Load up database and such
+  end
+end

data/spec/fixtures/without_db/gemfile.txt

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+gem 'melodiest', '0.4.0'
+gem 'thin'
+gem 'tux', require: false
+gem 'sinatra-asset-pipeline', require: 'sinatra/asset_pipeline'
+gem 'uglifier', require: false
+gem 'rack_csrf', require: 'rack/csrf'

data/spec/fixtures/without_db/rakefile.txt

@@ -0,0 +1,5 @@
+require_relative 'config/boot'
+require_relative 'my_app'
+require 'sinatra/asset_pipeline/task'
+
+Sinatra::AssetPipeline::Task.define! MyApp

data/spec/melodiest/command_spec.rb

@@ -42,7 +42,6 @@ describe Melodiest::Command do
     it "has --database option" do
       app = Melodiest::Command.parse %w(-n my_app --target /tmp -d)
 
-      puts `ls /tmp/my_app`
       expect(app).to include "my_app is successfully generated in /tmp"
       expect(Dir.exists?("/tmp/my_app/db")).to be_truthy
     end

data/spec/melodiest/generator_spec.rb

@@ -31,7 +31,9 @@ describe Melodiest::Generator do
   end
 
   it "has default destination path app_name" do
+    FileUtils.rm_r @app if Dir.exists?(@app)
     expect(Melodiest::Generator.new(@app).destination).to eq File.expand_path(@app)
+    FileUtils.rm_r @app
   end
 
   it "sets new destination path even if it's not exist yet" do
@@ -45,15 +47,10 @@ describe Melodiest::Generator do
       it "should generate Gemfile without sequel" do
         generator.generate_gemfile
         file_content = File.read(gemfile)
+        expected_file_content = File.read(File.expand_path("../../fixtures/without_db/gemfile.txt", __FILE__))
 
         expect(File.exists?(gemfile)).to be_truthy
-        expect(file_content).to include "source 'https://rubygems.org'"
-        expect(file_content).to include "gem 'melodiest', '#{Melodiest::VERSION}'"
-        expect(file_content).to include "gem 'thin'"
-        expect(file_content).to include "gem 'tux'"
-        expect(file_content).to include "gem 'rack_csrf', require: 'rack/csrf'"
-        expect(file_content).to_not include "gem 'sequel'"
-        expect(file_content).to_not include "gem 'sequel_pg'"
+        expect(file_content).to eq(expected_file_content)
       end
     end
 
@@ -63,8 +60,10 @@ describe Melodiest::Generator do
       it "should generate Gemfile with sequel" do
         generator_with_db.generate_gemfile
         file_content = File.read(gemfile)
-        expect(file_content).to include "gem 'sequel'"
-        expect(file_content).to include "gem 'sequel_pg'"
+        expected_file_content = File.read(File.expand_path("../../fixtures/with_db/gemfile.txt", __FILE__))
+
+        expect(File.exists?(gemfile)).to be_truthy
+        expect(file_content).to eq(expected_file_content)
       end
     end
   end
@@ -75,132 +74,166 @@ describe Melodiest::Generator do
     it "should generate config.ru with correct content" do
       generator.generate_bundle_config
       file_content = File.read(bundle_config)
+      expected_file_content = File.read(File.expand_path("../../fixtures/config_ru.txt", __FILE__))
 
       expect(File.exists?(bundle_config)).to be_truthy
-      expect(file_content).to include "ENV['RACK_ENV'] ||= 'development'"
-      expect(file_content).to include "require 'rubygems'"
-      expect(file_content).to include "require 'bundler'"
-      expect(file_content).to include "Bundler.require :default, ENV['RACK_ENV'].to_sym"
-      expect(file_content).to include "require './my_app'"
-      expect(file_content).to include "run MyApp"
+      expect(file_content).to eq(expected_file_content)
     end
   end
 
   describe "#generate_app" do
-    let(:secret) { "supersecretcookiefromgenerator" }
-    before { allow(SecureRandom).to receive(:hex).with(32).and_return(secret) }
+    before { FileUtils.rm_r @dest if Dir.exists?(@dest) }
+    before { FileUtils.rm_r @dest_with_db if Dir.exists?(@dest_with_db) }
 
-    it "generates <app_name>.rb, public dir, and app dir" do
-      FileUtils.rm_r @dest if Dir.exists?(@dest)
+    it "generates home route" do
       generator.generate_app
-      app_file = "#{target_dir}/my_app.rb"
-      file_content = File.read(app_file)
-
-      expected_file_content =
-<<DOC
-class MyApp < Melodiest::Application
-  setup '#{secret}'
 
-  set :app_file, __FILE__
-  set :views, Proc.new { File.join(root, "app/views") }
-
-  use Rack::Csrf, raise: true
-
-  configure do
-    # Load up database and such
-  end
-end
-
-%w{app/models app/routes}.each do |dir|
-  Dir[File.join(dir, '**/*.rb')].each do |file|
-    require_relative file
-  end
-end
-DOC
+      app_file = "#{target_dir}/app/routes/home.rb"
+      erb_file = "#{target_dir}/app/routes/home.erb"
+      file_content = File.read(app_file)
+      expected_file_content = File.read(File.expand_path("../../fixtures/app_routes_home.txt", __FILE__))
 
       expect(File.exists?(app_file)).to be_truthy
+      expect(File.exists?(erb_file)).to be_falsey
       expect(file_content).to eq expected_file_content
-      expect(Dir.exists?("#{target_dir}/public")).to be_truthy
-      expect(Dir.exists?("#{target_dir}/app")).to be_truthy
-      expect(Dir.exists?("#{target_dir}/app/routes")).to be_truthy
-      expect(Dir.exists?("#{target_dir}/app/models")).to be_truthy
-      expect(Dir.exists?("#{target_dir}/app/views")).to be_truthy
     end
 
-    context "with sequel" do
-      it "has sequel database connector" do
-        FileUtils.rm_r @dest_with_db if Dir.exists?(@dest_with_db)
-        generator_with_db.generate_app
-        app_file = "#{target_dir_with_db}/my_app.rb"
-        file_content = File.read(app_file)
+    context "when generating without database" do
+      describe "copy_templates" do
+        let(:config_dir) { "#{target_dir}/config" }
+        let(:assets_dir) { "#{target_dir}/assets" }
+        let(:public_dir) { "#{target_dir}/public" }
+        let(:without_db_sample_migration) { "#{target_dir}/db_migrations/000_example.rb" }
+
+        it "copies from melodiest templates" do
+          expect(File.exists?(config_dir)).to be_falsey
+          expect(File.exists?(without_db_sample_migration)).to be_falsey
+          expect(File.exists?(assets_dir)).to be_falsey
+          expect(File.exists?(public_dir)).to be_falsey
+
+          expect(Dir.exists?("#{target_dir}/app")).to be_falsey
+          expect(Dir.exists?("#{target_dir}/app/routes")).to be_falsey
+          expect(Dir.exists?("#{target_dir}/app/models")).to be_falsey
+          expect(Dir.exists?("#{target_dir}/app/views")).to be_falsey
+          expect(File.exists?("#{target_dir}/app/views/layout.erb")).to be_falsey
+          expect(File.exists?("#{target_dir}/app/views/home/index.erb")).to be_falsey
+
+          generator.generate_app
+
+          expect(File.exists?(config_dir)).to be_truthy
+          expect(File.exists?("#{config_dir}/database.yml.example")).to be_falsey
+          expect(File.exists?(without_db_sample_migration)).to be_falsey
+          expect(File.exists?(assets_dir)).to be_truthy
+          expect(File.exists?(public_dir)).to be_truthy
+
+          expect(Dir.exists?("#{target_dir}/app")).to be_truthy
+          expect(Dir.exists?("#{target_dir}/app/routes")).to be_truthy
+          expect(Dir.exists?("#{target_dir}/app/models")).to be_falsey
+          expect(Dir.exists?("#{target_dir}/app/views")).to be_truthy
+          expect(File.exists?("#{target_dir}/app/views/layout.erb")).to be_truthy
+          expect(File.exists?("#{target_dir}/app/views/home/index.erb")).to be_truthy
+        end
+      end
 
-        expected_file_content =
-<<DOC
-require 'yaml'
+      describe "app file" do
+        let(:secret) { "supersecretcookiefromgenerator" }
+        before { allow(SecureRandom).to receive(:hex).with(32).and_return(secret) }
 
-class MyApp < Melodiest::Application
-  setup '#{secret}'
+        it "generates <app_name>.rb, public dir, and app dir" do
+          generator.generate_app
 
-  set :app_file, __FILE__
-  set :views, Proc.new { File.join(root, "app/views") }
+          app_file = "#{target_dir}/my_app.rb"
+          file_content = File.read(app_file)
+          expected_file_content = File.read(File.expand_path("../../fixtures/without_db/app.txt", __FILE__))
 
-  use Rack::Csrf, raise: true
+          expect(File.exists?(app_file)).to be_truthy
+          expect(file_content).to eq expected_file_content
+        end
+      end
+    end
 
-  configure :development, :test do
-    require 'logger'
+    context "when generating with database" do
+      describe "copy templates" do
+        let(:config_dir) { "#{target_dir_with_db}/config" }
+        let(:assets_dir) { "#{target_dir_with_db}/assets" }
+        let(:public_dir) { "#{target_dir_with_db}/public" }
+        let(:with_db_sample_migration) { "#{target_dir_with_db}/db/migrations/000_example.rb" }
+
+        it "copies from melodiest templates" do
+          expect(File.exists?(config_dir)).to be_falsey
+          expect(File.exists?("#{config_dir}/database.yml.example")).to be_falsey
+          expect(File.exists?("#{config_dir}/boot.rb")).to be_falsey
+          expect(File.exists?("#{config_dir}/application.rb")).to be_falsey
+
+          expect(File.exists?(with_db_sample_migration)).to be_falsey
+          expect(File.exists?(assets_dir)).to be_falsey
+          expect(File.exists?(public_dir)).to be_falsey
+
+          expect(Dir.exists?("#{target_dir_with_db}/app")).to be_falsey
+          expect(Dir.exists?("#{target_dir_with_db}/app/routes")).to be_falsey
+          expect(Dir.exists?("#{target_dir_with_db}/app/models")).to be_falsey
+          expect(Dir.exists?("#{target_dir_with_db}/app/views")).to be_falsey
+          expect(File.exists?("#{target_dir_with_db}/app/views/layout.erb")).to be_falsey
+          expect(File.exists?("#{target_dir_with_db}/app/views/home/index.erb")).to be_falsey
+
+          generator_with_db.generate_app
+
+          expect(File.exists?(config_dir)).to be_truthy
+          expect(File.exists?("#{config_dir}/database.yml.example")).to be_truthy
+          expect(File.exists?("#{config_dir}/boot.rb")).to be_truthy
+          expect(File.exists?("#{config_dir}/application.rb")).to be_truthy
+
+          expect(File.exists?(with_db_sample_migration)).to be_truthy
+          expect(File.exists?(assets_dir)).to be_truthy
+          expect(File.exists?(public_dir)).to be_truthy
+
+          expect(Dir.exists?("#{target_dir_with_db}/app")).to be_truthy
+          expect(Dir.exists?("#{target_dir_with_db}/app/routes")).to be_truthy
+          expect(Dir.exists?("#{target_dir_with_db}/app/models")).to be_truthy
+          expect(Dir.exists?("#{target_dir_with_db}/app/views")).to be_truthy
+          expect(File.exists?("#{target_dir_with_db}/app/views/layout.erb")).to be_truthy
+          expect(File.exists?("#{target_dir_with_db}/app/views/home/index.erb")).to be_truthy
+        end
+      end
 
-    Sequel.connect YAML.load_file(File.expand_path("../config/database.yml", __FILE__))[settings.environment.to_s],
-      loggers: [Logger.new($stdout)]
-  end
+      describe "app file" do
+        let(:secret) { "supersecretcookiefromgenerator" }
+        before { allow(SecureRandom).to receive(:hex).with(32).and_return(secret) }
 
-  configure :production do
-    Sequel.connect YAML.load_file(File.expand_path("../config/database.yml", __FILE__))['production']
-  end
-end
+        it "has sequel database connector" do
+          generator_with_db.generate_app
 
-%w{app/models app/routes}.each do |dir|
-  Dir[File.join(dir, '**/*.rb')].each do |file|
-    require_relative file
-  end
-end
-DOC
+          app_file = "#{target_dir_with_db}/my_app.rb"
+          file_content = File.read(app_file)
+          expected_file_content = File.read(File.expand_path("../../fixtures/with_db/app.txt", __FILE__))
 
-        expect(file_content).to eq expected_file_content
+          expect(file_content).to eq expected_file_content
+        end
       end
     end
   end
 
-  describe "#copy_templates" do
-    context "when generating without database" do
-      let(:config_dir) { "#{target_dir}/config" }
-      let(:without_db_rakefile) { "#{target_dir}/Rakefile" }
-      let(:without_db_sample_migration) { "#{target_dir}/db_migrations/000_example.rb" }
-
-      it "copies config dir" do
-        expect(File.exists?(config_dir)).to be_falsey
-        expect(File.exists?("#{config_dir}/database.yml.example")).to be_falsey
-        expect(File.exists?(without_db_rakefile)).to be_falsey
-        expect(File.exists?(without_db_sample_migration)).to be_falsey
-        generator.copy_templates
-
-        expect(File.exists?(config_dir)).to be_truthy
-        expect(File.exists?("#{config_dir}/database.yml.example")).to be_truthy
-        expect(File.exists?(without_db_rakefile)).to be_falsey
-        expect(File.exists?(without_db_sample_migration)).to be_falsey
-      end
+  describe "#generate_rakefile" do
+    it "generate basic Rakefile tasks" do
+      expected_rakefile_content =
+      expected_rakefile_content = File.read(File.expand_path("../../fixtures/without_db/rakefile.txt", __FILE__))
+
+      generator.generate_rakefile
+      rakefile = "#{target_dir}/Rakefile"
+      rakefile_content = File.read(rakefile)
+
+      expect(rakefile_content).to eq expected_rakefile_content
     end
 
-    context "when generating with database" do
-      let(:with_db_rakefile) { "#{target_dir_with_db}/Rakefile" }
-      let(:with_db_sample_migration) { "#{target_dir_with_db}/db/migrations/000_example.rb" }
+    context "with database" do
+      it "generates db related tasks" do
+        expected_rakefile_content = File.read(File.expand_path("../../fixtures/with_db/rakefile.txt", __FILE__))
 
-      it "copies Rakefile" do
-        expect(File.exists?(with_db_rakefile)).to be_falsey
-        expect(File.exists?(with_db_sample_migration)).to be_falsey
-        generator_with_db.copy_templates
+        generator_with_db.generate_rakefile
+        rakefile = "#{target_dir_with_db}/Rakefile"
+        rakefile_content = File.read(rakefile)
 
-        expect(File.exists?(with_db_rakefile)).to be_truthy
-        expect(File.exists?(with_db_sample_migration)).to be_truthy
+        expect(rakefile_content).to eq expected_rakefile_content
       end
     end
   end

data/spec/melodiest_spec.rb

@@ -0,0 +1,15 @@
+describe Melodiest::Application do
+  let(:my_app) do
+    class MyApp < Melodiest::Application
+      cookie_secret 'mysupersecretcookie'
+    end
+
+    MyApp
+  end
+
+
+  it "use encrypted cookie" do
+    expect(my_app.instance_variable_get("@middleware")).to include
+      [Rack::Session::EncryptedCookie, [{:secret => "mysupersecretcookie"}], nil]
+  end
+end

data/spec/spec_helper.rb

@@ -79,7 +79,7 @@ RSpec.configure do |config|
 end
 
 class SpecApp < Melodiest::Application
-  setup 'supersecretcookiespec'
+  cookie_secret 'supersecretcookiespec'
 end
 
 def app

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: melodiest
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Kunto Aji Kristianto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,14 +114,45 @@ files:
 - lib/melodiest/command.rb
 - lib/melodiest/generator.rb
 - lib/melodiest/setting.rb
-- lib/melodiest/templates/Rakefile
+- lib/melodiest/templates/Gemfile.erb
+- lib/melodiest/templates/Rakefile.erb
+- lib/melodiest/templates/app.erb
+- lib/melodiest/templates/app/routes/home.erb
+- lib/melodiest/templates/app/views/home/index.erb
+- lib/melodiest/templates/app/views/layout.erb
+- lib/melodiest/templates/assets/javascripts/app.js
+- lib/melodiest/templates/assets/javascripts/main.js
+- lib/melodiest/templates/assets/javascripts/plugins.js
+- lib/melodiest/templates/assets/stylesheets/app.css.scss
+- lib/melodiest/templates/assets/stylesheets/main.css.scss
+- lib/melodiest/templates/config.ru.erb
+- lib/melodiest/templates/config/application.rb
+- lib/melodiest/templates/config/boot.rb
 - lib/melodiest/templates/config/database.yml.example
 - lib/melodiest/templates/db/migrations/000_example.rb
+- lib/melodiest/templates/public/.DS_Store
+- lib/melodiest/templates/public/404.html
+- lib/melodiest/templates/public/apple-touch-icon.png
+- lib/melodiest/templates/public/browserconfig.xml
+- lib/melodiest/templates/public/crossdomain.xml
+- lib/melodiest/templates/public/favicon.ico
+- lib/melodiest/templates/public/humans.txt
+- lib/melodiest/templates/public/robots.txt
+- lib/melodiest/templates/public/tile-wide.png
+- lib/melodiest/templates/public/tile.png
 - lib/melodiest/version.rb
 - melodiest.gemspec
+- spec/fixtures/app_routes_home.txt
+- spec/fixtures/config_ru.txt
+- spec/fixtures/with_db/app.txt
+- spec/fixtures/with_db/gemfile.txt
+- spec/fixtures/with_db/rakefile.txt
+- spec/fixtures/without_db/app.txt
+- spec/fixtures/without_db/gemfile.txt
+- spec/fixtures/without_db/rakefile.txt
 - spec/melodiest/command_spec.rb
 - spec/melodiest/generator_spec.rb
-- spec/melodiest/setting_spec.rb
+- spec/melodiest_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/kuntoaji/melodiest
 licenses:

data/spec/melodiest/setting_spec.rb

@@ -1,25 +0,0 @@
-describe Melodiest::Setting do
-  describe ".setup" do
-    let(:my_app) do
-      class MyApp < Melodiest::Application
-        setup 'mysupersecretcookie', server: 'puma'
-      end
-
-      MyApp
-    end
-
-    it "set thin as server" do
-      expect(app.settings.server).to eq("thin")
-    end
-
-    it "overrides default setting" do
-      expect(my_app.settings.server).to eq("puma")
-    end
-
-    it "use encrypted cookie" do
-      expect(my_app.instance_variable_get("@middleware")).to include
-        [Rack::Session::EncryptedCookie, [{:secret => "mysupersecretcookie"}], nil]
-    end
-
-  end
-end