hotchkiss 0.0.2 → 0.0.3

data/lib/hotchkiss/application.rb

@@ -6,7 +6,6 @@ module HK
 
     @@router = nil
     @@root  = nil
-    @@favicon = nil
 
     attr_accessor :router, :root
 
@@ -16,26 +15,17 @@ module HK
 
     def self.root=(root)
       @@root = root if @@root.nil?
-      begin
-        @@favicon = File.read(File.join("#{root}/public/favicon.ico"))
-      rescue
-        @@favicon = nil
-      end
     end
 
     def self.root
       @@root
     end
 
-    def self.favicon
-      @@favicon
-    end
-
     def self.burnbabyburn!
       lambda do |env|
         begin
           route, params = @@router.match?(env)
-          env['hk.params'] = (params.nil? ? "" : params)
+          env['hk.params'] = (params.nil? ? {} : params)
           if !route.nil? && route.has_key?(:special)
             env['hk.controller'] = route[:controller]
           elsif !route.nil?
@@ -44,7 +34,7 @@ module HK
             raise Exception, "Unknown route for path: #{env['REQUEST_PATH']}"
           end
           env['hk.action'] = route[:action]
-          Object.const_get(env['hk.controller']).new.call(env)
+          resp = Object.const_get(env['hk.controller']).new.call(env)
         rescue Exception => e
           env['hk.action'] = "on_exception"
           env['hk.exception'] = e
@@ -53,8 +43,11 @@ module HK
           else
             env['hk.controller'] = :FastResponder
           end
-          Object.const_get(env['hk.controller']).new.call(env)
+          resp = Object.const_get(env['hk.controller']).new.call(env)
         end
+        response = Rack::Response.new()
+        response.write(resp)
+        response.finish
       end
     end
 

data/lib/hotchkiss/cli/const.rb

@@ -1,8 +1,13 @@
+require 'yaml'
+
 module Cli
 
+  DB_INFO_FILE = Dir.pwd + "/config/db.yml"
+
   TEMPLATE_DIR = Gem::Specification.find_by_name("hotchkiss").gem_dir +
                      "/lib/hotchkiss/templates/"
-  DB_INFOS = YAML::load(File.open(Dir.pwd + "/config/db.yml"))
+  DB_INFOS = YAML::load(File.open(DB_INFO_FILE)) if File.exists?(DB_INFO_FILE)
   MG_DIR = Dir.pwd + "/db/migrations/"
+  MODEL_DIR = Dir.pwd + "/code/app/models"
 
 end ## Cli

data/lib/hotchkiss/cli/generate.rb

@@ -4,19 +4,45 @@ module Cli
 
     desc "model NAME", "Generate model files."
     def model(name)
-      puts name
+      init
+      file = Dir.pwd + "/code/app/models/#{name}.rb"
+      unless Dir.exists?(Cli::MODEL_DIR)
+        Dir.mkdir(Cli::MODEL_DIR)
+      end
+      open(file, File::CREAT|File::TRUNC|File::RDWR) do |f|
+        f << "class #{name.capitalize} < Sequel::Model\nend\n"
+      end
+      puts "Creation: #{file}"
     end
 
     desc "controller NAME", "Generate controller files."
     def controller(name)
-      puts name
+      init
+      file = Dir.pwd + "/code/app/controllers/#{name}_controller.rb"
+      open(file, File::CREAT|File::TRUNC|File::RDWR) do |f|
+        f << "class #{name.capitalize}Controller < HK::Controller\nend\n"
+      end
+      puts "Creation: #{file}"
     end
 
     desc "migration NAME", "Generate migration file."
     def migration(name)
+      init
       timestamp = Time.now.to_i
       final_name = "#{timestamp}_#{name}"
-      FileUtils.cp_r(Cli::TEMPLATE_DIR + "generate/migration/migration", Dir.pwd + "/db/migrations/#{final_name}.rb")
+      file = Dir.pwd + "/db/migrations/#{final_name}.rb"
+      FileUtils.cp_r(Cli::TEMPLATE_DIR + "generate/migration/migration", file)
+      puts "Creation: #{file}"
+    end
+
+    no_tasks do
+
+      def init
+        unless File.exists?(Cli::MG_DIR)
+          abort("#{Cli::MG_DIR} directory doesn't exist, did you create your app ?\nPlease use 'hk new [app_name] to create it.")
+        end
+      end
+
     end
 
   end # Generate

data/lib/hotchkiss/cli/migrate.rb

@@ -5,35 +5,63 @@ module Cli
     desc "reset", "migration reset (erase and migration up)"
     def reset
       init
-      Sequel::Migrator.run(@db, MG_DIR, :target => 0)
-      Sequel::Migrator.run(@db, MG_DIR)
+      try_catch_migrate do
+        Sequel::Migrator.run(@db, MG_DIR, :target => 0)
+        Sequel::Migrator.run(@db, MG_DIR)
+      end
     end
 
     desc "to", "Update migrations (up or down) to VERSION."
     def to
       init
-      version = ENV['VERSION'].to_i
-      raise "No VERSION was provided" if version.nil?
-      Sequel::Migrator.run(@db, MG_DIR, :target => version)
+      try_catch_migrate do
+        raise "No VERSION was provided" unless  ENV['VERSION']
+        version = ENV['VERSION'].to_i
+        Sequel::Migrator.run(@db, MG_DIR, :target => version)
+      end
     end
 
     desc "up", "Update migrations to latest available."
     def up
       init
-      Sequel::Migrator.run(@db, MG_DIR)
+      try_catch_migrate do
+        Sequel::Migrator.run(@db, MG_DIR)
+      end
     end
 
     desc "down", "Full migration downgrade (erase all data)."
     def down
       init
-      Sequel::Migrator.run(@db, MG_DIR, :target => 0)
+      try_catch_migrate do
+        Sequel::Migrator.run(@db, MG_DIR, :target => 0)
+      end
     end
 
     no_tasks do
+
       def init
         Sequel.extension :migration
-        @db = Sequel.connect(DB_INFOS[:url], DB_INFOS[:options])
+        begin
+          @db = Sequel.connect(DB_INFOS[:url], DB_INFOS[:options])
+        rescue NameError
+          puts "Did you configure your config/db.yml file ?"
+          abort "Are you in your app directory ?"
+        end
+      end
+
+      def try_catch_migrate
+        begin
+          yield
+        rescue NoMethodError => e
+          puts "Migration error:"
+          puts "Do you have some migration defined ?"
+          abort "You can have error with the name of your migration (timestamp_name.rb) - Avoid '-' character."
+        rescue Sequel::Migrator::Error, Exception => e
+          puts "Migration error:"
+          abort e.message
+        end
       end
+
     end
 
   end # Migrate

data/lib/hotchkiss/cli/willy.rb

@@ -5,8 +5,12 @@ module Cli
     desc "new NAME", "Create new hotchkiss application directories with skel files."
     def new(name)
       dir = Dir.pwd + '/' + name
-      FileUtils.mkdir(dir)
-      FileUtils.cp_r(TEMPLATE_DIR + "new/", dir)
+      unless File.exists?(dir)
+        FileUtils.cp_r(TEMPLATE_DIR + "new", dir)
+        FileUtils.mkpath(dir + '/db/migrations')
+      else
+        abort("#{dir} exists. Remove it or change your app name.")
+      end
     end
 
     desc "server [host - default 127.0.0.1] [port - default 3000]", "Run development server."
@@ -22,6 +26,16 @@ module Cli
       HK::Server.start!(options)
     end
 
+    desc "console", "IRB console."
+    def console
+      require 'irb'
+      db = YAML::load(File.open("#{Dir.pwd}/config/db.yml"))
+      Sequel.connect(db[:url], db[:options])
+      Dir["#{Dir.pwd}/code/app/models/*.rb"].each { |file| require file }
+      ARGV.clear
+      IRB.start
+    end
+
     desc "generate SUBCOMMAND", "Generators for model and controller files."
     subcommand "generate", Generate
 

data/lib/hotchkiss/controller.rb

@@ -1,15 +1,13 @@
-require 'pp'
 module HK
 
   class Controller
 
     def call(env)
+      @env = env
       @request = Rack::Request.new(env)
       @response = Rack::Response.new()
       @request.update_param :url, env['hk.params']
       resp = self.send(env['hk.action'])
-      @response.write(resp)
-      @response.finish
     end
 
   private
@@ -18,6 +16,16 @@ module HK
       @request.params
     end
 
+    def reroute(controller, action, args = {})
+      name = controller.to_s.capitalize + 'Controller'
+      c = Object.const_get(name).new
+      env = @env
+      env['hk.controller'] = name
+      env['hk.action'] = action
+      env['hk.params'].merge args
+      c.call(env)
+    end
+
     def redirect_to(url)
       @response.redirect(url)
     end

data/lib/hotchkiss/fast_responder.rb

@@ -1,11 +1,5 @@
 class FastResponder < HK::Controller
 
-  def favicon
-    @favicon = HK::Application.favicon
-    status @favicon.nil? ? 500 : 200
-    @favicon
-  end
-
   def on_exception
     e = request.env["hk.exception"]
     status 500

data/lib/hotchkiss/router.rb

@@ -1,5 +1,3 @@
-require 'pp'
-
 module HK
 
   class Router
@@ -8,7 +6,6 @@ module HK
       @routes_by_method = {}
       @routes = []
       yield(self)
-      finish
       compute
     end
 
@@ -69,11 +66,6 @@ module HK
       end
     end
 
-    def finish
-      @routes << { :method => :get, :path => "/favicon.ico", :action => "favicon",
-                   :controller => :FastResponder, :special => true }
-    end
-
   end # Router
 
 end ## HK

data/lib/hotchkiss/templates/new/config.ru

@@ -5,6 +5,10 @@ require 'tilt'
 require 'sequel'
 require 'hotchkiss'
 
+use Rack::Static,
+  :urls => ["/static", "/favicon.ico"],
+  :root => "public"
+
 HK::Application.root = ::File.expand_path(::File.dirname(__FILE__))
 require HK::Application.root + '/config/init'
 

data/lib/hotchkiss/version.rb

@@ -1,5 +1,5 @@
 module HK
 
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
 
 end ## HK

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: hotchkiss
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
 - Thibaut Deloffre
+- Valerian Cubero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-20 00:00:00.000000000 Z
+date: 2013-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -160,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby web framework