tanuki 0.3.0 → 0.3.1

data/LICENSE

@@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

data/README.rdoc

@@ -17,6 +17,14 @@ Fire up the terminal and type:
 
 View the result at: http://localhost:3000
 
-== Resources
+== Hack on the Core
 
-{Home Page}[http://withballs.org]
+If you would like to study the framework and contribute, try making sense of the project {wiki}[https://github.com/assistunion/tanuki/wiki], then move on to {documentation}[http://rubydoc.info/github/assistunion/tanuki].
+
+== Acknowledgements
+
+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

data/app/tanuki/attribute/attribute.rb

@@ -1,4 +1,4 @@
-class Tanuki_Attribute
+class Tanuki::Attribute
   def initialize(cfg, owner)
     #--
     # created on demand (first access)
@@ -16,4 +16,4 @@ class Tanuki_Attribute
   def value
     # value of data (scalar, array, or hash)
   end
-end
+end

data/app/tanuki/base/base.rb

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

data/app/tanuki/controller/controller.rb

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

data/app/tanuki/controller/default.thtml

@@ -2,4 +2,4 @@
 <%! visual_child.default_view -%>
 % else
 <%! index_view -%>
-% end
+% end

data/app/tanuki/controller/index.thtml

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

data/app/tanuki/controller/link.thtml

@@ -4,4 +4,4 @@
 <a class="active" href="<%= self.link %>"><%= self %></a>
 % else
 <a href="<%= self.link %>"><%= self %></a>
-% end
+% end

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

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

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

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

data/app/tanuki/meta_model/manager.ttxt

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

data/app/tanuki/meta_model/manager_base.ttxt

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

data/app/tanuki/meta_model/meta_model.rb

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

data/app/tanuki/meta_model/model.ttxt

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

data/app/tanuki/meta_model/model_base.ttxt

@@ -1,4 +1,4 @@
-class <%= class_name_for :model_base %> < Tanuki_Base
+class <%= class_name_for :model_base %> < Tanuki::Base
   extend Tanuki::ModelBehavior
 
   class << self
@@ -9,4 +9,4 @@ class <%= class_name_for :model_base %> < Tanuki_Base
     def get(ctx, *args)
     end
   end
-end
+end

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

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

data/app/tanuki/model/model.rb

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

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

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

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

@@ -58,4 +58,4 @@
         % end
     </div>
 </body>
-</html>
+</html>

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

@@ -1,4 +1,4 @@
-class Tanuki_Page_Missing < Tanuki_Controller
+class Tanuki::Page::Missing < Tanuki::Controller
   def visual_parent
     nil
   end
@@ -6,4 +6,4 @@ class Tanuki_Page_Missing < Tanuki_Controller
   def result_type
     :not_found
   end
-end
+end

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

@@ -118,4 +118,4 @@
         </table></div>
     </div>
 </body>
-</html>
+</html>

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

@@ -1,2 +1,2 @@
-class User_Page_Index < Tanuki_Controller
-end
+class User::Page::Index < Tanuki::Controller
+end

data/bin/tanuki

@@ -1,202 +1,4 @@
 #!/usr/bin/env ruby
-module Tanuki
-
-  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 = 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'
-        Loader.context = ctx = Context
-        default_root = File.expand_path(File.join('..', '..'), __FILE__)
-        cfg = Configurator.new(Context, cwd)
-        if cwd != default_root
-          cfg.config_root = File.join(default_root, 'config')
-          cfg.load_config :common
-        end
-        cfg.config_root = File.join(cwd, 'config')
-        cfg.load_config :common, cwd != default_root
-        puts "\n looking for models"
-        @tried = {}
-        @models = {}
-        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_name = namespace_path.split('_').map {|s| s.capitalize }.join
-          namespace = @models[namespace_name] = {}
-          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
-            meta_model = namespace[model_name] = Tanuki_MetaModel.new(
-              namespace_name,
-              model_name,
-              YAML.load_file(file_path),
-              @models
-            )
-            meta_model.process!
-            if @tried.include? namespace_model_name = "#{namespace_name}.#{model_name}"
-              next
-            else
-              @tried[namespace_model_name] = {:generated => [], :failed => [], :skipped => []}
-            end
-          end
-        end
-
-        @models.each do |namespace_name, namespace |
-          namespace.each do |model_name, meta_model|
-            meta_model.process_relations!
-          end
-        end
-
-        @models.each do |namespace_name, namespace |
-          namespace.each do |model_name, meta_model|
-            namespace_model_name = "#{namespace_name}.#{model_name}"
-            {
-              :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 "#{Dir.pwd}"}
-        version unless @in_repl
-        require 'tanuki'
-        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 Application.configure(env)
-      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)
+$:.unshift File.expand_path(File.join('..', '..', 'lib'), __FILE__)
+require 'tanuki/utility'
+Tanuki::Utility.init if File.basename(__FILE__) == File.basename($0)

data/config/common.rb

@@ -4,4 +4,4 @@ set :gen_root, proc { File.join(root, 'gen') }
 set :schema_root, proc { File.join(root, 'schema') }
 
 # Cache
-set :templates, {}
+set :templates, {}

data/config/common_application.rb

@@ -11,8 +11,8 @@ set :port, 3000
 set :development, false
 
 # Default controllers
-set :root_page, ::User_Page_Index
-set :missing_page, ::Tanuki_Page_Missing
+set :root_page, ::User::Page::Index
+set :missing_page, ::Tanuki::Page::Missing
 
 # Internationalization
 set :i18n, false
@@ -30,4 +30,4 @@ visitor :string do s = ''; proc {|out| s << out.to_s } end
 argument Fixnum, Argument::Integer
 argument Bignum, Argument::Integer
 argument Range, Argument::IntegerRange
-argument String, Argument::String
+argument String, Argument::String

data/config/development_application.rb

@@ -5,4 +5,4 @@ set :development, true
 use Rack::CommonLogger
 use Rack::Lint
 use Rack::Reloader, 0
-use Rack::ShowExceptions
+use Rack::ShowExceptions

data/config/production_application.rb

@@ -1,2 +1,2 @@
 load_config :common_application
-set :development, false
+set :development, false

data/config/test_application.rb

@@ -0,0 +1,2 @@
+load_config :development_application
+set :root_page, ::Test::Page::Index

data/lib/tanuki/application.rb

@@ -17,12 +17,17 @@ module Tanuki
         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/
@@ -54,10 +59,14 @@ module Tanuki
       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
-        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}."
-        @context.running_server.run rack_builder.to_app, :Host => @context.host, :Port => @context.port
+        @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}."
+        end
       end
 
       # Adds a given +middleware+ with optional +args+ and +block+ to the Rack middleware pipeline.
@@ -115,14 +124,23 @@ module Tanuki
         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(/^(.+)(?<!\$)\/$/)
+
+            # 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'}, []]
+
           else
+
+            # 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'}, []]
@@ -131,12 +149,14 @@ module Tanuki
             else
               [404, {'Content-Type' => 'text/html; charset=utf-8'}, build_body(result[:controller], request_ctx)]
             end
-          end
+
+          end # if
+
         end
       end
 
-    end # end class << self
+    end # class << self
 
-  end # end Application
+  end # Application
 
-end # end Tanuki
+end # Tanuki

data/lib/tanuki/argument/base.rb

@@ -21,7 +21,7 @@ module Tanuki
         @value = to_value(obj)
       end
 
-    end # end Base
+    end # Base
 
-  end # end Argument
-end # end Tanuki
+  end # Argument
+end # Tanuki

data/lib/tanuki/argument/integer.rb

@@ -9,7 +9,7 @@ module Tanuki
         begin Kernel::Integer obj rescue @default end
       end
 
-    end # end Integer
+    end # Integer
 
-  end # end Argument
-end # end Tanuki
+  end # Argument
+end # Tanuki

data/lib/tanuki/argument/integer_range.rb

@@ -16,7 +16,7 @@ module Tanuki
         @range.include?(i) ? i : @default
       end
 
-    end # end IntegerRange
+    end # IntegerRange
 
-  end # end Argument
-end # end Tanuki
+  end # Argument
+end # Tanuki

data/lib/tanuki/argument/string.rb

@@ -9,7 +9,7 @@ module Tanuki
         obj.to_s
       end
 
-    end # end String
+    end # String
 
-  end # end Argument
-end # end Tanuki
+  end # Argument
+end # Tanuki

data/lib/tanuki/argument.rb

@@ -34,8 +34,8 @@ module Tanuki
         end
       end
 
-    end # end class << self
+    end # class << self
 
-  end # end Argument
+  end # Argument
 
-end # end Tanuki
+end # Tanuki