uzuuzu-core 0.1.0 → 0.1.1

data/Gemfile

@@ -17,3 +17,4 @@ gem 'extlib'
 gem 'ruby-openid'
 gem 'oauth'
 gem 'tilt'
+gem 'erubis'

data/Gemfile.lock

@@ -2,6 +2,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.3)
+    erubis (2.7.0)
     extlib (0.9.15)
     git (1.2.5)
     jeweler (1.6.4)
@@ -28,6 +29,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler
+  erubis
   extlib
   jeweler
   oauth

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/uzuuzu-core/application.rb

@@ -139,6 +139,7 @@ module UzuUzu
         query = map[:query]
         route = map[:route]
         controller = controller_class.new
+        controller.extend(::UzuUzu::Controller)
         helper = Helper::Helper.new
         helpers.each do |h|
           helper.extend(h)
@@ -167,31 +168,29 @@ module UzuUzu
     end # call
 
     def require_noerror(path)
-      begin
-        require path
-      rescue LoadError => e
-      end
+      require path
+    rescue LoadError => e
     end
     #
     #
     #
     def auto_require(env)
-      require_base = "#{@name.to_s}/"
-      require_base = '' if @name == :uzuuzu
+      require_base = "/#{@name.to_s}"
+      require_base = '' if @name == :uzuuzu || @name == '' || @name.blank?
       array = []
       if env['PATH_INFO'] == '/'
-        require_noerror "#{controller_root}/#{require_base}index"
-        require_noerror "#{helper_root}/#{require_base}index"
+        require_noerror "#{controller_root}#{require_base}/index"
+        require_noerror "#{helper_root}#{require_base}/index"
       end
       env['PATH_INFO'].split('/').each do |path|
         array << path
         begin
           if array.size > 1
-            require_noerror "#{controller_root}/#{require_base}#{array.join('/')}/index"
-            require_noerror "#{helper_root}/#{require_base}#{array.join('/')}/index"
+            require_noerror "#{controller_root}#{require_base}#{array.join('/')}/index"
+            require_noerror "#{helper_root}#{require_base}#{array.join('/')}/index"
           end
-          require_noerror "#{controller_root}/#{require_base}#{array.join('/')}"
-          require_noerror "#{helper_root}/#{require_base}#{array.join('/')}"
+          require_noerror "#{controller_root}#{require_base}#{array.join('/')}"
+          require_noerror "#{helper_root}#{require_base}#{array.join('/')}"
         rescue
         end
       end
@@ -207,13 +206,21 @@ module UzuUzu
         :route => route,
         :query => query
       }
+    rescue NameError => e
     end
     
     #
     #
     #
     def find_helper(name, route)
-      
+      routes = route.split('/').map{|a| a.camel_case}
+      helper_str = "#{helper_root.camel_case}#{routes.join('::')}"
+      if routes.blank? || name != routes[-1]
+        helper_str += "::#{name.camel_case}"
+      end
+      helper = eval(helper_str)
+      helper
+    rescue NameError => e
     end # find_helper
     
     #
@@ -263,7 +270,7 @@ module UzuUzu
             classies << map
           end
           _c = map[:controller] if map
-          if _c.kind_of?(::Class) || _c.kind_of?(::Module)
+          unless _c.kind_of?(::Class) || _c.kind_of?(::Module)
             break
           end
         end
@@ -299,10 +306,6 @@ module UzuUzu
         action = 'index'
       end
       
-      #p controller
-      #p controller.methods.sort
-      #p action
-      #p query[0]
       unless action.nil?
         arity = controller.method(action).arity
         owner = controller.method(action).owner

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

@@ -3,7 +3,10 @@
 module UzuUzu
   module Controller
     class Index
-      include ::UzuUzu::Controller
+      
+      def index
+        
+      end
       
       def error(code)
         response.respond(helper.render_file(__DIR__("view/error/#{code}.rhtml")))

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

@@ -4,8 +4,10 @@ require 'oauth'
 module UzuUzu
   module Controller
     module Login
+      #
+      #
+      #
       class Twitter
-        include ::UzuUzu::Controller
         
         def index
           @config = Environments.current.config['twitter']
@@ -13,8 +15,8 @@ module UzuUzu
           if session[:login_user_id]
             redirect request.referrer || '/'
           end
-          if session[:twitter_request_token].blank? || session[:twitter_request_token_secret].blank?
-            request_token(name)
+          if session[:twitter_request_token].blank?
+            request_token
           end
           access_token
           response.redirect session[:referer] || '/'
@@ -23,27 +25,35 @@ module UzuUzu
         private
         def request_token
           session[:referer] = request.referrer || '/'
-          twitter_consumer = OAuth::Consumer.new(@config['consumer_key'], @config['consumer_secret'], :site => "http://twitter.com")
-          unless twitter_consumer
-            response.server_error
-          end
-  
-          request_token = twitter_consumer.get_request_token
+          twitter_consumer = OAuth::Consumer.new(
+             @config['consumer_key'],
+             @config['consumer_secret'],
+             :site => "http://twitter.com",
+             :request_token_url => 'https://api.twitter.com/oauth/request_token',
+             :autorize_url => 'https://api.twitter.com/oauth/authorize',
+             :access_token_url => 'https://api.twitter.com/oauth/access_token',
+             :oauth_callback => "#{helper.root_uri}#{helper.r}"
+          )
+          request_token = twitter_consumer.get_request_token()
           session[:twitter_request_token] = request_token.token
-          session[:twitter_request_token_secret] = request_token.secret
           
-          response.redirect request_token.authorize_url
-        end
+          response.redirect request_token.authorize_url(:oauth_callback => "#{helper.root_uri}#{helper.r}")
+        rescue
+          response.server_error
+        end # request_token
         
         def access_token
-          twitter_consumer = OAuth::Consumer.new(@config['consumer_key'], @config['consumer_secret'], :site => "http://twitter.com")
-          unless twitter_consumer
-            response.server_error
-          end
+          twitter_consumer = OAuth::Consumer.new(
+            @config['consumer_key'],
+            @config['consumer_secret'],
+            :site => "http://twitter.com",
+            :request_token_url => 'https://api.twitter.com/oauth/request_token',
+            :autorize_url => 'https://api.twitter.com/oauth/authorize',
+            :access_token_url => 'https://api.twitter.com/oauth/access_token',
+          )
           request_token = OAuth::RequestToken.new(
-            twitter,
-            session[:twitter_request_token],
-            session[:twitter_request_token_secret]
+            twitter_consumer,
+            session[:twitter_request_token]
           )
           access_token = request_token.get_access_token(
             {},
@@ -53,14 +63,16 @@ module UzuUzu
           session[:twitter_access_token] = access_token.token
           session[:twitter_access_token_secret] = access_token.secret
           session.delete(:twitter_request_token)
-          session.delete(:twitter_request_token_secret)
           
           session[:twitter_user_id] = access_token.params[:user_id]
           session[:login_user_id] = access_token.params[:screen_name]
           session[:login_name] = access_token.params[:screen_name]
           session[:login_domain] = 'twitter'
-        end
-      end # Oauth
+        rescue => e
+          response.server_error
+        end # access_token
+        
+      end # Twitter
     end # Login
   end # Controller
-end # UzuUzuCms
+end # UzuUzu

data/lib/uzuuzu-core/environments.rb

@@ -76,7 +76,7 @@ module UzuUzu
 
     def config
       return {} if @config.nil?
-      @config['config'] || {}
+      @config || {}
     end
     
     def logger

data/uzuuzu-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{uzuuzu-core}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Takuya Kondo"]
-  s.date = %q{2011-12-18}
+  s.date = %q{2011-12-23}
   s.description = %q{uzuuzu core library}
   s.email = %q{takuya.v3v@gmail.com}
   s.extra_rdoc_files = [
@@ -29,7 +29,6 @@ Gem::Specification.new do |s|
     "lib/uzuuzu-core/application.rb",
     "lib/uzuuzu-core/controller.rb",
     "lib/uzuuzu-core/controller/index.rb",
-    "lib/uzuuzu-core/controller/login/openid.rb",
     "lib/uzuuzu-core/controller/login/twitter.rb",
     "lib/uzuuzu-core/controller/view/error/404.rhtml",
     "lib/uzuuzu-core/controller/view/error/500.rhtml",
@@ -83,6 +82,7 @@ Gem::Specification.new do |s|
       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<erubis>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
@@ -93,6 +93,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<ruby-openid>, [">= 0"])
       s.add_dependency(%q<oauth>, [">= 0"])
       s.add_dependency(%q<tilt>, [">= 0"])
+      s.add_dependency(%q<erubis>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
@@ -104,6 +105,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<ruby-openid>, [">= 0"])
     s.add_dependency(%q<oauth>, [">= 0"])
     s.add_dependency(%q<tilt>, [">= 0"])
+    s.add_dependency(%q<erubis>, [">= 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.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Takuya Kondo
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-18 00:00:00 +09:00
+date: 2011-12-23 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,18 +69,18 @@ dependencies:
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: erubis
   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: bundler
+  name: rspec
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -91,7 +91,7 @@ dependencies:
   prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: bundler
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -102,7 +102,7 @@ dependencies:
   prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: rcov
+  name: jeweler
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -112,6 +112,17 @@ 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: []
@@ -134,7 +145,6 @@ files:
 - lib/uzuuzu-core/application.rb
 - lib/uzuuzu-core/controller.rb
 - lib/uzuuzu-core/controller/index.rb
-- lib/uzuuzu-core/controller/login/openid.rb
 - lib/uzuuzu-core/controller/login/twitter.rb
 - lib/uzuuzu-core/controller/view/error/404.rhtml
 - lib/uzuuzu-core/controller/view/error/500.rhtml
@@ -186,7 +196,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2970858063230439040
+      hash: 2659215679876593747
       segments: 
       - 0
       version: "0"

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

@@ -1,87 +0,0 @@
-# coding: utf-8
-
-require 'openid'
-require 'openid/store/filesystem'
-require 'openid/extensions/pape'
-require 'openid/extensions/sreg'
-require 'openid/store/memcache'
-
-module UzuUzu
-  module Controller
-    #
-    #
-    #
-    class Openid
-      include ::UzuUzu::Controller
-      
-      # need params['domain']
-      def index
-        if session[:openid_domain].blank? or session[:openid_entry].blank?
-          openid_begin
-        elsif session[:openid_domain] and session[:openid_entry]
-          openid_complete
-        else
-          response.redirect request.referrer || "/"
-        end
-      end
-      
-      def openid_begin
-        domain = request.params['domain']
-        response.redirect request.referrer || "/" if domain.to_s.empty?
-        session[:openid_domain] = domain
-        session[:openid_entry] = request.referrer || "/"
-
-        openid_request = openid_consumer.begin(domain)
-
-        papereq = ::OpenID::PAPE::Request.new
-        papereq.add_policy_uri(::OpenID::PAPE::AUTH_PHISHING_RESISTANT)
-        papereq.max_auth_age = 2*60*60
-        openid_request.add_extension(papereq)
-
-        sregreq = ::OpenID::SReg::Request.new
-        sregreq.request_fields(['fullname', 'nickname', 'dob', 'email',
-                               'gender', 'postcode', 'country', 'language',
-                               'timezone'])
-        openid_request.add_extension(sregreq)
-        openid_request.return_to_args['did_pape'] = 'y'
-
-        root      = helper.root_uri
-        return_to = "#{helper.root_uri}#{helper.r(:openid_complete)}"
-        immediate = false
-
-        if openid_request.send_redirect?(root, return_to, immediate)
-          redirect_url = openid_request.redirect_url(root, return_to, immediate)
-          response.redirect redirect_url
-        else
-          # what the hell is @form_text ?
-        end
-      rescue ::OpenID::OpenIDError => ex
-        response.server_error
-      end
-      
-      def openid_complete
-        openid_response = openid_consumer.complete(request.params, request.url)
-
-        case openid_response.status
-        when ::OpenID::Consumer::FAILURE
-        when ::OpenID::Consumer::SUCCESS
-          # Backwards compatibility
-          session[:openid_identity] = openid_response.identity_url
-          session[:openid_sreg] = ::OpenID::SReg::Response.from_success_response(openid_response)
-        end
-        openid_entry = session[:openid_entry]
-        session.delete(:openid_entry)
-        response.redirect openid_entry
-      end
-
-
-      private
-
-      # use memcache
-      def openid_consumer
-        _memcache = ::OpenID::Store::Memcache.new(memcache)
-        ::OpenID::Consumer.new(session, _memcache)
-      end
-    end # Openid
-  end # Controller
-end # UzuUzu