RubyGems - tanuki - Versions diffs - 0.3.1 → 0.4.0 - Mend

tanuki 0.3.1 → 0.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (63) hide show

data/README.rdoc +5 -4
data/app/tanuki/controller/{link.thtml → controller.link.thtml} +0 -0
data/app/tanuki/controller/controller.page.thtml +14 -0
data/app/tanuki/controller/controller.rb +1 -2
data/app/tanuki/controller/controller.title.ttxt +1 -0
data/app/tanuki/controller/controller.view.thtml +3 -0
data/app/tanuki/fetcher/sequel/sequel.rb +34 -0
data/app/tanuki/manager/controller/controller.rb +1 -1
data/app/tanuki/manager/page/page.rb +1 -1
data/app/tanuki/meta_model/{manager.ttxt → meta_model.manager.ttxt} +0 -0
data/app/tanuki/meta_model/{manager_base.ttxt → meta_model.manager_base.ttxt} +0 -0
data/app/tanuki/meta_model/{model.ttxt → meta_model.model.ttxt} +0 -0
data/app/tanuki/meta_model/{model_base.ttxt → meta_model.model_base.ttxt} +0 -0
data/app/tanuki/meta_model/meta_model.rb +1 -2
data/app/tanuki/model/controller/controller.rb +1 -1
data/app/tanuki/model/page/page.rb +1 -1
data/app/tanuki/page/missing/{default.thtml → missing.page.thtml} +1 -1
data/app/tanuki/page/missing/missing.rb +3 -2
data/app/user/page/home/home.rb +2 -0
data/app/user/page/home/home.title.thtml +1 -0
data/app/user/page/home/home.view.css +88 -0
data/app/user/page/home/home.view.thtml +22 -0
data/bin/tanuki +2 -1
data/config/common.rb +1 -0
data/config/common_application.rb +3 -6
data/config/development_application.rb +0 -3
data/lib/tanuki.rb +8 -7
data/lib/tanuki/application.rb +108 -81
data/lib/tanuki/argument.rb +10 -5
data/lib/tanuki/argument/integer_range.rb +4 -2
data/lib/tanuki/{behavior/object_behavior.rb → base_behavior.rb} +21 -4
data/lib/tanuki/configurator.rb +20 -8
data/lib/tanuki/const.rb +32 -0
data/lib/tanuki/context.rb +18 -7
data/lib/tanuki/controller.rb +517 -0
data/lib/tanuki/css_compressor.rb +50 -0
data/lib/tanuki/extensions/module.rb +21 -5
data/lib/tanuki/extensions/rack/frozen_route.rb +35 -0
data/lib/tanuki/extensions/rack/static_dir.rb +1 -1
data/lib/tanuki/extensions/sequel/model.rb +7 -0
data/lib/tanuki/i18n.rb +8 -6
data/lib/tanuki/loader.rb +166 -33
data/lib/tanuki/meta_model.rb +176 -0
data/lib/tanuki/{behavior/model_behavior.rb → model_behavior.rb} +7 -3
data/lib/tanuki/model_generator.rb +49 -29
data/lib/tanuki/template_compiler.rb +72 -41
data/lib/tanuki/utility.rb +11 -4
data/lib/tanuki/utility/create.rb +52 -11
data/lib/tanuki/utility/generate.rb +16 -10
data/lib/tanuki/utility/version.rb +1 -1
data/lib/tanuki/version.rb +7 -2
metadata +50 -66
data/app/tanuki/controller/default.thtml +0 -5
data/app/tanuki/controller/index.thtml +0 -1
data/app/user/page/index/default.thtml +0 -121
data/app/user/page/index/index.rb +0 -2
data/config/test_application.rb +0 -2
data/lib/tanuki/behavior/controller_behavior.rb +0 -366
data/lib/tanuki/behavior/meta_model_behavior.rb +0 -160
data/lib/tanuki/extensions/rack/builder.rb +0 -26
data/lib/tanuki/extensions/rack/server.rb +0 -18
data/lib/tanuki/launcher.rb +0 -21
data/lib/tanuki/utility/server.rb +0 -23

data/README.rdoc CHANGED

@@ -11,9 +11,10 @@ Right now it's very raw, so don't expect things to work properly.
 Fire up the terminal and type:
   $ gem install tanuki
-  $ tanuki
-  tanuki> create test
-  tanuki> server
+  $ tanuki create test
+  $ cd test
+  $ bundle install
+  $ rackup -p 3000
 View the result at: http://localhost:3000
@@ -27,4 +28,4 @@ Tanuki is thankful to:
 * All of the core contributors
 * Erika Olehno, for the cute logo
-* {Rack}[http://rack.rubyforge.org/], {Sequel}[http://sequel.rubyforge.org/], {escape_utils}[https://github.com/brianmario/escape_utils], and {Active Support}[https://github.com/rails/rails/tree/master/activesupport] authors and contributors, for their amazing work
+* {Rack}[http://rack.rubyforge.org/], {Sequel}[http://sequel.rubyforge.org/], {Bundler}[http://gembundler.com/], {escape_utils}[https://github.com/brianmario/escape_utils], and {Active Support}[https://github.com/rails/rails/tree/master/activesupport] authors and contributors, for their amazing work

data/app/tanuki/controller/{link.thtml → controller.link.thtml} RENAMED

File without changes

data/app/tanuki/controller/controller.page.thtml ADDED

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en-US">
+<head>
+    <meta charset="utf-8">
+    <title><%! title_view %></title>
+    <link rel="stylesheet" href="/bundle.css" media="screen" />
+</head>
+<body>
+    %! view
+    %~ ctx.javascripts.each_key do |js|
+    <script><%= File.read js %></script>
+    %~ end
+</body>
+</html>

data/app/tanuki/controller/controller.rb CHANGED

@@ -1,3 +1,2 @@
-class Tanuki::Controller < Tanuki::Base
-  include Tanuki::ControllerBehavior
+class Tanuki::Controller
 end

data/app/tanuki/controller/controller.title.ttxt ADDED

	@@ -0,0 +1 @@
1	+ Untitled

data/app/tanuki/controller/controller.view.thtml ADDED

@@ -0,0 +1,3 @@
+%~ if visual_child
+%!   visual_child.view
+%~ end

data/app/tanuki/fetcher/sequel/sequel.rb ADDED

@@ -0,0 +1,34 @@
+class Tanuki::Fetcher::Sequel
+  def initialize(dataset, controller_class)
+    @dataset = dataset
+    @controller_class = controller_class
+  end
+  def fetch(md, format)
+    keys = Hash[md.names.map {|name| [name.to_sym, md[name]] }]
+    item = @dataset.filter(keys).first
+    if item
+      {
+        :class => @controller_class,
+        :model => item,
+        :route => format.call(item).to_sym
+      }
+    else
+      nil
+    end
+  end
+  def fetch_all(format)
+    @dataset.each do |item|
+      yield({
+        :class => @controller_class,
+        :model => item,
+        :route => format.call(item).to_sym
+      })
+    end
+  end
+  def length
+    @dataset.count
+  end
+end

data/app/tanuki/manager/controller/controller.rb CHANGED

@@ -1,2 +1,2 @@
 class Tanuki::Manager::Controller
-end
+end

data/app/tanuki/manager/page/page.rb CHANGED

@@ -1,2 +1,2 @@
 class Tanuki::Manager::Page
-end
+end

data/app/tanuki/meta_model/{manager.ttxt → meta_model.manager.ttxt} RENAMED

File without changes

data/app/tanuki/meta_model/{manager_base.ttxt → meta_model.manager_base.ttxt} RENAMED

File without changes

data/app/tanuki/meta_model/{model.ttxt → meta_model.model.ttxt} RENAMED

File without changes

data/app/tanuki/meta_model/{model_base.ttxt → meta_model.model_base.ttxt} RENAMED

File without changes

data/app/tanuki/meta_model/meta_model.rb CHANGED

@@ -1,3 +1,2 @@
-class Tanuki::MetaModel < Tanuki::Base
-  include Tanuki::MetaModelBehavior
+class Tanuki::MetaModel
 end

data/app/tanuki/model/controller/controller.rb CHANGED

@@ -1,2 +1,2 @@
 class Tanuki::Model::Controller
-end
+end

data/app/tanuki/model/page/page.rb CHANGED

@@ -1,2 +1,2 @@
 class Tanuki::Model::Page
-end
+end

data/app/tanuki/page/missing/{default.thtml → missing.page.thtml} RENAMED

@@ -39,7 +39,7 @@
 <body>
     <h1>Page not found!</h1>
     <div>
-        <p>It seems that the page <code><%= ctx.env['REQUEST_URI'] %></code> at <a href="/"><%= ctx.env['HTTP_HOST'] %></a></p>
+        <p>It seems that the page <code><%= ctx.request.env['REQUEST_URI'] %></code> at <a href="/"><%= ctx.request.env['HTTP_HOST'] %></a></p>
         <ul>
             <li>has moved,</li>
             <li>no longer exists,</li>

data/app/tanuki/page/missing/missing.rb CHANGED

@@ -3,7 +3,8 @@ class Tanuki::Page::Missing < Tanuki::Controller
     nil
   end
-  def result_type
-    :not_found
+  def get # TODO: add other request methods
+    status 404
+    super
   end
 end

data/app/user/page/home/home.rb ADDED

	@@ -0,0 +1,2 @@
1	+ class User::Page::Home < Tanuki::Controller
2	+ end

data/app/user/page/home/home.title.thtml ADDED

	@@ -0,0 +1 @@
1	+ Welcome to Tanuki!

data/app/user/page/home/home.view.css ADDED

@@ -0,0 +1,88 @@
+body {
+    margin: 0;
+    padding: 0;
+    font-family: 'Trebuchet MS', Helvetica, sans-serif;
+    font-size: 11pt;
+    background-color: #f5f4ef;
+    color: #000305;
+}
+#header {
+    margin: 0 auto;
+    width: 540px;
+}
+div.top {
+    background-color: #fff;
+    margin: 0 auto 20px auto;
+    padding: 15px 20px 0 20px;
+    width: 540px;
+    border-radius: 10px;
+    -moz-border-radius: 10px;
+    -webkit-border-radius: 10px;
+}
+h1 {
+    margin: 20px 0;
+    padding: 0;
+    font-size: 22pt;
+}
+h1 em {
+    display: block;
+    font-style: normal;
+    font-size: 12pt;
+    color: #777a7c;
+}
+h2 {
+    margin: 0 0 15px 0;
+    padding: 0;
+    font-size: 16pt;
+}
+#next ol {
+    margin: 0;
+    padding-bottom: 25px;
+}
+#next li {
+    margin: 0;
+    padding: 0;
+    font-size: 16pt;
+    font-weight: bold;
+    color: #c74451;
+}
+#next li span {
+    font-size: 11pt;
+    font-weight: normal;
+    color: #000305;
+}
+code {
+    font-family: 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', Menlo, Monaco, Consolas, 'Courier New', monospace;
+    font-size: 10pt;
+    background-color: #fffccc;
+    padding: 1px 3px;
+}
+#env div {
+    padding-bottom: 25px;
+}
+#env table {
+    margin: 0;
+    padding: 0;
+    border-collapse: collapse;
+    color: #444;
+}
+#env table th {
+    text-align: left;
+}
+#env table td {
+    padding-left: 20px;
+    font-size: 10pt;
+}

data/app/user/page/home/home.view.thtml ADDED

@@ -0,0 +1,22 @@
+<div id="header">
+    <h1>It Works! <em>You have been granted one Tanuki.</em></h1>
+</div>
+<div class="top" id="next">
+    <h2>What to do next</h2>
+    <div>
+        <p>Here's a few suggestions to get things going:</p>
+        <ol>
+            <li><span>To use a database, describe its contents in <code>schema/user</code>.</span></li>
+            <li><span>To generate models from your schema, run <code>tanuki generate</code>.</span></li>
+            <li><span>To add or edit controllers, navigate to <code>app/user</code>.</span></li>
+        </ol>
+    </div>
+</div>
+<div class="top" id="env">
+    <h2>Your setup</h2>
+    <div><table>
+        <tr><th>Ruby</th><td><%= RUBY_VERSION %>p<%= RUBY_PATCHLEVEL %> (<%= RUBY_RELEASE_DATE %> revision <%= RUBY_REVISION %>) [<%= RUBY_PLATFORM %>]</td></tr>
+        <tr><th>Rack</th><td><%= Rack.version %> (on <%= ctx.request.env['SERVER_SOFTWARE'] %>)</td></tr>
+        <tr><th>Tanuki</th><td><%= Tanuki.version %></td></tr>
+    </table></div>
+</div>

data/bin/tanuki CHANGED

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
-$:.unshift File.expand_path(File.join('..', '..', 'lib'), __FILE__)
+$:.unshift File.expand_path('../../lib', __FILE__)
+require 'active_support/core_ext/string/inflections'
 require 'tanuki/utility'
 Tanuki::Utility.init if File.basename(__FILE__) == File.basename($0)

data/config/common.rb CHANGED

@@ -2,6 +2,7 @@
 set :app_root, proc { File.join(root, 'app') }
 set :gen_root, proc { File.join(root, 'gen') }
 set :schema_root, proc { File.join(root, 'schema') }
+set :public_root, proc { File.join(root, 'public') }
 # Cache
 set :templates, {}

data/config/common_application.rb CHANGED

@@ -2,16 +2,13 @@ load_config :common
 # Rack middleware
 use Rack::Head
-use Rack::StaticDir, 'public'
+use Rack::StaticDir, @context.public_root
-# Server
-set :server, [:thin, :mongrel, :webrick]
-set :host, '0.0.0.0'
-set :port, 3000
+# Environment
 set :development, false
 # Default controllers
-set :root_page, ::User::Page::Index
+set :root_page, ::User::Page::Home
 set :missing_page, ::Tanuki::Page::Missing
 # Internationalization

data/config/development_application.rb CHANGED

@@ -2,7 +2,4 @@ load_config :common_application
 set :development, true
 # Rack middleware
-use Rack::CommonLogger
-use Rack::Lint
 use Rack::Reloader, 0
-use Rack::ShowExceptions

data/lib/tanuki.rb CHANGED

@@ -9,19 +9,20 @@ require 'yaml'
 require 'escape_utils'
 require 'escape_utils/url/rack'
 require 'tanuki/version'
+require 'tanuki/const'
 require 'tanuki/extensions/module'
-require 'tanuki/extensions/rack/builder'
-require 'tanuki/extensions/rack/server'
+require 'tanuki/extensions/rack/frozen_route'
 require 'tanuki/extensions/rack/static_dir'
-require 'tanuki/behavior/controller_behavior'
-require 'tanuki/behavior/meta_model_behavior'
-require 'tanuki/behavior/model_behavior'
-require 'tanuki/behavior/object_behavior'
+require 'tanuki/base_behavior'
+require 'tanuki/extensions/sequel/model'
 require 'tanuki/argument'
 require 'tanuki/configurator'
 require 'tanuki/context'
-require 'tanuki/launcher'
+require 'tanuki/controller'
+require 'tanuki/css_compressor'
 require 'tanuki/loader'
+require 'tanuki/meta_model'
+require 'tanuki/model_behavior'
 require 'tanuki/i18n'
 require 'tanuki/template_compiler'
 require 'tanuki/application'

data/lib/tanuki/application.rb CHANGED

@@ -1,50 +1,29 @@
 module Tanuki
   # Tanuki::Application is the starting point for all framework applications.
-  # It contains core application functionality like configuration, request handling and view management.
+  # It contains core application functionality like configuration, request
+  # handling and view management.
   class Application
-    @context = (Loader.context = Context).child
+    Loader.context = Context
     @rack_middleware = []
     class << self
-      # Initializes application settings using configuration for environment +env+.
-      # These include settings for server, context, and middleware.
-      # Returns true, if configuration is successful.
-      def configure(env)
-        @environment = env
-        begin
-          default_root = File.expand_path(File.join('..', '..', '..'), __FILE__)
-          @cfg = Configurator.new(Context, pwd = Dir.pwd)
-          # Configure in default root (e.g. gem root)
-          if pwd != default_root
-            @cfg.config_root = File.join(default_root, 'config')
-            @cfg.load_config(([:development, :production].include? env) ? :"#{env}_application" : :common_application)
-          end
-          # Configure in application root
-          @cfg.config_root = File.join(pwd, 'config')
-          @cfg.load_config :"#{env}_application", pwd != default_root
-          return true
-        rescue NameError => e
-          if e.name =~ /\AA-Z/
-            raise NameError, "missing class or module for constant `#{e.name}'", e.backtrace
-          else
-            raise e
-          end
-        end
-        false
+      # Initializes the application in a given Rack::Builder +builder+.
+      def build(builder)
+        puts %{Calling for Tanuki #{Tanuki.version} in "#{Dir.pwd}"}
+        configure
+        Loader.prepare_for_production unless @cfg.context.development
+        at_exit { puts 'Tanuki ran away!' }
+        configure_middleware(builder)
+        vowel = @environment =~ /\A[aeiou]/
+        puts "A#{'n' if vowel} #{@environment} Tanuki appears!"
+        rack_app
       end
-      # Add utilized middleware to a given Rack::Builder instance +rack_builder+.
-      def configure_middleware(rack_builder)
-        @rack_middleware.each {|item| rack_builder.use(item[0], *item[1], &item[2]) }
-      end
-      # Removes all occurences of a given +middleware+ from the Rack middleware pipeline.
+      # Removes all occurences of a given +middleware+ from the Rack
+      # middleware pipeline.
       def discard(middleware)
         @rack_middleware.delete_if {|item| item[0] == middleware }
       end
@@ -55,21 +34,18 @@ module Tanuki
         @environment ||= nil
       end
-      # Runs the application with current settings.
-      def run
-        configure_middleware(rack_builder = Rack::Builder.new)
-        rack_builder.run(rack_app)
-        # Choose and start a Rack handler
-        @context.running_server = available_server
-        @context.running_server.run rack_builder.to_app, :Host => @context.host, :Port => @context.port do |server|
-          [:INT, :TERM].each {|sig| trap(sig) { (server.respond_to? :stop!) ? server.stop! : server.stop } }
-          puts "A#{'n' if @environment =~ /\A[aeiou]/} #{@environment} Tanuki appears! Press Ctrl-C to set it free.",
-            "You used #{@context.running_server.name.gsub(/.*::/, '')} at #{@context.host}:#{@context.port}."
+      # Pulls all occurences of a given +middleware+ down to the end
+      # of the Rack middleware pipeline (it would have the lowest priority).
+      def pull_down(middleware)
+        items = @rack_middleware.select {|item| item[0] == middleware }
+        if items
+          @rack_middleware.reject! {|item| item[0] == middleware }
+          items.each {|item| @rack_middleware << item }
         end
       end
-      # Adds a given +middleware+ with optional +args+ and +block+ to the Rack middleware pipeline.
+      # Adds a given +middleware+ with optional +args+ and +block+
+      # to the Rack middleware pipeline.
       def use(middleware, *args, &block)
         @rack_middleware << [middleware, args, block]
       end
@@ -90,70 +66,121 @@ module Tanuki
       #  <%_escape escaped_view %>
       #  <%_printf('<div>%s</div>') formatted_view %>
       def visitor(sym, &block)
-        BaseBehavior.instance_eval { define_method "#{sym}_visitor".to_sym, &block }
+        BaseBehavior.instance_eval do
+          define_method "#{sym}_visitor".to_sym, &block
+        end
       end
       private
-      # Returns the first available server from a server list in the current context.
-      def available_server
-        @context.server.each do |server_name|
-          begin
-            return Rack::Handler.get(server_name.downcase)
-          rescue LoadError
-          rescue NameError
+      # Initializes application settings using configuration
+      # for the current Rack environment.
+      # These include settings for server, context, and middleware.
+      def configure
+        @environment = ENV['RACK_ENV'].to_sym
+        default_root = File.expand_path('../../..', __FILE__)
+        @cfg = Configurator.new(Context, pwd = Dir.pwd)
+        env_config = :"#{@environment}_application"
+        # Configure in default root (e.g. gem root)
+        if pwd != default_root
+          @cfg.config_root = File.join(default_root, 'config')
+          if [:development, :production].include? @environment
+            default_config = env_config
+          else
+            default_config = :common_application
           end
+          @cfg.load_config default_config
         end
-        raise "servers #{@context.server.join(', ')} not found"
+        # Configure in application root
+        @cfg.config_root = File.join(pwd, 'config')
+        if @cfg.config_file? env_config
+          @cfg.load_config env_config, pwd != default_root
+        elsif @cfg.config_file? :common_application
+          @cfg.load_config :common_application
+        end
+        self
+      rescue NameError => e
+        raise e unless e.name =~ /\AA-Z/
+        message = "missing class or module for constant `#{e.name}'"
+        raise NameError, message, e.backtrace
       end
-      # Returns an array of template outputs for controller +ctrl+ in context +request_ctx+.
-      def build_body(ctrl, request_ctx)
-        arr = []
-        Launcher.new(ctrl, request_ctx).each &proc {|out| arr << out.to_s }
+      # Add utilized middleware to a given Rack::Builder instance
+      # +rack_builder+.
+      def configure_middleware(rack_builder)
+        @rack_middleware.each do |item|
+          rack_builder.use item[0], *item[1], &item[2]
+        end
       end
       # Returns a Rack app block for Rack::Builder.
-      # This block is passed a request environment and returns and array of three elements:
+      # This block is passed a request environment
+      # and returns and array of three elements:
       # * a response status code,
       # * a hash of headers,
       # * an iterable body object.
       # It is run on each request.
       def rack_app
-        ctx = @context
         proc do |env|
-          request_ctx = ctx.child
-          request_ctx.templates = {}
           # If there are trailing slashes in path, don't dispatch
-          if match = env['PATH_INFO'].match(/^(.+)(?<!\$)\/$/)
+          path_info = env[Const::PATH_INFO]
+          if match = path_info.match(Const::TRAILING_SLASH)
             # Remove trailing slash in the path and redirect
             loc = match[1]
-            loc << "?#{env['QUERY_STRING']}" unless env['QUERY_STRING'].empty?
-            [301, {'Location' => loc, 'Content-Type' => 'text/html; charset=utf-8'}, []]
+            query_string = env[Const::QUERY_STRING]
+            loc << "?#{query_string}" unless query_string.empty?
+            [
+              301,
+              {
+                Const::LOCATION     => loc,
+                Const::CONTENT_TYPE => Const::MIME_TEXT_HTML
+              },
+              Const::EMPTY_ARRAY
+            ]
           else
+            ctx = Context.child
+            ctx.templates = {}
+            ctx.resources = {}
+            ctx.javascripts = {}
             # Dispatch controller chain for the current path
-            request_ctx.env = env
-            result = ::Tanuki::ControllerBehavior.dispatch(request_ctx, ctx.i18n ? ::Tanuki::I18n : ctx.root_page,
-              Rack::Utils.unescape(env['PATH_INFO']).force_encoding('UTF-8'))
-            # Handle dispatch result
-            case result[:type]
-            when :redirect then
-              [302, {'Location' => result[:location], 'Content-Type' => 'text/html; charset=utf-8'}, []]
-            when :page then
-              [200, {'Content-Type' => 'text/html; charset=utf-8'}, build_body(result[:controller], request_ctx)]
+            Loader.refresh_css if ctx.development
+            ctx.request = Rack::Request.new(env)
+            resp = ctx.response = Rack::Response.new(
+              [],
+              200,
+              {Const::CONTENT_TYPE => Const::MIME_TEXT_HTML}
+            )
+            template = nil
+            catch :halt do
+              template = ::Tanuki::Controller.dispatch(
+                ctx,
+                Context.i18n ? ::Tanuki::I18n : Context.root_page,
+                Rack::Utils.unescape(path_info).force_encoding(Const::UTF_8)
+              )
+            end
+            if template &&
+               template.is_a?(Method) &&
+               template.receiver.is_a?(BaseBehavior) &&
+               template.name =~ Const::VIEW_METHOD
+            then
+              resp.finish do |resp|
+                template.call.call(proc {|s| resp.write s }, ctx)
+              end
             else
-              [404, {'Content-Type' => 'text/html; charset=utf-8'}, build_body(result[:controller], request_ctx)]
+              resp.finish
             end
           end # if
-        end
-      end
+        end # proc
+      end # rack_app
     end # class << self