tanuki 0.3.1 → 0.4.0

data/lib/tanuki/utility.rb

@@ -8,7 +8,8 @@ module Tanuki
     class << self
 
       # Executes given +args+.
-      # The first item in +args+ is the name of a command, and the rest are arguments for the command.
+      # The first item in +args+ is the name of a command,
+      # and the rest are arguments for the command.
       def execute(args)
         case args[0]
         when 'exit' then @in_repl ? (puts 'Bye bye!'; return false) : help
@@ -33,7 +34,7 @@ module Tanuki
         @in_repl = false
         @commands = []
         @help = {}
-        Dir.glob(File.expand_path(File.join('..', 'utility', '*.rb'), __FILE__)) do |file|
+        Dir.glob(File.expand_path('../utility/*.rb', __FILE__)) do |file|
           if match = file.match(/\/([^\/]+).rb/)
             require file
             command = match[1].to_sym
@@ -44,15 +45,21 @@ module Tanuki
         execute ARGV
       end
 
+      # Splits a given string +s+ to an argument list.
+      def split_args(s)
+        s.chomp.scan(/(?<=")[^"]*(?=")|[^\s]+/)
+      end
+
       # Starts a REPL (framework console).
-      # In this console +command [args]+ call is equivalent to +tanuki command [args]+ in the terminal.
+      # In this console +command [args]+ call is equivalent to
+      # +tanuki command [args]+ in the terminal.
       def start_repl
         @in_repl = true
         @help[:exit] = 'exit this utility'
         version
         print 'tanuki>'
         begin
-          print "\ntanuki>" while gets && execute($_.chomp.scan(/(?<=")[^"]*(?=")|[^\s]+/))
+          print "\ntanuki>" while gets && execute(split_args($_))
         rescue Interrupt
           puts "\nBye bye!"
         end

data/lib/tanuki/utility/create.rb

@@ -17,19 +17,60 @@ module Tanuki
         return
       end
       version unless @in_repl
-      puts "\n creating #{name = name.downcase}"
+      puts "Creating `#{name}'\n"
       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'))
+      file_source = File.expand_path('../../../..', __FILE__)
+      name_pos = ((file_source.length + 1)..-1)
+
+      # ./app/
+      puts '  app/'
+      FileUtils.mkdir "#{project_dir}/app"
+      puts '  app/user/'
+      FileUtils.mkdir "#{project_dir}/app/user"
+      Dir.glob("#{file_source}/app/user/**/*") do |file|
+        is_dir = File.directory? file
+        puts "  #{file[name_pos]}#{'/' if is_dir}"
+        if is_dir
+          FileUtils.mkdir("#{project_dir}/#{file[name_pos]}")
+        else
+          FileUtils.cp(file, "#{project_dir}/#{file[name_pos]}")
+        end
+      end
+
+      # ./gen/
+      puts '  gen/'
+      FileUtils.mkdir(gen_dir = "#{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'))
+
+      # ./public/
+      puts '  public/'
+      FileUtils.mkdir("#{project_dir}/public")
+
+      # ./schema/
+      puts '  schema/'
+      FileUtils.mkdir("#{project_dir}/schema")
+
+      # ./config.ru
+      puts '  config.ru'
+      File.open("#{project_dir}/config.ru", 'w') do |f|
+        f << "require 'bundler'\nBundler.require\n" <<
+             "run Tanuki::Application.build(self)\n"
+      end
+
+      # ./Gemfile
+      puts '  Gemfile'
+      File.open("#{project_dir}/Gemfile", 'w') do |f|
+        f << "source :rubygems\ngem 'tanuki', '~> #{Tanuki.version}'\n"
+      end
+
+      # ./README.rdoc
+      puts '  README.rdoc'
+      File.open("#{project_dir}/README.rdoc", 'w') do |f|
+        f << "= #{title = name.titleize}\n\n" <<
+             "#{title} is a " <<
+             "{Tanuki}[https://assistunion.com/sharing] application.\n"
+      end
+
       Dir.chdir(project_dir) if @in_repl
     end
 

data/lib/tanuki/utility/generate.rb

@@ -4,26 +4,28 @@ module Tanuki
 
     @help[:generate] = 'generate models for application schema'
 
-    # Generates models for application schema in the current directory or +cwd+.
+    # Generates models for application schema
+    # in the current directory or +cwd+.
     def self.generate(cwd=nil)
       version unless @in_repl
       cwd = cwd ? File.expand_path(cwd) : Dir.pwd
-      puts "Working directory is: #{cwd}\nTo specify another: `generate <path>'"
+      puts "Working directory is: #{cwd}",
+           "To specify another: `generate <path>'"
       require 'active_support/inflector'
       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/base_behavior'
       require 'tanuki/configurator'
       require 'tanuki/context'
       require 'tanuki/loader'
       require 'tanuki/template_compiler'
+      require 'tanuki/meta_model'
+      require 'tanuki/model_behavior'
       require 'tanuki/model_generator'
 
       ctx = Loader.context = Context
-      default_root = File.expand_path(File.join('..', '..', '..', '..'), __FILE__)
+      ctx.resources = {}
+      default_root = File.expand_path('../../../..', __FILE__)
       cfg = Configurator.new(ctx, cwd)
 
       # Load defaults
@@ -37,13 +39,17 @@ module Tanuki
       end
 
       puts "\n looking for models"
-      local_schema_root = File.expand_path(File.join('..', '..', '..', '..', 'schema'), __FILE__)
+      local_schema_root = File.expand_path('../../../../schema', __FILE__)
       mg = ModelGenerator.new(ctx)
       mg.generate ctx.schema_root
-      mg.generate local_schema_root unless ctx.schema_root == local_schema_root
+      unless ctx.schema_root == local_schema_root
+        mg.generate local_schema_root
+      end
       mg.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? }
+        arys.each_pair do |ary_name, ary|
+          puts %{ #{ary_name}:\n - #{ary.join "\n - "}} unless ary.empty?
+        end
       end
     end
 

data/lib/tanuki/utility/version.rb

@@ -7,7 +7,7 @@ module Tanuki
     # Prints the running framework version.
     def self.version
       require 'tanuki/version'
-      puts "Tanuki version #{VERSION}"
+      puts "Tanuki version #{Tanuki.version}"
     end
 
   end # Utility

data/lib/tanuki/version.rb

@@ -1,6 +1,11 @@
 module Tanuki
 
-  # Tanuki framework version.
-  VERSION = '0.3.1'
+  # Tanuki framework version as an Array.
+  VERSION = [0, 4, 0].freeze
+
+  # Returns Tanuki framework version as a dotted string.
+  def self.version
+    VERSION.join '.'
+  end
 
 end # Tanuki

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: tanuki
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 1
-  version: 0.3.1
+  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors: 
 - Anatoly Ressin
@@ -15,93 +11,86 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-05 00:00:00 +02:00
+date: 2011-03-16 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rack
+  name: bundler
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+        version: 1.0.10
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: sequel
+  name: rack
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 14
-        version: "3.14"
+        version: "1.0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: escape_utils
+  name: sequel
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        version: "0.1"
+        version: "3.14"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: escape_utils
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+        version: "0.1"
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: i18n
+  name: activesupport
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 4
-        version: "0.4"
+        version: "3.0"
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: i18n
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
-  type: :development
+        version: "0.4"
+  type: :runtime
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "2.5"
+  type: :development
+  version_requirements: *id007
 description: Tanuki is an MVVM-inspired web framework that fancies idiomatic Ruby, DRY and extensibility by its design.
 email: tanuki@withballs.org
 executables: 
@@ -113,55 +102,58 @@ extra_rdoc_files: []
 files: 
 - app/tanuki/attribute/attribute.rb
 - app/tanuki/base/base.rb
+- app/tanuki/controller/controller.link.thtml
+- app/tanuki/controller/controller.page.thtml
 - app/tanuki/controller/controller.rb
-- app/tanuki/controller/default.thtml
-- app/tanuki/controller/index.thtml
-- app/tanuki/controller/link.thtml
+- app/tanuki/controller/controller.title.ttxt
+- app/tanuki/controller/controller.view.thtml
+- app/tanuki/fetcher/sequel/sequel.rb
 - app/tanuki/manager/controller/controller.rb
 - app/tanuki/manager/page/page.rb
-- app/tanuki/meta_model/manager.ttxt
-- app/tanuki/meta_model/manager_base.ttxt
+- app/tanuki/meta_model/meta_model.manager.ttxt
+- app/tanuki/meta_model/meta_model.manager_base.ttxt
+- app/tanuki/meta_model/meta_model.model.ttxt
+- app/tanuki/meta_model/meta_model.model_base.ttxt
 - app/tanuki/meta_model/meta_model.rb
-- app/tanuki/meta_model/model.ttxt
-- app/tanuki/meta_model/model_base.ttxt
 - app/tanuki/model/controller/controller.rb
 - app/tanuki/model/model.rb
 - app/tanuki/model/page/page.rb
-- app/tanuki/page/missing/default.thtml
+- app/tanuki/page/missing/missing.page.thtml
 - app/tanuki/page/missing/missing.rb
-- app/user/page/index/default.thtml
-- app/user/page/index/index.rb
+- app/user/page/home/home.rb
+- app/user/page/home/home.title.thtml
+- app/user/page/home/home.view.css
+- app/user/page/home/home.view.thtml
 - bin/tanuki
 - config/common.rb
 - config/common_application.rb
 - config/development_application.rb
 - config/production_application.rb
-- config/test_application.rb
 - lib/tanuki/application.rb
 - lib/tanuki/argument/base.rb
 - lib/tanuki/argument/integer.rb
 - lib/tanuki/argument/integer_range.rb
 - lib/tanuki/argument/string.rb
 - lib/tanuki/argument.rb
-- lib/tanuki/behavior/controller_behavior.rb
-- lib/tanuki/behavior/meta_model_behavior.rb
-- lib/tanuki/behavior/model_behavior.rb
-- lib/tanuki/behavior/object_behavior.rb
+- lib/tanuki/base_behavior.rb
 - lib/tanuki/configurator.rb
+- lib/tanuki/const.rb
 - lib/tanuki/context.rb
+- lib/tanuki/controller.rb
+- lib/tanuki/css_compressor.rb
 - lib/tanuki/extensions/module.rb
-- lib/tanuki/extensions/rack/builder.rb
-- lib/tanuki/extensions/rack/server.rb
+- lib/tanuki/extensions/rack/frozen_route.rb
 - lib/tanuki/extensions/rack/static_dir.rb
+- lib/tanuki/extensions/sequel/model.rb
 - lib/tanuki/i18n.rb
-- lib/tanuki/launcher.rb
 - lib/tanuki/loader.rb
+- lib/tanuki/meta_model.rb
+- lib/tanuki/model_behavior.rb
 - lib/tanuki/model_generator.rb
 - lib/tanuki/template_compiler.rb
 - lib/tanuki/utility/create.rb
 - lib/tanuki/utility/generate.rb
 - lib/tanuki/utility/help.rb
-- lib/tanuki/utility/server.rb
 - lib/tanuki/utility/version.rb
 - lib/tanuki/utility.rb
 - lib/tanuki/version.rb
@@ -188,25 +180,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ~>
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 9
-      - 2
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Web framework with balls!

data/app/tanuki/controller/default.thtml

@@ -1,5 +0,0 @@
-% if visual_child
-<%! visual_child.default_view -%>
-% else
-<%! index_view -%>
-% end

data/app/tanuki/controller/index.thtml

@@ -1 +0,0 @@
-<%= self.class %> is under construction

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

@@ -1,121 +0,0 @@
-<!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>