hotchkiss 0.0.1 → 0.0.2

data/bin/hk

@@ -3,33 +3,9 @@
 require 'thor'
 require 'rack'
 require 'tilt'
+require 'sequel'
+require 'sqlite3'
 require 'hotchkiss'
+require 'hotchkiss/cli'
 
-class Generator < Thor
-
-  TEMPLATE_DIR = Gem::Specification.find_by_name("hotchkiss").gem_dir +
-                 "/lib/hotchkiss/templates/"
-
-  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)
-  end
-
-  desc "server", "Run development server"
-  def server(port = nil)
-    port ||= 3000
-    host ||= "127.0.0.1"
-    [:INT, :TERM].each { |sig| trap(sig) { exit } }
-    options = {}
-    options[:Host] = host
-    options[:Port] = port
-    options[:config] = "config.ru"
-    options[:server] = :webrick
-    HK::Server.start!(options)
-  end
-
-end # Generator
-
-Generator.start(ARGV)
+Cli::Willy.start(ARGV)

data/lib/hotchkiss/application.rb

@@ -34,7 +34,8 @@ module HK
     def self.burnbabyburn!
       lambda do |env|
         begin
-          route = @@router.match?(env)
+          route, params = @@router.match?(env)
+          env['hk.params'] = (params.nil? ? "" : params)
           if !route.nil? && route.has_key?(:special)
             env['hk.controller'] = route[:controller]
           elsif !route.nil?

data/lib/hotchkiss/cli/const.rb

@@ -0,0 +1,8 @@
+module Cli
+
+  TEMPLATE_DIR = Gem::Specification.find_by_name("hotchkiss").gem_dir +
+                     "/lib/hotchkiss/templates/"
+  DB_INFOS = YAML::load(File.open(Dir.pwd + "/config/db.yml"))
+  MG_DIR = Dir.pwd + "/db/migrations/"
+
+end ## Cli

data/lib/hotchkiss/cli/generate.rb

@@ -0,0 +1,24 @@
+module Cli
+
+  class Generate < Thor
+
+    desc "model NAME", "Generate model files."
+    def model(name)
+      puts name
+    end
+
+    desc "controller NAME", "Generate controller files."
+    def controller(name)
+      puts name
+    end
+
+    desc "migration NAME", "Generate migration file."
+    def migration(name)
+      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")
+    end
+
+  end # Generate
+
+end ## Cli

data/lib/hotchkiss/cli/migrate.rb

@@ -0,0 +1,41 @@
+module Cli
+
+  class Migrate < Thor
+
+    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)
+    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)
+    end
+
+    desc "up", "Update migrations to latest available."
+    def up
+      init
+      Sequel::Migrator.run(@db, MG_DIR)
+    end
+
+    desc "down", "Full migration downgrade (erase all data)."
+    def down
+      init
+      Sequel::Migrator.run(@db, MG_DIR, :target => 0)
+    end
+
+    no_tasks do
+      def init
+        Sequel.extension :migration
+        @db = Sequel.connect(DB_INFOS[:url], DB_INFOS[:options])
+      end
+    end
+
+  end # Migrate
+
+end ## Cli

data/lib/hotchkiss/cli/willy.rb

@@ -0,0 +1,33 @@
+module Cli
+
+  class Willy < Thor
+
+    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)
+    end
+
+    desc "server [host - default 127.0.0.1] [port - default 3000]", "Run development server."
+    def server(host = nil, port = nil)
+      port ||= 3000
+      host ||= "127.0.0.1"
+      [:INT, :TERM].each { |sig| trap(sig) { exit } }
+      options = {}
+      options[:Host] = host
+      options[:Port] = port
+      options[:config] = "config.ru"
+      options[:server] = :webrick
+      HK::Server.start!(options)
+    end
+
+    desc "generate SUBCOMMAND", "Generators for model and controller files."
+    subcommand "generate", Generate
+
+    desc "migrate SUBCOMMAND", "Up/down migration tool."
+    subcommand "migrate", Migrate
+
+  end # Willy
+
+end ## Cli

data/lib/hotchkiss/cli.rb

@@ -0,0 +1,4 @@
+require_relative 'cli/const'
+require_relative 'cli/migrate'
+require_relative 'cli/generate'
+require_relative 'cli/willy'

data/lib/hotchkiss/controller.rb

@@ -1,3 +1,4 @@
+require 'pp'
 module HK
 
   class Controller
@@ -5,6 +6,7 @@ module HK
     def call(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

data/lib/hotchkiss/router.rb

@@ -1,8 +1,11 @@
+require 'pp'
+
 module HK
 
   class Router
 
     def initialize
+      @routes_by_method = {}
       @routes = []
       yield(self)
       finish
@@ -22,29 +25,53 @@ module HK
     end
 
     def match?(env)
-      method = env['REQUEST_METHOD']
+      method = env['REQUEST_METHOD'].downcase.to_sym
       path = env['REQUEST_PATH'].eql?("/") ? "/" : env['REQUEST_PATH'].gsub(/\/$/, '')
-      @routes.each do |route|
+      @routes_by_method[method].each do |route|
         if path.match(route[:regexp])
-          return route
+          return route, extract_params(route, path.scan(route[:regexp]).flatten!)
         end
       end
-      return nil
+      return nil, nil
     end
 
     private
 
     def compute
       @routes.each do |route|
+        backup = String.new(route[:path])
         computed_route = route[:path].gsub!(/((:\w+)|\*)/, /(\w+)/.to_s)
-        computed_route = "^#{route[:path]}$" if computed_route.nil?
+        computed_route = "^#{route[:path]}$"
         computed_route = Regexp.new(computed_route)
         route[:regexp] = computed_route
+        route[:path] = backup
+        route[:params] = route[:path].scan(/:\w*/).map {|a| a.tr(':', '').to_sym}
+        if @routes_by_method.has_key? route[:method]
+          @routes_by_method[route[:method]] << route
+        else
+          @routes_by_method[route[:method]] = [route]
         end
+      end
+    end
+
+    def extract_params(route, params)
+      length = route[:params].length
+      if length > 0 && length = params.length
+        par = {}
+        i = 0
+        while i < length
+          par[route[:params][i]] = params[i]
+          i += 1
+        end
+        par
+      else
+        nil
+      end
     end
 
     def finish
-      @routes << {:path => "/favicon.ico", :action => "favicon", :controller => :FastResponder, :special => true}
+      @routes << { :method => :get, :path => "/favicon.ico", :action => "favicon",
+                   :controller => :FastResponder, :special => true }
     end
 
   end # Router

data/lib/hotchkiss/templates/generate/migration/migration

@@ -0,0 +1,9 @@
+Sequel.migration do
+  up do
+    # Up code here
+  end
+
+  down do
+    # Down code here
+  end
+end

data/lib/hotchkiss/templates/new/Gemfile

@@ -3,5 +3,7 @@ source 'https://rubygems.org'
 gem 'rack'
 gem 'thor'
 gem 'tilt'
+gem 'sequel'
+gem 'sqlite3'
 gem 'hotchkiss'
 

data/lib/hotchkiss/templates/new/code/app/views/application.html.erb

@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE html>
 <html>
   <head>
+    <meta http-equiv="Content-Type"
+          content="text/html; charset=utf-8">
     <title>
     </title>
   </head>

data/lib/hotchkiss/templates/new/config/db.yml.example

@@ -0,0 +1,3 @@
+:url: 'sqlite://db/demo.sqlite'
+:options:
+  :encoding: utf-8

data/lib/hotchkiss/templates/new/config/init.rb

@@ -1,8 +1,7 @@
 
+db = YAML::load(File.open("#{HK::Application.root}/config/db.yml"))
+Sequel.connect(db[:url], db[:options])
+
 Dir["#{HK::Application.root}/code/lib/**/*.rb"].each { |file| require file }
 Dir["#{HK::Application.root}/code/app/**/*.rb"].each { |file| require file }
 
-# Add your custom requires.
-#
-# require HK::Application.root + '/a/path'
-

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

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'bundler/setup'
 require 'rack'
 require 'tilt'
+require 'sequel'
 require 'hotchkiss'
 
 HK::Application.root = ::File.expand_path(::File.dirname(__FILE__))

data/lib/hotchkiss/version.rb

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

data/lib/hotchkiss.rb

@@ -1,11 +1,6 @@
+require 'hotchkiss/version'
 require 'hotchkiss/router'
 require 'hotchkiss/controller'
 require 'hotchkiss/fast_responder'
 require 'hotchkiss/application'
 require 'hotchkiss/server'
-
-module HK
-
-  VERSION = '0.0.1'
-
-end ## HK

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hotchkiss
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-22 00:00:00.000000000 Z
+date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -91,6 +91,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sequel
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby web framework
 email: tib@rocknroot.org
 executables:
@@ -99,24 +115,31 @@ extensions: []
 extra_rdoc_files:
 - LICENSE.txt
 files:
+- lib/hotchkiss.rb
+- lib/hotchkiss/application.rb
+- lib/hotchkiss/cli.rb
+- lib/hotchkiss/cli/const.rb
+- lib/hotchkiss/cli/generate.rb
+- lib/hotchkiss/cli/migrate.rb
+- lib/hotchkiss/cli/willy.rb
+- lib/hotchkiss/controller.rb
+- lib/hotchkiss/errors.rb
 - lib/hotchkiss/fast_responder.rb
+- lib/hotchkiss/router.rb
+- lib/hotchkiss/server.rb
+- lib/hotchkiss/templates/generate/migration/migration
 - lib/hotchkiss/templates/new/Gemfile
-- lib/hotchkiss/templates/new/public/favicon.ico
-- lib/hotchkiss/templates/new/config.ru
-- lib/hotchkiss/templates/new/code/app/routes.rb
 - lib/hotchkiss/templates/new/code/app/controllers/application_controller.rb
+- lib/hotchkiss/templates/new/code/app/routes.rb
 - lib/hotchkiss/templates/new/code/app/views/application.html.erb
-- lib/hotchkiss/templates/new/config/database.rb
+- lib/hotchkiss/templates/new/config.ru
+- lib/hotchkiss/templates/new/config/db.yml.example
 - lib/hotchkiss/templates/new/config/init.rb
-- lib/hotchkiss/errors.rb
-- lib/hotchkiss/server.rb
-- lib/hotchkiss/application.rb
-- lib/hotchkiss/controller.rb
-- lib/hotchkiss/router.rb
-- lib/hotchkiss.rb
+- lib/hotchkiss/templates/new/public/favicon.ico
+- lib/hotchkiss/version.rb
 - LICENSE.txt
 - bin/hk
-homepage: https://github.com/RocknRoot/hotchkiss
+homepage: https://github.com/RocknRoot/Hotchkiss
 licenses:
 - BSD
 post_install_message: 
@@ -137,8 +160,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: It rolls !
+summary: Ruby web framework
 test_files: []

data/lib/hotchkiss/templates/new/config/database.rb

@@ -1 +0,0 @@
-# In 0.0.2