pakyow-core 0.7.2 → 0.8rc1

metadata

@@ -1,62 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pakyow-core
-version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: 
-  segments: 
-  - 0
-  - 7
-  - 2
-  version: 0.7.2
+version: !ruby/object:Gem::Version
+  version: 0.8rc1
+  prerelease: 3
 platform: ruby
-authors: 
+authors:
 - Bryan Powell
 - Bret Young
 autorequire: 
 bindir: pakyow-core/bin
 cert_chain: []
-
-date: 2012-02-29 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-02-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rack
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: turn
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 2
-        - 11
-        version: "2.11"
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
 description: pakyow-core
 email: bryan@metabahn.com
-executables: 
+executables:
 - pakyow
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - pakyow-core/CHANGES
 - pakyow-core/README
 - pakyow-core/MIT-LICENSE
@@ -72,25 +66,33 @@ files:
 - pakyow-core/lib/core/configuration/app.rb
 - pakyow-core/lib/core/configuration/base.rb
 - pakyow-core/lib/core/configuration/server.rb
+- pakyow-core/lib/core/fn_context.rb
 - pakyow-core/lib/core/helpers.rb
 - pakyow-core/lib/core/loader.rb
 - pakyow-core/lib/core/log.rb
-- pakyow-core/lib/core/logger.rb
+- pakyow-core/lib/core/middleware/logger.rb
+- pakyow-core/lib/core/middleware/not_found.rb
+- pakyow-core/lib/core/middleware/presenter.rb
+- pakyow-core/lib/core/middleware/reloader.rb
+- pakyow-core/lib/core/middleware/router.rb
+- pakyow-core/lib/core/middleware/setup.rb
+- pakyow-core/lib/core/middleware/static.rb
 - pakyow-core/lib/core/presenter_base.rb
-- pakyow-core/lib/core/reloader.rb
 - pakyow-core/lib/core/request.rb
-- pakyow-core/lib/core/route_store.rb
-- pakyow-core/lib/core/static.rb
+- pakyow-core/lib/core/response.rb
+- pakyow-core/lib/core/route_lookup.rb
+- pakyow-core/lib/core/route_set.rb
+- pakyow-core/lib/core/route_template.rb
+- pakyow-core/lib/core/route_template_defaults.rb
+- pakyow-core/lib/core/router.rb
 - pakyow-core/lib/generators/pakyow/app/app_generator.rb
-- pakyow-core/lib/generators/pakyow/app/templates/app/lib/application_controller.rb
-- pakyow-core/lib/generators/pakyow/app/templates/app/views/main.html
-- 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/app.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
+- pakyow-core/lib/generators/pakyow/app/templates/views/main.html
+- pakyow-core/lib/generators/pakyow/app/templates/views/pakyow.html
 - pakyow-core/lib/pakyow-core.rb
 - pakyow-core/lib/utils/dir.rb
 - pakyow-core/lib/utils/hash.rb
@@ -98,38 +100,26 @@ files:
 - pakyow-core/bin/pakyow
 homepage: http://pakyow.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - pakyow-core/lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: pakyow-core
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: pakyow-core
 test_files: []
-

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

@@ -1,33 +0,0 @@
-module Pakyow
-  class Logger
-    def initialize(app)
-      @app = app
-    end
-    
-    def call(env)
-      began_at = Time.now
-      
-      Log.enter "Processing #{env['PATH_INFO']} (#{env['REMOTE_ADDR']} at #{began_at}) [#{env['REQUEST_METHOD']}]"
-      
-      result = nil
-      
-      if error = catch(:error) { 
-                  result = @app.call(env)
-                  nil 
-                }
-        Log.enter "[500] #{error}\n"
-        Log.enter error.backtrace.join("\n") + "\n\n"
-        
-        result = Pakyow.app.response.finish
-      end
-      
-      ended_at = Time.now.to_f
-      difference = ((ended_at - began_at.to_f) * 1000).to_f
-
-      Log.enter "Completed in #{difference}ms | #{Pakyow.app.response.status} | [#{Pakyow.app.request.url}]"
-      Log.enter
-      
-      result
-    end
-  end
-end

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

@@ -1,12 +0,0 @@
-module Pakyow
-  class Reloader
-    def initialize(app)
-      @app = app
-    end
-    
-    def call(env)
-      @app.reload
-      @app.call(env)
-    end
-  end
-end

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

@@ -1,220 +0,0 @@
-module Pakyow
-  class RouteStore
-
-    def initialize()
-      @order = 1
-      @store =
-          {
-              # string routes are stored, for each method, as a hash of 'route'=>{:block=>b,:order=>n,:hooks=>{...}}}
-            :string => {:get=>{}, :post=>{}, :put=>{}, :delete=>{}},
-
-              # regex routes are stored, for each method, as an array of hashes {:regex=>r,:block=>b,:order=>n,:vars=>{n=>var},:hooks=>{...}}
-              # they are in definition order in the array
-            :regex => {:get=>[], :post=>[], :put=>[], :delete=>[]},
-
-              # :order is a global order across both string and regex routes.
-
-              # hooks are blocks stored by name and used to augment returned block from get_block
-              :hooks => {}
-          }
-    end
-
-    def add_route(route_spec, block, method, data, hooks)
-      route_spec = normalize_route(route_spec)
-      hooks = normalize_hooks(hooks)
-      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,
-                                                 :hooks => hooks,
-                                                 :data => data}
-        @order = @order + 1
-      elsif route_to_match.is_a?(Regexp)
-        @store[:regex][method] << {:regex => route_to_match,
-                                   :block => block,
-                                   :order => @order,
-                                   :vars => vars,
-                                   :hooks => hooks,
-                                   :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
-
-    def add_hook(name, hook)
-      @store[:hooks][name] = hook
-    end
-
-    # returns block, {:vars=>{:var=>matched_value, ...}, :data=>data}
-    def get_block(route, method)
-      route = normalize_route(route)
-      # Get the match for a string route
-      string_route_match = @store[:string][method][route]
-
-      # Get first regex match
-      regex_route_match = nil
-      match_data = nil
-      @store[:regex][method].each { |rinfo|
-        if match_data = rinfo[:regex].match(route)
-          regex_route_match = rinfo
-          break
-        end
-      }
-
-      # return block for match with smaller :order
-      if string_route_match && regex_route_match
-        if string_route_match[:order] < regex_route_match[:order]
-          data = string_route_match[:data]
-          return build_hooked_block(string_route_match[:block], string_route_match[:hooks]),
-                  {:vars=>{}, :data=>data}
-        else
-          data = regex_route_match[:data]
-          return build_hooked_block(regex_route_match[:block], regex_route_match[:hooks]),
-                  {:vars=>build_regex_var_values(regex_route_match[:vars], match_data), :data=>data}
-        end
-      elsif string_route_match
-        data = string_route_match[:data]
-        return build_hooked_block(string_route_match[:block], string_route_match[:hooks]),
-                {:vars=>{}, :data=>data}
-      elsif regex_route_match
-        data = regex_route_match[:data]
-        return build_hooked_block(regex_route_match[:block], regex_route_match[:hooks]),
-                {:vars=>build_regex_var_values(regex_route_match[:vars], match_data), :data=>data}
-      else
-        return nil,
-                {:vars=>{}, :data=>nil}
-      end
-
-    end
-
-    private
-
-    def build_hooked_block(block, hooks)
-      unless hooks
-        return block
-      end
-      lambda {
-        hooks[:before].map { |h|
-          @store[:hooks][h].call() if @store[:hooks][h]
-        } if hooks && hooks[:before]
-
-        hooks[:around].map { |h|
-          @store[:hooks][h].call() if @store[:hooks][h]
-        } if hooks && hooks[:around]
-
-        block.call()
-
-        hooks[:around].map { |h|
-          @store[:hooks][h].call() if @store[:hooks][h]
-        } if hooks && hooks[:around]
-
-        hooks[:after].map { |h|
-          @store[:hooks][h].call() if @store[:hooks][h]
-        } if hooks && hooks[:after]
-      }
-    end
-
-    # Returns a regex and an array of variable info
-    def build_route_matcher(route_spec, data)
-      return route_spec, [] if route_spec.is_a?(Regexp)
-
-      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 = 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, '((\w|[-.~:@!$\'\(\)\*\+,;])*)')
-            position_counter += 2
-          else
-            regex_route = regex_route.sub(segment, '((\w|[-.~:@!$\'\(\)\*\+,;])*)')
-            position_counter += 2
-          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)
-
-      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
-
-    def normalize_hooks(hooks)
-      hooks.each_pair { |k,v|
-        unless v.is_a?(Array)
-          hooks[k] = [v]
-        end
-      } if hooks
-    end
-
-    def build_regex_var_values(vars_info, match_data)
-      var_values = {}
-      vars_info.each { |vi|
-        var_values[vi[:var]] = match_data[vi[:position]]
-      }
-      var_values
-    end
-
-  end
-end

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

@@ -1,25 +0,0 @@
-module Pakyow
-  class Static
-    def initialize(app)
-      @app = app
-    end
-    
-    def call(env)
-      if is_static?(env)
-        Pakyow.app.response = Rack::Response.new
-        
-        catch(:halt) do
-          Pakyow.app.send_file!(File.join(Configuration::Base.app.public_dir, env['PATH_INFO']))
-        end
-      else
-        @app.call(env)
-      end
-    end
-    
-    private
-    
-    def is_static?(env)
-      env['PATH_INFO'] =~ /\.(.*)$/ && File.exists?(File.join(Configuration::Base.app.public_dir, env['PATH_INFO']))
-    end
-  end
-end

data/pakyow-core/lib/generators/pakyow/app/templates/app/lib/application_controller.rb

@@ -1,6 +0,0 @@
-class ApplicationController
-  include Pakyow::Helpers
-  
-  def index
-  end
-end

data/pakyow-core/lib/generators/pakyow/app/templates/config/application.rb

@@ -1,18 +0,0 @@
-require 'rubygems'
-require 'pakyow'
-
-module PakyowApplication
-  class Application < Pakyow::Application
-    config.app.default_environment = :development
-  
-    configure(:development) do
-    end
-    
-    routes do
-      default :ApplicationController, :index
-    end
-    
-    middleware do
-    end
-  end
-end