uzuuzu-core 0.0.7 → 0.0.8

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/lib/uzuuzu/helper/controller.rb

@@ -13,77 +13,64 @@ module UzuUzu
       #
       #
       def application
-        @_application
+        ::UzuUzu.current
       end
+      
+      #
+      #
+      #
+      def controller
+        ::UzuUzu::Controller.current
+      end
+      
       #
       #
       #
       def request
-        @_request
+        ::UzuUzu::Request.current
       end
-
+  
       #
       #
       #
       def response
-        @_response
+        ::UzuUzu::Response.current
       end
       
       #
       #
       #
-      def action
-        @_action
+      def helper
+        ::UzuUzu::Helper.current
       end
       
       #
       #
       #
-      def query
-        @_query
+      def action
+        Thread.current[:action]
       end
       
       #
       #
       #
-      def route
-        @_route
+      def query
+        Thread.current[:query]
       end
       
       #
       #
       #
-      def info
-        @_info ||= UzuUzu::Info.uniq
+      def route
+        Thread.current[:route]
       end
-
+  
       #
       #
       #
       def session
         request.session
       end
-
-      #
-      #
-      #
-      def logger
-        UzuUzu.logger
-      end
-
-      #
-      #
-      #
-      def memcache
-        UzuUzu.memcache
-      end
-      
-      #
-      #
-      #
-      def remote_user
-        nil
-      end
       
       #
       #
@@ -99,15 +86,6 @@ module UzuUzu
         Rack::Utils.unescape(s)
       end
       
-      #
-      #
-      #
-      def admin?
-        if remote_user
-          remote_user.admin?
-        end
-      end
-      
       #
       #
       #
@@ -130,6 +108,17 @@ module UzuUzu
         return "" if query_string.blank?
         "?#{query_string.join('&')}"
       end
+      
+      #
+      #
+      #
+      def instance_variable_map(instance)
+        map = {}
+        instance.instance_variables.each do |variable_name|
+          map[variable_name] = instance.instance_variable_get(variable_name)
+        end
+        map
+      end
     end # Controller
   end # Helper
 end # UzuUzu

data/lib/uzuuzu/helper/jquery.rb

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

data/lib/uzuuzu/helper/localize.rb

@@ -4,10 +4,6 @@ module UzuUzu
   module Helper
     module Localize
       def localize(key, options={})
-        #TODO
-      end
-
-      def fix_localize(key, options={})
         (UzuUzu.localize[key.to_s] || "").force_encoding('UTF-8')
       end
     end

data/lib/uzuuzu/helper/renderer.rb

@@ -3,17 +3,22 @@
 module UzuUzu
   module Helper
     module Renderer
-      extend TiltWrapper
       
       #
       #
       #
-      def render_full(controller, action, options={})
-          _request, _response, _controller, _action, _query, _route = ::UzuUzu.current.get_thread_by_di
+      def render_full(controller_clazz, action, options={})
+          _request = request
+          _response = response
+          _controller = controller
+          _helper = helper
+          _action = action
+          _query = query
+          _route = route
           browser = ::Rack::MockRequest.new(::UzuUzu.current)
-          _render_response = browser.get self.rf(controller, action, options)
+          _render_response = browser.get(controller.rf(controller_clazz, action, options))
           _render =  _render_response.body.to_s
-          ::UzuUzu.current.di_thread(_request, _response, _controller, _action, _query, _route)
+          ::UzuUzu.current.di_thread(_request, _response, _controller, _helper, _action, _query, _route)
           _render
       end
       
@@ -44,8 +49,8 @@ module UzuUzu
         view_path = nil
         catch(:view_finded) do
           ::Tilt.mappings.each_key do |key|
-            self.application.views.each do |view_route|
-              _view_path = "#{view_route}#{self.route}/#{view}.#{key}"
+            application.views.each do |view_route|
+              _view_path = "#{view_route}#{controller.route}/#{view}.#{key}"
               if ::File.file?(_view_path)
                 view_path = _view_path
                 throw :view_finded
@@ -75,7 +80,9 @@ module UzuUzu
       #
       #
       def render_engine(view_string, engine=::UzuUzu.engine, options={}, locals={}, &block)
-        UzuUzu.render_engine(self, view_string, engine, options, locals, &block)
+        locals ||= {}
+        locals = locals.merge(instance_variable_map(controller))
+        UzuUzu.render_engine(helper, view_string, engine, options, locals, &block)
       end
       
       def send_file()
@@ -108,14 +115,14 @@ module UzuUzu
       #
       #
       def server_error(code=500, options={})
-        redirect self.rf(UzuUzu::Controller::Index, :error, code)
+        redirect controller.rf(UzuUzu::Controller::Index, :error, code)
       end # error
       
       #
       #
       #
       def not_found(code=404, options={})
-        redirect self.rf(UzuUzu::Controller::Index, :error, code)
+        redirect controller.rf(UzuUzu::Controller::Index, :error, code)
       end
       
       #

data/lib/uzuuzu/helper/route.rb

@@ -4,9 +4,8 @@ module UzuUzu
   module Helper
     module Route
       def url_for_controller(controller, *args)
-        app = UzuUzu.current
-        route_string = request.env['SCRIPT_NAME']
-        app.controllers.each do |root_controller|
+        route_string = request.env['SCRIPT_NAME'].clone
+        application.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
@@ -28,7 +27,7 @@ module UzuUzu
       alias :rf :url_for_controller
       
       def url_for(*args)
-        route_string = @_route.clone
+        route_string = route.clone
         if args[-1].kind_of?(Hash)
           query = query_string(args.pop)
         end

data/lib/uzuuzu/helper/xhtml.rb

@@ -3,40 +3,40 @@
 module UzuUzu
   module Helper
     module XHtml
+      
       #
       #
       #
-      def css(name, media='screen')
-        if name =~ /^http/
-          "<link href=\"#{name}\" media=\"#{media}\" rel=\"stylesheet\" type=\"text/css\" />"
-        else
-          "<link href=\"/css/#{name}.css\" media=\"#{media}\" rel=\"stylesheet\" type=\"text/css\" />"
-        end
+      def meta(name, content)
+        "<meta name=\"#{name}\" content=\"#{content}\">"
+      end
+      #
+      #
+      #
+      def css(css_path, media='screen')
+        "<link href=\"#{css_path}\" media=\"#{media}\" rel=\"stylesheet\" type=\"text/css\" />"
       end
-
       #
       #
       #
       def css_for(*args)
-        args.map{|arg| css(arg) }.join("\n")
+        args.map do |css_path|
+          css(css_path)
+        end.join("\n")
       end
-
       #
       #
       #
-      def js(name)
-        if name =~ /^http/
-          "<script src=\"#{name}\" type=\"text/javascript\"></script>"
-        else
-          "<script src=\"/js/#{name}.js\" type=\"text/javascript\"></script>"
-        end
+      def js(js_path)
+        "<script src=\"#{js_path}\" type=\"text/javascript\"></script>"
       end
-
       #
       #
       #
       def js_for(*args)
-        args.map{|arg| js(arg) }.join("\n")
+        args.map do |js_path|
+          js(js_path)
+        end.join("\n")
       end
 
     end

data/lib/uzuuzu/wrapper/application.rb

@@ -5,7 +5,6 @@ module UzuUzu
   #
   #
   class Application
-    
     #
     attr_accessor :name
     #
@@ -19,6 +18,8 @@ module UzuUzu
     #
     attr_accessor :after_filters
     #
+    attr_accessor :dicons
+    #
     attr_accessor :helpers
     #
     attr_accessor :views
@@ -27,14 +28,14 @@ module UzuUzu
     #
     #
     def self.current
-      Thread.current[:application]
+      ::Thread.current[:application]
     end
         
     #
     #
     #
     def initialize(options={})
-      Thread.current[:application] = self
+      ::Thread.current[:application] = self
       options.each do |key, value|
         case(key)
         when :name, 'name'
@@ -45,36 +46,70 @@ module UzuUzu
       end if options.kind_of?(Hash)
       @name ||= :uzuuzu
       @environments = Environments.new(@config_file)
-      UzuUzu.apps[@name] = self
+      ::UzuUzu.apps[@name] = self
       yield self if block_given?
     end # initialize
 
+    def self.controllers
+      @@controllers ||= [Controller]
+    end
+
     def controllers
-      @controllers ||= [UzuUzu::Controller]
+      @controllers ||= self.class.controllers.clone
+    end
+
+    def self.before_filters
+      @@before_filters ||= [Controller.method(:before_all)]
     end
 
     def before_filters
-      @before_filters ||= [UzuUzu::Controller.method(:before_all)]
+      @before_filters ||= self.class.before_filters.clone
     end
 
+    def self.after_filters
+      @@after_filters ||= [Controller.method(:after_all)]
+    end
+    
     def after_filters
-      @after_filters ||= [UzuUzu::Controller.method(:after_all)]
+      @after_filters ||= self.class.after_filters.clone
+    end
+    
+    def self.dicons
+      @@dicons ||= [
+                    Controller,
+                    Helper::Controller,
+                    Helper::Renderer, 
+                    Helper::Localize,
+                    Helper::Route,
+                  ]
     end
 
-    def helpers
-      @helpers ||= [
-                     Rack::Utils,
-                     UzuUzu::Helper::Controller,
-                     UzuUzu::Helper::Renderer,
-                     UzuUzu::Helper::Localize,
-                     UzuUzu::Helper::Route,
-                     UzuUzu::Helper::Form,
-                     UzuUzu::Helper::XHtml
+    def dicons
+      @dicons ||= self.class.dicons.clone
+    end
+
+    def self.helpers
+      @@helpers ||= [
+                     Helper::Controller,
+                     Helper::Form,
+                     Helper::Jquery,
+                     Helper::Localize,
+                     Helper::Renderer,
+                     Helper::Route,
+                     Helper::XHtml
                    ]
     end
+
+    def helpers
+      @helpers ||= self.class.helpers.clone
+    end
     
+    def self.views
+      @@views ||= ['./view']
+    end
+
     def views
-      @views ||= ['./view']
+      @views ||= self.class.views.clone
     end
 
     #
@@ -97,13 +132,14 @@ module UzuUzu
         query = map[:query]
         route = map[:route]
         controller = controller_class.new
-        di_helpers(controller)
+        include_dicon(controller)
+        helper = Helper::Helper.new
+        include_helper(helper)
 
         action, query = find_action(controller, query)
         next if action.blank?
         is_send = true
-        di_thread(request, response, controller, action, query, route)
-        di_instance(request, response, controller, action, query, route)
+        di_thread(request, response, controller, helper,  action, query, route)
         action_return = send_action(request, response, controller, action, query)
         if response.body.blank?
           render = controller.render(action)
@@ -175,41 +211,32 @@ module UzuUzu
       end
       _c
     end
+    
     #
     #
     #
-    def di_helpers(controller)
-      helpers.each do |helper|
-        controller.class.send(:include, helper)
+    def include_dicon(controller)
+      dicons.each do |dicon|
+        controller.extend(dicon)
       end
-    end # di_helpers
+    end # include_dicon
     
-    #
-    #
-    #
-    def di_instance(request, response, controller, action, query, route)
-      controller.instance_variable_set(:@_application, self)
-      controller.instance_variable_set(:@_request, request)
-      controller.instance_variable_set(:@_response, response)
-      controller.instance_variable_set(:@_action, action)
-      controller.instance_variable_set(:@_query, query)
-      controller.instance_variable_set(:@_route, route)
-    end # di_instance
+    def include_helper(helper)
+      helpers.each do |h|
+        helper.extend(h)
+      end
+    end # include_helper
     
-    def di_thread(request, response, controller, action, query, route)
-      current = Thread.current
+    def di_thread(request, response, controller, helper, action, query, route)
+      current = ::Thread.current
       current[:request] = request
       current[:response] = response
       current[:controller] = controller
+      current[:helper] = helper
       current[:action] = action
       current[:query] = query
       current[:route] = route
-    end
-    
-    def get_thread_by_di
-      current = Thread.current
-      [current[:request], current[:response], current[:controller], current[:action], current[:query], current[:route]]
-    end
+    end # di_thread
 
     #
     #
@@ -268,15 +295,15 @@ module UzuUzu
         before_filters.each do |filter|
           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}")
+        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}")
+        controller.send("after_#{action}") if controller.respond_to?("after_#{action}")
       end
       catch(:finish) do
-        controller.send(:after, []) if controller.respond_to?(:after)
+        controller.send(:after) if controller.respond_to?(:after)
       end
       after_filters.reverse.each do |filter|
         catch(:finish) do
@@ -287,7 +314,7 @@ module UzuUzu
     end # send_action
     
     def error(code, request, response)
-      UzuUzu.logger.debug "error : #{code}"
+      ::UzuUzu.logger.debug "error : #{code}"
       uri = "#{request.scheme}://#{request.host}"
       if (request.scheme == 'https' and request.port != 443) or
           (request.scheme == 'http' and request.port != 80)

data/lib/uzuuzu/wrapper/controller.rb

@@ -7,15 +7,25 @@ module UzuUzu
     end
     
     def self.before_all
-      UzuUzu.datastore
-      before_logger
+      ::UzuUzu.datastore
+      ::UzuUzu.logger.debug ::UzuUzu::Request.current.params
     end
     
     def self.after_all
     end
     
-    def self.before_logger
-      UzuUzu.logger.debug UzuUzu::Request.current.params
+    #
+    #
+    #
+    def logger
+      UzuUzu.logger
+    end
+
+    #
+    #
+    #
+    def memcache
+      UzuUzu.memcache
     end
   end # Controller
 end # UzuUzu

data/lib/uzuuzu/wrapper/environments.rb

@@ -59,7 +59,7 @@ module UzuUzu
         require 'uzuuzu/adapter/gae'
       end
       @lang = map['lang'] || 'ja'
-      @engine = map['engine'] || 'erubis'
+      @engine = map['engine'] || 'erb'
       load_localize
     end
 

data/lib/uzuuzu/wrapper/helper.rb

@@ -3,12 +3,21 @@
 module UzuUzu
   module Helper
     autoload(:Controller, 'uzuuzu/helper/controller')
-    autoload(:Fixture, 'uzuuzu/helper/fixture')
     autoload(:Form, 'uzuuzu/helper/form')
     autoload(:Jquery, 'uzuuzu/helper/jquery')
     autoload(:Localize, 'uzuuzu/helper/localize')
     autoload(:Renderer, 'uzuuzu/helper/renderer')
     autoload(:Route, 'uzuuzu/helper/route')
     autoload(:XHtml, 'uzuuzu/helper/xhtml')
+    
+    def self.current
+     Thread.current[:helper] 
+    end
+    
+    #
+    #
+    #
+    class Helper
+    end
   end
 end

data/uzuuzu-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{uzuuzu-core}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Takuya Kondo"]
-  s.date = %q{2011-08-23}
+  s.date = %q{2011-09-08}
   s.description = %q{uzuuzu core library}
   s.email = %q{takuya.v3v@gmail.com}
   s.extra_rdoc_files = [
@@ -28,7 +28,6 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/uzuuzu-core.rb",
     "lib/uzuuzu/helper/controller.rb",
-    "lib/uzuuzu/helper/fixture.rb",
     "lib/uzuuzu/helper/form.rb",
     "lib/uzuuzu/helper/jquery.rb",
     "lib/uzuuzu/helper/localize.rb",

metadata

@@ -2,7 +2,7 @@
 name: uzuuzu-core
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Takuya Kondo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-23 00:00:00 +09:00
+date: 2011-09-08 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -133,7 +133,6 @@ files:
 - VERSION
 - lib/uzuuzu-core.rb
 - lib/uzuuzu/helper/controller.rb
-- lib/uzuuzu/helper/fixture.rb
 - lib/uzuuzu/helper/form.rb
 - lib/uzuuzu/helper/jquery.rb
 - lib/uzuuzu/helper/localize.rb
@@ -173,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2144235226275281033
+      hash: -3233450064445015537
       segments: 
       - 0
       version: "0"

data/lib/uzuuzu/helper/fixture.rb

@@ -1,10 +0,0 @@
-# coding: utf-8
-
-module UzuUzu
-  module Helper
-    module Fixture
-      def import_file(file, overwrite=false)
-      end
-    end #Fixture
-  end # Helper
-end # UzuUzu