simba 0.0.3 → 0.0.4

data/lib/simba/base_app/Gemfile

@@ -7,6 +7,7 @@ gem "sequel"
 gem "sinatra"
 gem "coffee-script"
 gem "sinatra-contrib"
+gem "sinatra-flash"
 gem "sinatra-assetpack", :require => "sinatra/assetpack"
 
 group :development, :test do
@@ -22,3 +23,8 @@ group :test do
   gem "factory_girl"
   gem "database_cleaner"
 end
+
+group :deploy do
+  gem "uglifier"
+  gem "capistrano"
+end

data/lib/simba/base_app/Rakefile

@@ -1,6 +1,7 @@
-#load rake tasks
+# load rake tasks
 Dir["./lib/tasks/**/*.rake"].sort.each { |ext| load ext }
-#load assetpacket tasks
+
+# load assetpacket tasks
 APP_FILE  = './config/boot.rb'
 APP_CLASS = 'Sinatra::Application'
 require 'sinatra/assetpack/rake'

data/lib/simba/base_app/app/helpers/application_helper.rb

@@ -1,3 +1,3 @@
 helpers do
   #dummy
-end
+end

data/lib/simba/base_app/config/boot.rb

@@ -1,19 +1,25 @@
 require "rubygems"
 require "bundler"
-#require "bundle gems"
+require "yaml"
+
+# require "bundle gems"
 ENV["RACK_ENV"] ||= "development"
 Bundler.require(:default, ENV["RACK_ENV"].to_sym)
+
 # init database
-DB = Sequel.sqlite("./db/#{ENV["RACK_ENV"]}.db")
+DB = Sequel.connect(YAML.load_file("./config/database.yml")["default"]["url"])
+
 # init sinatra
 set :sessions, true
 set :root, File.expand_path(".")
 set :views, settings.root + "/app/views"
+
 # sinatra reloader
 if development?
   require "sinatra/reloader"
   also_reload "lib/**/*.rb", "app/{models,helpers}/**/*.rb"
 end
+
 # assetpack support
 assets do
   serve "/js", :from => "app/assets/js"
@@ -26,7 +32,8 @@ assets do
   js :application, ["/js/*.js"]
   css :application, ["/css/*.css"]
 end
-# require sinatra files
+
+# require project files
 Dir.glob "./{lib,app/models,app/helpers,app/controllers}/**/*.rb" do |f|
   require f
 end

data/lib/simba/base_app/config/database.yml

@@ -0,0 +1,2 @@
+default:
+  url: sqlite://db/development.db #postgres://user:password@host:port/database_name

data/lib/simba/base_app/lib/tasks/db.rake

@@ -1,12 +1,13 @@
+require "yaml"
+
 namespace :db do
-  require "sequel"
-  Sequel.extension :migration
-  DB = Sequel.sqlite('db/test.db')
+
+  database_url = YAML.load_file("./config/database.yml")["default"]["url"]
 
   desc "Perform migration reset (full erase and migration up)"
   task :setup do
-    Sequel::Migrator.run(DB, "db/migrations", :target => 0)
-    Sequel::Migrator.run(DB, "db/migrations")
+    puts `sequel -Etm ./db/migrations -M 0 #{database_url}`
+    puts `sequel -Etm ./db/migrations #{database_url}`
     puts "<= sq:migrate:reset executed"
   end
 
@@ -14,19 +15,19 @@ namespace :db do
   task :version do
     version = ENV['VERSION'].to_i
     raise "No VERSION was provided" if version.nil?
-    Sequel::Migrator.run(DB, "db/migrations", :target => version)
+    puts `sequel -Etm db/migrations -M #{version} #{database_url}`
     puts "<= sq:migrate:to version=[#{version}] executed"
   end
 
   desc "Perform migration up to latest migration available"
   task :migrate do
-    Sequel::Migrator.run(DB, "db/migrations")
+    puts `sequel -Etm ./db/migrations #{database_url}`
     puts "<= sq:migrate:up executed"
   end
 
   desc "Perform migration down (erase all data)"
   task :rollback do
-    Sequel::Migrator.run(DB, "db/migrations", :target => 0)
+    puts `sequel -Etm ./db/migrations -M 0 #{database_url}`
     puts "<= sq:migrate:down executed"
   end
 end

data/lib/simba/base_app/lib/tasks/test.rake

@@ -6,3 +6,10 @@
     end
   end
 end
+
+desc "run all tests"
+task "test" do
+  Dir.glob "./test/**/*_test.rb" do |f|
+    require f
+  end
+end

data/lib/simba/base_app/test/factory/user_factory.rb

@@ -1,3 +1,6 @@
-Factory.define :user do |u|
-  u.name "simba"
+# https://github.com/thoughtbot/factory_girl/wiki/Usage
+FactoryGirl.define do
+  factory :user do
+    name "simba"
+  end
 end

data/lib/simba/base_app/test/functional/user_controller_test.rb

@@ -0,0 +1,4 @@
+require_relative "../test_helper"
+
+class UserControllerTest < FunctionalTestCase
+end

data/lib/simba/base_app/test/test_helper.rb

@@ -1,18 +1,18 @@
 ENV['RACK_ENV'] ||= "test"
 require_relative "../config/boot.rb"
+
 # factory_girl
 dir = File.expand_path File.dirname(__FILE__)
 Dir.glob "#{dir}/factory/**/*_factory.rb" do |f|
   require f
 end
-# minitest
+
 require "minitest/autorun"
-# rack test
 require "rack/test"
-# database_clean
 DatabaseCleaner.strategy = :truncation
 
 class TestCase < MiniTest::Unit::TestCase
+  include FactoryGirl::Syntax::Methods
   def initialize *xs
     super
     DatabaseCleaner.clean
@@ -24,4 +24,4 @@ class FunctionalTestCase < TestCase
   def app
     Sinatra::Application
   end
-end
+end

data/lib/simba/base_app/test/unit/user_test.rb

@@ -2,10 +2,10 @@ require_relative "../test_helper"
 
 class UserTest < TestCase
   def setup
-    Factory(:user)
+    @user = build :user
   end
-  
+
   def test_user_name
-    #dummy
+    # dummy
   end
-end
+end

data/lib/simba/version.rb

@@ -1,3 +1,3 @@
 module Simba
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simba
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-22 00:00:00.000000000 Z
+date: 2012-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70296540820220 !ruby/object:Gem::Requirement
+  requirement: &70255967802680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70296540820220
+  version_requirements: *70255967802680
 description: simba is a generator for sinatra applications.
 email:
 - saitowu@gmail.com
@@ -50,6 +50,7 @@ files:
 - lib/simba/base_app/app/views/layout.slim.tt
 - lib/simba/base_app/config.ru
 - lib/simba/base_app/config/boot.rb
+- lib/simba/base_app/config/database.yml
 - lib/simba/base_app/db/migrations/1_create_users.rb
 - lib/simba/base_app/lib/tasks/db.rake
 - lib/simba/base_app/lib/tasks/stat.rake
@@ -85,3 +86,4 @@ signing_key:
 specification_version: 3
 summary: simba aim to set up ruby off rails best practice.
 test_files: []
+has_rdoc: