uzuuzu-core 0.0.15 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.15
+0.1.0

data/lib/{uzuuzu → uzuuzu-core}/application.rb

@@ -20,9 +20,11 @@ module UzuUzu
     #
     attr_accessor :helpers
     #
-    attr_accessor :views
+    attr_accessor :controller_root
     #
-    attr_accessor :servicies
+    attr_accessor :helper_root
+    #
+    attr_accessor :view_root
     
     #
     #
@@ -90,20 +92,28 @@ module UzuUzu
       @helpers ||= self.class.helpers.clone
     end
     
-    def self.views
-      @@views ||= ['./view']
+    def self.controller_root
+      @@controller_root ||= 'controller'
     end
 
-    def views
-      @views ||= self.class.views.clone
+    def controller_root
+      @controller_root ||= self.class.controller_root.clone
     end
-    
-    def self.services
-      @@services ||= []
+
+    def self.view_root
+      @@view_root ||= 'view'
     end
 
-    def services
-      @services ||= self.class.services.clone
+    def view_root
+      @view_root ||= self.class.view_root.clone
+    end
+
+    def self.helper_root
+      @@helper_root ||= 'helper'
+    end
+
+    def helper_root
+      @helper_root ||= self.class.helper_root.clone
     end
 
     #
@@ -113,8 +123,9 @@ module UzuUzu
       Thread.current[:application] = self
       request = UzuUzu::Request.new(env)
       response = UzuUzu::Response.new
-      clazz = find_controller(env)
-      if clazz.blank?
+      auto_require(env)
+      classies = find_controller(env)
+      if classies.blank?
         di_thread(request, response, nil, nil,  nil, nil, nil)
         return not_found(response)
       end
@@ -122,13 +133,17 @@ module UzuUzu
       is_send = false
       action_return = nil
       render = nil
-      clazz.reverse.each do |map|
-        controller_class = map[:clazz]
+      classies.reverse.each do |map|
+        controller_class = map[:controller]
+        helper_module = map[:helper]
         query = map[:query]
         route = map[:route]
         controller = controller_class.new
         helper = Helper::Helper.new
-        include_helper(helper)
+        helpers.each do |h|
+          helper.extend(h)
+        end
+        helper.extend(helper_module) if helper_module.kind_of?(::Module)
 
         action, query = find_action(controller, query)
         di_thread(request, response, controller, helper,  action, query, route)
@@ -151,6 +166,56 @@ module UzuUzu
       response.finish
     end # call
 
+    def require_noerror(path)
+      begin
+        require path
+      rescue LoadError => e
+      end
+    end
+    #
+    #
+    #
+    def auto_require(env)
+      require_base = "#{@name.to_s}/"
+      require_base = '' if @name == :uzuuzu
+      array = []
+      if env['PATH_INFO'] == '/'
+        require_noerror "#{controller_root}/#{require_base}index"
+        require_noerror "#{helper_root}/#{require_base}index"
+      end
+      env['PATH_INFO'].split('/').each do |path|
+        array << path
+        begin
+          if array.size > 1
+            require_noerror "#{controller_root}/#{require_base}#{array.join('/')}/index"
+            require_noerror "#{helper_root}/#{require_base}#{array.join('/')}/index"
+          end
+          require_noerror "#{controller_root}/#{require_base}#{array.join('/')}"
+          require_noerror "#{helper_root}/#{require_base}#{array.join('/')}"
+        rescue
+        end
+      end
+    end # auto_require
+    
+    def get_class_map(name, controller, route, query)
+      _c = controller.const_get(name) if controller.const_defined?(name)
+      return nil if _c.nil?
+      _h = find_helper(name, route)
+      map = {
+        :controller => _c,
+        :helper => _h,
+        :route => route,
+        :query => query
+      }
+    end
+    
+    #
+    #
+    #
+    def find_helper(name, route)
+      
+    end # find_helper
+    
     #
     #
     #
@@ -159,9 +224,22 @@ module UzuUzu
       request_paths = env['PATH_INFO'].split('/')
       request_paths.shift if request_paths[0].blank?
       
-      controllers.each do |c|
+      _controllers = controllers.clone
+      _base = "::#{@name.to_s.camel_case}"
+      _base = '' if @name == :uzuuzu || @name == 'uzuuzu'
+      begin
+        _controllers << eval("#{_base}::#{controller_root.camel_case}")
+      rescue LoadError => e
+      rescue => e
+      end
+      _controllers.each do |c|
+        _c = c
+        _h = nil
         if request_paths.size == 0
-          add_classies(classies, c, 'Index', env['SCRIPT_NAME'], request_paths)
+          map = get_class_map('Index', _c, env['SCRIPT_NAME'], request_paths)
+          if map && map[:controller].kind_of?(::Class)
+            classies << map
+          end
         end
         request_paths.each_with_index do |request_path, index|
           next if request_path.blank?
@@ -173,47 +251,25 @@ module UzuUzu
             route = "#{env['SCRIPT_NAME']}/#{route}"
           end
           query = request_paths[index..-1]
-          add_classies(classies, c, 'Index', route, query)
+          map = get_class_map('Index', _c, route, query)
+          if map && map[:controller].kind_of?(::Class)
+            classies << map
+          end
           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
+          map = get_class_map(c_str, _c, route, query)
+          if map && map[:controller].kind_of?(::Class)
+            classies << map
+          end
+          _c = map[:controller] if map
+          if _c.kind_of?(::Class) || _c.kind_of?(::Module)
             break
           end
         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
-    
-    #
-    #
-    #
-    def include_helper(helper)
-      helpers.each do |h|
-        helper.extend(h)
-      end
-    end # include_helper
     
     #
     #
@@ -243,6 +299,10 @@ module UzuUzu
         action = 'index'
       end
       
+      #p controller
+      #p controller.methods.sort
+      #p action
+      #p query[0]
       unless action.nil?
         arity = controller.method(action).arity
         owner = controller.method(action).owner
@@ -306,7 +366,7 @@ module UzuUzu
 
     def not_found(response)
       catch(:finish) do
-        response.redirect("/error/404")
+        response.not_found
       end
       response.finish
     end

data/lib/uzuuzu-core/controller.rb

@@ -0,0 +1,23 @@
+# coding: utf-8
+
+module UzuUzu
+  module Controller
+    include ::UzuUzu::Helper::Controller
+    require 'uzuuzu-core/controller/index'
+    module Login
+      require 'uzuuzu-core/controller/login/openid'
+      require 'uzuuzu-core/controller/login/twitter'
+    end
+    
+    def self.current
+      Thread.current[:controller]
+    end
+    
+    def self.before_all
+      ::UzuUzu.logger.debug "params : #{::UzuUzu::Request.current.params}"
+    end
+    
+    def self.after_all
+    end
+  end # Controller
+end # UzuUzu

data/lib/uzuuzu-core/controller/index.rb

@@ -0,0 +1,18 @@
+# coding: utf-8
+
+module UzuUzu
+  module Controller
+    class Index
+      include ::UzuUzu::Controller
+      
+      def error(code)
+        response.respond(helper.render_file(__DIR__("view/error/#{code}.rhtml")))
+      end
+      
+      def logout
+        session.clear
+        response.redirect '/'
+      end
+    end # Index
+  end # Controller
+end # UzuUzu

data/lib/{uzuuzu → uzuuzu-core}/controller/login/openid.rb

@@ -12,7 +12,7 @@ module UzuUzu
     #
     #
     class Openid
-      include ::UzuUzuCms::Helper::Controller
+      include ::UzuUzu::Controller
       
       # need params['domain']
       def index

data/lib/{uzuuzu → uzuuzu-core}/controller/login/twitter.rb

@@ -1,11 +1,11 @@
 # coding: utf-8
 require 'oauth'
 
-module UzuUzuCms
+module UzuUzu
   module Controller
     module Login
       class Twitter
-        include ::UzuUzuCms::Helper::Controller
+        include ::UzuUzu::Controller
         
         def index
           @config = Environments.current.config['twitter']

data/lib/uzuuzu-core/controller/view/error/404.rhtml

@@ -0,0 +1,39 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+		<title><%= localize(:not_found) %></title>
+		<style type="text/css">
+			body {
+				background-color: white;
+				color: #333333;
+				font-family: Arial, sans-serif;
+				margin: 0;
+				padding: 36px;
+				line-height: 18px;
+				font-size: 14px;
+			}
+			.section {
+				margin-bottom: 36px;
+				color: #222222;
+			}
+			.section h1 {
+				font-size: 26px;
+				background-color: #dad8e4;
+				padding: 18px 22px 15px 22px;
+				margin: 0;
+				overflow: hidden;
+			}
+			.article {
+				border: 4px solid #dad8e4;
+				padding: 24px 18px 18px 18px;
+				font-size: 14px;
+			}
+		</style>
+	</head>
+	<body>
+		<div class="section">
+			<h1><%= localize(:not_found) %></h1>
+		</div>
+	</body>
+</html>

data/lib/uzuuzu-core/controller/view/error/500.rhtml

@@ -0,0 +1,39 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+		<title><%= localize(:server_error) %></title>
+		<style type="text/css">
+			body {
+				background-color: white;
+				color: #333333;
+				font-family: Arial, sans-serif;
+				margin: 0;
+				padding: 36px;
+				line-height: 18px;
+				font-size: 14px;
+			}
+			.section {
+				margin-bottom: 36px;
+				color: #222222;
+			}
+			.section h1 {
+				font-size: 26px;
+				background-color: #dad8e4;
+				padding: 18px 22px 15px 22px;
+				margin: 0;
+				overflow: hidden;
+			}
+			.article {
+				border: 4px solid #dad8e4;
+				padding: 24px 18px 18px 18px;
+				font-size: 14px;
+			}
+		</style>
+	</head>
+	<body>
+		<div class="section">
+			<h1><%= localize(:server_error) %></h1>
+		</div>
+	</body>
+</html>

data/lib/uzuuzu-core/helper.rb

@@ -0,0 +1,23 @@
+# coding: utf-8
+
+module UzuUzu
+  module Helper
+    require 'uzuuzu-core/helper/controller'
+    require 'uzuuzu-core/helper/form'
+    require 'uzuuzu-core/helper/jquery'
+    require 'uzuuzu-core/helper/localize'
+    require 'uzuuzu-core/helper/renderer'
+    require 'uzuuzu-core/helper/route'
+    require 'uzuuzu-core/helper/xhtml'
+    
+    def self.current
+     Thread.current[:helper] 
+    end
+    
+    #
+    #
+    #
+    class Helper
+    end
+  end
+end

data/lib/{uzuuzu → uzuuzu-core}/helper/controller.rb

@@ -82,8 +82,8 @@ module UzuUzu
       #
       #
       #
-      def service(name)
-        ::UzuUzu.service(name)
+      def service
+        ::UzuUzu.service
       end
       
       #

data/lib/{uzuuzu → uzuuzu-core}/helper/renderer.rb

@@ -29,12 +29,10 @@ module UzuUzu
         view_path = nil
         catch(:view_finded) do
           ::Tilt.mappings.each_key do |key|
-            application.views.each do |view_route|
-              _view_path = "#{view_route}#{helper.route}/#{view}.#{key}"
-              if ::File.file?(_view_path)
-                view_path = _view_path
-                throw :view_finded
-              end
+            _view_path = "#{application.view_root}#{helper.route}/#{view}.#{key}"
+            if ::File.file?(_view_path)
+              view_path = _view_path
+              throw :view_finded
             end
           end
         end

data/lib/{uzuuzu → uzuuzu-core}/logger/loggers.rb

@@ -16,7 +16,7 @@ module UzuUzu
         end
         env.each do |logger_env|
           adapter = logger_env["adapter"]
-          require "uzuuzu/logger/#{adapter}"
+          require "uzuuzu-core/logger/#{adapter}"
           adapter_class = eval("::UzuUzu::Logger::#{adapter.camel_case}")
           logger = adapter_class.new(logger_env)
           @loggers << logger
@@ -37,7 +37,6 @@ module UzuUzu
             # puts standerd error output
             $stderr.puts 'logger unknown error'
             $stderr.puts e
-            $stderr.puts e.backtrace
           end
         end
       end # method_missing

data/lib/{uzuuzu → uzuuzu-core}/rack_session/appengine.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+require 'rack/session/abstract/id'
 
 module UzuUzu
   module RackSession

data/lib/{uzuuzu → uzuuzu-core}/response.rb

@@ -127,5 +127,5 @@ module UzuUzu
       end
     end # etag
     
-  end
-end
+  end # Response
+end # UzuUzu

data/lib/{uzuuzu/wrapper/uzuuzu.rb → uzuuzu-core/uzuuzu-core.rb}

@@ -63,21 +63,6 @@ module UzuUzu
     Response.current
   end
   
-  def service
-    _service = nil
-    Application.current.services.reverse.each do |service|
-      begin
-        _service = service.send(name)
-      rescue => e
-        logger.error "service not found : #{service.name}::#{name}"
-        logger.debug e
-        logger.debug e.backtrace
-      end
-      break if _service
-    end
-    _service
-  end
-  
   #
   def render_engine(instance, view_string, engine='erb', options={}, locals={}, &block)
     Tilt.render_engine(instance, view_string, engine, options, locals, &block)

data/lib/{uzuuzu → uzuuzu-core}/wrapper/logger.rb

@@ -14,11 +14,11 @@ module UzuUzu
       def initialize(env=nil)
         begin
           if env.nil? || env.kind_of?(Array) || env['adapter'].nil?
-            require 'uzuuzu/logger/loggers'
+            require 'uzuuzu-core/logger/loggers'
             @logger = ::UzuUzu::Logger::Loggers.new(env)
           else
             adapter = env['adapter']
-            require "uzuuzu/logger/#{adapter}"
+            require "uzuuzu-core/logger/#{adapter}"
             adapter_class = eval("::UzuUzu::Logger::#{adapter.camel_case}")
             @logger = adapter_class.new(env)
           end

data/lib/{uzuuzu → uzuuzu-core}/wrapper/wrapper.rb

@@ -17,7 +17,7 @@ module UzuUzu
         end
         begin
           adapter = env['adapter']
-          require "uzuuzu/#{wrapper}/#{adapter}"
+          require "uzuuzu-core/#{wrapper}/#{adapter}"
           adapter_class = eval("::UzuUzu::#{wrapper.camel_case}::#{adapter.camel_case}")
           @wrapper = adapter_class.new(env)
         rescue => e

data/lib/uzuuzu_core.rb

@@ -6,15 +6,14 @@ require 'rack'
 require 'rack/builder'
 require 'tilt'
 
-require 'uzuuzu/ext/object'
-require 'uzuuzu/wrapper/uzuuzu'
-require 'uzuuzu/wrapper/logger'
-require 'uzuuzu/wrapper/wrapper'
-require 'uzuuzu/application'
-require 'uzuuzu/environments'
-require 'uzuuzu/helper'
-require 'uzuuzu/request'
-require 'uzuuzu/response'
-require 'uzuuzu/controller'
-require 'uzuuzu/service'
-require 'uzuuzu/tilt'
+require 'uzuuzu-core/ext/object'
+require 'uzuuzu-core/uzuuzu-core'
+require 'uzuuzu-core/wrapper/logger'
+require 'uzuuzu-core/wrapper/wrapper'
+require 'uzuuzu-core/application'
+require 'uzuuzu-core/environments'
+require 'uzuuzu-core/helper'
+require 'uzuuzu-core/request'
+require 'uzuuzu-core/response'
+require 'uzuuzu-core/controller'
+require 'uzuuzu-core/tilt'

data/uzuuzu-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{uzuuzu-core}
-  s.version = "0.0.15"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Takuya Kondo"]
-  s.date = %q{2011-12-14}
+  s.date = %q{2011-12-18}
   s.description = %q{uzuuzu core library}
   s.email = %q{takuya.v3v@gmail.com}
   s.extra_rdoc_files = [
@@ -26,45 +26,43 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
-    "lib/uzuuzu/application.rb",
-    "lib/uzuuzu/controller.rb",
-    "lib/uzuuzu/controller/error.rb",
-    "lib/uzuuzu/controller/login/openid.rb",
-    "lib/uzuuzu/controller/login/twitter.rb",
-    "lib/uzuuzu/controller/logout/index.rb",
-    "lib/uzuuzu/controller/view/error/404.rhtml",
-    "lib/uzuuzu/controller/view/error/500.rhtml",
-    "lib/uzuuzu/environments.rb",
-    "lib/uzuuzu/ext/object.rb",
-    "lib/uzuuzu/helper.rb",
-    "lib/uzuuzu/helper/controller.rb",
-    "lib/uzuuzu/helper/form.rb",
-    "lib/uzuuzu/helper/jquery.rb",
-    "lib/uzuuzu/helper/localize.rb",
-    "lib/uzuuzu/helper/renderer.rb",
-    "lib/uzuuzu/helper/route.rb",
-    "lib/uzuuzu/helper/xhtml.rb",
-    "lib/uzuuzu/lang/en.yaml",
-    "lib/uzuuzu/lang/ja.yaml",
-    "lib/uzuuzu/logger/appengine.rb",
-    "lib/uzuuzu/logger/file.rb",
-    "lib/uzuuzu/logger/loggers.rb",
-    "lib/uzuuzu/logger/stderr.rb",
-    "lib/uzuuzu/logger/stdout.rb",
-    "lib/uzuuzu/memcache/appengine.rb",
-    "lib/uzuuzu/memcache/dalli.rb",
-    "lib/uzuuzu/memcache/leveldb.rb",
-    "lib/uzuuzu/memcache/memcached.rb",
-    "lib/uzuuzu/rack_session/appengine.rb",
-    "lib/uzuuzu/rack_session/cookie.rb",
-    "lib/uzuuzu/rack_session/memcache.rb",
-    "lib/uzuuzu/request.rb",
-    "lib/uzuuzu/response.rb",
-    "lib/uzuuzu/service.rb",
-    "lib/uzuuzu/tilt.rb",
-    "lib/uzuuzu/wrapper/logger.rb",
-    "lib/uzuuzu/wrapper/uzuuzu.rb",
-    "lib/uzuuzu/wrapper/wrapper.rb",
+    "lib/uzuuzu-core/application.rb",
+    "lib/uzuuzu-core/controller.rb",
+    "lib/uzuuzu-core/controller/index.rb",
+    "lib/uzuuzu-core/controller/login/openid.rb",
+    "lib/uzuuzu-core/controller/login/twitter.rb",
+    "lib/uzuuzu-core/controller/view/error/404.rhtml",
+    "lib/uzuuzu-core/controller/view/error/500.rhtml",
+    "lib/uzuuzu-core/environments.rb",
+    "lib/uzuuzu-core/ext/object.rb",
+    "lib/uzuuzu-core/helper.rb",
+    "lib/uzuuzu-core/helper/controller.rb",
+    "lib/uzuuzu-core/helper/form.rb",
+    "lib/uzuuzu-core/helper/jquery.rb",
+    "lib/uzuuzu-core/helper/localize.rb",
+    "lib/uzuuzu-core/helper/renderer.rb",
+    "lib/uzuuzu-core/helper/route.rb",
+    "lib/uzuuzu-core/helper/xhtml.rb",
+    "lib/uzuuzu-core/lang/en.yaml",
+    "lib/uzuuzu-core/lang/ja.yaml",
+    "lib/uzuuzu-core/logger/appengine.rb",
+    "lib/uzuuzu-core/logger/file.rb",
+    "lib/uzuuzu-core/logger/loggers.rb",
+    "lib/uzuuzu-core/logger/stderr.rb",
+    "lib/uzuuzu-core/logger/stdout.rb",
+    "lib/uzuuzu-core/memcache/appengine.rb",
+    "lib/uzuuzu-core/memcache/dalli.rb",
+    "lib/uzuuzu-core/memcache/leveldb.rb",
+    "lib/uzuuzu-core/memcache/memcached.rb",
+    "lib/uzuuzu-core/rack_session/appengine.rb",
+    "lib/uzuuzu-core/rack_session/cookie.rb",
+    "lib/uzuuzu-core/rack_session/memcache.rb",
+    "lib/uzuuzu-core/request.rb",
+    "lib/uzuuzu-core/response.rb",
+    "lib/uzuuzu-core/tilt.rb",
+    "lib/uzuuzu-core/uzuuzu-core.rb",
+    "lib/uzuuzu-core/wrapper/logger.rb",
+    "lib/uzuuzu-core/wrapper/wrapper.rb",
     "lib/uzuuzu_core.rb",
     "spec/spec_helper.rb",
     "spec/uzuuzu-core_spec.rb",

metadata

@@ -2,7 +2,7 @@
 name: uzuuzu-core
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.15
+  version: 0.1.0
 platform: ruby
 authors: 
 - Takuya Kondo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-14 00:00:00 +09:00
+date: 2011-12-18 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -131,45 +131,43 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- lib/uzuuzu/application.rb
-- lib/uzuuzu/controller.rb
-- lib/uzuuzu/controller/error.rb
-- lib/uzuuzu/controller/login/openid.rb
-- lib/uzuuzu/controller/login/twitter.rb
-- lib/uzuuzu/controller/logout/index.rb
-- lib/uzuuzu/controller/view/error/404.rhtml
-- lib/uzuuzu/controller/view/error/500.rhtml
-- lib/uzuuzu/environments.rb
-- lib/uzuuzu/ext/object.rb
-- lib/uzuuzu/helper.rb
-- lib/uzuuzu/helper/controller.rb
-- lib/uzuuzu/helper/form.rb
-- lib/uzuuzu/helper/jquery.rb
-- lib/uzuuzu/helper/localize.rb
-- lib/uzuuzu/helper/renderer.rb
-- lib/uzuuzu/helper/route.rb
-- lib/uzuuzu/helper/xhtml.rb
-- lib/uzuuzu/lang/en.yaml
-- lib/uzuuzu/lang/ja.yaml
-- lib/uzuuzu/logger/appengine.rb
-- lib/uzuuzu/logger/file.rb
-- lib/uzuuzu/logger/loggers.rb
-- lib/uzuuzu/logger/stderr.rb
-- lib/uzuuzu/logger/stdout.rb
-- lib/uzuuzu/memcache/appengine.rb
-- lib/uzuuzu/memcache/dalli.rb
-- lib/uzuuzu/memcache/leveldb.rb
-- lib/uzuuzu/memcache/memcached.rb
-- lib/uzuuzu/rack_session/appengine.rb
-- lib/uzuuzu/rack_session/cookie.rb
-- lib/uzuuzu/rack_session/memcache.rb
-- lib/uzuuzu/request.rb
-- lib/uzuuzu/response.rb
-- lib/uzuuzu/service.rb
-- lib/uzuuzu/tilt.rb
-- lib/uzuuzu/wrapper/logger.rb
-- lib/uzuuzu/wrapper/uzuuzu.rb
-- lib/uzuuzu/wrapper/wrapper.rb
+- lib/uzuuzu-core/application.rb
+- lib/uzuuzu-core/controller.rb
+- lib/uzuuzu-core/controller/index.rb
+- lib/uzuuzu-core/controller/login/openid.rb
+- lib/uzuuzu-core/controller/login/twitter.rb
+- lib/uzuuzu-core/controller/view/error/404.rhtml
+- lib/uzuuzu-core/controller/view/error/500.rhtml
+- lib/uzuuzu-core/environments.rb
+- lib/uzuuzu-core/ext/object.rb
+- lib/uzuuzu-core/helper.rb
+- lib/uzuuzu-core/helper/controller.rb
+- lib/uzuuzu-core/helper/form.rb
+- lib/uzuuzu-core/helper/jquery.rb
+- lib/uzuuzu-core/helper/localize.rb
+- lib/uzuuzu-core/helper/renderer.rb
+- lib/uzuuzu-core/helper/route.rb
+- lib/uzuuzu-core/helper/xhtml.rb
+- lib/uzuuzu-core/lang/en.yaml
+- lib/uzuuzu-core/lang/ja.yaml
+- lib/uzuuzu-core/logger/appengine.rb
+- lib/uzuuzu-core/logger/file.rb
+- lib/uzuuzu-core/logger/loggers.rb
+- lib/uzuuzu-core/logger/stderr.rb
+- lib/uzuuzu-core/logger/stdout.rb
+- lib/uzuuzu-core/memcache/appengine.rb
+- lib/uzuuzu-core/memcache/dalli.rb
+- lib/uzuuzu-core/memcache/leveldb.rb
+- lib/uzuuzu-core/memcache/memcached.rb
+- lib/uzuuzu-core/rack_session/appengine.rb
+- lib/uzuuzu-core/rack_session/cookie.rb
+- lib/uzuuzu-core/rack_session/memcache.rb
+- lib/uzuuzu-core/request.rb
+- lib/uzuuzu-core/response.rb
+- lib/uzuuzu-core/tilt.rb
+- lib/uzuuzu-core/uzuuzu-core.rb
+- lib/uzuuzu-core/wrapper/logger.rb
+- lib/uzuuzu-core/wrapper/wrapper.rb
 - lib/uzuuzu_core.rb
 - spec/spec_helper.rb
 - spec/uzuuzu-core_spec.rb
@@ -188,7 +186,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -784320366249850912
+      hash: 2970858063230439040
       segments: 
       - 0
       version: "0"

data/lib/uzuuzu/controller.rb

@@ -1,25 +0,0 @@
-# coding: utf-8
-
-module UzuUzu
-  module Controller
-    autoload(:Error, 'uzuuzu/controller/error')
-    module Login
-      autoload(:Openid, 'uzuuzu/controller/login/openid')
-      autoload(:Twitter, 'uzuuzu/controller/login/twitter')
-    end
-    module Logout
-      autoload(:Index, 'uzuuzu/controller/logout')
-    end
-    
-    def self.current
-      Thread.current[:controller]
-    end
-    
-    def self.before_all
-      ::UzuUzu.logger.debug ::UzuUzu::Request.current.params
-    end
-    
-    def self.after_all
-    end
-  end # Controller
-end # UzuUzu

data/lib/uzuuzu/controller/error.rb

@@ -1,11 +0,0 @@
-# coding: utf-8
-
-module UzuUzu
-  module Controller
-    class Error
-      def index(code)
-        response.respond(helper.render_file(__DIR__("view/error/#{code}.rhtml")))
-      end
-    end
-  end
-end # UzuUzuCms

data/lib/uzuuzu/controller/logout/index.rb

@@ -1,25 +0,0 @@
-# coding: utf-8
-
-module UzuUzuCms
-  module Controller
-    module Logout
-      class Index
-        include ::UzuUzuCms::Helper::Controller
-        
-        def index
-          session.delete(:openid_identity)
-          session.delete(:openid_sreg)
-          session.delete(:openid_domain)
-          session.delete(:openid_entry)
-          session.delete(:twitter_user_id)
-          session.delete(:twitter_access_token)
-          session.delete(:twitter_access_token_secret)
-          session.delete(:login_user_id)
-          session.delete(:login_name)
-          session.delete(:login_domain)
-          session.clear
-        end
-      end # Index
-    end # Logout
-  end # Controller
-end # UzuUzuCms

data/lib/uzuuzu/controller/view/error/404.rhtml

@@ -1,6 +0,0 @@
-
-<html>
-	<body>
-		<%= localize(:not_found) %>
-	</body>
-</html>

data/lib/uzuuzu/controller/view/error/500.rhtml

@@ -1,6 +0,0 @@
-
-<html>
-	<body>
-		<%= localize(:server_error) %>
-	</body>
-</html>

data/lib/uzuuzu/helper.rb

@@ -1,23 +0,0 @@
-# coding: utf-8
-
-module UzuUzu
-  module Helper
-    autoload(:Controller, 'uzuuzu/helper/controller')
-    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/lib/uzuuzu/service.rb

@@ -1,50 +0,0 @@
-# coding: utf-8
-
-module UzuUzu
-  module Service
-    AppsLoaded = {}
-    #
-    #
-    #
-    def const_missing(id)
-      AppsLoaded[::UzuUzu.current.name] ||= {}
-      service = AppsLoaded[::UzuUzu.current.name][id.to_sym]
-      unless service
-        require_base = self.name.gsub(/::/, '/').sub(/^UzuUzu/, 'uzuuzu').snake_case
-        service_name = ::Environments.current.service_name || ''
-        service_name = "#{service_name}/" unless service_name.blank?
-        require "#{require_base}/#{service_name}#{id.to_s.snake_case}"
-        service = const_get("#{service_name.camel_case}").const_get("#{id}")
-        service.apploaded if service.respond_to?(:apsploaded)
-        AppsLoaded[::UzuUzu.current.name][id.to_sym] = service
-      end
-      if service
-        service
-      else
-        super(id)
-      end
-    rescue => e
-      ::UzuUzu.logger.debug e
-      ::UzuUzu.logger.debug e.backtrace
-      super(id)
-    end
-    
-    #
-    #
-    #
-    def method_missing(id)
-      service = const_missing(id.to_s.camel_case)
-      if service
-        service.new
-      else
-        super(id)
-      end
-    rescue => e
-      ::UzuUzu.logger.debug e
-      ::UzuUzu.logger.debug e.backtrace
-      super(id)
-    end
-    
-    extend self
-  end # Service
-end # UzuUzu