uzuuzu-core 0.0.4 → 0.0.5

data/lib/uzuuzu/wrapper/object.rb

@@ -0,0 +1,9 @@
+class Object
+  unless defined?(__DIR__)
+    def __DIR__(*args)
+      filename = caller[0][/^(.*):/, 1]
+      dir = File.expand_path(File.dirname(filename))
+      ::File.expand_path(::File.join(dir, *args.map{|a| a.to_s}))
+    end
+  end
+end

data/lib/uzuuzu/wrapper/request.rb

@@ -0,0 +1,26 @@
+# coding: utf-8
+
+
+module UzuUzu
+  class Request < Rack::Request
+    
+    def accept
+      @env['HTTP_ACCEPT'].to_s.split(',').map { |a| a.split(';')[0].strip }
+    end
+    
+    def path_suffix
+      if /^.+\.(.+?)$/ =~ self.path
+        suffix = $1.to_sym
+      else
+        suffix = :html
+      end
+      suffix = :xhr if suffix == :html and self.xhr?
+      suffix
+    end
+    alias :wish :path_suffix
+    
+    def self.current
+      Thread.current[:request]
+    end
+  end
+end

data/lib/uzuuzu/wrapper/response.rb

@@ -0,0 +1,16 @@
+# coding: utf-8
+
+module UzuUzu
+  #
+  #
+  #
+  class Response < Rack::Response
+
+    #
+    #
+    #
+    def self.current
+      Thread.current[:response]
+    end
+  end
+end

data/lib/uzuuzu/wrapper/uzuuzu.rb

@@ -4,186 +4,66 @@
 #
 #
 module UzuUzu
+  Apps = {}
   #
-  LIB_DIR = __DIR__
-  #
-  def self.dispacher_path
-    Environments.instance.dispacher_path
+  def self.current
+    UzuUzu::Application.current
   end
-
-  #
-  def self.root
-    Environments.instance.dispacher_path
+  
+  def self.apps
+    UzuUzu::Apps
   end
-
+  
   #
   def self.logger
-    Environments.instance.logger
+    Environments.current.logger
   end
 
   #
   def self.datastore
-    Environments.instance.datastore
+    Environments.current.datastore
   end
 
   #
   def self.memcache
-    Environments.instance.memcache.memcache
+    Environments.current.memcache.memcache
   end
 
   #
   def self.repository(&b)
-    Environments.instance.repository(&b)
+    Environments.current.repository(&b)
   end
 
   #
   def self.transaction(&b)
-    Environments.instance.transaction(&b)
+    Environments.current.transaction(&b)
   end
 
   #
   def self.mailler
-    Environments.instance.mailler
+    Environments.current.mailler
   end
 
   #
   def self.gae?
-    if Environments.instance.gae
-    return true
+    if Environments.current.gae
+      return true
     end
     false
   end
-
+  
+  def self.engine
+    Environments.current.engine
+  end
+  
+  def self.localize
+    Environments.current.localize
+  end
+  
   #
   def self.auto_upgrade?
     return false if gae?
-    return true if Environments.instance.datastore.auto_upgrade?
+    return true if Environments.current.datastore.auto_upgrade?
     false
   end
-
-  #
-  #
-  #
-  class Environments
-    include Singleton
-
-    #
-    DEFAULT_YAML = './uzuuzu.yaml'
-    #
-    attr_accessor :logger
-    #
-    attr_accessor :datastore
-    #
-    attr_accessor :memcache
-    #
-    attr_accessor :mailler
-    #
-    attr_accessor :dispatche_path
-    #
-    attr_accessor :public
-    #
-    attr_accessor :gae
-    #
-    attr_accessor :map
-    
-    def self.default_yaml=(yaml)
-      @@yaml = yaml
-    end
-    
-    def self.default_yaml
-      @@yaml || DEFAULT_YAML
-    end
-    
-    def initialize
-      unless default_yaml.blank?
-        load_yaml(default_yaml)
-      end
-    end
-
-    def load_yaml(yaml)
-      return if yaml.blank?
-      begin
-        yaml = YAML.load_file(yaml) unless yaml.kind_of?(Hash)
-        setup(yaml)
-      rescue => e
-        Ramaze::Log.error "UzuUzu initialize error : load_yaml(#{yaml})"
-      end
-    end
-
-    def setup(map)
-      return if map.blank?
-      @map = map
-      @dispatcher_path = map['dispatcher_path']
-      if map['gae'].blank?
-      @gae = false
-      else
-      @gae = true
-      require 'uzuuzu/adapter/gae'
-      end
-      @public = map['public']
-      @logger = nil
-      @datastore = nil
-      @memcache = nil
-      @mailer = nil
-    end
-
-    def logger
-      if @logger.nil?
-        unless @gae or @map['logger'].blank?
-          case(@map['logger']['adapter'])
-          when ''
-          end
-        end
-        @logger = UzuUzu::LoggerWrapper.new(@map['logger']) unless @logger
-      end
-      @logger
-    end
-
-    def datastore
-      if @datastore.nil?
-        unless @gae or @map['datastore'].blank?
-          case(@map['datastore']['adapter'])
-          when 'datamapper'
-            require 'uzuuzu/adapter/datamapper'
-          end
-        end
-        @datastore = UzuUzu::DataStoreWrapper.new(@map['datastore'])
-      end
-      @datastore
-    end
-
-    def memcache
-      if @memcache.nil?
-        unless @gae or @map['memcache'].blank?
-          case(@map['memcache']['adapter'])
-          when 'memcache-client'
-            require 'uzuuzu/adapter/memcache-client'
-          end
-        end
-        @memcache = UzuUzu::MemcacheWrapper.new(@map['memcache'])
-      end
-      @memcache
-    end
-
-    def mailler
-      if @mailer.nil?
-        unless @gae or @map['mailer'].blank?
-          case(@map['mailer']['adapter'])
-          when 'tmail'
-            require 'uzuuzu/adapter/tmail'
-          end
-        end
-        @mailer = UzuUzu::MailerWrapper.new(@map['mailer'])
-      end
-      @mailer
-    end
-
-    def repository(&b)
-      datastore.uzuuzu_repository(&b)
-    end
-
-    def transaction(*args, &b)
-      datastore.uzuuzu_transaction(*args, &b)
-    end
-  end
-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.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Takuya Kondo"]
-  s.date = %q{2011-06-13}
+  s.date = %q{2011-07-24}
   s.description = %q{uzuuzu core library}
   s.email = %q{takuya.v3v@gmail.com}
   s.extra_rdoc_files = [
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".project",
+    ".redcar/tags",
     ".rspec",
     "Gemfile",
     "Gemfile.lock",
@@ -28,12 +29,56 @@ Gem::Specification.new do |s|
     "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/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",
     "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/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/uzuuzu.rb",
     "spec/spec_helper.rb",
     "spec/uzuuzu-core_spec.rb",
@@ -49,26 +94,38 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<ramaze>, [">= 0"])
+      s.add_runtime_dependency(%q<rack>, [">= 0"])
       s.add_runtime_dependency(%q<extlib>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 2.3.0"])
-      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.6.2"])
+      s.add_runtime_dependency(%q<ruby-openid>, [">= 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"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<ramaze>, [">= 0"])
+      s.add_dependency(%q<rack>, [">= 0"])
       s.add_dependency(%q<extlib>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 2.3.0"])
-      s.add_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_dependency(%q<jeweler>, [">= 1.6.2"])
+      s.add_dependency(%q<ruby-openid>, [">= 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"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<ramaze>, [">= 0"])
+    s.add_dependency(%q<rack>, [">= 0"])
     s.add_dependency(%q<extlib>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 2.3.0"])
-    s.add_dependency(%q<bundler>, [">= 1.0.0"])
-    s.add_dependency(%q<jeweler>, [">= 1.6.2"])
+    s.add_dependency(%q<ruby-openid>, [">= 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"])
     s.add_dependency(%q<rcov>, [">= 0"])
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: uzuuzu-core
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Takuya Kondo
@@ -10,11 +10,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-13 00:00:00 +09:00
+date: 2011-07-24 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: ramaze
+  name: rack
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -36,49 +36,93 @@ dependencies:
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: ruby-openid
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.0
-  type: :development
+        version: "0"
+  type: :runtime
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: tilt
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.0
-  type: :development
+        version: "0"
+  type: :runtime
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: tenjin
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.6.2
-  type: :development
+        version: "0"
+  type: :runtime
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rcov
+  name: nokogiri
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  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: []
@@ -91,6 +135,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .project
+- .redcar/tags
 - .rspec
 - Gemfile
 - Gemfile.lock
@@ -100,12 +145,56 @@ files:
 - 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/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
 - 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/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/uzuuzu.rb
 - spec/spec_helper.rb
 - spec/uzuuzu-core_spec.rb
@@ -124,7 +213,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4124952310505373553
+      hash: 3703982758708222883
       segments: 
       - 0
       version: "0"