uzuuzu-core 0.0.5 → 0.0.6

data/lib/uzuuzu/wrapper/controller.rb

@@ -2,20 +2,6 @@
 
 module UzuUzu
   module Controller
-    autoload(:Admin, 'uzuuzu/controller/admin')
-    autoload(:Contents, 'uzuuzu/controller/contents')
-    autoload(:Crud, 'uzuuzu/controller/crud')
-    autoload(:Css, 'uzuuzu/controller/css')
-    autoload(:Error, 'uzuuzu/controller/error')
-    autoload(:Index, 'uzuuzu/controller/index')
-    autoload(:Initialize, 'uzuuzu/controller/initialize')
-    autoload(:Javascript, 'uzuuzu/controller/javascript')
-    autoload(:Oauth, 'uzuuzu/controller/oauth')
-    autoload(:Openid, 'uzuuzu/controller/openid')
-    autoload(:Page, 'uzuuzu/controller/page')
-    autoload(:Plugin, 'uzuuzu/controller/plugin')
-    autoload(:User, 'uzuuzu/controller/user')
-    
     def self.current
       Thread.current[:controller]
     end

data/lib/uzuuzu/wrapper/environments.rb

@@ -28,15 +28,15 @@ module UzuUzu
     attr_accessor :localize
     
     def self.current
-      UzuUzu.current.environments
+      ::UzuUzu.current.environments
     end
     
     def self.default_yaml=(yaml)
-      @@yaml = yaml
+      @@default_yaml = yaml
     end
 
     def self.default_yaml
-      @@yaml ||= DEFAULT_YAML
+      @@default_yaml ||= DEFAULT_YAML
     end
 
     def initialize(yaml=nil)
@@ -45,7 +45,7 @@ module UzuUzu
 
     def load_yaml(yaml)
       return if yaml.blank?
-      yaml = YAML.load_file(yaml) unless yaml.kind_of?(Hash)
+      yaml = ::YAML.load_file(yaml) unless yaml.kind_of?(Hash)
       setup(yaml)
     end
 
@@ -64,13 +64,23 @@ module UzuUzu
     end
 
     def load_localize
-      @localize = YAML.load_file(__DIR__("lang/#{@lang}.yaml"))
+      @localize = {}
+      if ::File.file?("./lang/#{@lang}.yaml")
+        File.open("./lang/#{@lang}.yaml", :encoding => "UTF-8") do |f|
+          @localize.merge!(::YAML.load(f))
+        end
+      end
+      if ::File.file?(__DIR__("lang/#{@lang}.yaml"))
+        File.open(__DIR__("lang/#{@lang}.yaml"), :encoding => "UTF-8") do |f|
+          @localize.merge!(::YAML.load(f))
+        end
+      end
     end
 
     def logger
       if @logger.nil?
         env = @config['logger'] unless @config.nil?
-        @logger = UzuUzu::LoggerWrapper.new(env || {})
+        @logger = LoggerWrapper.new(env || {})
       end
       @logger
     end
@@ -84,7 +94,7 @@ module UzuUzu
           end
         end
         env = @config['datastore'] unless @config.nil?
-        @datastore = UzuUzu::DataStoreWrapper.new(env || {})
+        @datastore = DataStoreWrapper.new(env || {})
       end
       @datastore
     end
@@ -98,7 +108,7 @@ module UzuUzu
           end
         end
         env = @config['memcache'] unless @config.nil?
-        @memcache = UzuUzu::MemcacheWrapper.new(env || {})
+        @memcache = MemcacheWrapper.new(env || {})
       end
       @memcache
     end
@@ -112,7 +122,7 @@ module UzuUzu
           end
         end
         env = @config['mailer'] unless @config.nil?
-        @mailer = UzuUzu::MailerWrapper.new(env || {})
+        @mailer = MailerWrapper.new(env || {})
       end
       @mailer
     end # mailler

data/lib/uzuuzu/wrapper/helper.rb

@@ -4,10 +4,11 @@ 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(:UzuUzuPage, 'uzuuzu/helper/uzuuzu_page')
     autoload(:XHtml, 'uzuuzu/helper/xhtml')
   end
 end

data/lib/uzuuzu/wrapper/lang/en.yaml

@@ -7,6 +7,10 @@ delete: Delete
 
 login: Login
 
+# common error
+not_found: page is not found
+server_error: server error
+
 # openid
 openid_messege: Choice!
 openid_url: Other OpenId URL

data/lib/uzuuzu/wrapper/lang/ja.yaml

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 
 # common
 create: 作成
@@ -7,6 +8,10 @@ delete: 削除
 
 login: ログイン
 
+# error
+not_found: お探しのページが見つかりません。
+server_error: エラーが発生しました。
+
 # openid
 openid_messege: ログイン方法を選択してください
 openid_url: その他OpenId

data/lib/uzuuzu/wrapper/logger.rb

@@ -18,6 +18,10 @@ module UzuUzu
       end
     end
     
+    def write(*args)
+      #
+    end
+    
     #
     #
     #
@@ -33,7 +37,6 @@ module UzuUzu
           # puts standerd error output
           $stderr.puts 'logger send error'
           $stderr.puts e
-          $stderr.puts e.backtrace
         end
       end
     end
@@ -61,7 +64,7 @@ module UzuUzu
     #
     #
     def stderr_logger(env)
-      logger = Logger.new($stderr)
+      logger = ::Logger.new($stderr)
       default_level_setting(logger, env)
     end
 
@@ -69,7 +72,7 @@ module UzuUzu
     #
     #
     def stdout_logger(env)
-      logger = Logger.new($stdout)
+      logger = ::Logger.new($stdout)
       default_level_setting(logger, env)
     end
 
@@ -81,8 +84,8 @@ module UzuUzu
       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)
+      ::FileUtils.mkdir_p(::File.dirname(out))
+      logger = ::Logger.new(out, rotate, rotate_size)
       default_level_setting(logger, env)
     end # file_logger
     
@@ -93,17 +96,17 @@ module UzuUzu
       level = env['level'] || :debug
       case(level.to_sym)
       when :info
-        logger.level = Logger::Severity::INFO
+        logger.level = ::Logger::Severity::INFO
       when :warn
-        logger.level = Logger::Severity::WARN
+        logger.level = ::Logger::Severity::WARN
       when :error
-        logger.level = Logger::Severity::ERROR
+        logger.level = ::Logger::Severity::ERROR
       when :fatal
-        logger.level = Logger::Severity::FATAL
+        logger.level = ::Logger::Severity::FATAL
       when :unknown
-        logger.level = Logger::Severity::UNKNOWN
+        logger.level = ::Logger::Severity::UNKNOWN
       else
-        logger.level = Logger::Severity::DEBUG
+        logger.level = ::Logger::Severity::DEBUG
       end
       logger
     end

data/lib/uzuuzu/wrapper/request.rb

@@ -4,23 +4,31 @@
 module UzuUzu
   class Request < Rack::Request
     
+    def self.current
+      Thread.current[:request]
+    end
+
     def accept
       @env['HTTP_ACCEPT'].to_s.split(',').map { |a| a.split(';')[0].strip }
     end
     
-    def path_suffix
+    def query_suffix
+      return @query_suffix if @query_suffix
       if /^.+\.(.+?)$/ =~ self.path
-        suffix = $1.to_sym
+        @query_suffix = $1.to_sym
       else
-        suffix = :html
+        @query_suffix = :html
       end
-      suffix = :xhr if suffix == :html and self.xhr?
-      suffix
+      @query_suffix = :xhr if @query_suffix == :html and self.xhr?
+      @query_suffix
     end
-    alias :wish :path_suffix
+    alias :wish :query_suffix
     
-    def self.current
-      Thread.current[:request]
+    def domain(path = nil, options = {})
+      uri = URI(self.url)
+      uri.path = path.to_s if path
+      uri.query = nil unless options[:keep_query]
+      uri.to_s
     end
-  end
-end
+  end # Request
+end # UzuUzu

data/lib/uzuuzu/wrapper/tilt.rb

@@ -0,0 +1,31 @@
+# coding: utf-8
+
+module UzuUzu
+  #
+  #
+  #
+  module TiltWrapper
+    #
+    #
+    #
+    def self.render_engine(instance, view_string, engine=::UzuUzu.engine, options={}, locals={}, &block)
+      template = ::Tilt[engine].new { |t| view_string.force_encoding('UTF-8') }
+      contents = template.render(instance, locals, &block)
+      unless options.blank?
+        layout = options.delete(:layout)
+        layout_string = options.delete(:layout_string)
+        layout_engine = options.delete(:layout_engine) || engine
+        unless layout.blank?
+          if ::File.file?(layout)
+            layout_string = ::File.respond_to?(:binread) ? ::File.binread(layout) : ::File.read(layout)
+          end
+        end
+        unless layout_string.blank?
+          locals[:@contents] = contents
+          contents = self.render_engine(instance, layout_string, layout_engine, options, locals)
+        end
+      end
+      contents
+    end # self.render_engine
+  end # TiltWrapper
+end # UzuUzu

data/lib/uzuuzu/wrapper/uzuuzu.rb

@@ -5,6 +5,23 @@
 #
 module UzuUzu
   Apps = {}
+  
+  #
+  def self.app
+    if Apps.blank?
+      UzuUzu::Application.new
+    end
+    app = {}
+    Apps.each do |key, value|
+      if key == :uzuuzu
+        app['/'] = Rack::Cascade.new([Rack::Static.new(value, :urls => ['/'], :root => 'public'), value])
+      else
+        app["/#{key}"] = Rack::Cascade.new([Rack::Static.new(value, :urls => ['/'], :root => 'public'), value])
+      end
+    end
+    Rack::URLMap.new(app)
+  end
+  
   #
   def self.current
     UzuUzu::Application.current
@@ -66,4 +83,9 @@ module UzuUzu
     return true if Environments.current.datastore.auto_upgrade?
     false
   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
 end # UzuUzu

data/uzuuzu-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{uzuuzu-core}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Takuya Kondo"]
-  s.date = %q{2011-07-24}
+  s.date = %q{2011-08-14}
   s.description = %q{uzuuzu core library}
   s.email = %q{takuya.v3v@gmail.com}
   s.extra_rdoc_files = [
@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".project",
-    ".redcar/tags",
     ".rspec",
     "Gemfile",
     "Gemfile.lock",
@@ -28,43 +27,14 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/uzuuzu-core.rb",
-    "lib/uzuuzu/.DS_Store",
-    "lib/uzuuzu/controller/admin.rb",
-    "lib/uzuuzu/controller/contents.rb",
-    "lib/uzuuzu/controller/crud.rb",
-    "lib/uzuuzu/controller/css.rb",
-    "lib/uzuuzu/controller/error.rb",
-    "lib/uzuuzu/controller/index.rb",
-    "lib/uzuuzu/controller/initialize.rb",
-    "lib/uzuuzu/controller/javascript.rb",
-    "lib/uzuuzu/controller/oauth.rb",
-    "lib/uzuuzu/controller/openid.rb",
-    "lib/uzuuzu/controller/page.rb",
-    "lib/uzuuzu/controller/plugin.rb",
-    "lib/uzuuzu/controller/user.rb",
-    "lib/uzuuzu/controller/view/admin/index.xhtml",
-    "lib/uzuuzu/controller/view/crud/destroy.rhtml",
-    "lib/uzuuzu/controller/view/crud/edit.rhtml",
-    "lib/uzuuzu/controller/view/crud/index.rhtml",
-    "lib/uzuuzu/controller/view/crud/new.rhtml",
-    "lib/uzuuzu/controller/view/crud/show.rhtml",
-    "lib/uzuuzu/controller/view/error/404.tenjin",
-    "lib/uzuuzu/controller/view/initialize/step1.xhtml",
-    "lib/uzuuzu/controller/view/initialize/step2.xhtml",
-    "lib/uzuuzu/controller/view/initialize/step3.xhtml",
-    "lib/uzuuzu/controller/view/openid/index.xhtml",
-    "lib/uzuuzu/controller/view/page.xhtml",
-    "lib/uzuuzu/controller/view/user/entry.xhtml",
-    "lib/uzuuzu/fixture/layout.yaml",
     "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",
     "lib/uzuuzu/helper/renderer.rb",
     "lib/uzuuzu/helper/route.rb",
-    "lib/uzuuzu/helper/uzuuzu_page.rb",
     "lib/uzuuzu/helper/xhtml.rb",
-    "lib/uzuuzu/model/.DS_Store",
-    "lib/uzuuzu/model/remote_user.rb",
     "lib/uzuuzu/uzuuzu-core.rb",
     "lib/uzuuzu/wrapper/application.rb",
     "lib/uzuuzu/wrapper/controller.rb",
@@ -79,6 +49,7 @@ Gem::Specification.new do |s|
     "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",
     "spec/spec_helper.rb",
     "spec/uzuuzu-core_spec.rb",
@@ -97,9 +68,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rack>, [">= 0"])
       s.add_runtime_dependency(%q<extlib>, [">= 0"])
       s.add_runtime_dependency(%q<ruby-openid>, [">= 0"])
+      s.add_runtime_dependency(%q<oauth>, [">= 0"])
       s.add_runtime_dependency(%q<tilt>, [">= 0"])
-      s.add_runtime_dependency(%q<tenjin>, [">= 0"])
-      s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
@@ -108,9 +78,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rack>, [">= 0"])
       s.add_dependency(%q<extlib>, [">= 0"])
       s.add_dependency(%q<ruby-openid>, [">= 0"])
+      s.add_dependency(%q<oauth>, [">= 0"])
       s.add_dependency(%q<tilt>, [">= 0"])
-      s.add_dependency(%q<tenjin>, [">= 0"])
-      s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
@@ -120,9 +89,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rack>, [">= 0"])
     s.add_dependency(%q<extlib>, [">= 0"])
     s.add_dependency(%q<ruby-openid>, [">= 0"])
+    s.add_dependency(%q<oauth>, [">= 0"])
     s.add_dependency(%q<tilt>, [">= 0"])
-    s.add_dependency(%q<tenjin>, [">= 0"])
-    s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])

metadata

@@ -2,7 +2,7 @@
 name: uzuuzu-core
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Takuya Kondo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-24 00:00:00 +09:00
+date: 2011-08-14 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,7 +47,7 @@ dependencies:
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: tilt
+  name: oauth
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -58,7 +58,7 @@ dependencies:
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: tenjin
+  name: tilt
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -69,18 +69,18 @@ dependencies:
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: rspec
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: bundler
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -91,7 +91,7 @@ dependencies:
   prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: jeweler
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -102,7 +102,7 @@ dependencies:
   prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: rcov
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -112,17 +112,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id010
 description: uzuuzu core library
 email: takuya.v3v@gmail.com
 executables: []
@@ -135,7 +124,6 @@ extra_rdoc_files:
 files: 
 - .document
 - .project
-- .redcar/tags
 - .rspec
 - Gemfile
 - Gemfile.lock
@@ -144,43 +132,14 @@ files:
 - Rakefile
 - VERSION
 - lib/uzuuzu-core.rb
-- lib/uzuuzu/.DS_Store
-- lib/uzuuzu/controller/admin.rb
-- lib/uzuuzu/controller/contents.rb
-- lib/uzuuzu/controller/crud.rb
-- lib/uzuuzu/controller/css.rb
-- lib/uzuuzu/controller/error.rb
-- lib/uzuuzu/controller/index.rb
-- lib/uzuuzu/controller/initialize.rb
-- lib/uzuuzu/controller/javascript.rb
-- lib/uzuuzu/controller/oauth.rb
-- lib/uzuuzu/controller/openid.rb
-- lib/uzuuzu/controller/page.rb
-- lib/uzuuzu/controller/plugin.rb
-- lib/uzuuzu/controller/user.rb
-- lib/uzuuzu/controller/view/admin/index.xhtml
-- lib/uzuuzu/controller/view/crud/destroy.rhtml
-- lib/uzuuzu/controller/view/crud/edit.rhtml
-- lib/uzuuzu/controller/view/crud/index.rhtml
-- lib/uzuuzu/controller/view/crud/new.rhtml
-- lib/uzuuzu/controller/view/crud/show.rhtml
-- lib/uzuuzu/controller/view/error/404.tenjin
-- lib/uzuuzu/controller/view/initialize/step1.xhtml
-- lib/uzuuzu/controller/view/initialize/step2.xhtml
-- lib/uzuuzu/controller/view/initialize/step3.xhtml
-- lib/uzuuzu/controller/view/openid/index.xhtml
-- lib/uzuuzu/controller/view/page.xhtml
-- lib/uzuuzu/controller/view/user/entry.xhtml
-- lib/uzuuzu/fixture/layout.yaml
 - 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
 - lib/uzuuzu/helper/renderer.rb
 - lib/uzuuzu/helper/route.rb
-- lib/uzuuzu/helper/uzuuzu_page.rb
 - lib/uzuuzu/helper/xhtml.rb
-- lib/uzuuzu/model/.DS_Store
-- lib/uzuuzu/model/remote_user.rb
 - lib/uzuuzu/uzuuzu-core.rb
 - lib/uzuuzu/wrapper/application.rb
 - lib/uzuuzu/wrapper/controller.rb
@@ -195,6 +154,7 @@ files:
 - 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
 - spec/spec_helper.rb
 - spec/uzuuzu-core_spec.rb
@@ -213,7 +173,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3703982758708222883
+      hash: -2491266081406158821
       segments: 
       - 0
       version: "0"