uzuuzu-core 0.0.8 → 0.0.9

data/lib/uzuuzu/wrapper/logger.rb

@@ -1,114 +1,34 @@
-require 'logger'
+# coding: utf-8
 
 module UzuUzu
-  class LoggerWrapper
-    attr_reader :loggers
-
+  module Wrapper
     #
     #
     #
-    def initialize(env=nil, options={})
-      logger_env =  env.clone
-      unless logger_env.kind_of?(Array)
-        logger_env = [logger_env]
-      end
-      @loggers = []
-      logger_env.each do |logger|
-          @loggers << create_logger(logger)
-      end
-    end
-    
-    def write(*args)
+    class Logger
       #
-    end
-    
-    #
-    #
-    #
-    def method_missing(action, *args)
-      @loggers.each do |logger|
+      attr_reader :logger
+      #
+      #
+      #
+      def initialize(env=nil)
         begin
-          args.each do |message|
-            message = message.to_str if message.respond_to?(:to_str)
-            message = message.inspect unless message.instance_of?(String)
-            logger.send(action, message)
+          if env.nil? || env.kind_of?(Array) || env['adapter'].nil?
+            require 'uzuuzu/logger/loggers'
+            @logger = ::UzuUzu::Logger::Loggers.new(env)
+          else
+            adapter = env['adapter']
+            require "uzuuzu/logger/#{adapter}"
+            adapter_class = eval("::UzuUzu::Logger::#{adapter.camel_case}")
+            @logger = adapter_class.new(env)
           end
         rescue => e
-          # puts standerd error output
-          $stderr.puts 'logger send error'
+          $stderr.puts 'logger create error'
           $stderr.puts e
+          $stderr.puts e.backtrace
         end
-      end
-    end
-    
-    #
-    #
-    #TODO:: more logger
-    #
-    def create_logger(env)
-      case(env['adapter'])
-      when 'file'
-        logger = file_logger(env)
-      when 'stderr'
-        logger = stderr_logger(env)
-      when 'stdout'
-        logger = stdout_logger(env)
-      when 'syslog'
-      when 'growl'
-      when 'analogger'
-      end
-      logger
-    end # create_logger
-    
-    #
-    #
-    #
-    def stderr_logger(env)
-      logger = ::Logger.new($stderr)
-      default_level_setting(logger, env)
-    end
-
-    #
-    #
-    #
-    def stdout_logger(env)
-      logger = ::Logger.new($stdout)
-      default_level_setting(logger, env)
-    end
-
-    
-    #
-    #
-    #
-    def file_logger(env)
-      out = env['path']
-      rotate = (env['rotate'] || 0).to_i
-      rotate_size = (env['rotate_size'] || 0).to_i * 1024
-      ::FileUtils.mkdir_p(::File.dirname(out))
-      logger = ::Logger.new(out, rotate, rotate_size)
-      default_level_setting(logger, env)
-    end # file_logger
-    
-    #
-    #
-    #
-    def default_level_setting(logger, env)
-      level = env['level'] || :debug
-      case(level.to_sym)
-      when :info
-        logger.level = ::Logger::Severity::INFO
-      when :warn
-        logger.level = ::Logger::Severity::WARN
-      when :error
-        logger.level = ::Logger::Severity::ERROR
-      when :fatal
-        logger.level = ::Logger::Severity::FATAL
-      when :unknown
-        logger.level = ::Logger::Severity::UNKNOWN
-      else
-        logger.level = ::Logger::Severity::DEBUG
-      end
-      logger
-    end
-  end
-end
+      end # initialize
+      
+    end # Logger
+  end # Wrapper
+end # UzuUzu

data/lib/uzuuzu/wrapper/uzuuzu.rb

@@ -7,85 +7,65 @@ module UzuUzu
   Apps = {}
   
   #
-  def self.app
+  def app
     if Apps.blank?
-      UzuUzu::Application.new
+      Application.new
     end
     app = {}
     Apps.each do |key, value|
+      rack_session = value.environments.rack_session
+      static = Rack::Static.new(value, :urls => ['/'], :root => 'public')
       if key == :uzuuzu
-        app['/'] = Rack::Cascade.new([Rack::Static.new(value, :urls => ['/'], :root => 'public'), value])
+        app['/'] = rack_session.app(Rack::Cascade.new([static, value]))
       else
-        app["/#{key}"] = Rack::Cascade.new([Rack::Static.new(value, :urls => ['/'], :root => 'public'), value])
+        app["/#{key}"] = rack_session.app(Rack::Cascade.new([static, value]))
       end
     end
     Rack::URLMap.new(app)
   end
   
   #
-  def self.current
-    UzuUzu::Application.current
+  def current
+    Application.current
   end
   
-  def self.apps
-    UzuUzu::Apps
+  def apps
+    Apps
   end
   
   #
-  def self.logger
+  def logger
     Environments.current.logger
   end
 
   #
-  def self.datastore
+  def datastore
     Environments.current.datastore
   end
 
   #
-  def self.memcache
-    Environments.current.memcache.memcache
+  def kvs
+    Environments.current.kvs
   end
 
   #
-  def self.repository(&b)
-    Environments.current.repository(&b)
+  def memcache
+    Environments.current.memcache
   end
 
   #
-  def self.transaction(&b)
-    Environments.current.transaction(&b)
-  end
-
-  #
-  def self.mailler
-    Environments.current.mailler
-  end
-
-  #
-  def self.gae?
-    if Environments.current.gae
-      return true
-    end
-    false
-  end
-  
-  def self.engine
-    Environments.current.engine
+  def mailer
+    Environments.current.mailer
   end
   
-  def self.localize
+  def localize
     Environments.current.localize
   end
   
   #
-  def self.auto_upgrade?
-    return false if gae?
-    return true if Environments.current.datastore.auto_upgrade?
-    false
+  def render_engine(instance, view_string, engine='erb', options={}, locals={}, &block)
+    Tilt.render_engine(instance, view_string, engine, options, locals, &block)
   end
   
-  #
-  def self.render_engine(instance, view_string, engine=::UzuUzu.engine, options={}, locals={}, &block)
-    TiltWrapper.render_engine(instance, view_string, engine, options, locals, &block)
-  end
+  extend self
 end # UzuUzu

data/lib/uzuuzu/wrapper/wrapper.rb

@@ -0,0 +1,31 @@
+# coding: utf-8
+
+module UzuUzu
+  module Wrapper
+    #
+    #
+    #
+    class Wrapper
+      #
+      attr_reader :wrapper
+      #
+      #
+      #
+      def initialize(wrapper, env=nil)
+        unless env && env['adapter']
+          return
+        end
+        begin
+          adapter = env['adapter']
+          require "uzuuzu/#{wrapper}/#{adapter}"
+          adapter_class = eval("::UzuUzu::#{wrapper.camel_case}::#{adapter.camel_case}")
+          @wrapper = adapter_class.new(env)
+        rescue => e
+          $stderr.puts "#{wrapper} create error"
+          $stderr.puts e
+          $stderr.puts e.backtrace
+        end
+      end
+    end # Wrapper
+  end # Wrapper
+end # UzuUzu

data/lib/uzuuzu_core.rb

@@ -0,0 +1,19 @@
+require 'extlib'
+require 'singleton'
+require 'yaml'
+require 'uri'
+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/request'
+require 'uzuuzu/response'
+require 'uzuuzu/helper'
+require 'uzuuzu/controller'
+require 'uzuuzu/tilt'

data/uzuuzu-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{uzuuzu-core}
-  s.version = "0.0.8"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Takuya Kondo"]
-  s.date = %q{2011-09-08}
+  s.date = %q{2011-09-21}
   s.description = %q{uzuuzu core library}
   s.email = %q{takuya.v3v@gmail.com}
   s.extra_rdoc_files = [
@@ -26,30 +26,54 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
-    "lib/uzuuzu-core.rb",
+    "lib/uzuuzu/application.rb",
+    "lib/uzuuzu/controller.rb",
+    "lib/uzuuzu/controller/error.rb",
+    "lib/uzuuzu/controller/view/error/404.rhtml",
+    "lib/uzuuzu/controller/view/error/500.rhtml",
+    "lib/uzuuzu/datastore/activerecord.rb",
+    "lib/uzuuzu/datastore/datamapper.rb",
+    "lib/uzuuzu/datastore/sequel.rb",
+    "lib/uzuuzu/environments.rb",
+    "lib/uzuuzu/ext/object.rb",
+    "lib/uzuuzu/fixture/datamapper.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/uzuuzu.rb",
     "lib/uzuuzu/helper/xhtml.rb",
-    "lib/uzuuzu/uzuuzu-core.rb",
-    "lib/uzuuzu/wrapper/application.rb",
-    "lib/uzuuzu/wrapper/controller.rb",
-    "lib/uzuuzu/wrapper/datastore.rb",
-    "lib/uzuuzu/wrapper/environments.rb",
-    "lib/uzuuzu/wrapper/helper.rb",
-    "lib/uzuuzu/wrapper/lang/en.yaml",
-    "lib/uzuuzu/wrapper/lang/ja.yaml",
+    "lib/uzuuzu/kvs/appengine.rb",
+    "lib/uzuuzu/kvs/hbase.rb",
+    "lib/uzuuzu/kvs/leveldb.rb",
+    "lib/uzuuzu/kvs/mongo.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/mailer/appengine.rb",
+    "lib/uzuuzu/mailer/tmail.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/datastore.rb",
+    "lib/uzuuzu/rack_session/memcache.rb",
+    "lib/uzuuzu/request.rb",
+    "lib/uzuuzu/response.rb",
+    "lib/uzuuzu/tilt.rb",
     "lib/uzuuzu/wrapper/logger.rb",
-    "lib/uzuuzu/wrapper/mailer.rb",
-    "lib/uzuuzu/wrapper/memcache.rb",
-    "lib/uzuuzu/wrapper/object.rb",
-    "lib/uzuuzu/wrapper/request.rb",
-    "lib/uzuuzu/wrapper/response.rb",
-    "lib/uzuuzu/wrapper/tilt.rb",
     "lib/uzuuzu/wrapper/uzuuzu.rb",
+    "lib/uzuuzu/wrapper/wrapper.rb",
+    "lib/uzuuzu_core.rb",
     "spec/spec_helper.rb",
     "spec/uzuuzu-core_spec.rb",
     "uzuuzu-core.gemspec"

metadata

@@ -2,7 +2,7 @@
 name: uzuuzu-core
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - Takuya Kondo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-08 00:00:00 +09:00
+date: 2011-09-21 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -131,30 +131,54 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- lib/uzuuzu-core.rb
+- lib/uzuuzu/application.rb
+- lib/uzuuzu/controller.rb
+- lib/uzuuzu/controller/error.rb
+- lib/uzuuzu/controller/view/error/404.rhtml
+- lib/uzuuzu/controller/view/error/500.rhtml
+- lib/uzuuzu/datastore/activerecord.rb
+- lib/uzuuzu/datastore/datamapper.rb
+- lib/uzuuzu/datastore/sequel.rb
+- lib/uzuuzu/environments.rb
+- lib/uzuuzu/ext/object.rb
+- lib/uzuuzu/fixture/datamapper.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/uzuuzu.rb
 - lib/uzuuzu/helper/xhtml.rb
-- lib/uzuuzu/uzuuzu-core.rb
-- lib/uzuuzu/wrapper/application.rb
-- lib/uzuuzu/wrapper/controller.rb
-- lib/uzuuzu/wrapper/datastore.rb
-- lib/uzuuzu/wrapper/environments.rb
-- lib/uzuuzu/wrapper/helper.rb
-- lib/uzuuzu/wrapper/lang/en.yaml
-- lib/uzuuzu/wrapper/lang/ja.yaml
+- lib/uzuuzu/kvs/appengine.rb
+- lib/uzuuzu/kvs/hbase.rb
+- lib/uzuuzu/kvs/leveldb.rb
+- lib/uzuuzu/kvs/mongo.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/mailer/appengine.rb
+- lib/uzuuzu/mailer/tmail.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/datastore.rb
+- lib/uzuuzu/rack_session/memcache.rb
+- lib/uzuuzu/request.rb
+- lib/uzuuzu/response.rb
+- lib/uzuuzu/tilt.rb
 - lib/uzuuzu/wrapper/logger.rb
-- lib/uzuuzu/wrapper/mailer.rb
-- lib/uzuuzu/wrapper/memcache.rb
-- lib/uzuuzu/wrapper/object.rb
-- lib/uzuuzu/wrapper/request.rb
-- lib/uzuuzu/wrapper/response.rb
-- lib/uzuuzu/wrapper/tilt.rb
 - lib/uzuuzu/wrapper/uzuuzu.rb
+- lib/uzuuzu/wrapper/wrapper.rb
+- lib/uzuuzu_core.rb
 - spec/spec_helper.rb
 - spec/uzuuzu-core_spec.rb
 - uzuuzu-core.gemspec
@@ -172,7 +196,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3233450064445015537
+      hash: 3127904207285325660
       segments: 
       - 0
       version: "0"