uzuuzu-core 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/uzuuzu-core/application.rb

@@ -133,22 +133,23 @@ module UzuUzu
       is_send = false
       action_return = nil
       render = nil
+      
       classies.reverse.each do |map|
         controller_class = map[:controller]
         helper_module = map[:helper]
         query = map[:query]
         route = map[:route]
         controller = controller_class.new
+        action, query = find_action(controller, query)
+        next if action.blank?
         controller.extend(::UzuUzu::Controller)
         helper = Helper::Helper.new
         helpers.each do |h|
           helper.extend(h)
         end
+        p map
         helper.extend(helper_module) if helper_module.kind_of?(::Module)
-
-        action, query = find_action(controller, query)
         di_thread(request, response, controller, helper,  action, query, route)
-        next if action.blank?
         is_send = true
         action_return = send_action(request, response, controller, action, query)
         if response.body.blank?
@@ -213,14 +214,20 @@ module UzuUzu
     #
     #
     def find_helper(name, route)
-      routes = route.split('/').map{|a| a.camel_case}
-      helper_str = "#{helper_root.camel_case}#{routes.join('::')}"
+      routes = route.split('/').map { |a| a.camel_case }
       if routes.blank? || name != routes[-1]
-        helper_str += "::#{name.camel_case}"
+        routes << "#{name.camel_case}"
+      end
+      _base = "::#{@name.to_s.camel_case}"
+      _base = '' if @name == :uzuuzu || @name == 'uzuuzu'
+      helper = eval("#{_base}::#{helper_root.camel_case}")
+      routes.each do |const_name|
+        helper = helper.const_get(const_name) if helper.const_defined?(const_name)
       end
-      helper = eval(helper_str)
       helper
+    rescue LoadError => e
     rescue NameError => e
+    rescue => e
     end # find_helper
     
     #

data/lib/uzuuzu-core/controller/login/twitter.rb

@@ -13,7 +13,7 @@ module UzuUzu
           @config = Environments.current.config['twitter']
           response.server_error if @config.blank?
           if session[:login_user_id]
-            redirect request.referrer || '/'
+            response.redirect request.referrer || '/'
           end
           if session[:twitter_request_token].blank?
             request_token

data/uzuuzu-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{uzuuzu-core}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Takuya Kondo"]
-  s.date = %q{2011-12-23}
+  s.date = %q{2011-12-24}
   s.description = %q{uzuuzu core library}
   s.email = %q{takuya.v3v@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -2,7 +2,7 @@
 name: uzuuzu-core
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Takuya Kondo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-23 00:00:00 +09:00
+date: 2011-12-24 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -196,7 +196,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2659215679876593747
+      hash: -2603983306622906813
       segments: 
       - 0
       version: "0"