goliath 1.0.1 → 1.0.2

data/HISTORY.md

@@ -1,5 +1,11 @@
 # HISTORY
 
+# v1.0.2 (April 25th 2013)
+  - Added a handle to disable server startup on exit
+  - Added support for JSON post bodies that are not a hash
+  - Added a setup hook for API's
+  - See full list @ https://github.com/postrank-labs/goliath/compare/v1.0.1...v1.0.2
+
 # v1.0.1 (November 8, 2012)
 
   - integrated console (CLI flag)

data/goliath.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'eventmachine', '>= 1.0.0.beta.4'
   s.add_dependency 'em-synchrony', '>= 1.0.0'
-  s.add_dependency 'em-websocket'
+  s.add_dependency 'em-websocket', "0.3.8"
   s.add_dependency 'http_parser.rb', '0.5.3'
   s.add_dependency 'log4r'
 

data/lib/goliath/application.rb

@@ -125,7 +125,11 @@ module Goliath
   end
 
   at_exit do
-    if $!.nil? && $0 == Goliath::Application.app_file
+    # Only run the application if ...
+    #  - we want it to run
+    #  - there has been no exception raised
+    #  - the file that has been run, is the goliath application file
+    if Goliath.run_app_on_exit? && $!.nil? && $0 == Goliath::Application.app_file
       Application.run!
     end
   end

data/lib/goliath/goliath.rb

@@ -25,7 +25,13 @@ module Goliath
 
     alias :prod? :production?
     alias :dev? :development?
+
+    # Controls whether or not the application will be run using an at_exit block.
+    attr_accessor :run_app_on_exit
+    alias_method :run_app_on_exit?, :run_app_on_exit
   end
+  # By default, we do run the application using the at_exit block.
+  self.run_app_on_exit = true
 
   # Retrieves the current goliath environment
   #

data/lib/goliath/rack/params.rb

@@ -31,7 +31,12 @@ module Goliath
                   when URL_ENCODED then
                     ::Rack::Utils.parse_nested_query(body)
                   when JSON_ENCODED then
-                    MultiJson.load(body)
+                    json = MultiJson.load(body)
+                    if json.is_a?(Hash)
+                      json
+                    else
+                      {'_json' => json}
+                    end
                   else
                     {}
                   end

data/lib/goliath/runner.rb

@@ -293,6 +293,7 @@ module Goliath
        log.info("Starting server on #{@address}:#{@port} in #{Goliath.env} mode. Watch out for stones.")
 
        server = setup_server(log)
+       server.api.setup if server.api.respond_to?(:setup)
        server.start
      end
 

data/lib/goliath/server.rb

@@ -126,7 +126,7 @@ module Goliath
 
     # Retrieves the configuration directory for the server
     #
-    # @return [String] THe full path to the config directory
+    # @return [String] The full path to the config directory
     def config_dir
       dir = options[:config] ? File.dirname(options[:config]) : './config'
       File.expand_path(dir)

data/lib/goliath/test_helper.rb

@@ -6,6 +6,8 @@ require 'goliath/server'
 require 'goliath/rack'
 require 'rack'
 
+Goliath.run_app_on_exit = false
+
 module Goliath
   # Methods to help with testing Goliath APIs
   #
@@ -178,9 +180,11 @@ module Goliath
     end
 
     def create_test_request(request_data)
+      domain = request_data.delete(:domain) || "localhost:#{@test_server_port}"
       path = request_data.delete(:path) || ''
       opts = request_data.delete(:connection_options) || {}
-      EM::HttpRequest.new("http://localhost:#{@test_server_port}#{path}", opts)
+
+      EM::HttpRequest.new("http://#{domain}#{path}", opts)
     end
 
     private

data/lib/goliath/version.rb

@@ -1,4 +1,4 @@
 module Goliath
   # The current version of Goliath
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/lib/goliath/websocket.rb

@@ -59,6 +59,10 @@ module Goliath
           @parent.on_message(@env, msg)
         end
 
+        def close_connection
+          @env[STREAM_CLOSE].call
+        end
+
         def close_connection_after_writing
           @connection_close.call
         end

data/spec/unit/rack/params_spec.rb

@@ -142,6 +142,16 @@ Berry\r
         ret['foo'].should == 'bar'
       end
 
+      it "parses json that does not evaluate to a hash" do
+        @env['CONTENT_TYPE'] = 'application/json'
+        @env['rack.input'] = StringIO.new
+        @env['rack.input'] << %|["foo","bar"]|
+        @env['rack.input'].rewind
+
+        ret = @params.retrieve_params(@env)
+        ret['_json'].should == ['foo', 'bar']
+      end
+
       it "handles empty input gracefully on JSON" do
         @env['CONTENT_TYPE'] = 'application/json'
         @env['rack.input'] = StringIO.new

data/spec/unit/runner_spec.rb

@@ -108,6 +108,16 @@ describe Goliath::Runner do
       end
     end
 
+    it 'sets up the api if that implements the #setup method' do
+      server_mock = mock("Server").as_null_object
+      server_mock.api.should_receive(:setup)
+
+      Goliath::Server.stub!(:new).and_return(server_mock)
+
+      @r.stub!(:load_config).and_return({})
+      @r.send(:run_server)
+    end
+
     it 'runs the server' do
       server_mock = mock("Server").as_null_object
       server_mock.should_receive(:start)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: goliath
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-09 00:00:00.000000000 Z
+date: 2013-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -49,17 +49,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.8
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
@@ -666,9 +666,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -356739448572304908
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24