RubyGems - tanuki - Versions diffs - 0.1.3 → 0.2.1 - Mend

tanuki 0.1.3 → 0.2.1

Files changed (44) hide show

data/README.rdoc +6 -3
data/app/tanuki/attribute/attribute.rb +19 -0
data/app/tanuki/base/base.rb +3 -0
data/app/tanuki/controller/controller.rb +1 -1
data/app/tanuki/controller/link.thtml +6 -6
data/app/tanuki/meta_model/manager.ttxt +2 -0
data/app/tanuki/meta_model/manager_base.ttxt +2 -0
data/app/tanuki/meta_model/meta_model.rb +3 -0
data/app/tanuki/meta_model/model.ttxt +2 -0
data/app/tanuki/meta_model/model_base.ttxt +12 -0
data/app/tanuki/model/model.rb +3 -0
data/app/tanuki/page/missing/default.thtml +61 -2
data/app/user/page/index/default.thtml +120 -120
data/app/user/page/index/index.rb +1 -1
data/bin/tanuki +185 -53
data/config/common.rb +7 -0
data/config/common_application.rb +31 -0
data/config/development_application.rb +8 -0
data/config/production_application.rb +2 -0
data/lib/tanuki/application.rb +15 -19
data/lib/tanuki/argument/base.rb +2 -2
data/lib/tanuki/argument/integer.rb +2 -2
data/lib/tanuki/argument/integer_range.rb +3 -3
data/lib/tanuki/argument/string.rb +2 -2
data/lib/tanuki/argument.rb +3 -3
data/lib/tanuki/{controller_behavior.rb → behavior/controller_behavior.rb} +22 -21
data/lib/tanuki/behavior/meta_model_behavior.rb +43 -0
data/lib/tanuki/behavior/model_behavior.rb +112 -0
data/lib/tanuki/{object_behavior.rb → behavior/object_behavior.rb} +6 -6
data/lib/tanuki/configurator.rb +39 -76
data/lib/tanuki/context.rb +31 -19
data/lib/tanuki/{module_extensions.rb → extensions/module.rb} +3 -3
data/lib/tanuki/extensions/object.rb +12 -0
data/lib/tanuki/extensions/rack/static_dir.rb +18 -0
data/lib/tanuki/i18n.rb +3 -1
data/lib/tanuki/launcher.rb +3 -2
data/lib/tanuki/loader.rb +37 -46
data/lib/tanuki/template_compiler.rb +8 -7
data/lib/tanuki/version.rb +1 -1
data/lib/tanuki.rb +14 -8
data/schema/tanuki/models/controller.yml +2 -3
data/schema/tanuki/models/page.yml +7 -8
metadata +35 -27
data/app/tanuki/object/object.rb +0 -3

data/README.rdoc CHANGED Viewed

@@ -4,16 +4,19 @@ Tanuki is a web application framework inspired by the MVVM pattern with focus
 on DRY code and extensibility. Tanuki tries to keep its looks close to
 idiomatic Ruby, so you would feel at home.
+Right now it's very raw, so don't expect things to work properly.
 == Quick Start
 Fire up the terminal and type:
   $ gem install tanuki
-  $ tanuki create test
-  $ ruby test/main.rb
+  $ tanuki
+  tanuki> create test
+  tanuki> server
 View the result at: http://localhost:3000
 == Resources
-{Home Page}[http://bitbucket.org/dimituri/tanuki]
+{Home Page}[http://withballs.org]

data/app/tanuki/attribute/attribute.rb ADDED Viewed

@@ -0,0 +1,19 @@
+class Tanuki_Attribute
+  def initialize(cfg, owner)
+    #--
+    # created on demand (first access)
+    # cfg is a parsed yaml hash
+    # attribute owner object
+    # all Object and Collection attrs are defined in relations
+    @cfg = cfg
+    @owner = owner
+  end
+  def required?
+    @cfg[:required]
+  end
+  def value
+    # value of data (scalar, array, or hash)
+  end
+end

data/app/tanuki/base/base.rb ADDED Viewed

@@ -0,0 +1,3 @@
+class Tanuki_Base
+  include Tanuki::BaseBehavior
+end

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

@@ -1,3 +1,3 @@
-class Tanuki_Controller < Tanuki_Object
+class Tanuki_Controller < Tanuki_Base
   include Tanuki::ControllerBehavior
 end

data/app/tanuki/controller/link.thtml CHANGED Viewed

@@ -1,7 +1,7 @@
-% if current?
-<span class="active"><%= self %></span>
-% elsif active?
-<a class="active" href="<%= self.link %>"><%= self %></a>
-% else
-<a href="<%= self.link %>"><%= self %></a>
+% if current?
+<span class="active"><%= self %></span>
+% elsif active?
+<a class="active" href="<%= self.link %>"><%= self %></a>
+% else
+<a href="<%= self.link %>"><%= self %></a>
 % end

data/app/tanuki/meta_model/manager.ttxt ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ class <%= class_name_for :manager %> < <%= class_name_for :manager_base %>
2	+ end

data/app/tanuki/meta_model/manager_base.ttxt ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ class <%= class_name_for :manager_base %> < Tanuki_Controller
2	+ end

data/app/tanuki/meta_model/meta_model.rb ADDED Viewed

@@ -0,0 +1,3 @@
+class Tanuki_MetaModel < Tanuki_Base
+  include Tanuki::MetaModelBehavior
+end

data/app/tanuki/meta_model/model.ttxt ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ class <%= class_name_for :model %> < <%= class_name_for :model_base %>
2	+ end

data/app/tanuki/meta_model/model_base.ttxt ADDED Viewed

@@ -0,0 +1,12 @@
+class <%= class_name_for :model_base %> < Tanuki_Base
+  extend Tanuki::ModelBehavior
+  class << self
+    def extract_key(data)
+      [<% key.each do |field_name| %>data[:<%= field_name.inspect %>], <% end %>]
+    end
+    def get(ctx,*args)
+    end
+  end
+end

data/app/tanuki/model/model.rb ADDED Viewed

@@ -0,0 +1,3 @@
+class Tanuki_Model
+  include Tanuki::ModelBehavior
+end

data/app/tanuki/page/missing/default.thtml CHANGED Viewed

@@ -1,2 +1,61 @@
-<h1>Oh no!</h1>
-<p>Tanuki broke free at <%= ctx.env['REQUEST_URI'] %>!</p>
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>404 Not Found</title>
+    <style type="text/css" media="screen">
+    body {
+        margin: 0;
+        padding: 0;
+        font-family: 'Trebuchet MS', Helvetica, sans-serif;
+        font-size: 11pt;
+        background-color: #f5f4ef;
+        color: #000305;
+    }
+    h1 {
+        margin: 30px 40px 20px 40px;
+        padding: 0;
+        font-size: 22pt;
+    }
+    div {
+        background-color: #fff;
+        margin: 20px 30px 30px 30px;
+        padding: 15px 20px;
+        border-radius: 10px;
+        -moz-border-radius: 10px;
+        -webkit-border-radius: 10px;
+    }
+    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;
+    }
+    </style>
+</head>
+<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>
+        <ul>
+            <li>has moved,</li>
+            <li>no longer exists,</li>
+            <li>or never existed.</li>
+        </ul>
+        % if ctx.development
+            Controller chain: <ul>
+        %   ctrl = self
+        %   traceback = []
+        %   traceback << ctrl while ctrl = ctrl.logical_parent
+        %   traceback.reverse_each do |ctrl|
+              <li><code><%= ctrl.class %> @ <%= ctrl.link %></code></li>
+        %   end
+              <li><code><%= self.class %> @ <%= self.link %></code></li>
+            </ul>
+        % end
+    </div>
+</body>
+</html>

data/app/user/page/index/default.thtml CHANGED Viewed

@@ -1,121 +1,121 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <title>Welcome to Tanuki</title>
-    <style type="text/css" media="screen">
-    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;
-    }
-    </style>
-</head>
-<body>
-    <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, type <code>rake tanuki:models</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 %> (<%= RUBY_RELEASE_DATE %>) [<%= RUBY_PLATFORM %>]</td></tr>
-            <tr><th>Rack</th><td><%= Rack.version %> (on <%= ctx.env['SERVER_SOFTWARE'] %>)</td></tr>
-            <tr><th>Tanuki</th><td><%= Tanuki::VERSION %></td></tr>
-        </table></div>
-    </div>
-</body>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8" />
+    <title>Welcome to Tanuki</title>
+    <style type="text/css" media="screen">
+    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;
+    }
+    </style>
+</head>
+<body>
+    <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 %> (<%= RUBY_RELEASE_DATE %>) [<%= RUBY_PLATFORM %>]</td></tr>
+            <tr><th>Rack</th><td><%= Rack.version %> (on <%= ctx.env['SERVER_SOFTWARE'] %>)</td></tr>
+            <tr><th>Tanuki</th><td><%= Tanuki::VERSION %></td></tr>
+        </table></div>
+    </div>
+</body>
 </html>

data/app/user/page/index/index.rb CHANGED Viewed

@@ -1,2 +1,2 @@
-class User_Page_Index < Tanuki_Controller
+class User_Page_Index < Tanuki_Controller
 end

data/bin/tanuki CHANGED Viewed

@@ -1,55 +1,187 @@
 #!/usr/bin/env ruby
 module Tanuki
-  class << self
-    def create(name)
-      require 'fileutils'
-      version
-      puts "\n creating #{name = name.downcase}"
-      FileUtils.mkdir name
-      puts " copying app/tanuki"
-      FileUtils.mkdir_p File.join(name, 'app', 'tanuki')
-      FileUtils.cp_r File.expand_path(File.join('..', '..', 'app', 'tanuki'), __FILE__), File.join(name, 'app')
-      puts " copying app/user"
-      FileUtils.mkdir_p File.join(name, 'app', 'user')
-      FileUtils.cp_r File.expand_path(File.join('..', '..', 'app', 'user'), __FILE__), File.join(name, 'app')
-      puts " creating cache"
-      FileUtils.mkdir(File.join(name, 'cache'))
-      puts " copying schema"
-      FileUtils.mkdir(File.join(name, 'schema'))
-      FileUtils.cp_r File.expand_path(File.join('..', '..', 'schema'), __FILE__), name
-      puts " writing main"
-      File.open(File.join(name, 'main.rb'), 'w') {|file| file.write "require 'tanuki'\nTanuki.development_application" }
-    end
-    def help
-      version
-      puts "\nbasic commands:\n"
-      {
-        'help'    => 'show help (this text)',
-        'create'  => 'create a new app with the given name',
-        'version' => 'show framework version'
-      }.each_pair {|k, v| puts ' %-7s   %s' % [k, v] }
-    end
-    def init
-      case ARGV[0]
-      when /\Ac(r(e(a(te?)?)?)?)?\Z/, '--create', '-c' then create(ARGV[1])
-      when /\Ah(e(lp?)?)?\Z/, '--help', '-h', nil then help
-      when /\Av(e(r(s(i(on?)?)?)?)?)?\Z/, '--version', '-v' then version
-      else create(ARGV[0])
-      end
-    end
-    def version
-      begin
-        require 'tanuki/version'
-      rescue LoadError
-        $:.unshift File.expand_path(File.join('..', '..', 'lib'), __FILE__)
-        require 'tanuki/version'
-      end
-      puts "Tanuki version #{VERSION}"
-    end
-  end
-end
-Tanuki.init if File.basename(__FILE__) == File.basename($0)
+  module Utility
+    class << self
+      def create(name)
+        unless name
+          puts "To use this command: `create <name>'"
+          return
+        end
+        require 'fileutils'
+        project_dir = File.expand_path(name)
+        if File.exists? project_dir
+          puts "File or directory `#{name}' already exists!"
+          return
+        end
+        version unless @in_repl
+        puts "\n creating #{name = name.downcase}"
+        FileUtils.mkdir project_dir
+        file_source = File.expand_path(File.join('..', '..'), __FILE__)
+        puts " creating #{File.join(name, 'app')}"
+        FileUtils.mkdir_p File.join(project_dir, 'app', 'user')
+        FileUtils.cp_r File.join(file_source, 'app', 'user'), File.join(project_dir, 'app')
+        puts " creating #{File.join(name, 'gen')}"
+        FileUtils.mkdir(gen_dir = File.join(project_dir, 'gen'))
+        FileUtils.chmod(0777, gen_dir)
+        puts " creating #{File.join(name, 'public')}"
+        FileUtils.mkdir(File.join(project_dir, 'public'))
+        puts " creating #{File.join(name, 'schema')}"
+        FileUtils.mkdir(File.join(project_dir, 'schema'))
+        Dir.chdir(project_dir) if @in_repl
+      end
+      def generate(cwd)
+        version unless @in_repl
+        cwd = File.expand_path(cwd ? cwd : '.')
+        puts "Working directory is: #{cwd}\nTo specify another: `generate <path>'"
+        require 'yaml'
+        require 'fileutils'
+        require 'tanuki/extensions/object'
+        require 'tanuki/behavior/meta_model_behavior'
+        require 'tanuki/behavior/model_behavior'
+        require 'tanuki/behavior/object_behavior'
+        require 'tanuki/configurator'
+        require 'tanuki/context'
+        require 'tanuki/loader'
+        require 'tanuki/template_compiler'
+        Loader.context = ctx = Context
+        cfg = Configurator.new(Context, cwd, File.expand_path(File.join('..', '..', 'config'), __FILE__))
+        cfg.load_config :common
+        cfg.config_root = File.join(cwd, 'config')
+        cfg.load_config :common, true
+        puts "\n looking for models"
+        @tried = {}
+        local_schema_root = File.expand_path(File.join('..', '..', 'schema'), __FILE__)
+        generate_in(ctx.schema_root, ctx)
+        generate_in(local_schema_root, ctx) if ctx.schema_root != local_schema_root
+        @tried.each_pair do |name, arys|
+          puts "\n found: #{name}"
+          arys.each_pair {|ary_name, ary| puts %{ #{ary_name}:\n - #{ary.join "\n - "}} unless ary.empty? }
+        end
+      end
+      def generate_in(schema_root, ctx)
+        Dir.entries(schema_root)[2..-1].each do |namespace_path|
+          namespace = namespace_path.capitalize
+          Dir.glob(File.join(schema_root, namespace_path, 'models', '*.yml')) do |file_path|
+            model_name = File.basename(file_path, '.yml').split('_').map {|s| s.capitalize }.join
+            if @tried.include? namespace_model_name = "#{namespace}.#{model_name}"
+              next
+            else
+              @tried[namespace_model_name] = {:generated => [], :failed => [], :skipped => []}
+            end
+            meta_model = Tanuki_MetaModel.new(namespace, model_name, YAML.load_file(file_path))
+            {
+              :model => false,
+              :model_base => true,
+              :manager => false,
+              :manager_base => true
+            }.each do |class_type, base|
+              class_name = meta_model.class_name_for class_type
+              path = Tanuki::Loader.class_path(class_name, base ? ctx.gen_root : ctx.app_root)
+              if base || !(File.exists? path)
+                begin
+                  dirname = File.dirname(path)
+                  FileUtils.mkdir_p dirname unless File.directory? dirname
+                  File.open path, 'w' do |file|
+                    writer = proc {|out| file.print out.to_s }
+                    Loader.run_template({}, meta_model, class_type).call(writer, ctx)
+                  end
+                  @tried[namespace_model_name][:generated] << class_name unless base
+                rescue
+                  @tried[namespace_model_name][:failed] << class_name unless base
+                end
+              else
+                @tried[namespace_model_name][:skipped] << class_name unless base
+              end
+            end
+          end
+        end
+      end
+      def execute(args)
+        case args[0]
+        when 'create' then create(args[1])
+        when 'exit' then @in_repl ? (puts 'Bye bye!'; return false) : help
+        when 'generate' then generate(args[1])
+        when 'help' then help
+        when 'server' then return server(args[1])
+        when 'version' then version
+        when nil then start_repl unless @in_repl
+        else help
+        end
+        true
+      end
+      def help
+        version unless @in_repl
+        puts "\nbasic commands:\n"
+        commands = {}
+        commands['create']   = 'create a new app with the given name'
+        commands['exit']     = 'exit this utility' if @in_repl
+        commands['generate'] = 'generate models for application schema'
+        commands['help']     = 'show help (this text)'
+        commands['server']   = 'run application'
+        commands['version']  = 'show framework version'
+        commands.each_pair {|k, v| puts ' %-8s   %s' % [k, v] }
+      end
+      def init
+        @in_repl = false
+        execute ARGV
+      end
+      def server(env=nil)
+        env = env ? env.to_sym : :development
+        puts %{Calling for a Tanuki in "#{pwd = Dir.pwd}"}
+        version unless @in_repl
+        require 'tanuki'
+        allow_run = false
+        begin
+          @cfg = Configurator.new(Context, pwd, File.expand_path(File.join('..', '..', 'config'), __FILE__))
+          @cfg.load_config(([:development, :production].include? env) ? :"#{env}_application" : :common_application)
+          @cfg.config_root = File.join(pwd, 'config')
+          @cfg.load_config :"#{env}_application", true
+          allow_run = true
+        rescue NameError => e
+          puts "Tanuki wanted `#{e.name}', but you didn't have any."
+        end
+        begin
+          Application.run
+          false
+        rescue Interrupt
+          puts 'Tanuki ran away!'
+          false
+        rescue SystemCallError
+          puts 'Tanuki ran away! Someone else is playing here.'
+          true
+        end if allow_run
+      end
+      def start_repl
+        @in_repl = true
+        version
+        print 'tanuki>'
+        print "\ntanuki>" while gets && execute($_.chomp.scan /(?<=")\w[\w\s]*(?=")|\w+/)
+      end
+      def version
+        begin
+          require 'tanuki/version'
+        rescue LoadError
+          $:.unshift File.expand_path(File.join('..', '..', 'lib'), __FILE__)
+          require 'tanuki/version'
+        end
+        puts "Tanuki version #{VERSION}"
+      end
+    end # end class << self
+  end # end Utility
+end # end Tanuki
+Tanuki::Utility.init if File.basename(__FILE__) == File.basename($0)

data/config/common.rb ADDED Viewed

@@ -0,0 +1,7 @@
+# Paths
+set :app_root, proc { File.join(root, 'app') }
+set :gen_root, proc { File.join(root, 'gen') }
+set :schema_root, proc { File.join(root, 'schema') }
+# Cache
+set :templates, {}