melodiest 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eece355e0a6414d9bc928d73070eee099b9df27a
-  data.tar.gz: 18e71602d9b587def177b120c8bedf2947125d06
+  metadata.gz: 79d0d120efedd4b0f01025a4ce1c98e50af974c5
+  data.tar.gz: 46b4f818997bbbfed1bf3c3b4309ebc6bfeb229e
 SHA512:
-  metadata.gz: 34b276aab69efe0e3239d75441a06e82a86aabfd139fd6c2dfa46daed8c93f06d1e1020c569d5d6ad0b552d9487532e799ee4fdb164835347151a3bbcd6836a0
-  data.tar.gz: fbde39029c8854b4703a3a653499750e83faf28436e70c5000423a6e46a16cabe195731159393cdc4bb828dd0517c65d6dde102225f3fba2eb7a95e425b4fdbc
+  metadata.gz: f1203ee900d402a4922792a3edf5a9a771305bc7a2174dd497f7de26be4f6929d8b7cbd9c28657e3bde9c7597feb2c25db73c703b752f2424c3b9003222a907f
+  data.tar.gz: e7ae8844ff29e53e0af62067e625e0e1348e2215ebf2fd3e1c2abe9f2aa842e4dd772fad1fd86822f26b5d9c364b827f97e56eb48a52d20214c859da5c69b30c

data/.gitignore

@@ -2,3 +2,4 @@
 *.swp
 *.swo
 *.gem
+.DS_Store

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-development:
+1.0.0:
   * prevent tux to be required
   * add sinatra assets pipeline extension
   * restructure generated app

data/Gemfile.lock

@@ -1,23 +1,12 @@
 PATH
   remote: .
   specs:
-    melodiest (0.4.0)
-      encrypted_cookie (= 0.0.4)
-      sinatra (= 1.4.6)
-      sinatra-contrib (= 1.4.2)
+    melodiest (1.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    backports (3.6.4)
     diff-lcs (1.2.5)
-    encrypted_cookie (0.0.4)
-    multi_json (1.11.2)
-    rack (1.6.0)
-    rack-protection (1.5.3)
-      rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
     rspec (3.2.0)
       rspec-core (~> 3.2.0)
       rspec-expectations (~> 3.2.0)
@@ -31,18 +20,6 @@ GEM
       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, < 3)
-    sinatra-contrib (1.4.2)
-      backports (>= 2.0)
-      multi_json
-      rack-protection
-      rack-test
-      sinatra (~> 1.4.0)
-      tilt (~> 1.3)
-    tilt (1.4.1)
 
 PLATFORMS
   ruby
@@ -50,5 +27,4 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.7)
   melodiest!
-  rack-test (= 0.6.3)
   rspec (= 3.2.0)

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2015 kuntoaji
+Copyright (c) 2015-2016 Kunto Aji Kristianto
 
 MIT License
 

data/README.md

@@ -35,20 +35,6 @@ generate app in current directory with database. `-d` option will generate app w
 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`.
-
-```ruby
-# my_app.rb
-
-class App < Melodiest::Application
-  cookie_secret 'this_is_secret_for_encrypted_cookie'
-  ...
-end
-```
-
 ### Example Usage
 This example assume that PostgreSQL is already running and desired database is already exist.
 For complete example see [github.com/kuntoaji/todo_melodiest](https://github.com/kuntoaji/todo_melodiest)
@@ -57,7 +43,7 @@ For complete example see [github.com/kuntoaji/todo_melodiest](https://github.com
   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
@@ -66,42 +52,42 @@ For complete example see [github.com/kuntoaji/todo_melodiest](https://github.com
         String :name, :null=>false
       end
     end
-  
+
     down do
       drop_table(:artists)
     end
   end
   ```
-  
+
   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 '/artists' do
       @artists = Artist.all
       erb :"artists/index"
     end
-    
+
     post '/artists' do
       @artist = Artist.new
       @artist.name = params[:name]
       @artist.save
-      
+
       redirect '/artists'
     end
   end
   ```
-  
+
   9. create file `app/views/artists/index.erb` and put the following code:
-  
+
   ```erb
   <h1>List of Artist</h1>
   <ul>
@@ -109,22 +95,22 @@ For complete example see [github.com/kuntoaji/todo_melodiest](https://github.com
       <li><%= artist.name %></li>
     <% end %>
   </ul>
-  
+
   <form action="/artists" method="post">
     <%= Rack::Csrf.tag(env) %>
     <input type="text" name="name" />
     <button>Submit</button>
   </form>
   ```
-  
+
   10. run the server `bundle exec thin start`
   11. open url `localhost:3000/artists`
 
 ### List of Ruby Gems
 
-  * sinatra (required by default)
-  * sinatra-contrib (required by default)
-  * encrypted_cookie (required by default)
+  * sinatra
+  * sinatra-contrib
+  * encrypted_cookie
   * `Sinatra::Reloader` in development environment only
   * thin
   * `Rack::Session::EncryptedCookie`

data/lib/melodiest.rb

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

data/lib/melodiest/templates/Gemfile.erb

@@ -1,6 +1,8 @@
 source 'https://rubygems.org'
 
-gem 'melodiest', '<%= Melodiest::VERSION %>'
+gem 'sinatra'
+gem 'sinatra-contrib'
+gem 'encrypted_cookie'
 gem 'thin'
 gem 'tux', require: false
 gem 'sinatra-asset-pipeline', require: 'sinatra/asset_pipeline'

data/lib/melodiest/templates/app.erb

@@ -1,6 +1,7 @@
 <%= "require 'yaml'\n\n" if @with_database -%>
-class <%= @app_class_name %> < Melodiest::Application
-  cookie_secret '<%= SecureRandom.hex 32 %>'
+class <%= @app_class_name %> < Sinatra::Application
+  use Rack::Session::EncryptedCookie,
+    secret: '<%= SecureRandom.hex 32 %>'
 
   set :app_file, __FILE__
   set :views, Proc.new { File.join(root, "app/views") }
@@ -19,8 +20,10 @@ class <%= @app_class_name %> < Melodiest::Application
   end
 
   configure :development do
+    require 'sinatra/reloader'
     require 'logger'
 
+    register Sinatra::Reloader
     Sequel.connect YAML.load_file(File.expand_path("../config/database.yml", __FILE__))['development'],
       loggers: [Logger.new($stdout)]
   end
@@ -41,7 +44,7 @@ class <%= @app_class_name %> < Melodiest::Application
   end
 <% else -%>
   configure do
-    # Load up database and such
+    # do something
   end
 <% end -%>
 end

data/lib/melodiest/version.rb

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

data/melodiest.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.summary     = "Sinatra application boilerplate generator"
   s.description = "Melodiest provides generator and contains minimal configuration to develop application with Sinatra"
   s.author      = 'Kunto Aji Kristianto'
-  s.email       = 'kunto.aji.kr@slackware-id.org'
+  s.email       = 'kuntoaji@kaklabs.com'
   s.files       = `git ls-files -z`.split("\x0")
   s.executables << 'melodiest'
   s.homepage    = 'http://github.com/kuntoaji/melodiest'
@@ -16,8 +16,4 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.1'
   s.add_development_dependency 'bundler', '~> 1.7'
   s.add_development_dependency 'rspec', '3.2.0'
-  s.add_development_dependency 'rack-test', '0.6.3'
-  s.add_runtime_dependency 'sinatra', '1.4.6'
-  s.add_runtime_dependency 'sinatra-contrib', '1.4.2'
-  s.add_runtime_dependency 'encrypted_cookie', '0.0.4'
 end

data/spec/fixtures/with_db/app.txt

@@ -1,7 +1,8 @@
 require 'yaml'
 
-class MyApp < Melodiest::Application
-  cookie_secret 'supersecretcookiefromgenerator'
+class MyApp < Sinatra::Application
+  use Rack::Session::EncryptedCookie,
+    secret: 'supersecretcookiefromgenerator'
 
   set :app_file, __FILE__
   set :views, Proc.new { File.join(root, "app/views") }
@@ -19,8 +20,10 @@ class MyApp < Melodiest::Application
   end
 
   configure :development do
+    require 'sinatra/reloader'
     require 'logger'
 
+    register Sinatra::Reloader
     Sequel.connect YAML.load_file(File.expand_path("../config/database.yml", __FILE__))['development'],
       loggers: [Logger.new($stdout)]
   end

data/spec/fixtures/with_db/gemfile.txt

@@ -1,6 +1,8 @@
 source 'https://rubygems.org'
 
-gem 'melodiest', '0.4.0'
+gem 'sinatra'
+gem 'sinatra-contrib'
+gem 'encrypted_cookie'
 gem 'thin'
 gem 'tux', require: false
 gem 'sinatra-asset-pipeline', require: 'sinatra/asset_pipeline'

data/spec/fixtures/without_db/app.txt

@@ -1,5 +1,6 @@
-class MyApp < Melodiest::Application
-  cookie_secret 'supersecretcookiefromgenerator'
+class MyApp < Sinatra::Application
+  use Rack::Session::EncryptedCookie,
+    secret: 'supersecretcookiefromgenerator'
 
   set :app_file, __FILE__
   set :views, Proc.new { File.join(root, "app/views") }
@@ -10,6 +11,6 @@ class MyApp < Melodiest::Application
   use Rack::Csrf, raise: true
 
   configure do
-    # Load up database and such
+    # do something
   end
 end

data/spec/fixtures/without_db/gemfile.txt

@@ -1,6 +1,8 @@
 source 'https://rubygems.org'
 
-gem 'melodiest', '0.4.0'
+gem 'sinatra'
+gem 'sinatra-contrib'
+gem 'encrypted_cookie'
 gem 'thin'
 gem 'tux', require: false
 gem 'sinatra-asset-pipeline', require: 'sinatra/asset_pipeline'

data/spec/helpers/generator.rb

@@ -0,0 +1,46 @@
+module Helper
+  module Generator
+    def expect_file_eq(file, expected_file)
+      file_content = File.read(file)
+      expected_file_content = File.read(expected_file)
+
+      expect(File.exists?(file)).to be_truthy
+      expect(file_content).to eq(expected_file_content)
+    end
+
+    def expected_default_files(target_dir, expected_value)
+      config_dir       = "#{target_dir}/config"
+      assets_dir       = "#{target_dir}/assets"
+      public_dir       = "#{target_dir}/public"
+      boot             = "#{config_dir}/boot.rb"
+      application      = "#{config_dir}/application.rb"
+
+      app_dir          = "#{target_dir}/app"
+      routes_dir       = "#{target_dir}/app/routes"
+      views_dir        = "#{target_dir}/app/views"
+      layout           = "#{target_dir}/app/views/layout.erb"
+      home_index       = "#{target_dir}/app/views/home/index.erb"
+
+      expect(File.exists?(config_dir)).to eq(expected_value)
+      expect(File.exists?("#{config_dir}/boot.rb")).to eq(expected_value)
+      expect(File.exists?("#{config_dir}/application.rb")).to eq(expected_value)
+      expect(File.exists?(assets_dir)).to eq(expected_value)
+      expect(File.exists?(public_dir)).to eq(expected_value)
+
+      expect(Dir.exists?(app_dir)).to eq(expected_value)
+      expect(Dir.exists?(routes_dir)).to eq(expected_value)
+      expect(Dir.exists?(views_dir)).to eq(expected_value)
+      expect(File.exists?(layout)).to eq(expected_value)
+      expect(File.exists?(home_index)).to eq(expected_value)
+    end
+
+    def expected_generated_files_with_db(target_dir, expected_value)
+      sample_migration = "#{target_dir}/db/migrations/000_example.rb"
+
+      expect(Dir.exists?("#{target_dir}/app/models")).to eq(expected_value)
+      expect(File.exists?("#{target_dir}/config/database.yml.example")).to eq(expected_value)
+      expect(File.exists?(sample_migration)).to eq(expected_value)
+    end
+
+  end
+end

data/spec/melodiest/command_spec.rb

@@ -3,14 +3,17 @@ require_relative '../../lib/melodiest/command'
 describe Melodiest::Command do
 
   describe "parse" do
-    before do
+    def remove_existing_app_if_exists
       FileUtils.rm_r "my_app" if Dir.exists?("my_app")
       FileUtils.rm_r "/tmp/my_app" if Dir.exists?("/tmp/my_app")
     end
 
+    before do
+      remove_existing_app_if_exists
+    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")
+      remove_existing_app_if_exists
     end
 
     it "has --help option" do

data/spec/melodiest/generator_spec.rb

@@ -1,25 +1,26 @@
 require_relative '../../lib/melodiest/generator'
+require_relative '../helpers/generator'
 
 describe Melodiest::Generator do
+  include Helper::Generator
+
   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
+  before do
     @dest = "/tmp/melodiest"
     @dest_with_db = "#{@dest}_with_db"
     @app = "my_app"
-  end
 
-  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
+  after do
+    FileUtils.rm_r @dest if Dir.exists?(@dest)
+    FileUtils.rm_r @dest_with_db if Dir.exists?(@dest_with_db)
   end
 
   it "sets app_name" do
@@ -33,105 +34,68 @@ describe Melodiest::Generator do
   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
+    FileUtils.rm_r @app if Dir.exists?(@app)
   end
 
   it "sets new destination path even if it's not exist yet" do
-    expect("/tmp/melodiest/my_app").to eq target_dir
+    expect(Melodiest::Generator.new(@dest).destination).to eq File.expand_path(@dest)
   end
 
   describe "#generate_gemfile" do
     context "without database" do
       let(:gemfile) { "#{target_dir}/Gemfile" }
+      let(:expected_gemfile) { File.expand_path("../../fixtures/without_db/gemfile.txt", __FILE__) }
 
       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 eq(expected_file_content)
+        expect_file_eq(gemfile, expected_gemfile)
       end
     end
 
     context "with database" do
       let(:gemfile) { "#{target_dir_with_db}/Gemfile" }
+      let(:expected_gemfile) { File.expand_path("../../fixtures/with_db/gemfile.txt", __FILE__) }
 
       it "should generate Gemfile with sequel" do
         generator_with_db.generate_gemfile
-        file_content = File.read(gemfile)
-        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)
+        expect_file_eq(gemfile, expected_gemfile)
       end
     end
   end
 
   describe "#generate_bundle_config" do
     let(:bundle_config) { "#{target_dir}/config.ru" }
+    let(:expected_bundle_config) { File.expand_path("../../fixtures/config_ru.txt", __FILE__) }
 
     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 eq(expected_file_content)
+      expect_file_eq(bundle_config, expected_bundle_config)
     end
   end
 
   describe "#generate_app" do
-    before { FileUtils.rm_r @dest if Dir.exists?(@dest) }
-    before { FileUtils.rm_r @dest_with_db if Dir.exists?(@dest_with_db) }
-
     it "generates home route" do
       generator.generate_app
 
-      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__))
+      generated_file = "#{target_dir}/app/routes/home.rb"
+      expected_file = 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(File.exists?(generated_file)).to be_truthy
+      expect_file_eq(generated_file, expected_file)
     end
 
     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
+          expected_default_files(target_dir, false)
+          expected_generated_files_with_db(target_dir, false)
 
           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
+          expected_default_files(target_dir, true)
+          expected_generated_files_with_db(target_dir, false)
         end
       end
 
@@ -142,57 +106,24 @@ describe Melodiest::Generator do
         it "generates <app_name>.rb, public dir, and app dir" do
           generator.generate_app
 
-          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__))
+          generated_file = "#{target_dir}/my_app.rb"
+          expected_file = File.expand_path("../../fixtures/without_db/app.txt", __FILE__)
 
-          expect(File.exists?(app_file)).to be_truthy
-          expect(file_content).to eq expected_file_content
+          expect_file_eq(generated_file, expected_file)
         end
       end
     end
 
     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
+          expected_default_files(target_dir_with_db, false)
+          expected_generated_files_with_db(target_dir_with_db, false)
 
           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
+          expected_default_files(target_dir_with_db, true)
+          expected_generated_files_with_db(target_dir_with_db, true)
         end
       end
 
@@ -203,11 +134,10 @@ describe Melodiest::Generator do
         it "has sequel database connector" do
           generator_with_db.generate_app
 
-          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__))
+          generated_file = "#{target_dir_with_db}/my_app.rb"
+          expected_file = File.expand_path("../../fixtures/with_db/app.txt", __FILE__)
 
-          expect(file_content).to eq expected_file_content
+          expect_file_eq(generated_file, expected_file)
         end
       end
     end
@@ -215,25 +145,22 @@ describe Melodiest::Generator do
 
   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
+      generated_file = "#{target_dir}/Rakefile"
+      expected_file = File.expand_path("../../fixtures/without_db/rakefile.txt", __FILE__)
+
+      expect_file_eq(generated_file, expected_file)
     end
 
     context "with database" do
       it "generates db related tasks" do
-        expected_rakefile_content = File.read(File.expand_path("../../fixtures/with_db/rakefile.txt", __FILE__))
-
         generator_with_db.generate_rakefile
-        rakefile = "#{target_dir_with_db}/Rakefile"
-        rakefile_content = File.read(rakefile)
 
-        expect(rakefile_content).to eq expected_rakefile_content
+        generated_file = "#{target_dir_with_db}/Rakefile"
+        expected_file = File.expand_path("../../fixtures/with_db/rakefile.txt", __FILE__)
+
+        expect_file_eq(generated_file, expected_file)
       end
     end
   end

data/spec/melodiest_spec.rb

@@ -1,15 +1 @@
-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

@@ -1,92 +1,29 @@
 ENV['RACK_ENV'] = 'test'
-require 'rack/test'
 require_relative '../lib/melodiest'
 
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  config.include Rack::Test::Methods
-  
-  # rspec-expectations config goes here. You can use an alternate
-  # assertion/expectation library such as wrong or the stdlib/minitest
-  # assertions if you prefer.
   config.expect_with :rspec do |expectations|
-    # This option will default to `true` in RSpec 4. It makes the `description`
-    # and `failure_message` of custom matchers include text for helper methods
-    # defined using `chain`, e.g.:
-    # be_bigger_than(2).and_smaller_than(4).description
-    #   # => "be bigger than 2 and smaller than 4"
-    # ...rather than:
-    #   # => "be bigger than 2"
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
   end
 
-  # rspec-mocks config goes here. You can use an alternate test double
-  # library (such as bogus or mocha) by changing the `mock_with` option here.
   config.mock_with :rspec do |mocks|
-    # Prevents you from mocking or stubbing a method that does not exist on
-    # a real object. This is generally recommended, and will default to
-    # `true` in RSpec 4.
     mocks.verify_partial_doubles = true
   end
 
   begin
-    # These two settings work together to allow you to limit a spec run
-    # to individual examples or groups you care about by tagging them with
-    # `:focus` metadata. When nothing is tagged with `:focus`, all examples
-    # get run.
     config.filter_run :focus
     config.run_all_when_everything_filtered = true
 
-    # Limits the available syntax to the non-monkey patched syntax that is recommended.
-    # For more details, see:
-    #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
-    #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-    #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
     #config.disable_monkey_patching!
-
-    # This setting enables warnings. It's recommended, but in some cases may
-    # be too noisy due to issues in dependencies.
-    #config.warnings = true
     config.warnings = false
 
-    # Many RSpec users commonly either run the entire suite or an individual
-    # file, and it's useful to allow more verbose output when running an
-    # individual spec file.
     if config.files_to_run.one?
-      # Use the documentation formatter for detailed output,
-      # unless a formatter has already been configured
-      # (e.g. via a command-line flag).
       config.default_formatter = 'doc'
     end
 
-    # Print the 10 slowest examples and example groups at the
-    # end of the spec run, to help surface which specs are running
-    # particularly slow.
     config.profile_examples = 10
-
-    # Run specs in random order to surface order dependencies. If you find an
-    # order dependency and want to debug it, you can fix the order by providing
-    # the seed, which is printed after each run.
-    #     --seed 1234
     config.order = :random
 
-    # Seed global randomization in this process using the `--seed` CLI option.
-    # Setting this allows you to use `--seed` to deterministically reproduce
-    # test failures related to randomization by passing the same `--seed` value
-    # as the one that triggered the failure.
     Kernel.srand config.seed
   end
 end
-
-class SpecApp < Melodiest::Application
-  cookie_secret 'supersecretcookiespec'
-end
-
-def app
-  SpecApp
-end
-
-def gem_root_path
-  File.expand_path "../../", __FILE__
-end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: melodiest
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Kunto Aji Kristianto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,65 +38,9 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.2.0
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.6.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.6.3
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.4.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.4.6
-- !ruby/object:Gem::Dependency
-  name: sinatra-contrib
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.4.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.4.2
-- !ruby/object:Gem::Dependency
-  name: encrypted_cookie
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.4
 description: Melodiest provides generator and contains minimal configuration to develop
   application with Sinatra
-email: kunto.aji.kr@slackware-id.org
+email: kuntoaji@kaklabs.com
 executables:
 - melodiest
 extensions: []
@@ -113,7 +57,6 @@ files:
 - lib/melodiest.rb
 - lib/melodiest/command.rb
 - lib/melodiest/generator.rb
-- lib/melodiest/setting.rb
 - lib/melodiest/templates/Gemfile.erb
 - lib/melodiest/templates/Rakefile.erb
 - lib/melodiest/templates/app.erb
@@ -130,7 +73,6 @@ files:
 - 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
@@ -150,6 +92,7 @@ files:
 - spec/fixtures/without_db/app.txt
 - spec/fixtures/without_db/gemfile.txt
 - spec/fixtures/without_db/rakefile.txt
+- spec/helpers/generator.rb
 - spec/melodiest/command_spec.rb
 - spec/melodiest/generator_spec.rb
 - spec/melodiest_spec.rb

data/lib/melodiest/setting.rb

@@ -1,8 +0,0 @@
-module Melodiest
-  module Setting
-    def setup(cookie_secret)
-      use Rack::Session::EncryptedCookie,
-        secret: cookie_secret
-    end
-  end
-end