pakyow-core 0.6.1 → 0.6.3.1

data/pakyow-core/CHANGES

@@ -1,3 +1,21 @@
+= 0.6.3 / 2011-09-13
+
+  * Fixes several load path issues
+  * Fixes gemspecs so gem can be built/used from anywhere
+  * Fixes inconsistency with with request.params having string and symbol keys
+  * Fixes loading of middleware when staging application (simplifies rackup)
+
+= 0.6.2 / 2011-08-20
+
+  * Fixes issue running pakyow server on Windows
+  * Fixes several issues related to error handlers
+  * Fixes an issue when using alphanumeric ids in restful routes
+  * JRuby Support
+
+= 0.6.1 / 2011-08-20
+
+  * Fixes gemspec problem
+
 = 0.6.0 / 2011-08-20
 
  * Initial gem release of 0.6.0 codebase

data/pakyow-core/lib/core/application.rb

@@ -6,7 +6,11 @@ module Pakyow
       # Sets the path to the application file so it can be reloaded later.
       #
       def inherited(subclass)
-        Pakyow::Configuration::App.application_path = caller[0].split(':')[0]
+        Pakyow::Configuration::App.application_path = parse_path_from_caller(caller[0])
+      end
+      
+      def parse_path_from_caller(caller)
+        caller.match(/^(.+)(:?:\d+(:?:in `.+')?$)/)[1]
       end
       
       # Runs the application. Accepts the environment(s) to run, for example:
@@ -14,15 +18,10 @@ module Pakyow
       # run([:development, :staging])
       #
       def run(*args)
-        self.load_config args.empty? || args.first.nil? ? [Configuration::Base.app.default_environment] : args
         return if running?
-        
         @running = true
         
-        builder = Rack::Builder.new
-        builder.use(Rack::MethodOverride)
-        builder.instance_eval(&self.middleware_proc) if self.middleware_proc
-        builder.run(self.new)
+        self.builder.run(self.prepare(*args))
         detect_handler.run(builder, :Host => Pakyow::Configuration::Base.server.host, :Port => Pakyow::Configuration::Base.server.port)
       end
       
@@ -30,12 +29,18 @@ module Pakyow
       # not started. Accepts the same arguments as #run.
       #
       def stage(*args)
-        load_config args.empty? || args.first.nil? ? [Configuration::Base.app.default_environment] : args
         return if staged?
-        
-        app = self.new
-        
         @staged = true
+        
+        prepare(*args)
+      end
+      
+      def builder
+        @builder ||= Rack::Builder.new
+      end
+      
+      def prepared?
+        @prepared
       end
       
       # Returns true if the application is running.
@@ -100,6 +105,21 @@ module Pakyow
       
       protected
       
+      # Prepares the application for running or staging and returns an instance
+      # of the application.
+      def prepare(*args)
+        self.load_config args.empty? || args.first.nil? ? [Configuration::Base.app.default_environment] : args
+        return if prepared?
+        
+        self.builder.use(Rack::MethodOverride)
+        self.builder.instance_eval(&self.middleware_proc) if self.middleware_proc
+        
+        @prepared = true
+        
+        $:.unshift(Dir.pwd) unless $:.include? Dir.pwd
+        return self.new
+      end
+      
       def load_config(args)
         if self.configurations
           args << Configuration::Base.app.default_environment if args.empty?
@@ -178,9 +198,8 @@ module Pakyow
         self.request.format = ((format && (format[format.length - 1, 1] == '/')) ? format[0, format.length - 1] : format)
         catch(:halt) do
           rhs, packet = @route_store.get_block(just_the_path, self.request.method)
-          packet[:vars].each_pair { |var, val|
-            request.params[var] = val
-          }
+          request.params.merge!(HashUtils.strhash(packet[:vars]))
+
           self.request.route_spec = packet[:data][:route_spec] if packet[:data]
           restful_info = packet[:data][:restful] if packet[:data]
           self.request.restful = restful_info
@@ -210,10 +229,11 @@ module Pakyow
       Log.enter "[500] #{error}\n"
       Log.enter error.backtrace.join("\n") + "\n\n"
       
-      self.response = Rack::Response.new
+      # self.response = Rack::Response.new
       
       if Configuration::Base.app.errors_in_browser
         # Show errors in browser
+        self.response.body = []
         self.response.body << "<h4>#{CGI.escapeHTML(error.to_s)}</h4>"
         self.response.body << error.backtrace.join("<br />")
       end
@@ -322,7 +342,7 @@ module Pakyow
           end
           
           # Create the route
-          register_route(action_url, nil, opts[:method], controller, opts[:action], true)
+          register_route(action_url, nil, opts[:method], controller, opts[:action], :restful)
           
           # Store url for later use (currently used by Binder#action)
           @restful_routes[model][opts[:action]] = action_url if model
@@ -333,13 +353,13 @@ module Pakyow
     end
     
     @@restful_actions = [
-      { :action => :index, :method => :get },
+      { :action => :edit, :method => :get, :url_suffix => 'edit/:id' },
       { :action => :show, :method => :get, :url_suffix => ':id' },
       { :action => :new, :method => :get, :url_suffix => 'new' },
-      { :action => :create, :method => :post },
-      { :action => :edit, :method => :get, :url_suffix => 'edit/:id' },
       { :action => :update, :method => :put, :url_suffix => ':id' },
-      { :action => :delete, :method => :delete, :url_suffix => ':id' }
+      { :action => :delete, :method => :delete, :url_suffix => ':id' },
+      { :action => :index, :method => :get },
+      { :action => :create, :method => :post }
     ]
     
     protected
@@ -350,7 +370,7 @@ module Pakyow
     
     # Handles route registration.
     #
-    def register_route(route, block, method, controller = nil, action = nil, restful = false)
+    def register_route(route, block, method, controller = nil, action = nil, type = :user)
       if controller
         controller = eval(controller.to_s)
         action ||= Configuration::Base.app.default_action
@@ -364,8 +384,8 @@ module Pakyow
         }
       end
 
-      data = {:route_spec=>route}
-      if restful
+      data = {:route_type=>type, :route_spec=>route}
+      if type == :restful
         data[:restful] = {:restful_action=>action}
       end
       @route_store.add_route(route, block, method, data)
@@ -400,11 +420,13 @@ module Pakyow
       return unless handler = self.class.error_handlers[code]
       
       if handler.is_a? Proc
-        handler.call
+        Pakyow.app.instance_eval(&handler)
       else
         c = eval(handler[:controller].to_s).new
         c.send(handler[:action])
       end
+      
+      self.response.body = [self.presenter.content]
     end
     
     def set_cookies

data/pakyow-core/lib/core/configuration/base.rb

@@ -21,9 +21,8 @@ module Pakyow
           klass.instance_variables.each do |var|
             # Assumes application_path shouldn't be reset, since it's only set
             # once when Pakyow::Application is inherited.
-            next if var == '@application_path'
-            
-            klass.send("#{var.gsub('@', '')}=", nil)
+            next if var.to_sym == :'@application_path'
+            klass.send("#{var.to_s.gsub('@', '')}=", nil)
           end
         end
       end

data/pakyow-core/lib/core/route_store.rb

@@ -18,20 +18,29 @@ module Pakyow
 
     def add_route(route_spec, block, method, data)
       route_spec = normalize_route(route_spec)
-      route_to_match, vars = extract_route_vars(route_spec)
-      if route_to_match.class == String
+      route_to_match, vars = build_route_matcher(route_spec, data)
+      
+      if route_to_match.is_a?(String)
         @store[:string][method][route_to_match]={:block => block,
                                                  :order => @order,
                                                  :data => data}
         @order = @order + 1
-      elsif route_to_match.class == Regexp
+      elsif route_to_match.is_a?(Regexp)
         @store[:regex][method] << {:regex => route_to_match,
                                    :block => block,
                                    :order => @order,
                                    :vars => vars,
                                    :data => data}
         @order = @order + 1
+      else
+        if Configuration::Base.app.dev_mode == true
+          Log.warn("Unsupported route spec class. (#{route_spec.class})")
+        else
+          Log.warn("Unsupported route spec class. (#{route_spec.class})")
+          raise "Unsupported route spec class. (#{route_spec.class})"
+        end
       end
+
     end
 
     # returns block, {:vars=>{:var=>matched_value, ...}, :data=>data}
@@ -74,34 +83,80 @@ module Pakyow
     private
 
     # Returns a regex and an array of variable info
-    def extract_route_vars(route_spec)
+    def build_route_matcher(route_spec, data)
       return route_spec, [] if route_spec.is_a?(Regexp)
 
-      unless route_spec[0,1] == ':' || route_spec.index('/:')
-        return route_spec, []
+      if route_spec.is_a?(String)
+        # check for vars
+        return route_spec, [] unless route_spec[0,1] == ':' || route_spec.index('/:')
+        # we have vars
+        if data[:route_type] == :user
+          return build_user_route_matcher(route_spec)
+        elsif data[:route_type] == :restful
+          return build_restful_route_matcher(route_spec, data)
+        else
+          raise "Unknown route type. (#{data[:route_type]})"
+        end
       end
 
+      return route_spec, []
+    end
+
+    def build_user_route_matcher(route_spec)
       vars = []
-      position_counter = 0
+      position_counter = 1
       regex_route = route_spec
-      route_spec.split('/').each_with_index do |segment, i|
+      route_segments = route_spec.split('/')
+      route_segments.each_with_index { |segment, i|
         if segment.include?(':')
-          position_counter += 1
-          vars << { :position => position_counter, :var => segment.gsub(':', '').to_sym }
-          regex_route = regex_route.gsub(segment, '([^new/]+)')
+          vars << { :position => position_counter, :var => segment.gsub(':', '') }
+          if i == route_segments.length-1 then
+            regex_route = regex_route.sub(segment, '((\w|[-.~:@!$\'\(\)\*\+,;])*)')
+            position_counter += 2
+          else
+            regex_route = regex_route.sub(segment, '((\w|[-.~:@!$\'\(\)\*\+,;])*)')
+            position_counter += 2
+          end
         end
-      end
-
+      }
       reg = Regexp.new("^#{regex_route}$")
+      return reg, vars
+    end
+
+    def build_restful_route_matcher(route_spec, data)
+      build_user_route_matcher(route_spec) unless data[:restful][:restful_action] == :show
 
+      #special case for restful show route, can't match 'new' on last var
+      vars = []
+      position_counter = 1
+      regex_route = route_spec
+      route_segments = route_spec.split('/')
+      route_segments.each_with_index { |segment, i|
+        if segment.include?(':')
+          vars << { :position => position_counter, :var => segment.gsub(':', '') }
+          if i == route_segments.length-1 then
+            regex_route = regex_route.sub(segment, '((?!(new\b|.*?\/))(\w|[-.~:@!$\'\(\)\*\+,;])*)')
+            position_counter += 1
+          else
+            regex_route = regex_route.sub(segment, '((\w|[-.~:@!$\'\(\)\*\+,;])*)')
+            position_counter += 2
+          end
+        end
+      }
+      reg = Regexp.new("^#{regex_route}$")
       return reg, vars
     end
 
     # remove leading/trailing forward slashes
     def normalize_route(route_spec)
       return route_spec if route_spec.is_a?(Regexp)
-      route_spec = route_spec[1, route_spec.length - 1] if route_spec[0, 1] == '/'
-      route_spec = route_spec[0, route_spec.length - 1] if route_spec[route_spec.length - 1, 1] == '/'
+
+      if route_spec.is_a?(String) then
+        route_spec = route_spec[1, route_spec.length - 1] if route_spec[0, 1] == '/'
+        route_spec = route_spec[0, route_spec.length - 1] if route_spec[route_spec.length - 1, 1] == '/'
+        route_spec
+      end
+
       route_spec
     end
 

data/pakyow-core/lib/generators/pakyow/app/templates/config.ru

@@ -1,10 +1,4 @@
-require 'config/application'
-PakyowApplication::Application.stage(:development)
+env = ENV['RACK_ENV'] || 'production'
 
-app = Rack::Builder.new do
-  # Needed for Pakyow to work
-  use Rack::MethodOverride
-  run PakyowApplication::Application.new
-end.to_app
-
-run(app)
+require File.expand_path('../config/application', __FILE__)
+run PakyowApplication::Application.stage(env)

data/pakyow-core/lib/generators/pakyow/app/templates/rakefile

@@ -1,5 +1,5 @@
 env = ARGV[1] || 'development'
 env = env.split('=')[1] || env
 
-require 'config/application'
+require File.expand_path('../config/application', __FILE__)
 PakyowApplication::Application.stage(env.to_sym)

metadata

@@ -1,21 +1,24 @@
 --- !ruby/object:Gem::Specification 
 name: pakyow-core
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 113
   prerelease: 
   segments: 
   - 0
   - 6
+  - 3
   - 1
-  version: 0.6.1
+  version: 0.6.3.1
 platform: ruby
 authors: 
 - Bryan Powell
+- Bret Young
 autorequire: 
 bindir: pakyow-core/bin
 cert_chain: []
 
-date: 2011-08-20 00:00:00 Z
+date: 2011-09-13 00:00:00 -05:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -23,13 +26,13 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 9
         segments: 
         - 1
-        - 2
-        version: "1.2"
+        - 3
+        version: "1.3"
   type: :runtime
   version_requirements: *id001
 description: pakyow-core
@@ -65,7 +68,6 @@ files:
 - pakyow-core/lib/generators/pakyow/app/templates/app/views/pakyow.html
 - pakyow-core/lib/generators/pakyow/app/templates/config/application.rb
 - pakyow-core/lib/generators/pakyow/app/templates/config.ru
-- pakyow-core/lib/generators/pakyow/app/templates/logs/requests.log
 - pakyow-core/lib/generators/pakyow/app/templates/public/favicon.ico
 - pakyow-core/lib/generators/pakyow/app/templates/rakefile
 - pakyow-core/lib/generators/pakyow/app/templates/README
@@ -74,6 +76,7 @@ files:
 - pakyow-core/lib/utils/hash.rb
 - pakyow-core/lib/utils/string.rb
 - pakyow-core/bin/pakyow
+has_rdoc: true
 homepage: http://pakyow.com
 licenses: []
 
@@ -105,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: pakyow-core
-rubygems_version: 1.8.8
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: pakyow-core