uzuuzu-core 0.1.10 → 0.1.11

data/VERSION

@@ -1 +1 @@
-0.1.10
+0.1.11

data/lib/dm-simpledb-adapter.rb

@@ -0,0 +1 @@
+require 'dm-adapter-simpledb'

data/lib/uzuuzu-core/application.rb

@@ -153,6 +153,8 @@ module UzuUzu
         action_return = send_action(request, response, controller, action, query)
         if response.body.blank?
           render = helper.render(action)
+          p action
+          p render
         end
         break
       end
@@ -215,6 +217,7 @@ module UzuUzu
       if routes.blank? || name != routes[-1]
         routes << "#{name.camel_case}"
       end
+      routes.shift if routes[0].blank?
       _base = "::#{@name.to_s.camel_case}"
       _base = '' if @name == :uzuuzu || @name == 'uzuuzu'
       helper = eval("#{_base}::#{helper_root.camel_case}")
@@ -234,6 +237,7 @@ module UzuUzu
       classies = []
       request_paths = env['PATH_INFO'].split('/')
       request_paths.shift if request_paths[0].blank?
+      request_paths << ''
       
       _controllers = controllers.clone
       _base = "::#{@name.to_s.camel_case}"
@@ -246,42 +250,32 @@ module UzuUzu
       _controllers.each do |c|
         _c = c
         _h = nil
-        if request_paths.size == 0
-          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|
           break if _c.nil?
-          next if request_path.blank?
           c_str = request_path.camel_case
           route = "#{request_paths[0...index].join('/')}"
           if route.blank?
-            route = "#{env['SCRIPT_NAME']}"
+            route = "#{env['SCRIPT_NAME']}/index"
+            route.blank?
           else
-            route = "#{env['SCRIPT_NAME']}/#{route}"
+            route = "#{env['SCRIPT_NAME']}/#{route}/index"
           end
-          query = request_paths[index..-1]
+          query = request_paths[index...-1]
           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]
+          next if c_str == 'Index' || c_str.blank?
+          route = "#{env['SCRIPT_NAME']}/#{request_paths[0...index].join('/')}"
+          query = request_paths[(index+1)...-1]
           map = get_class_map(c_str, _c, route, query)
-          if map && map[:controller].kind_of?(::Class)
-            classies << map
-          end
+          _c = nil
           if map
-            _c = map[:controller]
-          else
-            _c = nil
-          end
-          unless _c.kind_of?(::Class) || _c.kind_of?(::Module)
-            _c = nil
-            break
+            classies << map if map[:controller].kind_of?(::Class)
+            p map[:controller].kind_of?(::Module)
+            if map[:controller].kind_of?(::Class) || map[:controller].kind_of?(::Module)
+              _c = map[:controller]
+            end
           end
         end
       end

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

@@ -9,7 +9,7 @@ module UzuUzu
       end
       
       def error(code)
-        response.respond(helper.render_file(__DIR__("view/error/#{code}.rhtml")))
+        response.respond(helper.render_file(__DIR__("view/index/error/#{code}.rhtml")))
       end
       
       def logout

data/lib/uzuuzu-core/environments.rb

@@ -9,10 +9,14 @@ module UzuUzu
     #
     DEFAULT_YAML = 'uzuuzu.yaml'
     #
-    attr_accessor :flyweight
+    attr_accessor :map
     #
     attr_accessor :service_name
     #
+    attr_accessor :dm
+    #
+    attr_accessor :s3
+    #
     attr_accessor :logger
     #
     attr_accessor :memcache
@@ -39,6 +43,7 @@ module UzuUzu
 
     def initialize(yaml=nil)
       load_yaml(yaml||self.class.default_yaml)
+      dm
     end
 
     def load_yaml(yaml)
@@ -69,9 +74,9 @@ module UzuUzu
       end
     end
     
-    def flyweight
-      @flyweight = {} if @flyweight.nil?
-      @flyweight
+    def map
+      @map = {} if @map.nil?
+      @map
     end
 
     def config
@@ -81,15 +86,31 @@ module UzuUzu
     
     def logger
       if @logger.nil?
-        env = @config['logger'].clone unless @config.nil?
+        env = @config['logger'].dup unless @config.nil?
         @logger = Wrapper::Logger.new(env || {}).logger
       end
       @logger
     end
 
+    def dm
+      if @dm.nil?
+        env = @config['dm'].dup unless @config.nil?
+        @dm = Wrapper::Dm.new(env || {})
+      end
+      @dm
+    end
+
+    def s3
+      if @s3.nil?
+        env = @config['s3'].dup unless @config.nil?
+        @s3 = Wrapper::S3.new(env || {})
+      end
+      @s3
+    end
+
     def memcache
       if @memcache.nil?
-        env = @config['memcache'].clone unless @config.nil?
+        env = @config['memcache'].dup unless @config.nil?
         @memcache = Wrapper::Wrapper.new('memcache', env || {}).wrapper
         @memcache ||= {}
       end
@@ -98,7 +119,7 @@ module UzuUzu
     
     def rack_session
       if @rack_session.nil?
-        env = @config['rack_session'].clone unless @config.nil?
+        env = @config['rack_session'].dup unless @config.nil?
         @rack_session = Wrapper::Wrapper.new('rack_session', env || {}).wrapper
       end
       @rack_session

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

@@ -82,8 +82,15 @@ module UzuUzu
       #
       #
       #
-      def service
-        ::UzuUzu.service
+      def dm
+        ::UzuUzu.dm
+      end
+      
+      #
+      #
+      #
+      def s3
+        ::UzuUzu.s3
       end
       
       #

data/lib/uzuuzu-core/helper/renderer.rb

@@ -28,8 +28,8 @@ module UzuUzu
       def render(view, options={}, locals={}, &block)
         view_path = nil
         catch(:view_finded) do
-          _view_path = "#{application.view_root}#{view}" if view[0] == '/'
-          _view_path ||= "#{application.view_root}#{helper.route}/#{view}"
+          _view_path = "#{application.view_root}#{helper.route}"
+          p _view_path
           ::Tilt.mappings.each_key do |key|
             _path = "#{_view_path}.#{key}"
             if ::File.file?(_path)

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

@@ -38,6 +38,16 @@ module UzuUzu
     Environments.current.logger
   end
 
+  #
+  def dm
+    Environments.current.dm
+  end
+
+  #
+  def s3
+    Environments.current.s3
+  end
+
   #
   def memcache
     Environments.current.memcache

data/lib/uzuuzu-core/wrapper/dm.rb

@@ -0,0 +1,137 @@
+# coding: utf-8
+require 'dm-core'
+
+module UzuUzu
+  module Wrapper
+    class Dm
+      #
+      attr_reader :adapter
+      #
+      attr_reader :repositories
+      
+      #
+      #
+      #
+      def initialize(env=nil)
+        if env.nil?
+        return
+        end
+
+        unless env['logger'].nil?
+          DataMapper::logger = ::UzuUzu::Wrapper::Logger.new(env['logger']).logger
+        end
+        @repositories = []
+        env.each do |key, value|
+          @repositories.push key.to_sym
+          if value['adapter']
+            @adapter = value['adapter']
+            DataMapper.setup(key.to_sym, value)
+            if value['logger']
+              case(value['adapter'])
+              when 'sqlite3'
+                DataObjects::Sqlite3.logger = ::UzuUzu::Wrapper::Logger.new(value['logger']).logger
+              when 'postgres'
+                DataObjects::Postgres.logger = ::UzuUzu::Wrapper::Logger.new(value['logger']).logger
+              when 'mysql'
+                DataObjects::MySql.logger = ::UzuUzu::Wrapper::Logger.new(value['logger']).logger
+              end
+            end
+          end
+        end # repositories_env.each
+      end # new
+
+      #
+      #
+      #
+      def import_file(model, file, overwrite=false)
+        unless ::File.file?(file)
+          raise "UzuUzu fixture import error file not found : #{file}"
+        end
+        ext = ::File.extname(file)
+        case(ext)
+        when '.yml', '.yaml'
+          import_yaml(model, ::YAML.load_file(file), overwrite)
+        when '.xml'
+          # TODO
+        when '.json', '.js'
+          # TODO
+        when '.csv'
+          begin
+            require 'fastercsv'
+            ::FasterCSV.foreach(file) do |row|
+              import_csv(model, row, overwrite)
+            end
+          rescue
+            require "csv"
+            ::CSV.open(file) do |row|
+              import_csv(model, row, overwrite)
+            end
+          end
+        end
+        nil
+      end # import_file
+      
+      def import_yaml(model, yaml, overwrite=false)
+        ::UzuUzu.logger.debug 'import yaml'
+        if yaml.kind_of?(Array)
+          yaml.each do |map|
+            ::UzuUzu.logger.debug "import #{map.inspect}"
+            resource = model.first(:id => map[:id]) unless map[:id].nil?
+            if resource.nil?
+              resource = model.new(map)
+              unless resource.valid?
+                ::UzuUzu.logger.error resource.errors
+              end
+              resource.save
+            elsif overwrite
+              resource.update(map)
+              unless resource.valid?
+                ::UzuUzu.logger.error resource.errors
+              end
+            end
+          end
+        elsif yaml.kind_of?(Hash)
+          ::UzuUzu.logger.debug "import #{yaml.inspect}"
+          resource = model.first(:id => yaml[:id]) unless yaml[:id].nil?
+          if resource.nil?
+            resource = model.new(yaml)
+            unless resource.valid?
+              ::UzuUzu.logger.error resource.errors
+            end
+            resource.save
+          elsif overwrite
+            resource.update(yaml)
+            unless resource.valid?
+              ::UzuUzu.logger.error resource.errors
+            end
+          end
+        else
+          ::UzuUzu.logger.error "import type miss match #{yaml.inspect}"
+        end
+        ::UzuUzu.logger.debug 'imported yaml'
+      end # import_yaml
+      
+      def import_json(model, json, overwrite=false)
+        # TODO
+      end # import_json
+      
+      def import_xml(model, xml, overwrite=false)
+        # TODO
+      end # import_xml
+      
+      def import_csv(model, csv, overwrite=false)
+        resource = model.first(:id => csv[0])
+        csv.each_with_index do |culumn, index|
+          if resource.nil? || overwrite
+            resource ||= model.new
+            resource.properties.each_with_index do |property, column_no|
+              resource[property.name] = culumn if index = column_no
+            end
+            resource.save
+          end
+        end
+      end # import_csv
+      
+    end # Dm
+  end # Wrapper
+end # UzuUzu

data/lib/uzuuzu-core/wrapper/s3.rb

@@ -0,0 +1,52 @@
+# coding: utf-8
+require 'right_aws'
+
+module UzuUzu
+  module Wrapper
+    class S3
+      #
+      attr_reader :s3
+      #
+      attr_reader :buckets
+      
+      #
+      #
+      #
+      def initialize(env=nil)
+        if env.nil?
+        return
+        end
+        @env = env.dup
+        @buckets_env = @env['buckets'].dup
+        @access_key = @env['access_key'] || @env[:access_key] ||''
+        @secret_key = @env['secret_key'] || @env[:secret_key] ||''
+        
+       params = {}
+       params[:server] = @env['server'] unless @env['server'] .blank?
+       params[:port] = @env['port'] unless @env['port'] .blank?
+       params[:protocol] = @env['protocol'] unless @env['protocol'] .blank?
+       params[:logger] = ::UzuUzu.logger
+        @s3 = ::RightAws::S3.new(@access_key, @secret_key, params)
+        @buckets = {}
+      end # new
+
+      #
+      #
+      #
+      def method_missing(name, *args)
+        name = name.to_s
+        if @buckets_env[name].nil?
+          return nil
+        end
+        if  @buckets[name].nil?
+          params = {}
+          params[:location] = @buckets_env[name]['location'] unless @buckets_env[name]['location'].blank?
+          params = nil if params.blank?
+          @buckets[name] = @s3.bucket(@buckets_env[name]['name'], true, params)
+        end
+        @buckets[name]
+      end # method_missing
+      
+    end # S3
+  end # Wrapper
+end # UzuUzu

data/lib/uzuuzu_core.rb

@@ -9,6 +9,8 @@ require 'tilt'
 require 'uzuuzu-core/ext/object'
 require 'uzuuzu-core/uzuuzu-core'
 require 'uzuuzu-core/wrapper/logger'
+require 'uzuuzu-core/wrapper/dm'
+require 'uzuuzu-core/wrapper/s3'
 require 'uzuuzu-core/wrapper/wrapper'
 require 'uzuuzu-core/application'
 require 'uzuuzu-core/environments'

data/uzuuzu-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{uzuuzu-core}
-  s.version = "0.1.10"
+  s.version = "0.1.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Takuya Kondo"]
-  s.date = %q{2012-01-03}
+  s.date = %q{2012-01-09}
   s.description = %q{uzuuzu core library}
   s.email = %q{takuya_v_v@uzuuzu.jp}
   s.extra_rdoc_files = [
@@ -26,14 +26,15 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "lib/dm-simpledb-adapter.rb",
     "lib/uzuuzu-core/application.rb",
     "lib/uzuuzu-core/controller.rb",
     "lib/uzuuzu-core/controller/index.rb",
     "lib/uzuuzu-core/controller/login/facebook.rb",
     "lib/uzuuzu-core/controller/login/google.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/controller/view/index/error/404.rhtml",
+    "lib/uzuuzu-core/controller/view/index/error/500.rhtml",
     "lib/uzuuzu-core/environments.rb",
     "lib/uzuuzu-core/ext/object.rb",
     "lib/uzuuzu-core/helper.rb",
@@ -62,7 +63,9 @@ Gem::Specification.new do |s|
     "lib/uzuuzu-core/response.rb",
     "lib/uzuuzu-core/tilt.rb",
     "lib/uzuuzu-core/uzuuzu-core.rb",
+    "lib/uzuuzu-core/wrapper/dm.rb",
     "lib/uzuuzu-core/wrapper/logger.rb",
+    "lib/uzuuzu-core/wrapper/s3.rb",
     "lib/uzuuzu-core/wrapper/wrapper.rb",
     "lib/uzuuzu_core.rb",
     "spec/spec_helper.rb",

metadata

@@ -2,7 +2,7 @@
 name: uzuuzu-core
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors: 
 - Takuya Kondo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-03 00:00:00 +09:00
+date: 2012-01-09 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -142,14 +142,15 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- lib/dm-simpledb-adapter.rb
 - lib/uzuuzu-core/application.rb
 - lib/uzuuzu-core/controller.rb
 - lib/uzuuzu-core/controller/index.rb
 - lib/uzuuzu-core/controller/login/facebook.rb
 - lib/uzuuzu-core/controller/login/google.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/controller/view/index/error/404.rhtml
+- lib/uzuuzu-core/controller/view/index/error/500.rhtml
 - lib/uzuuzu-core/environments.rb
 - lib/uzuuzu-core/ext/object.rb
 - lib/uzuuzu-core/helper.rb
@@ -178,7 +179,9 @@ files:
 - lib/uzuuzu-core/response.rb
 - lib/uzuuzu-core/tilt.rb
 - lib/uzuuzu-core/uzuuzu-core.rb
+- lib/uzuuzu-core/wrapper/dm.rb
 - lib/uzuuzu-core/wrapper/logger.rb
+- lib/uzuuzu-core/wrapper/s3.rb
 - lib/uzuuzu-core/wrapper/wrapper.rb
 - lib/uzuuzu_core.rb
 - spec/spec_helper.rb
@@ -198,7 +201,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2546083607633769446
+      hash: -4154038049771216448
       segments: 
       - 0
       version: "0"