melodiest 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b579b11889dfcee9922093cab10b487bf65dc88
-  data.tar.gz: 723d68077098c8218a7c75e6df36caa9550e9b9f
+  metadata.gz: fcb354a2aa73158378af93b4f18bf9d397f6b0da
+  data.tar.gz: b29f697ff27ba0ea4095382e41177bd47354b942
 SHA512:
-  metadata.gz: 25f1d75cdd945a882798146c6e10942ce5bf5dba2cafdbc6dab8a84a63a6ba44b9eb524090980a92cea6cf59952743e5e91949232e10de02cdcb58415e5f006f
-  data.tar.gz: b9c15805e704306bf1e2566dcdfa65b3f8e935b0dc5b782f85e27ede43f5b2f1ebfd4f212df256574f5a04e2315cf343b44d0f8df6a6eaa0eaa1ebae936a96ea
+  metadata.gz: 951a2c2a88bcbcd9432fa667ac753a98663f88a19805a98564746e9d78bb7752f4f21065e64acb7d4ad6ad4811a1ae9abe57a65e67de5a40adabe707a63a3469
+  data.tar.gz: 5560623ecda83e4834900fffabf61960a3e8ca08a879cb339a39181c571b320857ec6706cc07cde608f72b52c2bf6df95ffbd41a97657f1af847441a189e5e1f

data/CHANGELOG.md

@@ -0,0 +1,17 @@
+0.3.0:
+
+  * remove Melodiest::Auth::Http module, it's better to use sinatra-authorization extension
+  * refactor Melodiest::Setting.setup so that it can be overridden via app and remove thin as dependency
+  * add generator for sequel orm and postgres sql
+  * use encrypted cookie
+  * add generator for Rack::Csrf
+
+0.2.x:
+
+  * add sinatra application boilerplate generator
+  * add melodiest command to run generator
+ 
+0.1.x:
+
+ * add http authorization module
+ * set thin as server

data/Gemfile.lock

@@ -2,40 +2,39 @@ PATH
   remote: .
   specs:
     melodiest (0.2.1)
-      sinatra (= 1.4.5)
+      encrypted_cookie (= 0.0.4)
+      sinatra (= 1.4.6)
       sinatra-contrib (= 1.4.2)
-      thin (= 1.6.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
     backports (3.6.4)
-    daemons (1.1.9)
     diff-lcs (1.2.5)
-    eventmachine (1.0.7)
-    fakefs (0.6.7)
-    multi_json (1.10.1)
+    encrypted_cookie (0.0.4)
+    multi_json (1.11.0)
     rack (1.6.0)
     rack-protection (1.5.3)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
+    rspec (3.2.0)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+    rspec-core (3.2.3)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    sinatra (1.4.5)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.2)
+    sinatra (1.4.6)
       rack (~> 1.4)
       rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
+      tilt (>= 1.3, < 3)
     sinatra-contrib (1.4.2)
       backports (>= 2.0)
       multi_json
@@ -43,10 +42,6 @@ GEM
       rack-test
       sinatra (~> 1.4.0)
       tilt (~> 1.3)
-    thin (1.6.3)
-      daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0)
-      rack (~> 1.0)
     tilt (1.4.1)
 
 PLATFORMS
@@ -54,7 +49,6 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.7)
-  fakefs (= 0.6.7)
   melodiest!
   rack-test (= 0.6.3)
-  rspec (= 3.1.0)
+  rspec (= 3.2.0)

data/README.md

@@ -1,6 +1,6 @@
 # Melodiest
 
-Melodiest is [Sinatra](http://www.sinatrarb.com/) application boilerplate. It provides generator and useful modules for developing application.
+Melodiest is [Sinatra](http://www.sinatrarb.com/) application boilerplate. It provides generator and contains minimalist configuration to develop application with Sinatra.
 
 ### Installation
 
@@ -16,17 +16,20 @@ gem 'melodiest'
 ```
 
 ### How to Use
-#### Command
-generate app in current directory
+generate app in current directory without database
 ```
 melodiest -n my_app
 ```
-generate app in target directory
+generate app in target directory without database
 ```
-melodiest -n my_app -d target/dir
+melodiest -n my_app -t target/dir
+```
+generate app in current directory with database. `-d` option will generate app with `Sequel` orm and PostgreSQL adapter.
+```
+melodiest -n my_app -d
 ```
 
-#### Example Code
+### 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.
@@ -35,41 +38,71 @@ Because Melodiest is already required Sinatra, you don't have to require 'sinatr
 ```ruby
 # my_app.rb
 
-require 'melodiest/auth/http'
-
 class App < Melodiest::Application
-  configure do
-    # Load up database and such
+  setup 'this_is_secret_for_encrypted_cookie'
+  ...
+end
+```
+### Example Usage
+This example assume that PostgreSQL is already running and .
+  1. run `melodiest -n my_app -d`
+  2. cd `my_app`
+  3. run `bundle install`
+  4. create `config/database.yml` and configure your database setting
+  5. create file `db/migrations/001_create_artists.rb` and put the following code:
+```ruby
+Sequel.migration do
+  up do
+    create_table(:artists) do
+      primary_key :id
+      String :name, :null=>false
+    end
   end
   
-  helpers Melodiest::Auth::Http
+  down do
+    drop_table(:artists)
+  end
 end
-
-# app/routes/my_routes.rb
-
-get "/" do
-  "hello world!"
+```
+  6. run `rake db:migrate`
+  7. create file `app/models/Artist.rb` and put the following code:
+```ruby
+class Artist < Sequel::Model
 end
+```
+  8. create file `app/routes/artists.rb` and put the following code:
+```ruby
+class MyApp
+  get '/' do
+    "hello world!"
+  end
 
-get "/protected" do
-  authorized! "myhttpauthusername", "myhttpauthpassword"
-  "welcome!"
+  get '/artists' do
+    # for example purpose :)
+    artist = Artist.new
+    artist.name = 'Melody'
+    artist.save
+    
+    @artists = Artist.all
+    erb :"artists/index"
+  end
 end
-
-```
-#### Run the server
 ```
-bundle exec rackup
+  9. create file `app/views/artists/index.erb` and put the following code:
+```erb
+<h1>List of Artist</h1>
+<% @artists.each do |artist| %>
+  <li><%= artist.name %></li>
+<% end %>
 ```
+  10. run the server `bundle exec rackup`
+  11. open url `localhost:9292/artists`
 
 
 ### Default Configuration
 
   * `Sinatra::Reloader` in development environment only
-  * See [melodiest/config.yml](https://github.com/kuntoaji/melodiest/blob/master/lib/melodiest/config.yml)
-
-### Modules
-
-Available modules from Melodiest
-
-  * `Melodiest::Auth::Http`
+  * `Rack::Session::EncryptedCookie`
+  * `Rack::Csrf`
+  * `Sequel` ORM
+  * `sequel_pg` as PostgreSQL adapter

data/lib/melodiest/command.rb

@@ -5,7 +5,7 @@ module Melodiest
 
   class Command
     def self.parse(options)
-      args = {name: nil, dir: nil}
+      args = {}
       result = ""
 
       option_parser = OptionParser.new do |opts|
@@ -23,28 +23,34 @@ module Melodiest
           args[:name] = name
         end
 
-        opts.on("-dDIR", "--dir=DIR", "instead of current directory, generate app in target DIR") do |dir|
-          args[:dir] = dir
+        opts.on("-tDIR", "--target=DIR", "instead of current directory, generate app in target DIR") do |target|
+          args[:target] = target
+        end
+
+        opts.on("-d", "--database", "add sequel orm for postgres sql") do
+          args[:database] = true
         end
 
       end
 
       option_parser.parse! options
 
-      result = Command.run(args[:name], args[:dir]) unless args[:name].nil?
+      result = run(args) unless args[:name].nil?
 
       result
     end
 
-    def self.run(app_name, target_dir)
-      generator = Melodiest::Generator.new app_name, target_dir
+    def self.run(args)
+      generator = Melodiest::Generator.new args[:name],
+        destination: args[:target], with_database: args[:database]
 
       generator.generate_gemfile
       generator.generate_bundle_config
       generator.generate_app
+      generator.copy_templates
 
-      msg = "#{app_name} is successfully generated"
-      msg << " in #{target_dir}" if target_dir
+      msg = "#{args[:name]} is successfully generated"
+      msg << " in #{args[:target]}" if args[:target]
 
       msg 
     end

data/lib/melodiest/generator.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'securerandom'
 require_relative 'version'
 
 module Melodiest
@@ -6,10 +7,12 @@ module Melodiest
   class Generator
     attr_accessor :destination, :app_name, :app_class_name
 
-    def initialize(app_name, destination=nil)
+    def initialize(app_name, options={})
       @app_name = app_name
       @app_class_name = app_name.split("_").map{|s| s.capitalize }.join("")
-      destination = destination ? "#{destination}/#{@app_name}" : @app_name
+
+      destination = options[:destination] ? "#{options[:destination]}/#{@app_name}" : @app_name
+      @with_database = options[:with_database]
 
       unless File.directory?(destination)
         FileUtils.mkdir_p(destination)
@@ -21,7 +24,14 @@ module Melodiest
     def generate_gemfile
       File.open "#{@destination}/Gemfile", "w" do |f|
         f.write("source 'https://rubygems.org'\n\n")
-        f.write("gem 'melodiest', '#{Melodiest::VERSION}'")
+        f.write("gem 'melodiest', '#{Melodiest::VERSION}'\n")
+        f.write("gem 'thin'\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
       end
     end
 
@@ -38,25 +48,48 @@ module Melodiest
 
     # 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] = "    Sequel.connect YAML.load_file(File.expand_path(\"../config/database.yml\", __FILE__))[settings.environment.to_s]\n"
+      else
+        content[:yaml] = nil
+        content[:database] = "    # Load up database and such\n"
+      end
+
       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("  configure do\n")
-        f.write("    # Load up database and such\n")
+        f.write(content[:database])
         f.write("  end\n")
         f.write("end\n\n")
-        f.write("# Load all route files\n")
-        f.write("Dir[File.dirname(__FILE__) + \"/app/routes/**\"].each do |route|\n")
-        f.write("  require route\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")
       end
 
-      FileUtils.mkdir_p "#{@destination}/db/migrations"
-
       app_dir = "#{@destination}/app"
       ["", "/routes", "/models", "/views"].each do |dir|
         FileUtils.mkdir "#{app_dir}/#{dir}"
       end
     end
+
+    def copy_templates
+      FileUtils.cp_r File.expand_path("../templates/config", __FILE__), @destination
+
+      if @with_database
+        FileUtils.cp File.expand_path("../templates/Rakefile", __FILE__), @destination
+        FileUtils.cp_r File.expand_path("../templates/db", __FILE__), @destination
+      end
+    end
   end
 
 end

data/lib/melodiest/setting.rb

@@ -1,8 +1,16 @@
 module Melodiest
   module Setting
-    def setup
-      register Sinatra::ConfigFile
-      config_file File.expand_path('../config.yml', __FILE__)
+    def setup(cookie_secret, options={})
+      settings = {
+        server: 'thin'
+      }.merge(options)
+
+      settings.each do |key, value|
+        set key, value
+      end
+
+      use Rack::Session::EncryptedCookie,
+        secret: cookie_secret
     end
   end
 end

data/lib/melodiest/templates/Rakefile

@@ -0,0 +1,21 @@
+require 'sequel'
+require 'yaml'
+
+env = ENV['RACK_ENV'] || 'development'
+
+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__)
+
+    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

data/lib/melodiest/templates/config/database.yml.example

@@ -0,0 +1,8 @@
+# http://sequel.jeremyevans.net/rdoc/files/doc/opening_databases_rdoc.html
+#
+# development:
+#   adapter: mysql2
+#   host: localhost
+#   database: exampledb_development
+#   user: exampleuser
+#   password: examplepassword

data/lib/melodiest/templates/db/migrations/000_example.rb

@@ -0,0 +1,12 @@
+# http://sequel.jeremyevans.net/rdoc/files/doc/migration_rdoc.html
+
+# Sequel.migration do
+#   up do
+#     add_column :artists, :location, String
+#     from(:artists).update(:location=>'Sacramento')
+#   end
+#
+#   down do
+#     drop_column :artists, :location
+#   end
+# end

data/lib/melodiest/version.rb

@@ -1,3 +1,3 @@
 module Melodiest
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/lib/melodiest.rb

@@ -1,12 +1,11 @@
-require 'sinatra'
-require 'sinatra/config_file'
+require 'sinatra/base'
 require 'sinatra/reloader'
+require 'encrypted_cookie'
 require 'melodiest/setting'
 
 module Melodiest
   class Application < Sinatra::Application
-    extend Setting
-    setup
+    register Melodiest::Setting
 
     # http://www.sinatrarb.com/contrib/reloader.html
     configure :development do

data/melodiest.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.version     = Melodiest::VERSION
   s.date        = Date.today.to_s
   s.summary     = "Sinatra application boilerplate"
-  s.description = "Melodiest provides generator and useful modules for your Sinatra application"
+  s.description = "Melodiest provides generator and contains minimalist configuration to develop application with Sinatra"
   s.author      = 'Kunto Aji Kristianto'
   s.email       = 'kunto.aji.kr@slackware-id.org'
   s.files       = `git ls-files -z`.split("\x0")
@@ -13,11 +13,11 @@ Gem::Specification.new do |s|
   s.homepage    = 'http://github.com/kuntoaji/melodiest'
   s.license     = 'MIT'
 
+  s.required_ruby_version = '>= 2.1'
   s.add_development_dependency 'bundler', '~> 1.7'
-  s.add_development_dependency 'rspec', '3.1.0'
+  s.add_development_dependency 'rspec', '3.2.0'
   s.add_development_dependency 'rack-test', '0.6.3'
-  s.add_development_dependency 'fakefs', '0.6.7'
-  s.add_runtime_dependency 'sinatra', '1.4.5'
+  s.add_runtime_dependency 'sinatra', '1.4.6'
   s.add_runtime_dependency 'sinatra-contrib', '1.4.2'
-  s.add_runtime_dependency 'thin', '1.6.3'
+  s.add_runtime_dependency 'encrypted_cookie', '0.0.4'
 end

data/spec/melodiest/command_spec.rb

@@ -1,10 +1,18 @@
 require_relative '../../lib/melodiest/command'
-require 'fakefs/spec_helpers'
 
 describe Melodiest::Command do
-  include FakeFS::SpecHelpers
 
   describe "parse" do
+    before do
+      FileUtils.rm_r "my_app" if Dir.exists?("my_app")
+      FileUtils.rm_r "/tmp/my_app" if Dir.exists?("/tmp/my_app")
+    end
+
+    after :all do
+      FileUtils.rm_r "my_app" if Dir.exists?("my_app")
+      FileUtils.rm_r "/tmp/my_app" if Dir.exists?("/tmp/my_app")
+    end
+
     it "has --help option" do
       help = Melodiest::Command.parse %w(--help)
 
@@ -24,19 +32,28 @@ describe Melodiest::Command do
       expect(app).to include "my_app is successfully generated"
     end
 
-    it "has --directory option as target directory" do
-      app = Melodiest::Command.parse %w(-n my_app --dir /tmp)
+    it "has --target option as target directory" do
+      app = Melodiest::Command.parse %w(-n my_app --target /tmp)
 
       expect(app).to include "my_app is successfully generated in /tmp"
       expect(Dir.exists?("/tmp/my_app")).to be_truthy
     end
 
-    context "when has no --name option and only --dir option" 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
+
+    context "when has no --name option and only --target option" do
       it "does nothing" do
-        app = Melodiest::Command.parse %w(--dir /tmp/melodiest)
+        app = Melodiest::Command.parse %w(--target /tmp/melodiest)
 
         expect(app).to be_empty
       end
     end
   end
+
 end

data/spec/melodiest/generator_spec.rb

@@ -1,15 +1,29 @@
 require_relative '../../lib/melodiest/generator'
-require 'fakefs/spec_helpers'
 
 describe Melodiest::Generator do
-  include FakeFS::SpecHelpers
+  let(:generator) { Melodiest::Generator.new @app, destination: @dest }
+  let(:generator_with_db) { Melodiest::Generator.new @app, destination: @dest_with_db, with_database: true }
+  let(:target_dir) { "#{@dest}/#{@app}" }
+  let(:target_dir_with_db) { "#{@dest_with_db}/#{@app}" }
+
+  before :all do
+    @dest = "/tmp/melodiest"
+    @dest_with_db = "#{@dest}_with_db"
+    @app = "my_app"
+  end
 
-  let(:dest) { "/tmp/melodiest" }
-  let(:app) { "my_app" }
-  let(:generator) { Melodiest::Generator.new app, dest }
+  before :all do
+    FileUtils.rm_r @dest if Dir.exists?(@dest)
+    FileUtils.rm_r @dest_with_db if Dir.exists?(@dest_with_db)
+  end
+
+  after :all do
+    FileUtils.rm_r @dest
+    FileUtils.rm_r @dest_with_db
+  end
 
   it "sets app_name" do
-    expect(generator.app_name).to eq app
+    expect(generator.app_name).to eq @app
   end
 
   it "sets app_class_name" do
@@ -17,28 +31,45 @@ describe Melodiest::Generator do
   end
 
   it "has default destination path app_name" do
-    expect(Melodiest::Generator.new(app).destination).to eq File.expand_path(app)
+    expect(Melodiest::Generator.new(@app).destination).to eq File.expand_path(@app)
   end
 
   it "sets new destination path even if it's not exist yet" do
-    expect("/tmp/melodiest/my_app").to eq "#{dest}/#{app}"
+    expect("/tmp/melodiest/my_app").to eq target_dir
   end
 
   describe "#generate_gemfile" do
-    let(:gemfile) { "#{dest}/#{app}/Gemfile" }
+    context "without database" do
+      let(:gemfile) { "#{target_dir}/Gemfile" }
+
+      it "should generate Gemfile without sequel" do
+        generator.generate_gemfile
+        file_content = File.read(gemfile)
+
+        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 'rack_csrf', require: 'rack/csrf'"
+        expect(file_content).to_not include "gem 'sequel'"
+        expect(file_content).to_not include "gem 'sequel_pg'"
+      end
+    end
 
-    it "should generate Gemfile with correct content" do
-      generator.generate_gemfile
-      file_content = File.read(gemfile)
+    context "with database" do
+      let(:gemfile) { "#{target_dir_with_db}/Gemfile" }
 
-      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}'"
+      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'"
+      end
     end
   end
 
   describe "#generate_bundle_config" do
-    let(:bundle_config) { "#{dest}/#{app}/config.ru" }
+    let(:bundle_config) { "#{target_dir}/config.ru" }
 
     it "should generate config.ru with correct content" do
       generator.generate_bundle_config
@@ -55,9 +86,11 @@ describe Melodiest::Generator do
   end
 
   describe "#generate_app" do
-    let(:target_dir) { "#{dest}/#{app}" }
+    let(:secret) { "supersecretcookiefromgenerator" }
+    before { allow(SecureRandom).to receive(:hex).with(32).and_return(secret) }
 
     it "generates <app_name>.rb" do
+      FileUtils.rm_r @dest if Dir.exists?(@dest)
       generator.generate_app
       app_file = "#{target_dir}/my_app.rb"
       file_content = File.read(app_file)
@@ -65,25 +98,102 @@ describe Melodiest::Generator do
       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
 
-# Load all route files
-Dir[File.dirname(__FILE__) + "/app/routes/**"].each do |route|
-  require route
+%w{app/models app/routes}.each do |dir|
+  Dir[File.join(dir, '**/*.rb')].each do |file|
+    require_relative file
+  end
 end
 DOC
 
       expect(File.exists?(app_file)).to be_truthy
       expect(file_content).to eq expected_file_content
-      expect(Dir.exists?("#{target_dir}/db/migrations")).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)
+
+        expected_file_content =
+<<DOC
+require 'yaml'
+
+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
+    Sequel.connect YAML.load_file(File.expand_path("../config/database.yml", __FILE__))[settings.environment.to_s]
+  end
+end
+
+%w{app/models app/routes}.each do |dir|
+  Dir[File.join(dir, '**/*.rb')].each do |file|
+    require_relative file
+  end
+end
+DOC
+
+        expect(file_content).to eq expected_file_content
+      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
+    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" }
+
+      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
+
+        expect(File.exists?(with_db_rakefile)).to be_truthy
+        expect(File.exists?(with_db_sample_migration)).to be_truthy
+      end
+    end
   end
 
 end

data/spec/melodiest/setting_spec.rb

@@ -1,5 +1,25 @@
 describe Melodiest::Setting do
-  it "respond to setup" do
-    expect(Melodiest::Setting.method_defined?(:setup)).to be_truthy
+  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

data/spec/melodiest_spec.rb

@@ -1,14 +1,4 @@
 describe Melodiest::Application do
-  it "has config.yml" do
-    expect(File.exists?(File.expand_path('../../lib/melodiest/config.yml', __FILE__))).to be_truthy
-  end
-
-  context ".settings" do
-    it "use thin as server" do
-      expect(Melodiest::Application.settings.server).to eq("thin")
-    end
-  end
-
   context ".extensions" do
     it "has reloader extension" do
       expect(app.extensions.include?(Sinatra::Reloader)).to be_truthy

data/spec/spec_helper.rb

@@ -1,7 +1,6 @@
 ENV['RACK_ENV'] = 'test'
 require 'rack/test'
 require_relative '../lib/melodiest'
-require_relative '../lib/melodiest/auth/http'
 
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
@@ -79,14 +78,12 @@ RSpec.configure do |config|
   end
 end
 
-def app
-  Melodiest::Application.helpers Melodiest::Auth::Http
-
-  Melodiest::Application.get "/protected" do
-    authorized!
-  end
+class SpecApp < Melodiest::Application
+  setup 'supersecretcookiespec'
+end
 
-  Melodiest::Application
+def app
+  SpecApp
 end
 
 def gem_root_path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: melodiest
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Kunto Aji Kristianto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -52,34 +52,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.6.3
-- !ruby/object:Gem::Dependency
-  name: fakefs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.6.7
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.6.7
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.5
+        version: 1.4.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.5
+        version: 1.4.6
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
@@ -95,20 +81,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.4.2
 - !ruby/object:Gem::Dependency
-  name: thin
+  name: encrypted_cookie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.3
+        version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.3
-description: Melodiest provides generator and useful modules for your Sinatra application
+        version: 0.0.4
+description: Melodiest provides generator and contains minimalist configuration to
+  develop application with Sinatra
 email: kunto.aji.kr@slackware-id.org
 executables:
 - melodiest
@@ -117,20 +104,21 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
 - bin/melodiest
 - lib/melodiest.rb
-- lib/melodiest/auth/http.rb
 - lib/melodiest/command.rb
-- lib/melodiest/config.yml
 - lib/melodiest/generator.rb
 - lib/melodiest/setting.rb
+- lib/melodiest/templates/Rakefile
+- lib/melodiest/templates/config/database.yml.example
+- lib/melodiest/templates/db/migrations/000_example.rb
 - lib/melodiest/version.rb
 - melodiest.gemspec
-- spec/melodiest/auth/http_spec.rb
 - spec/melodiest/command_spec.rb
 - spec/melodiest/generator_spec.rb
 - spec/melodiest/setting_spec.rb
@@ -148,7 +136,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/melodiest/auth/http.rb

@@ -1,19 +0,0 @@
-module Melodiest
-  module Auth
-
-    # http://www.sinatrarb.com/faq.html#auth
-    module Http
-      def authorized!(username="admin", password="admin")
-        return if authorized?(username, password)
-        headers['WWW-Authenticate'] = 'Basic realm="Restricted Area"'
-        halt 401, "Not authorized\n"
-      end
-
-      def authorized?(username, password)
-        @auth ||=  Rack::Auth::Basic::Request.new(request.env)
-        @auth.provided? and @auth.basic? and @auth.credentials and @auth.credentials == [username, password]
-      end
-    end
-
-  end
-end

data/lib/melodiest/config.yml

@@ -1 +0,0 @@
-server: thin

data/spec/melodiest/auth/http_spec.rb

@@ -1,25 +0,0 @@
-describe Melodiest::Auth::Http do
-  it "respond to authorized!" do
-    expect(Melodiest::Auth::Http.method_defined?(:authorized!)).to be_truthy
-  end
-
-  it "respond to authorized?" do
-    expect(Melodiest::Auth::Http.method_defined?(:authorized?)).to be_truthy
-  end
-
-  it "returns 401 status code without authentication" do
-    get "/protected"
-    expect(last_response.status).to eq 401
-  end
-
-  it "returns 401 status code with bad authentication" do
-    get "/protected"
-    expect(last_response.status).to eq 401
-  end
-
-  it "returns 200 status code with good authentication" do
-    authorize "admin", "admin"
-    get "/protected"
-    expect(last_response.status).to eq 200
-  end
-end