tanuki 0.2.1 → 0.3.0

data/app/tanuki/meta_model/manager.ttxt

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

data/app/tanuki/meta_model/model.ttxt

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

data/app/tanuki/meta_model/model_base.ttxt

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

data/bin/tanuki

@@ -35,8 +35,9 @@ module Tanuki
 
       def generate(cwd)
         version unless @in_repl
-        cwd = File.expand_path(cwd ? cwd : '.')
+        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'
@@ -48,12 +49,17 @@ module Tanuki
         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
+        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, true
+        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
@@ -65,15 +71,34 @@ module Tanuki
 
       def generate_in(schema_root, ctx)
         Dir.entries(schema_root)[2..-1].each do |namespace_path|
-          namespace = namespace_path.capitalize
+          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
-            if @tried.include? namespace_model_name = "#{namespace}.#{model_name}"
+            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
-            meta_model = Tanuki_MetaModel.new(namespace, model_name, YAML.load_file(file_path))
+          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,
@@ -136,19 +161,9 @@ module Tanuki
 
       def server(env=nil)
         env = env ? env.to_sym : :development
-        puts %{Calling for a Tanuki in "#{pwd = Dir.pwd}"}
+        puts %{Calling for a Tanuki in "#{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
@@ -158,7 +173,7 @@ module Tanuki
         rescue SystemCallError
           puts 'Tanuki ran away! Someone else is playing here.'
           true
-        end if allow_run
+        end if Application.configure(env)
       end
 
       def start_repl

data/config/common_application.rb

@@ -8,6 +8,7 @@ use Rack::StaticDir, 'public'
 set :server, [:thin, :mongrel, :webrick]
 set :host, '0.0.0.0'
 set :port, 3000
+set :development, false
 
 # Default controllers
 set :root_page, ::User_Page_Index
@@ -15,6 +16,7 @@ set :missing_page, ::Tanuki_Page_Missing
 
 # Internationalization
 set :i18n, false
+set :i18n_redirect, false
 set :language, nil
 set :language_fallback, {}
 set :languages, proc { language_fallback.keys }

data/lib/tanuki/application.rb

@@ -9,20 +9,55 @@ module Tanuki
 
     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)
+          if pwd != default_root
+            @cfg.config_root = File.join(default_root, 'config')
+            @cfg.load_config(([:development, :production].include? env) ? :"#{env}_application" : :common_application)
+          end
+          @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
+      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.
       def discard(middleware)
         @rack_middleware.delete_if {|item| item[0] == middleware }
       end
 
+      # Returns current environment +Symbol+, if application is configured.
+      # Returns +nil+ otherwise.
+      def environment
+        @environment ||= nil
+      end
+
       # Runs the application with current settings.
       def run
-        rack_builder = Rack::Builder.new
-        @rack_middleware.each {|item| rack_builder.use(item[0], *item[1], &item[2]) }
+        configure_middleware(rack_builder = Rack::Builder.new)
         rack_builder.run(rack_app)
-        srv = available_server
-        puts "A wild Tanuki appears! Press Ctrl-C to set it free.",
-          "You used #{srv.name.gsub(/.*::/, '')} at #{@context.host}:#{@context.port}."
-        srv.run rack_builder.to_app, :Host => @context.host, :Port => @context.port
+        @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
       end
 
       # Adds a given +middleware+ with optional +args+ and +block+ to the Rack middleware pipeline.

data/lib/tanuki/behavior/controller_behavior.rb

@@ -77,7 +77,7 @@ module Tanuki
       @_cache[key] = child # Thread safe (possible overwrite, but within consistent state)
     end
 
-    # Returns true, if controller is active.
+    # Returns +true+, if controller is active.
     def active?
       @_active
     end
@@ -112,12 +112,16 @@ module Tanuki
     def configure
     end
 
-    # Returns true, if controller is current.
+    # Returns +true+, if controller is current.
     def current?
       @_current
     end
 
     # If set, controller navigates to a given child route by default.
+    # Returned object should be either +nil+ (don't navigate), or a +Hash+ with keys:
+    # * +:route+ is the +Symbol+ for the route
+    # * +:args+ contain route arguments +Hash+
+    # * +:redirect+ makes a 302 redirect to this route, if true (optional)
     def default_route
       nil
     end
@@ -267,28 +271,33 @@ module Tanuki
 
       # Dispathes route chain in context +ctx+ on +request_path+, starting with controller +klass+.
       def dispatch(ctx, klass, request_path)
-        parts = parse_path(request_path)
+        route_parts = parse_path(request_path)
         curr = root_ctrl = klass.new(ctx, nil, nil, true)
-        parts.each do |part|
+        route_parts.each do |route_part|
           curr.instance_variable_set :@_active, true
-          nxt = curr[part[:route], *part[:args]]
+          nxt = curr[route_part[:route], *route_part[:args]]
+          curr.logical_child = nxt
+          curr = nxt
+        end
+        while route_part = curr.default_route
+          if route_part[:redirect]
+            klass = curr.child_class(route_part)
+            return {:type => :redirect, :location => grow_link(curr, route_part, klass.arg_defs)}
+          end
+          curr.instance_variable_set :@_active, true
+          nxt = curr[route_part[:route], *route_part[:args]]
           curr.logical_child = nxt
           curr = nxt
         end
         curr.instance_variable_set :@_active, true
         curr.instance_variable_set :@_current, true
-        if route = curr.default_route
-          klass = curr.child_class(route)
-          {:type => :redirect, :location => grow_link(curr, route, klass.arg_defs)}
-        else
-          type = (curr.is_a? ctx.missing_page) ? :missing_page : :page
+        type = (curr.is_a? ctx.missing_page) ? :missing_page : :page
+        prev = curr
+        while curr = prev.visual_parent
+          curr.visual_child = prev
           prev = curr
-          while curr = prev.visual_parent
-            curr.visual_child = prev
-            prev = curr
-          end
-          {:type => type, :controller => prev}
         end
+        {:type => type, :controller => prev}
       end
 
       # Extends the including module with Tanuki::ControllerBehavior::ClassMethods.

data/lib/tanuki/behavior/meta_model_behavior.rb

@@ -1,13 +1,20 @@
 module Tanuki
 
+  # Tanuki::MetaModelBehavior contains all methods for the meta-model.
+  # In is included in the meta-model class.
   module MetaModelBehavior
 
-      def initialize(namespace, name, data)
+      # Creates new meta-model +name+ in +namespace+.
+      # Model schema is passed as +data+.
+      # Stucture +models+ contains all models being generated.
+      def initialize(namespace, name, data, models)
         @namespace = namespace
         @name = name
         @data = data
+        @models = models
       end
 
+      # Returns class name for a given class type.
       def class_name_for(class_type)
         case class_type
         when :model, :model_base then "#{@namespace}_Model_#{@name}"
@@ -15,24 +22,92 @@ module Tanuki
         end
       end
 
+      # Returns an array of code for alias-column name pair.
       def key
-        if @data['key'].nil?
-          []
-        elsif @data['key'].is_a? Array
-          @data['key'].map {|item| qualified_name(item) }
-        elsif @data['key'].is_a? String
-          [qualified_name(@data['key'])]
+        @key.inspect
+      end
+
+      # Prepares data for template generation.
+      # Processes own keys, fields, etc.
+      def process!
+        process_source!
+        process_key!
+      end
+
+      def process_key!
+        @key = @source['key'] || 'id'
+        @key = [@key] if @key.is_a? String
+        raise 'invalid key' unless @key.is_a? Array
+        @key.map! do |k|
+          parts = k.split('.').map {|p| p.to_sym }
+          raise "invalid key field #{k}" if parts.count > 2
+          if parts.count == 2
+            raise 'all key fields should belong to the first-source' if parts[0] != @first_source.to_s
+            parts
+          else
+            [@first_source, parts[0]]
+          end
+        end
+      end
+
+      # Extracts the model firts-source information form the YAML @data
+      # and performs
+      def process_source!
+        guess_table = @name.pluralize
+        @data ||= {}
+        @source = @data['source'] || guess_table
+        @source = {'table' => @source} if @source.is_a? String
+        @first_source = (@source['table'] || guess_table).downcase.to_sym
+      end
+
+      def process_joins!
+        @joins = {}
+        @joins[@first_source] = nil
+      end
+
+      # Prepares data for template generation.
+      # Processes foreign keys, fields, etc.
+      def process_relations!
+        joins = @source['joins'] || {}
+        joins = [joins] if joins.is_a? String
+        joins = Hash[*joins.collect {|v| [v, nil] }.flatten] if joins.is_a? Array
+        if joins.is_a? Hash
+          joins.each_pair do |table_alias, join|
+            table_alias = table_alias.to_sym
+            raise "#{table_alias} is already in use" if @joins.include? table_alias
+            if join
+              if join['on'].is_a Hash
+                table_name = join['table'] || table_alias
+                on = join['on']
+              else
+                on = join
+                table_name = table_alias
+              end
+            else
+               on = nil
+               table_name = table_alias
+            end
+            if on
+            else
+              on = {}
+              @key.each do |k|
+                on[[table_alias, @first_source.to_s.singularize.to_sym]] = []
+                # TODO choose a right priciple
+              end
+            end
+          end
         else
-          raise "key for model #{@namespace}.#{@name} is invalid"
+          raise "`joins' should be either nil or string or array or hash"
         end
       end
 
+      # Returns code for alias-column name pair for field +field_name+.
       def qualified_name(field_name)
         parts = field_name.split('.')
         if parts.length == 1
-          ":#{field_name}"
+          "%w{:#{@first_source} :#{field_name}}"
         elsif parts.length == 2
-          ":#{parts[1]}.qualify(:#{parts[0]}"
+          "%w{:#{parts[0]} :#{parts[1]}}"
         else
           raise "field name for model #{@namespace}.#{@name} is invalid"
         end

data/lib/tanuki/behavior/model_behavior.rb

@@ -1,17 +1,23 @@
 module Tanuki
 
+  # Tanuki::ModelBehavior contains basic methods for a framework model.
+  # In is included in the base model class.
   module ModelBehavior
 
-    def initialize(data = {}, lazy = false)
+    # Creates new model with dataset row +data+.
+    # If the model is +lazy+, +data+ should contain only row keys.
+    def initialize(data={}, lazy=false)
       @_data = data
       @_loaded = !lazy
     end
 
+    # Returns the value of a given attribute, loading the model on demand.
     def [](attribute)
-      ensure_loaded!
+      ensure_loaded! unless self.class[attribute].present_in(@_data)
       self.class[attribute].get(@_data)
     end
 
+    # Sets the value of a given attribute.
     def []=(attribute, value)
       @_errors ||= {}
       @_original ||= {}
@@ -24,16 +30,27 @@ module Tanuki
       end
     end
 
+    # Returns the modification errors hash.
+    def errors
+      @_errors ||= {}
+      @_errors
+    end
+
+    # Returns transport representation of data.
     def internals_get(attribute)
       self.class[attribute].internals_get(@_data)
     end
 
+    # Sets transport representation of data.
     def internals_set(attribute, internal_value)
       @_errors ||= {}
       internals_set(self.class[attribute], @_data)
     end
 
+    # Returns model updates hash.
+    # This method is used internally to generate a data source update.
     def get_updates
+      # TODO Rewrite this properly
       @_original ||= {}
       original_data = {}
       self.class.attributes.each_pair do |name, attrib|
@@ -46,30 +63,23 @@ module Tanuki
       updates
     end
 
-    def get_error(attribute)
-      @_errors ||= {}
-      @_errors[attribute]
-    end
-
-    def invalid?(attribute)
-      @_errors.include? attribute
-    end
-
+    # Returns +true+ if there are any modification errors.
     def has_errors?
       @_errors ||= {}
       @_errors == {}
     end
 
-    def errors
-      @_errors ||= {}
-      @_errors
-    end
-
     module ClassMethods
 
-      def create(data, ctx, lazy = false) # IDENTITY TRACKING AND LAZY LOADING
+      # Returns meta-information for a given attribute.
+      def [](attribute)
+        @_attributes[attribute]
+      end
+
+      # Creates new model, or returns existing one.
+      def get(data, ctx, lazy=false) # IDENTITY TRACKING AND LAZY LOADING
         entity_key = extract_key(data)
-        key = [self, entity_key] #extract_key is generated ad hoc by model compiler!
+        key = [self, entity_key] # extract_key is generated ad hoc by model compiler!
         if cached = ctx.entity_cache[key]
           cached
         else
@@ -77,30 +87,29 @@ module Tanuki
         end
       end
 
+      # Assigns +attribute+ with definition +attr_def+ to model.
       def has_attribute(attribute, attr_def)
         @_attributes ||= superclass.instance_variable_get(:@_attributes).dup
         @_attributes[attribute] = attr_def
       end
 
-      def [](attribute)
-        @_attributes[attribute]
-      end
-
-      def has_reference(attribute, reference_def)
-        @_references ||= superclass.instance_variable_get(:@_references).dup
-        @_references[attribute] = reference_def
+      # Adds a relation +name+ with definition +relation_def+ to model.
+      def has_relation(name, relation_def)
+        @_relations ||= superclass.instance_variable_get(:@_relations).dup
+        @_relations[name] = relation_def
       end
 
       # Prepares the extended module.
       def self.extended(mod)
         mod.instance_variable_set(:@_attributes, {})
-        mod.instance_variable_set(:@_references, {})
+        mod.instance_variable_set(:@_relations, {})
       end
 
     end # end ClassMethods
 
     class << self
 
+      # Extends the including module with Tanuki::ModelBehavior::ClassMethods.
       def included(mod)
         mod.extend ClassMethods
       end

data/lib/tanuki/configurator.rb

@@ -1,7 +1,6 @@
 module Tanuki
 
   # Tanuki::Configurator is a scope for evaluating a Tanuki application configuration block.
-  # Use Tanuki::development_application and Tanuki::production_application to create such a block.
   class Configurator
 
     # Configuration root.
@@ -12,7 +11,6 @@ module Tanuki
     def initialize(ctx, root, config_root=nil)
       @context = ctx
       set :root, root ? root : Dir.pwd
-      @config_root = config_root ? config_root : File.join(@context.root, 'config')
     end
 
     # Loads and executes a given configuraion file with symbolic name +config+.

data/lib/tanuki/context.rb

@@ -7,41 +7,66 @@ module Tanuki
 
     @_defined = {}
 
-    # Creates and returns child context object.
-    # This object's superclass is going to be current context class.
-    def self.child
-      child = Class.new(self)
-      child.instance_variable_set(:@_defined, {})
-      child
-    end
-
-    # Allowes arbitary values to be assigned to context with a +key=+ method.
-    # A reader in context object class is created for each assigned value.
-    def self.method_missing(sym, arg=nil)
-      match = sym.to_s.match(/\A(?!(?:child|method_missing)=\Z)([^=]+)(=)?\Z/)
-      raise "`#{sym}' method cannot be called for Context and its descendants" unless match
-      defined = @_defined
-      class << self; self; end.instance_eval do
-        method_sym = match[1].to_sym
-        if defined.include? method_sym
-          undef_method method_sym
-        else
-          defined[method_sym] = nil
-        end
-        if arg.is_a? Proc
-          define_method(method_sym, &arg)
-        else
-          define_method(method_sym) { arg }
+    class << self
+
+      # Creates and returns child context object.
+      # This object's superclass is going to be current context class.
+      def child
+        child = Class.new(self)
+        child.instance_variable_set(:@_defined, {})
+        child
+      end
+
+      # Returns a printable version of Tanuki::Context, represented as a +Hash+.
+      # Can be used during development for inspection purposes.
+      #--
+      # When changing this method, remember to update `#{__LINE__ + 12}' to `defined.inspect` line number.
+      # This is required to avoid infinite recursion.
+      def inspect
+        return to_s if caller.any? {|entry_point| entry_point =~ /\A#{__FILE__}:#{__LINE__ + 12}/}
+        defined = {}
+        ancestors.each do |ancestor|
+          ancestor.instance_variable_get(:@_defined).each_key do |key|
+            begin
+              defined[key] ||= send(key)
+            rescue ArgumentError
+              defined[key] ||= method(key)
+            end
+          end
+          break if ancestor.equal? Context
         end
-        return arg
-      end if match[2]
-      super
-    end
-
-    # Disallow context instantiation
-    def self.new
-      raise "contexts cannot be instantiated"
-    end
+        defined.inspect
+      end
+
+      # Allowes arbitary values to be assigned to context with a +key=+ method.
+      # A reader in context object class is created for each assigned value.
+      def method_missing(sym, arg=nil)
+        match = sym.to_s.match(/\A(?!(?:child|inspect|method_missing)=\Z)([^=]+)(=)?\Z/)
+        raise "`#{sym}' method cannot be called for Context and its descendants" unless match
+        defined = @_defined
+        class << self; self; end.instance_eval do
+          method_sym = match[1].to_sym
+          if defined.include? method_sym
+            undef_method method_sym
+          else
+            defined[method_sym] = nil
+          end
+          if arg.is_a? Proc
+            define_method(method_sym, &arg)
+          else
+            define_method(method_sym) { arg }
+          end
+          return arg
+        end if match[2]
+        super
+      end
+
+      # Disallow context instantiation
+      def new
+        raise "contexts cannot be instantiated"
+      end
+
+    end # end class << self
 
   end # end Context
 

data/lib/tanuki/extensions/rack/builder.rb

@@ -0,0 +1,26 @@
+module Rack
+  class Builder
+
+    # Initializes application settings using configuration for environment +env+ and +rackup+ arguments.
+    # Application is configured for development, if no environment is specified.
+    # Returns Tanuki::Application::rack_app.
+    #
+    # This should be invoked from Rackup configuration files (e.g. +config.ru+):
+    #
+    #   #\ -p 3000
+    #   require 'tanuki'
+    #   run tanuki
+    def tanuki(env=nil)
+      puts %{Calling for a Tanuki in "#{Dir.pwd}"}
+      at_exit { puts 'Tanuki ran away!' }
+      builder = self
+      Tanuki::Application.instance_eval do
+        configure(env = env ? env.to_sym : :development)
+        configure_middleware(builder)
+        puts "A racked #{env} Tanuki appears!"
+        rack_app
+      end
+    end
+
+  end # end
+end # end Rack

data/lib/tanuki/extensions/rack/server.rb

@@ -0,0 +1,18 @@
+module Rack
+  class Server
+
+    # Wraps around Rack::Server#options to update application configuration accordingly.
+    def options_with_tanuki(*args, &block)
+      rack_server = self
+      rackup_options = options_without_tanuki(*args, &block)
+      Tanuki::Application.instance_eval do
+        rackup_options.each_pair {|k, v| @context.send :"#{k.downcase}=", v }
+        @context.running_server = rack_server.server
+      end
+      rackup_options
+    end
+
+    alias_method_chain :options, :tanuki
+
+  end # end
+end # end Rack

data/lib/tanuki/extensions/rack/static_dir.rb

@@ -1,7 +1,7 @@
 module Rack
   class StaticDir
 
-    # Initializes a +Rack::File+ server at +root+ or +Dir.pwd+.
+    # Initializes a Rack::File server at +root+ or +Dir.pwd+.
     def initialize(app, root=nil)
       @app = app
       @file_server = Rack::File.new(root || Dir.pwd)

data/lib/tanuki/i18n.rb

@@ -15,7 +15,7 @@ module Tanuki
     # Returns default route according to default language.
     def default_route
       raise 'default language is not configured' unless @_ctx.language
-      {:route => @_ctx.language.to_s, :args => {}}
+      {:route => @_ctx.language, :args => {}, :redirect => @_ctx.i18n_redirect}
     end
 
     # Calls default view of visual child.

data/lib/tanuki/version.rb

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

data/lib/tanuki.rb

@@ -1,6 +1,7 @@
 libdir = File.dirname(__FILE__)
 $:.unshift(libdir) unless $:.include?(libdir)
 
+require 'active_support/all'
 require 'rack'
 require 'fileutils'
 require 'sequel'
@@ -10,6 +11,8 @@ 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'
 require 'tanuki/behavior/controller_behavior'
 require 'tanuki/behavior/meta_model_behavior'

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Anatoly Ressin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-29 00:00:00 +03:00
+date: 2010-09-10 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +24,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 1
@@ -38,13 +38,12 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 3
         - 14
-        - 0
-        version: 3.14.0
+        version: "3.14"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -53,30 +52,56 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         - 1
-        - 5
-        version: 0.1.5
+        version: "0.1"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: activesupport
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
         - 3
         - 0
-        version: 1.3.0
-  type: :development
+        version: "3.0"
+  type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: i18n
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
+        version: "0.4"
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
+  type: :development
+  version_requirements: *id006
 description: Tanuki is an MVVM-inspired web framework that fancies idiomatic Ruby, DRY and extensibility by its design.
 email: tanuki@withballs.org
 executables: 
@@ -121,6 +146,8 @@ files:
 - 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
@@ -148,7 +175,7 @@ require_paths:
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ~>
     - !ruby/object:Gem::Version 
       segments: 
       - 1