tanuki 0.3.0 → 0.3.1

data/lib/tanuki/template_compiler.rb

@@ -1,27 +1,81 @@
 module Tanuki
 
   # Tanuki::TemplateCompiler is used for, well, compiling templates.
+  #
+  # Tanuki templates are text (or HTML) files with an extended tag syntax.
+  # ERB syntax is forward compatible with Tanuki template syntax.
+  #
+  # The following tags are recognized:
+  #
+  #   <% Ruby code -- output to stdout %>
+  #   <%= Ruby expression -- replace with result %>
+  #   <%# comment -- ignored -- useful in testing %>
+  #   % a line of Ruby code -- treated as <% line %>
+  #   %% replaced with % if first thing on a line
+  #   <%% or %%> -- replace with <% or %> respectively
+  #   <%! Ruby expression -- must return a template %> -- renders a template
+  #   <%_visitor Ruby code %> -- see Tanuki::Application::visitor for details
+  #   <l10n><en>English text</en> ... -- other localizations </l10n>
   class TemplateCompiler
 
     class << self
 
       # Compiles a template from a given +src+ string to +ios+ for method +sym+ in class +klass+.
       def compile_template(ios, src, klass, sym)
-        ios << "# encoding: #{src.encoding}\nclass #{klass}\ndef #{sym}_view(*args,&block)\nproc do|_,ctx|\n" \
-          "if _has_tpl ctx,self.class,:#{sym}\nctx=_ctx(ctx)"
-        last_state = compile(ios, src)
-        ios << "\n_.call('',ctx)" unless PRINT_STATES.include? last_state
-        ios << "\nelse\n(_run_tpl ctx,self,:#{sym},*args,&block).call(_,ctx)\nend\nend\nend\nend"
+        ios << "# encoding: #{src.encoding}\nclass #{klass}\n" << TEMPLATE_HEADER % sym
+        compile(ios, src, true)
+        ios << TEMPLATE_FOOTER % sym << "\nend"
+      end
+
+      # Compiles a wikified template from a given +src+ string to method +sym+ for a given object +obj+.
+      def compile_wiki(src, obj, sym)
+        code = StringIO.new
+        code << TEMPLATE_HEADER % sym
+        parse_wiki src
+        compile(code, src, true)
+        code << TEMPLATE_FOOTER % sym
+        obj.instance_eval code
+      end
+
+      # Replaces all wiki inserts like +[[controller?attribute:link#template]]+ with corresponding code in template tags +<%! %>+.
+      def parse_wiki(s)
+        s.gsub WIKI_SYNTAX do
+          code = '<%! self'
+
+          # Controller
+          code << $~[:controller].split('/').map {|route|
+            case route
+            when '' then '.root'
+            when '.' then ''
+            when '..' then '.logical_parent'
+            else "[:#{route}]"
+            end
+          }.join
+
+          code << ".model#{$~[:model].split('.').map {|attr| "[:#{attr}]"}.join}" if $~[:model]
+          code << ".link_to(:#{$~[:link]})" if $~[:link]
+
+          # Template
+          code << case $~[:template]
+          when '' then '.default_view'
+          when nil then '.link_view'
+          else ".#{$~[:template]}_view"
+          end
+
+          code << ' %>'
+        end
       end
 
       # Compiles code from a given +src+ string to +ios+.
-      def compile(ios, src)
+      def compile(ios, src, ensure_output=false)
         state = :outer
         last_state = nil
         index = 0
         trim_newline = false
         code_buf = ''
         begin
+
+          # Find out state for expected pattern
           if new_index = src[index..-1].index(pattern = expect_pattern(state))
             new_index += index
             match = src[index..-1].match(pattern)[0]
@@ -29,6 +83,8 @@ module Tanuki
           else
             new_state = nil
           end
+
+          # Process outer state (e.g. HTML or plain text)
           if state == :outer
             s = new_index ? src[index, new_index - index] : src[index..-1]
             if trim_newline && !s.empty?
@@ -40,10 +96,12 @@ module Tanuki
               index = new_index + match.length
               next
             elsif not s.empty?
-              ios << "\n_.call(#{(code_buf << s).inspect},ctx)"
+              ios << "\n_.(#{(code_buf << s).inspect},ctx)"
               code_buf = ''
             end
           end
+
+          # Process current state, if there should be a state change
           if new_index
             unless state != :outer && new_state == :code_skip
               if new_state == :outer
@@ -59,7 +117,9 @@ module Tanuki
               index = new_index + match.length
             end
           end
+
         end until new_index.nil?
+        ios << "\n_.('',ctx)" if ensure_output && !(PRINT_STATES.include? last_state)
         last_state
       end
 
@@ -68,6 +128,22 @@ module Tanuki
       # Scanner states that output the evaluated result.
       PRINT_STATES = [:outer, :code_print]
 
+      # Template header code. Sent to output before compilation.
+      TEMPLATE_HEADER = "def %1$s_view(*args,&block)\nproc do|_,ctx|\nif _has_tpl ctx,self.class,:%1$s\nctx=_ctx(ctx)"
+
+      # Template footer code. Sent to output after compilation.
+      TEMPLATE_FOOTER = "\nelse\n(_run_tpl ctx,self,:%s,*args,&block).(_,ctx)\nend\nend\nend"
+
+      # Wiki insert syntax
+      WIKI_SYNTAX = %r{
+        \[\[
+          (?<controller>(?:\.{1,2}(?:/\.\.)*|[a-z%0-9_]+|)(?:/[a-z%0-9_]+)*)
+          (?:\?(?<model>[a-z_\.]*))?
+          (?::(?<link>[a-z_]+))?
+          (?:\#(?<template>[a-z_]*))?
+        \]\]
+      }x
+
       # Generates code for Ruby template bits from a given +src+ to +ios+ for a given +state+.
       def process_code_state(ios, src, state)
         src.strip!
@@ -76,12 +152,12 @@ module Tanuki
         when :code_line, :code_span then
           ios << "\n#{src}"
         when :code_print then
-          ios << "\n_.call((#{src}),ctx)"
+          ios << "\n_.((#{src}),ctx)"
         when :code_template then
-          ios << "\n(#{src}).call(_,ctx)"
+          ios << "\n(#{src}).(_,ctx)"
         when :code_visitor
           inner_m = src.match(/^([^ \(]+)?(\([^\)]*\))?\s*(.*)$/)
-          ios << "\n#{inner_m[1]}_result=(#{inner_m[3]}).call(#{inner_m[1]}_visitor#{inner_m[2]},ctx)"
+          ios << "\n#{inner_m[1]}_result=(#{inner_m[3]}).(#{inner_m[1]}_visitor#{inner_m[2]},ctx)"
         when :l10n then
           localize(ios, src)
         end
@@ -139,8 +215,8 @@ module Tanuki
         ios << "#{lngs.inspect.gsub(/ /, '')}#{code.string}\nend"
       end
 
-    end # end class << self
+    end # class << self
 
-  end # end TemplateCompiler
+  end # TemplateCompiler
 
-end # end Tanuki
+end # Tanuki

data/lib/tanuki/utility/create.rb

@@ -0,0 +1,38 @@
+module Tanuki
+
+  module Utility
+
+    @help[:create] = 'create a new app with the given name'
+
+    # Creates a new application with a given +name+.
+    def self.create(name=nil)
+      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
+
+  end # Utility
+
+end # Tanuki

data/lib/tanuki/utility/generate.rb

@@ -0,0 +1,52 @@
+module Tanuki
+
+  module Utility
+
+    @help[:generate] = 'generate models for application schema'
+
+    # 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>'"
+      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/configurator'
+      require 'tanuki/context'
+      require 'tanuki/loader'
+      require 'tanuki/template_compiler'
+      require 'tanuki/model_generator'
+
+      ctx = Loader.context = Context
+      default_root = File.expand_path(File.join('..', '..', '..', '..'), __FILE__)
+      cfg = Configurator.new(ctx, cwd)
+
+      # Load defaults
+      cfg.config_root = File.join(default_root, 'config')
+      cfg.load_config :common
+
+      # Override with user settings if needed
+      if cwd != default_root
+        cfg.config_root = File.join(cwd, 'config')
+        cfg.load_config :common, true
+      end
+
+      puts "\n looking for models"
+      local_schema_root = File.expand_path(File.join('..', '..', '..', '..', 'schema'), __FILE__)
+      mg = ModelGenerator.new(ctx)
+      mg.generate ctx.schema_root
+      mg.generate local_schema_root unless ctx.schema_root == local_schema_root
+      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? }
+      end
+    end
+
+  end # Utility
+
+end # Tanuki

data/lib/tanuki/utility/help.rb

@@ -0,0 +1,16 @@
+module Tanuki
+
+  module Utility
+
+    @help[:help] = 'show help (this text)'
+
+    # Shows help for all available commands.
+    def self.help
+      version unless @in_repl
+      puts "\nbasic commands:\n"
+      @help.each_pair {|k, v| puts ' %-8s   %s' % [k, v] }
+    end
+
+  end # Utility
+
+end # Tanuki

data/lib/tanuki/utility/server.rb

@@ -0,0 +1,23 @@
+module Tanuki
+
+  module Utility
+
+    @help[:server] = 'run application'
+
+    # Runs the application in the current directory and environment +env+.
+    def self.server(env=nil)
+      env = env ? env.to_sym : :development
+      puts %{Calling for a Tanuki in "#{Dir.pwd}"}
+      version unless @in_repl
+      require 'tanuki'
+      begin
+        Application.run
+        puts 'Tanuki ran away!'
+      rescue SystemCallError
+        puts 'Tanuki ran away! Someone else is playing here.'
+      end if Application.configure(env)
+    end
+
+  end # Utility
+
+end # Tanuki

data/lib/tanuki/utility/version.rb

@@ -0,0 +1,15 @@
+module Tanuki
+
+  module Utility
+
+    @help[:version] = 'show framework version'
+
+    # Prints the running framework version.
+    def self.version
+      require 'tanuki/version'
+      puts "Tanuki version #{VERSION}"
+    end
+
+  end # Utility
+
+end # Tanuki

data/lib/tanuki/utility.rb

@@ -0,0 +1,65 @@
+module Tanuki
+
+  # Tanuki::Utility is a collection of methods for the framework console.
+  # The actual script is located in +bin/tanuki+ in gem or source location.
+  # An executable +tanuki+ is installed with the gem.
+  module Utility
+
+    class << self
+
+      # Executes given +args+.
+      # 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
+        when nil then start_repl unless @in_repl
+        else
+          if @commands.include? args[0].to_sym
+            begin
+              method(args[0].to_sym).call(*args[1..-1])
+            rescue ArgumentError => e
+              puts e.message.capitalize
+            end
+          else
+            help
+          end
+        end
+        true
+      end
+
+      # Initializes the utility state and loads command methods.
+      # Executes the utility with +ARGV+.
+      def init
+        @in_repl = false
+        @commands = []
+        @help = {}
+        Dir.glob(File.expand_path(File.join('..', 'utility', '*.rb'), __FILE__)) do |file|
+          if match = file.match(/\/([^\/]+).rb/)
+            require file
+            command = match[1].to_sym
+            @commands << command
+            @help[command] = nil unless @help.include? command
+          end
+        end
+        execute ARGV
+      end
+
+      # Starts a REPL (framework console).
+      # 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]+/))
+        rescue Interrupt
+          puts "\nBye bye!"
+        end
+      end
+
+    end # class << self
+
+  end # Utility
+
+end # Tanuki

data/lib/tanuki/version.rb

@@ -1,6 +1,6 @@
 module Tanuki
 
   # Tanuki framework version.
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 
-end # end Tanuki
+end # Tanuki

data/lib/tanuki.rb

@@ -10,7 +10,6 @@ require 'escape_utils'
 require 'escape_utils/url/rack'
 require 'tanuki/version'
 require 'tanuki/extensions/module'
-require 'tanuki/extensions/object'
 require 'tanuki/extensions/rack/builder'
 require 'tanuki/extensions/rack/server'
 require 'tanuki/extensions/rack/static_dir'
@@ -28,4 +27,4 @@ require 'tanuki/template_compiler'
 require 'tanuki/application'
 
 module Tanuki
-end
+end

data/schema/tanuki/l10n/en/controller.yml

@@ -10,4 +10,4 @@ attributes:
         description: Readable controller title
     pages:
         title: pages
-        description: Pages with this controller
+        description: Pages with this controller

data/schema/tanuki/l10n/en/page.yml

@@ -28,4 +28,4 @@ attributes:
         description: Use path to main child page
     hidden:
         title: hidden
-        description: Page is hidden or not
+        description: Page is hidden or not

data/schema/tanuki/l10n/ru/controller.yml

@@ -10,4 +10,4 @@ attributes:
         description: Читабельное название контроллера
     pages:
         title: страницы
-        description: Страницы, управляемые данным контроллером
+        description: Страницы, управляемые данным контроллером

data/schema/tanuki/l10n/ru/page.yml

@@ -28,4 +28,4 @@ attributes:
         description: Переходить к главной дочерней странице
     hidden:
         title: скрыта
-        description: Скрыта страница или нет
+        description: Скрыта страница или нет

data/schema/tanuki/models/controller.yml

@@ -14,4 +14,4 @@ l10n:
     table: tanuki_controllers_l10n
 list:
     class: { link: true }
-    title: ~
+    title: ~

data/schema/tanuki/models/page.yml

@@ -44,4 +44,4 @@ list:
     controller: ~
     default_route: ~
     use_default_route: ~
-    hidden: ~
+    hidden: ~

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Anatoly Ressin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-10 00:00:00 +03:00
+date: 2011-02-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -117,12 +117,16 @@ files:
 - app/tanuki/controller/default.thtml
 - app/tanuki/controller/index.thtml
 - app/tanuki/controller/link.thtml
+- 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.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.rb
 - app/user/page/index/default.thtml
@@ -132,6 +136,7 @@ files:
 - 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
@@ -145,14 +150,20 @@ files:
 - lib/tanuki/configurator.rb
 - lib/tanuki/context.rb
 - lib/tanuki/extensions/module.rb
-- lib/tanuki/extensions/object.rb
 - lib/tanuki/extensions/rack/builder.rb
 - lib/tanuki/extensions/rack/server.rb
 - lib/tanuki/extensions/rack/static_dir.rb
 - lib/tanuki/i18n.rb
 - lib/tanuki/launcher.rb
 - lib/tanuki/loader.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
 - lib/tanuki.rb
 - schema/tanuki/l10n/en/controller.yml
@@ -164,7 +175,7 @@ files:
 - LICENSE
 - README.rdoc
 has_rdoc: true
-homepage: http://withballs.org
+homepage: http://assistunion.com/sharing
 licenses: []
 
 post_install_message: 

data/lib/tanuki/extensions/object.rb

@@ -1,12 +0,0 @@
-class Object
-
-  # Runs Tanuki::Loader for every missing constant in main namespace.
-  def self.const_missing(sym)
-    unless (paths = Dir.glob(Tanuki::Loader.combined_class_path(sym))).empty?
-      paths.reverse_each {|path| require path }
-      return const_get(sym)
-    end
-    super
-  end
-
-end # end Object