halcyon 0.5.1 → 0.5.2

data/Rakefile

@@ -27,7 +27,8 @@ project = {
   :dependencies => {
     'json_pure' => '>=1.1.2',
     'rack' => '>=0.3.0',
-    'merb' => '>=0.9.2',
+    'extlib' => '>=0.9.4',
+    'merb' => '>=0.9.4',
     'rubigen' => '>=1.2.4'
   },
   :requirements => 'install the json gem to get faster JSON parsing',

data/lib/halcyon.rb

@@ -1,6 +1,6 @@
 $:.unshift File.dirname(__FILE__)
 
-%w(rubygems rack merb-core/core_ext merb-core/vendor/facets merb-core/dispatch/router json uri).each {|dep|require dep}
+%w(rubygems rack extlib merb-core/vendor/facets merb-core/dispatch/router json uri).each {|dep|require dep}
 
 # Provides global values, like the root of the current application directory,
 # the current logger, the application name, and the framework version.
@@ -11,11 +11,11 @@ $:.unshift File.dirname(__FILE__)
 #   Halcyon.config #=> {:allow_from => :all, :logging => {...}, ...}
 #   Halcyon.paths #=> {:config => Halcyon.root/'config', ...}
 #   Halcyon.logger #=> #<Logger>
-#   Halcyon.version #=> "0.5.1"
+#   Halcyon.version #=> "0.5.2"
 # 
 module Halcyon
   
-  VERSION = [0,5,1] unless defined?(Halcyon::VERSION)
+  VERSION = [0,5,2] unless defined?(Halcyon::VERSION)
   
   autoload :Application, 'halcyon/application'
   autoload :Client, 'halcyon/client'

data/lib/halcyon/application.rb

@@ -165,7 +165,7 @@ module Halcyon
         # default to the Application controller
         ::Application.new(env)
       when String
-        # pulled from URL, so camelize (from merb/core_ext) and symbolize first
+        # pulled from URL, so camelize (from extlib) and symbolize first
         begin
           Object.const_get(route[:controller].camel_case.to_sym).new(env)
         rescue NameError => e
@@ -289,8 +289,8 @@ module Halcyon
         # Run configuration files (when available)
         # These are unique in that they are Ruby files that we require so we
         # can get rid of YAML config files and use Ruby configuration files.
-        Dir.glob(Halcyon.paths[:config]/'*.rb').each do |config_file|
-          require config_file
+        Dir.glob(%w(init config environment).map{|file| Halcyon.paths[:config]/file+'.rb' }).each do |config_file|
+          require config_file if File.exist?(config_file)
         end
         
         # Yield to the block to handle boot configuration (and other tasks).
@@ -307,13 +307,13 @@ module Halcyon
         Halcyon.logger = Halcyon::Logger.setup(Halcyon.config[:logging])
         
         # Run initializers
-        Dir.glob(%w(requires hooks routes *).map{|init|Halcyon.paths[:init]/init+'.rb'}).each do |initializer|
+        Dir.glob(%w(requires hooks routes *).map{|init|Halcyon.paths[:init]/init+'.rb'}).uniq.each do |initializer|
           self.logger.debug "Init: #{File.basename(initializer).chomp('.rb').camel_case}" if
           require initializer.chomp('.rb')
         end
         
         # Setup autoloads for Controllers found in Halcyon.root/'app' (by default)
-        Dir.glob([Halcyon.paths[:controller]/'application.rb', Halcyon.paths[:controller]/'*.rb']).each do |controller|
+        Dir.glob([Halcyon.paths[:controller]/'application.rb', Halcyon.paths[:controller]/'*.rb']).uniq.each do |controller|
           self.logger.debug "Load: #{File.basename(controller).chomp('.rb').camel_case} Controller" if
           require controller.chomp('.rb')
         end

data/lib/halcyon/application/hooks.rb

@@ -22,7 +22,7 @@ module Halcyon
         def startup &hook
           Halcyon.hooks[:startup] << hook
         end
-      
+        
         # Sets the shutdown hook to the proc.
         # 
         # Close any resources opened in the +startup+ hook.

data/lib/halcyon/application/router.rb

@@ -1,4 +1,4 @@
-%w(rubygems merb-core/core_ext merb-core/dispatch/router uri).each {|dep|require dep}
+%w(rubygems extlib merb-core/dispatch/router uri).each {|dep|require dep}
 
 module Halcyon
   class Application

data/lib/halcyon/client.rb

@@ -174,7 +174,8 @@ module Halcyon
       res = Net::HTTP.start(self.uri.host, self.uri.port) {|http|http.request(req)}
       
       # parse response
-      body = JSON.parse(res.body).to_mash
+      # unescape just in case any problematic characters were POSTed through
+      body = JSON.parse(Rack::Utils.unescape(res.body)).to_mash
       
       # handle non-successes
       if self.options[:raise_exceptions] && !res.kind_of?(Net::HTTPSuccess)
@@ -193,8 +194,26 @@ module Halcyon
     def format_body(data)
       data = {:body => data} unless data.is_a? Hash
       data.to_mash
-      # uses the Merb Hash#to_params method defined in merb/core_ext.
-      data.to_params
+      # Hash.to_params (from extlib) doesn't escape keys/values
+      build_query(data)
+    end
+    
+    # Ported over from Rack::Utils.build_query which has not been released yet
+    # as of Halcyon 0.5.2's release.
+    # 
+    # The key difference from this and extlib's Hash.to_params is
+    # that the keys and values are escaped (which cause many problems).
+    # 
+    # TODO: Remove when Rack is released with Rack::Utils.build_query included.
+    # 
+    def build_query(params)
+      params.map { |k, v|
+        if v.class == Array
+          build_query(v.map { |x| [k, x] })
+        else
+          Rack::Utils.escape(k) + "=" + Rack::Utils.escape(v)
+        end
+      }.join("&")
     end
     
   end

data/lib/halcyon/config.rb

@@ -206,7 +206,7 @@ module Halcyon
             :level => 'debug'
           },
           :paths => Paths.new,
-          :hooks => Hash.new([])
+          :hooks => {:startup => [], :shutdown => []}
         }
         case (env || :development)
         when :development

data/lib/halcyon/config/file.rb

@@ -43,20 +43,27 @@ module Halcyon
       #   # parsing errors will happen if you try to use the wrong marshal
       #   # load method
       # 
+      # Returns a Mash if the contents parse to a Hash.
+      # 
       def to_hash(from = :from_yaml)
-        case from
+        contents = case from
         when :from_yaml
           require 'yaml'
           YAML.load(self.content)
         when :from_json
           JSON.parse(self.content)
         end
+        # return mash instead of hash if result is a hash
+        if contents.is_a?(Hash)
+          contents = Mash.new contents
+        end
+        contents
       end
       
       # Filters the contents through ERB.
       # 
       def filter(content, filter_through_erb)
-        content =  ERB.new(content).result if filter_through_erb
+        content = ERB.new(content).result if filter_through_erb
         content
       end
       

data/lib/halcyon/logging.rb

@@ -1,3 +1,5 @@
+require 'logger'
+
 module Halcyon
   module Logging
     
@@ -22,7 +24,7 @@ module Halcyon
       #     Log4r               => specifies Log4r
       def set(logger = 'Logger')
         Halcyon.send(:remove_const, :Logger) if Halcyon.const_defined? :Logger
-        Halcyon.const_set :Logger, Halcyon::Logging.const_get(logger)
+        Halcyon.const_set :Logger, Halcyon::Logging.const_get(logger.to_sym)
       end
       
     end

data/lib/halcyon/runner.rb

@@ -16,11 +16,13 @@ module Halcyon
   #   
   #   # load the config file and initialize the app
   #   Halcyon::Runner.new
+  # 
   class Runner
     
     autoload :Commands, 'halcyon/runner/commands'
     
     # Initializes the application and application resources.
+    # 
     def initialize(&block)
       Halcyon::Application.boot(&block) unless Halcyon::Application.booted
       @app = Halcyon::Application.new
@@ -30,6 +32,7 @@ module Halcyon
     #   +env+ the request environment details
     # 
     # Returns [Fixnum:status, {String:header => String:value}, [String:body]]
+    # 
     def call(env)
       @app.call(env)
     end
@@ -40,6 +43,7 @@ module Halcyon
       #   +argv+ the arguments to pass to the commands
       # 
       # Returns nothing
+      # 
       def run!(argv=ARGV)
         Commands.send(argv.shift, argv)
       end

data/spec/halcyon/client_spec.rb

@@ -60,4 +60,11 @@ describe "Halcyon::Client" do
     @client.get('/time')[:status].should == 200
   end
   
+  it "should handle ampersands (and others) in POST data correctly" do
+    response = @client.post('/returner', :key => "value1&value2=0")
+    
+    response[:status].should == 200
+    response[:body].should == {'controller' => 'application', 'action' => 'returner', 'key' => "value1&value2=0"}
+  end
+  
 end

data/support/generators/halcyon/templates/app/application.rb

@@ -40,4 +40,9 @@ class Application < Halcyon::Controller
     end
   end
   
+  # Returns exactly what it gets in terms of params
+  def returner
+    ok params
+  end
+  
 end

data/support/generators/halcyon/templates/config/init/routes.rb

@@ -30,6 +30,10 @@ Halcyon::Application.route do |r|
   # Safe to remove!
   r.match('/time').to(:controller => 'application', :action => 'time')
   
+  # Used for testing how requests are routed. Used internally but can be used
+  # for personal tests.
+  r.match('/returner').to(:controller => 'application', :action => 'returner')
+  
   # RESTful routes
   # r.resources :posts
 

data/support/generators/halcyon_flat/templates/app.rb

@@ -15,6 +15,7 @@ end
 
 # = Routes
 Halcyon::Application.route do |r|
+  r.match('/returner').to(:controller => 'application', :action => 'returner')
   r.match('/time').to(:controller => 'application', :action => 'time')
   
   r.match('/').to(:controller => 'application', :action => 'index')
@@ -39,4 +40,9 @@ class Application < Halcyon::Controller
     ok(Time.now.to_s)
   end
   
+  # Returns exactly what it gets in terms of params
+  def returner
+    ok params
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: halcyon
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Matt Todd
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-26 00:00:00 -04:00
+date: 2008-08-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,17 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.2
+        version: 0.9.4
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: extlib
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: json_pure