halcyon 0.5.0 → 0.5.1

data/spec/halcyon/halcyon_spec.rb

@@ -3,10 +3,9 @@ describe "Halcyon" do
   before do
     @log = ''
     @logger = Logger.new(StringIO.new(@log))
-    @config = $config.dup
-    @config[:logger] = @logger
-    @config[:app] = 'Specs'
-    Halcyon.config = @config
+    Halcyon.config.use do |c|
+      c[:logger] = @logger
+    end
     @app = Halcyon::Runner.new
   end
   
@@ -15,11 +14,11 @@ describe "Halcyon" do
   end
   
   it "should provide quick access to the configuration hash" do
-    Halcyon.config.is_a?(Hash).should.be.true?
+    Halcyon.config.is_a?(Halcyon::Config).should.be.true?
   end
   
   it "should provide environment label" do
-    Halcyon.environment.should == :development
+    Halcyon.environment.should == :test
     Halcyon.environment.should == Halcyon.config[:environment]
   end
   
@@ -36,11 +35,12 @@ describe "Halcyon" do
   end
   
   it "should provide sane default paths for essential components" do
-    Halcyon.paths.is_a?(Hash).should.be.true?
+    Halcyon.paths.is_a?(Halcyon::Config::Paths).should.be.true?
     Halcyon.paths[:controller].should == Halcyon.root/"app"
+    Halcyon.paths[:model].should == Halcyon.root/"app"/"models"
     Halcyon.paths[:lib].should == Halcyon.root/"lib"
     Halcyon.paths[:config].should == Halcyon.root/"config"
-    Halcyon.paths[:init].should == Halcyon.root/"config"/"{init,initialize}"
+    Halcyon.paths[:init].should == Halcyon.root/"config"/"init"
     Halcyon.paths[:log].should == Halcyon.root/"log"
   end
   

data/spec/halcyon/router_spec.rb

@@ -3,9 +3,9 @@ describe "Halcyon::Application::Router" do
   before do
     @log = ''
     @logger = Logger.new(StringIO.new(@log))
-    @config = $config.dup
-    @config[:logger] = @logger
-    Halcyon.config = @config
+    Halcyon.config.use do |c|
+      c[:logger] = @logger
+    end
     @app = Halcyon::Runner.new
   end
   

data/spec/halcyon/runner_spec.rb

@@ -1,39 +1,23 @@
-module Kernel
-  alias_method :__warn, :warn
-  def warn(msg)
-    $warning = msg
-    __warn(msg) if $do_warns
-  end
-end
-
 describe "Halcyon::Runner" do
   
   before do
     @log = ''
     @logger = Logger.new(StringIO.new(@log))
-    @config = $config.dup
-    @config[:logger] = @logger
-    Halcyon.config = @config
+    Halcyon.config.use do |c|
+      c[:logger] = @logger
+    end
     @app = Halcyon::Runner.new
   end
   
-  it "should warn if a non-existent config file is loaded" do
-    $do_warns = false
-    path = Halcyon.root/'config'/'config.yml'
-    Halcyon::Runner.load_config(path).nil?.should == true
-    $warning.should =~ %r{#{path} not found}
-    $do_warns = true
-  end
-  
-  it "should set up logging according to configuration" do
-    time = Time.now.to_s
-    @app.logger.debug "Test message for #{time}"
-    @log.should =~ /Test message for #{time}/
-  end
+  # it "should set up logging according to configuration" do
+  #   time = Time.now.to_s
+  #   @app.logger.debug "Test message for #{time}"
+  #   @log.should =~ /Test message for #{time}/
+  # end
   
   it "should recognize what application it is running as" do
     # Without setting explicitly in config
-    Halcyon.app.should == Halcyon.root.split('/').last.camel_case
+    Halcyon.app.should == "Specs" # set by the default config for test env
     
     # With setting explicitly in config
     Halcyon.config[:app] = 'Specr'
@@ -48,7 +32,7 @@ describe "Halcyon::Runner" do
   it "should proxy calls to Halcyon::Application" do
     status, headers, body = @app.call(Rack::MockRequest.env_for('/'))
     status.should == 200
-    body.body[0].should == Specs.new(Rack::MockRequest.env_for('/')).send(:index).to_json
+    body.body[0].should == Specs.new(Rack::MockRequest.env_for('/')).send(:index).reject{|(k,v)|k == :headers}.to_json
   end
   
 end

data/spec/spec_helper.rb

@@ -4,14 +4,7 @@ require 'logger'
 
 # Default Settings
 
-$config = {
-  :allow_from => :all,
-  :environment => :development,
-  :logger => nil,
-  :logging => {
-    :level => 'debug'
-  }
-}
+Halcyon.config = Halcyon::Config.new(:environment => :test)
 
 # Testing Application
 
@@ -21,7 +14,14 @@ class Application < Halcyon::Controller; end
 # Weird edge-case controller
 class Specs < Application
   
+  before :before_index, :only => [:index]
+  after :after_everything_but_index, :except => [:index]
+  before :greeter do |controller|
+    raise NotFound.new if controller.params[:cause_exception_in_filter_block]
+  end
+  
   def greeter
+    $hello = params[:name]
     ok("Hello #{params[:name]}")
   end
   
@@ -29,6 +29,24 @@ class Specs < Application
     ok('Found')
   end
   
+  # For testing headers in responses
+  def goob
+    ok "boog", 'Date' => Time.now.strftime("%a, %d %h %Y %H:%I:%S %Z"), 'Content-Language' => 'en'
+  end
+  
+  # For testing various return types
+  def gaff
+    $return_value_for_gaff || ok
+  end
+  
+  def foobar
+    ok('fubr')
+  end
+  
+  def unprocessable_entity_test
+    error :unprocessable_entity
+  end
+  
   def cause_exception
     raise Exception.new("Oops!")
   end
@@ -45,6 +63,14 @@ class Specs < Application
     "it's private, so it won't be found by the dispatcher"
   end
   
+  def before_index
+    raise Accepted.new if params[:cause_exception_in_filter]
+  end
+  
+  def after_everything_but_index
+    raise Created.new if params[:cause_exception_in_filter]
+  end
+  
 end
 
 # Resources controller

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

@@ -0,0 +1,42 @@
+Halcyon.config.use do |c|
+  
+  # = Framework
+  # 
+  # <tt>allow_from</tt>: specifies what connections to accept;
+  # * <tt>all</tt>: allow connections from all clients
+  # * <tt>local</tt>: only allow connections from the same host (localhost et al)
+  # * <tt>halcyon_clients</tt>: only Halcyon clients (tests the User-Agent only)
+  c[:allow_from] = :all
+  
+  # = Environment
+  # 
+  # Uncomment to manually specify the environment to run the application in.
+  # Defaults to <tt>:development</tt>.
+  # 
+  # c[:environment] = :production
+  
+  # = Logging
+  # 
+  # Configures the logging client in the framework, including destination,
+  # level filter, and what logger to use.
+  # 
+  # <tt>type</tt>: the logger to use (defaults to Ruby's <tt>Logger</tt>)
+  # * <tt>Logger</tt>
+  # * <tt>Analogger</tt>
+  # * <tt>Logging</tt>
+  # * <tt>Log4r</tt>
+  # <tt>file</tt>: the log file; leave unset for STDOUT
+  # <tt>level</tt>: the message filter level (default to <tt>debug</tt>)
+  # * specific to the client used, often is: debug, info, warn, error, fatal
+  # = Logging
+  c[:logging] = {
+    :type => 'Logger',
+    # :file => nil, # nil is STDOUT
+    :level => 'debug'
+  }
+  
+  # = Application
+  # 
+  # Your application-specific configuration options here.
+  
+end

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

@@ -4,21 +4,14 @@ require 'halcyon'
 %w().each {|dep|require dep}
 
 # = Configuration
-# Halcyon.config = Halcyon::Runner.load_config
-Halcyon.config = {
-  :allow_from => 'all',
-  :logging => {
+Halcyon.config.use do |c|
+  c[:allow_from] = :all
+  c[:logging] = {
     :type => 'Logger',
-    # :file => nil, # STDOUT
+    # :file => nil, # nil is STDOUT
     :level => 'debug'
   }
-}.to_mash
-
-# = Environment
-# Set the environment if not set above; create the <tt>Halcyon.environment</tt>
-# configurable attribute. Maps to <tt>Halcyon.config[:environment]</tt>.
-Halcyon.configurable_attr(:environment)
-Halcyon.environment = :development unless Halcyon.environment
+end
 
 # = Routes
 Halcyon::Application.route do |r|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: halcyon
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Matt Todd
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-29 00:00:00 -04:00
+date: 2008-06-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -23,6 +24,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: merb
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -32,6 +34,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -41,6 +44,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: rubigen
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -65,6 +69,7 @@ files:
 - spec/halcyon
 - spec/halcyon/application_spec.rb
 - spec/halcyon/client_spec.rb
+- spec/halcyon/config_spec.rb
 - spec/halcyon/controller_spec.rb
 - spec/halcyon/halcyon_spec.rb
 - spec/halcyon/logging_spec.rb
@@ -73,11 +78,17 @@ files:
 - spec/spec_helper.rb
 - lib/halcyon
 - lib/halcyon/application
+- lib/halcyon/application/hooks.rb
 - lib/halcyon/application/router.rb
 - lib/halcyon/application.rb
 - lib/halcyon/client
 - lib/halcyon/client/ssl.rb
 - lib/halcyon/client.rb
+- lib/halcyon/config
+- lib/halcyon/config/file.rb
+- lib/halcyon/config/helpers.rb
+- lib/halcyon/config/paths.rb
+- lib/halcyon/config.rb
 - lib/halcyon/controller.rb
 - lib/halcyon/exceptions.rb
 - lib/halcyon/logging
@@ -94,6 +105,8 @@ files:
 - lib/halcyon/runner/helpers.rb
 - lib/halcyon/runner.rb
 - lib/halcyon.rb
+- lib/rack
+- lib/rack/jsonp.rb
 - support/generators
 - support/generators/halcyon
 - support/generators/halcyon/halcyon_generator.rb
@@ -101,12 +114,11 @@ files:
 - support/generators/halcyon/templates/app
 - support/generators/halcyon/templates/app/application.rb
 - support/generators/halcyon/templates/config
-- support/generators/halcyon/templates/config/config.yml
 - support/generators/halcyon/templates/config/init
-- support/generators/halcyon/templates/config/init/environment.rb
 - support/generators/halcyon/templates/config/init/hooks.rb
 - support/generators/halcyon/templates/config/init/requires.rb
 - support/generators/halcyon/templates/config/init/routes.rb
+- support/generators/halcyon/templates/config/init.rb
 - support/generators/halcyon/templates/lib
 - support/generators/halcyon/templates/lib/client.rb
 - support/generators/halcyon/templates/Rakefile
@@ -154,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - install the json gem to get faster JSON parsing
 rubyforge_project: halcyon
-rubygems_version: 1.1.0
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: A JSON App Server Framework

data/support/generators/halcyon/templates/config/config.yml

@@ -1,36 +0,0 @@
-# = Framework
-# 
-# <tt>allow_from</tt>: specifies what connections to accept;
-# * <tt>all</tt>: allow connections from all clients
-# * <tt>local</tt>: only allow connections from the same host (localhost et al)
-# * <tt>halcyon_clients</tt>: only Halcyon clients (tests the User-Agent only)
-allow_from: all
-
-# = Environment
-# 
-# Uncomment to manually specify the environment to run the application in.
-# Defaults to <tt>:development</tt>.
-# 
-# environment: production
-
-# = Logging
-# 
-# Configures the logging client in the framework, including destination,
-# level filter, and what logger to use.
-# 
-# <tt>type</tt>: the logger to use (defaults to Ruby's <tt>Logger</tt>)
-# * <tt>Logger</tt>
-# * <tt>Analogger</tt>
-# * <tt>Logging</tt>
-# * <tt>Log4r</tt>
-# <tt>file</tt>: the log file; leave unset for STDOUT
-# <tt>level</tt>: the message filter level (default to <tt>debug</tt>)
-# * specific to the client used, often is: debug, info, warn, error, fatal
-logging:
-  type: Logger
-  # file: # STDOUT
-  level: debug
-
-# = Application
-# 
-# Your application-specific configuration options here.

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

@@ -1,11 +0,0 @@
-# = Environment
-# 
-# Sets the environment unless already set.
-# 
-# Creates the <tt>Halcyon.environment</tt> configurable attribute. Since this
-# is mapped to <tt>Halcyon.config[:environment]</tt>, environment can be set
-# by setting the <tt>environment:</tt> configuration value in the
-# <tt>config/config.yml</tt> file.
-
-Halcyon.configurable_attr(:environment)
-Halcyon.environment = :development unless Halcyon.environment