uzuuzu-core 0.0.5 → 0.0.6

data/Gemfile

@@ -15,6 +15,5 @@ end
 gem 'rack'
 gem 'extlib'
 gem 'ruby-openid'
+gem 'oauth'
 gem 'tilt'
-gem 'tenjin'
-gem 'nokogiri'

data/Gemfile.lock

@@ -8,7 +8,7 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    nokogiri (1.5.0)
+    oauth (0.4.5)
     rack (1.3.1)
     rake (0.8.7)
     rcov (0.9.9)
@@ -21,7 +21,6 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
     ruby-openid (2.1.8)
-    tenjin (0.6.1)
     tilt (1.3.2)
 
 PLATFORMS
@@ -31,10 +30,9 @@ DEPENDENCIES
   bundler
   extlib
   jeweler
-  nokogiri
+  oauth
   rack
   rcov
   rspec
   ruby-openid
-  tenjin
   tilt

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/uzuuzu/helper/fixture.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 
 module UzuUzu
   module Helper

data/lib/uzuuzu/helper/form.rb

@@ -0,0 +1,9 @@
+# coding: utf-8
+
+module UzuUzu
+  module Helper
+    module Form
+
+    end
+  end
+end

data/lib/uzuuzu/helper/localize.rb

@@ -8,7 +8,7 @@ module UzuUzu
       end
 
       def fix_localize(key, options={})
-        UzuUzu.localize[key.to_s]
+        (UzuUzu.localize[key.to_s] || "").force_encoding('UTF-8')
       end
     end
   end

data/lib/uzuuzu/helper/renderer.rb

@@ -3,19 +3,20 @@
 module UzuUzu
   module Helper
     module Renderer
-      module ExtendClass
-        def render(action, options={})
-          _request, _response, _controller, _action, _query, _route = UzuUzu.current.get_thread_by_di
-          browser = Rack::Test::Session.new(Rack::MockSession.new(UzuUzu.current))
-          browser.get self.url_for(action, options)
-          browser.last_response.body
-          UzuUzu.current.di_thread(_request, _response, _controller, _action, _query, _route)
-        end
-      end
+      extend TiltWrapper
       
-      def self.included(clazz)
-        clazz.extend ExtendClass
+      #
+      #
+      #
+      def render_full(controller, action, options={})
+          _request, _response, _controller, _action, _query, _route = ::UzuUzu.current.get_thread_by_di
+          browser = ::Rack::MockRequest.new(::UzuUzu.current)
+          _render_response = browser.get self.rf(controller, action, options)
+          _render =  _render_response.body.to_s
+          ::UzuUzu.current.di_thread(_request, _response, _controller, _action, _query, _route)
+          _render
       end
+      
       #
       #
       #
@@ -26,6 +27,9 @@ module UzuUzu
         throw :finish
       end
       
+      #
+      #
+      #
       def respond_to
         return unless block_given?
         response.status = 200
@@ -39,7 +43,7 @@ module UzuUzu
       def render(view, options={}, locals={}, &block)
         view_path = nil
         catch(:view_finded) do
-          Tilt.mappings.each_key do |key|
+          ::Tilt.mappings.each_key do |key|
             self.application.views.each do |view_route|
               _view_path = "#{view_route}#{self.route}/#{view}.#{key}"
               if ::File.file?(_view_path)
@@ -55,20 +59,6 @@ module UzuUzu
         render_file(view_path, options={}, locals={}, &block)
       end
       
-      #
-      #
-      #
-      def render_engine(view_string, engine=UzuUzu.engine, options={}, locals={}, &block)
-        template = Tilt[engine].new { |t| view_string }
-        contents = template.render(self, locals, &block)
-        unless options.blank?
-          layout = options[:layout] || options['layout']
-          unless layout.blank?
-            wrap_layout(layout, contents, options, locals)
-          end
-        end
-        contents
-      end
       #
       #
       #
@@ -77,19 +67,15 @@ module UzuUzu
           view_string = ::File.respond_to?(:binread) ? ::File.binread(view_path) : ::File.read(view_path)
           render_engine(view_string, ::File.extname(view_path), options, locals, &block)
         else
-          raise ArgmentError.new("file not found : #{view_path}")
+          raise ::ArgmentError.new("file not found : #{view_path}")
         end
       end
-      
+
       #
       #
       #
-      def wrap_layout(layout, contents, options={}, locals={})
-        if ::File.file?(layout)
-          template = Tilt.new(layout)
-          contents = template.render(self, locals.merge({:contents => contents})){contents}
-        end
-        contents
+      def render_engine(view_string, engine=::UzuUzu.engine, options={}, locals={}, &block)
+        UzuUzu.render_engine(self, view_string, engine, options, locals, &block)
       end
       
       def send_file()
@@ -117,6 +103,20 @@ module UzuUzu
         response.redirect(uri)
         throw :finish
       end # redirect
+
+      #
+      #
+      #
+      def server_error(code=500, options={})
+        redirect self.rf(UzuUzu::Controller::Index, :error, code)
+      end # error
+      
+      #
+      #
+      #
+      def not_found(code=404, options={})
+        redirect self.rf(UzuUzu::Controller::Index, :error, code)
+      end
       
       #
       #
@@ -126,10 +126,10 @@ module UzuUzu
         if time.respond_to?(:to_time)
             time = time.to_time
         else
-            time = Time.parse(time.to_s)
+            time = ::Time.parse(time.to_s)
         end
         response['Last-Modified'] = time.httpdate
-        if Time.httpdate(request.env['HTTP_IF_MODIFIED_SINCE']).to_i >= time.to_i
+        if ::Time.httpdate(request.env['HTTP_IF_MODIFIED_SINCE']).to_i >= time.to_i
           response.status = 304
           throw :finish
         end
@@ -139,7 +139,7 @@ module UzuUzu
       #
       #
       def etag(value, kind=:strong)
-        raise TypeError, ":strong or :weak expected" if ![:strong,:weak].include?(kind)
+        raise ::TypeError, ":strong or :weak expected" if ![:strong,:weak].include?(kind)
         value = '"%s"' % value
         value = 'W/' + value if kind == :weak
         response['ETag'] = value
@@ -153,6 +153,8 @@ module UzuUzu
           end
         end
       end # etag
+      
+      
     end # Renderer
   end # Helper
 end # UzuUzu

data/lib/uzuuzu/helper/route.rb

@@ -3,46 +3,29 @@
 module UzuUzu
   module Helper
     module Route
-      module RouteClass
-        def url_for(*args)
-          app = UzuUzu.current
-          route_string = UzuUzu::Request.current.env['SCRIPT_NAME']
-          app.controllers.each do |controller|
-            re = Regexp.compile("^#{controller.name}::")
-            if re =~ self.name
-              path = self.name.gsub(re, '').gsub(/Controller$/, '').to_const_path
-              route_string << "/#{path}" unless path == 'index'
-              break
-            end
+      def url_for_controller(controller, *args)
+        app = UzuUzu.current
+        route_string = request.env['SCRIPT_NAME']
+        app.controllers.each do |root_controller|
+          re = Regexp.compile("^#{root_controller.name}::")
+          if re =~ controller.name
+            path = controller.name.gsub(re, '').gsub(/Controller$/, '').to_const_path
+            route_string << "/#{path}" unless path == 'index'
+            break
           end
-          if args[-1].kind_of?(Hash)
-            query = query_string(args.pop)
-          end
-          args.each do |arg|
-            route_string << "/#{arg}"
-          end
-          
-          route_string << '/' if args.blank?
-          route_string << query unless query.blank?
-          route_string
         end
-        alias :r :url_for
-        #
-        #
-        #
-        def query_string(query_options={})
-          query_string = []
-          query_options do |key, value|
-            query_string << "#{key}=#{value}"
-          end
-          return "" if query_string.blank?
-          "?#{query_string.join('&')}"
+        if args[-1].kind_of?(Hash)
+          query = query_string(args.pop)
         end
+        args.each do |arg|
+          route_string << "/#{arg}"
+        end
+        
+        route_string << '/' if args.blank?
+        route_string << query unless query.blank?
+        route_string
       end
-      
-      def self.included(clazz)
-        clazz.extend RouteClass
-      end
+      alias :rf :url_for_controller
       
       def url_for(*args)
         route_string = @_route.clone

data/lib/uzuuzu/uzuuzu-core.rb

@@ -8,6 +8,7 @@ require 'uzuuzu/wrapper/memcache'
 require 'uzuuzu/wrapper/datastore'
 require 'uzuuzu/wrapper/request'
 require 'uzuuzu/wrapper/response'
+require 'uzuuzu/wrapper/tilt'
 require 'uzuuzu/wrapper/controller'
 require 'uzuuzu/wrapper/helper'
 require 'uzuuzu/wrapper/application'

data/lib/uzuuzu/wrapper/application.rb

@@ -23,10 +23,13 @@ module UzuUzu
     #
     attr_accessor :views
     
+    #
+    #
+    #
     def self.current
       Thread.current[:application]
     end
-    
+        
     #
     #
     #
@@ -65,7 +68,7 @@ module UzuUzu
                      UzuUzu::Helper::Renderer,
                      UzuUzu::Helper::Localize,
                      UzuUzu::Helper::Route,
-                     UzuUzu::Helper::UzuUzuPage,
+                     UzuUzu::Helper::Form,
                      UzuUzu::Helper::XHtml
                    ]
     end
@@ -89,7 +92,7 @@ module UzuUzu
       is_send = false
       action_return = nil
       render = nil
-      clazz.each do |map|
+      clazz.reverse.each do |map|
         controller_class = map[:clazz]
         query = map[:query]
         route = map[:route]
@@ -126,49 +129,52 @@ module UzuUzu
       request_paths = env['PATH_INFO'].split('/')
       request_paths.shift if request_paths[0].blank?
       
-      controllers.reverse.each do |c|
-        if c.instance_of?(Module) or c.instance_of?(Class)
-          controller_str = []
-          request_paths.each_with_index do |request_path, index|
-            next if request_path.blank?
-            controller_str << request_path.camel_case
-            c_str = controller_str.join('::')
-            next if c_str == 'Index'
-            route = "#{env['SCRIPT_NAME']}/#{request_paths[0..index].join('/')}"
-            query = request_paths[(index+1)..-1]
-            begin
-              if c.const_defined?(c_str)
-                classies <<  {:clazz => c.module_eval(c_str),
-                              :route => route,
-                              :query => query}
-              end
-            rescue NameError => e
-              begin
-                if c.const_defined?("#{c_str}Controller")
-                  classies << {:clazz => c.module_eval("#{c_str}Controller"),
-                               :route => route,
-                               :query => query}
-                end
-              rescue NameError => e
-              end
-            end
+      controllers.each do |c|
+        if request_paths.size == 0
+          add_classies(classies, c, 'Index', env['SCRIPT_NAME'], request_paths)
+        end
+        request_paths.each_with_index do |request_path, index|
+          next if request_path.blank?
+          c_str = request_path.camel_case
+          route = "#{request_paths[0...index].join('/')}"
+          if route.blank?
+            route = "#{env['SCRIPT_NAME']}"
+          else
+            route = "#{env['SCRIPT_NAME']}/#{route}"
           end
-          if c.const_defined?('Index')
-            classies << {:clazz => c.module_eval("Index"),
-                         :route => env['SCRIPT_NAME'],
-                         :query => request_paths}
-          elsif c.const_defined?('IndexController')
-            classies << {:clazz => c.module_eval("Index"),
-                         :route => env['SCRIPT_NAME'],
-                         :query => request_paths}
+          query = request_paths[index..-1]
+          add_classies(classies, c, 'Index', route, query)
+          next if c_str == 'Index'
+          route = "#{env['SCRIPT_NAME']}/#{request_paths[0..index].join('/')}"
+          query = request_paths[(index+1)..-1]
+          _c = add_classies(classies, c, c_str, route, query)
+          if _c
+            c = _c
+          else
+            break
           end
-        else
-          UzuUzu.logger.warn "routing miss controllers only Module or Class : #{c}"
         end
       end
       classies
     end # find_controller
 
+    def add_classies(classies, c, c_str, route, query)
+      _c = nil
+      begin
+        if c.const_defined?(c_str)
+          _c = c.const_get(c_str)
+          classies << {:clazz => _c,
+                       :route => route,
+                       :query => query}
+        elsif c.const_defined?("#{c_str}Controller")
+          classies << {:clazz => c.const_get("#{c_str}Controller"),
+                       :route => route,
+                       :query => query}
+        end
+      rescue NameError => e
+      end
+      _c
+    end
     #
     #
     #
@@ -210,30 +216,39 @@ module UzuUzu
     #
     def find_action(controller, query)
       action = nil
-      query = query.map do |q|
-        q.sub(/\.\w+$/, '')
-      end
-      if query[0] and controller.respond_to?(query[0])
+      index_flag = false
+      query[-1] = query[-1].sub(/\.\w+$/, '') if query && query[-1]
+      if query[0] && controller.respond_to?(query[0])
         action = query.shift
       end
-      if action.nil? and controller.respond_to?(:index)
+      if action.nil? && controller.respond_to?(:index)
         action = 'index'
       end
       
       unless action.nil?
         arity = controller.method(action).arity
-        unless (arity >= 0 and query.size == arity) or
-               (arity < 0 and query.size >= ((-1 * arity)-1))
-          if (not action == 'index') and controller.respond_to?(:index)
-            query.unshift(action)
-            action = 'index'
-            if controller.respond_to?(action)
-              arity = controller.method(action).arity
-              unless (arity >= 0 and query.size == arity) or
-                     (arity < 0 and query.size >= ((-1 * arity)-1))
-                action = nil
+        owner = controller.method(action).owner
+        unless controller.method(action).owner == controller.class
+          index_flag = true
+          if controller.respond_to?(:use_actions)
+            controller.actions.each do |use_action|
+              if use_action.to_s == action.to_s
+                index_flag = false
               end
-            else
+            end
+          end
+        end
+        unless (arity >= 0 && query.size == arity) or
+               (arity < 0 && query.size >= ((-1 * arity)-1))
+          index_flag = true
+        end
+        if index_flag && !(action == 'index') && controller.respond_to?(:index)
+          query.unshift(action)
+          action = 'index'
+          if controller.respond_to?(action)
+            arity = controller.method(action).arity
+            unless (arity >= 0 && query.size == arity) ||
+                   (arity < 0 && query.size >= ((-1 * arity)-1))
               action = nil
             end
           else
@@ -254,9 +269,17 @@ module UzuUzu
           filter.call if filter.respond_to?(:call)
         end
         controller.send(:before, []) if controller.respond_to?(:before)
+        controller.send("before_#{action}", []) if controller.respond_to?("before_#{action}")
         value = controller.send(action, *query)
+      end
+      catch(:finish) do
+        controller.send("after_#{action}", []) if controller.respond_to?("after_#{action}")
+      end
+      catch(:finish) do
         controller.send(:after, []) if controller.respond_to?(:after)
-        after_filters.reverse.each do |filter|
+      end
+      after_filters.reverse.each do |filter|
+        catch(:finish) do
           filter.call if filter.respond_to?(:call)
         end
       end