uzuuzu-core 0.1.11 → 0.1.13

data/VERSION

@@ -1 +1 @@
-0.1.11
+0.1.13

data/lib/uzuuzu-core/application.rb

@@ -153,8 +153,6 @@ 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
@@ -165,7 +163,6 @@ module UzuUzu
       if response.status == 200 and response.body.blank?
         response.write render || action_return
       end
-
       response.finish
     end # call
 
@@ -199,6 +196,7 @@ module UzuUzu
     def get_class_map(name, controller, route, query)
       _c = controller.const_get(name) if controller.const_defined?(name)
       return nil if _c.nil?
+      return nil if _c.name.index(controller.name).nil?
       _h = find_helper(name, route)
       map = {
         :controller => _c,
@@ -248,31 +246,31 @@ module UzuUzu
       rescue => e
       end
       _controllers.each do |c|
-        _c = c
         _h = nil
         request_paths.each_with_index do |request_path, index|
           break if _c.nil?
           c_str = request_path.camel_case
-          route = "#{request_paths[0...index].join('/')}"
-          if route.blank?
-            route = "#{env['SCRIPT_NAME']}/index"
-            route.blank?
-          else
-            route = "#{env['SCRIPT_NAME']}/#{route}/index"
-          end
-          query = request_paths[index...-1]
-          map = get_class_map('Index', _c, route, query)
-          if map && map[:controller].kind_of?(::Class)
-            classies << map
+          if c_str != 'Index'
+            route = "#{request_paths[0...index].join('/')}"
+            if route.blank?
+              route = "#{env['SCRIPT_NAME']}/index"
+              route.blank?
+            else
+              route = "#{env['SCRIPT_NAME']}/#{route}/index"
+            end
+            query = request_paths[index...-1]
+            map = get_class_map('Index', _c, route, query)
+            if map && map[:controller].kind_of?(::Class)
+              classies << map
+            end
           end
-          next if c_str == 'Index' || c_str.blank?
-          route = "#{env['SCRIPT_NAME']}/#{request_paths[0...index].join('/')}"
+          next if 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)
           _c = nil
           if map
             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

data/lib/uzuuzu-core/environments.rb

@@ -86,7 +86,7 @@ module UzuUzu
     
     def logger
       if @logger.nil?
-        env = @config['logger'].dup unless @config.nil?
+        env = @config['logger'] unless @config.nil?
         @logger = Wrapper::Logger.new(env || {}).logger
       end
       @logger
@@ -94,7 +94,7 @@ module UzuUzu
 
     def dm
       if @dm.nil?
-        env = @config['dm'].dup unless @config.nil?
+        env = @config['dm'] unless @config.nil?
         @dm = Wrapper::Dm.new(env || {})
       end
       @dm
@@ -102,7 +102,7 @@ module UzuUzu
 
     def s3
       if @s3.nil?
-        env = @config['s3'].dup unless @config.nil?
+        env = @config['s3'] unless @config.nil?
         @s3 = Wrapper::S3.new(env || {})
       end
       @s3
@@ -110,7 +110,7 @@ module UzuUzu
 
     def memcache
       if @memcache.nil?
-        env = @config['memcache'].dup unless @config.nil?
+        env = @config['memcache'] unless @config.nil?
         @memcache = Wrapper::Wrapper.new('memcache', env || {}).wrapper
         @memcache ||= {}
       end
@@ -119,7 +119,7 @@ module UzuUzu
     
     def rack_session
       if @rack_session.nil?
-        env = @config['rack_session'].dup unless @config.nil?
+        env = @config['rack_session'] unless @config.nil?
         @rack_session = Wrapper::Wrapper.new('rack_session', env || {}).wrapper
       end
       @rack_session

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

@@ -25,11 +25,19 @@ module UzuUzu
       #
       #
       #
-      def render(view, options={}, locals={}, &block)
+      def render(view=nil, options={}, locals={}, &block)
+        view = helper.action if view.blank?
         view_path = nil
         catch(:view_finded) do
-          _view_path = "#{application.view_root}#{helper.route}"
-          p _view_path
+          route = helper.route
+          if /index$/ =~ route 
+            route = route.split('/')[0...-1].join('/')
+          end
+          if view[0] == '/'
+            _view_path = "#{application.view_root}#{view}"
+          else
+            _view_path = "#{application.view_root}#{route}/#{view}"
+          end
           ::Tilt.mappings.each_key do |key|
             _path = "#{_view_path}.#{key}"
             if ::File.file?(_path)
@@ -37,6 +45,7 @@ module UzuUzu
               throw :view_finded
             end
           end
+          return nil
         end
         if view_path.blank?
           return nil

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

@@ -28,6 +28,9 @@ module UzuUzu
       
       def url_for(*args)
         route_string = route.clone
+        if /index$/ =~ route_string 
+          route_string = route_string.split('/')[0...-1].join('/')
+        end
         if args[-1].kind_of?(Hash)
           query = query_string(args.pop)
         end

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

@@ -16,12 +16,13 @@ module UzuUzu
         if env.nil?
         return
         end
+        @env = env.clone
 
-        unless env['logger'].nil?
-          DataMapper::logger = ::UzuUzu::Wrapper::Logger.new(env['logger']).logger
+        unless @env['logger'].nil?
+          DataMapper::logger = ::UzuUzu::Wrapper::Logger.new(@env['logger']).logger
         end
         @repositories = []
-        env.each do |key, value|
+        @env.each do |key, value|
           @repositories.push key.to_sym
           if value['adapter']
             @adapter = value['adapter']
@@ -37,7 +38,7 @@ module UzuUzu
               end
             end
           end
-        end # repositories_env.each
+        end # env.each
       end # new
 
       #

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

@@ -15,11 +15,12 @@ module UzuUzu
         unless env && env['adapter']
           return
         end
+        @env = env.clone
         begin
-          adapter = env['adapter']
+          adapter = @env['adapter']
           require "uzuuzu-core/#{wrapper}/#{adapter}"
           adapter_class = eval("::UzuUzu::#{wrapper.camel_case}::#{adapter.camel_case}")
-          @wrapper = adapter_class.new(env)
+          @wrapper = adapter_class.new(@env)
         rescue => e
           $stderr.puts "#{wrapper} create error"
           $stderr.puts e

data/uzuuzu-core.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{uzuuzu-core}
-  s.version = "0.1.11"
+  s.version = "0.1.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Takuya Kondo"]

metadata

@@ -2,7 +2,7 @@
 name: uzuuzu-core
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.11
+  version: 0.1.13
 platform: ruby
 authors: 
 - Takuya Kondo
@@ -201,7 +201,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4154038049771216448
+      hash: -2416727837931408106
       segments: 
       - 0
       version: "0"