holoserve 0.2.0 → 0.2.1

data/README.rdoc

@@ -29,7 +29,9 @@ To start up an empty Holoserve instance, type...
 
 To load a server layout and define a situation during start up, use these parameters.
 
-  holoserve -l layouts.yml -s backend_without_users
+  holoserve -l layout.yaml -s backend_without_users
+
+Notice, that the layout file must have either the <tt>.yaml</tt> or the <tt>.json</tt> extension.
 
 == Control routes
 
@@ -58,6 +60,10 @@ Sets the current situation.
 
 Returns the name of the current situation.
 
+=== DELETE /_control/situation
+
+Clears the current situation.
+
 ==== Response example
 
   backend_without_users

data/lib/holoserve/configuration.rb

@@ -17,13 +17,18 @@ class Holoserve::Configuration
     @layout = Holoserve::Tool::Hash::KeySymbolizer.new(hash_or_array).hash
   end
 
+  def clear_layout!
+    self.layout = nil
+  end
+
   def situation=(value)
     @situation = value.to_sym
     logger.info "made '#{value}' the current situation"
   end
 
-  def clear_layout!
-    self.layout = nil
+  def clear_situation!
+    @situation = nil
+    logger.info "cleared the current situation"
   end
 
   def load_layout_from_yaml_file(file)

data/lib/holoserve/interface/control.rb

@@ -47,6 +47,10 @@ class Holoserve::Interface::Control < Sinatra::Base
     configuration.situation.to_s
   end
 
+  delete "/_control/situation" do
+    configuration.clear_situation!
+  end
+
   get "/_control/bucket/requests" do
     respond_json bucket.requests
   end

data/lib/holoserve/interface/fake.rb

@@ -10,8 +10,7 @@ class Holoserve::Interface::Fake
         history.pair_names << name
         logger.info "received handled request with name '#{name}'"
       end
-      responses = pair[:responses]
-      response = Holoserve::Tool::Merger.new(responses[:default] || { }, responses[configuration.situation.to_sym] || { }).result
+      response = compose_response pair
       if response.empty?
         logger.warn "received request #{pair[:name]} with undefined response"
         not_found
@@ -27,6 +26,13 @@ class Holoserve::Interface::Fake
 
   private
 
+  def compose_response(pair)
+    responses = pair[:responses]
+    response_default = responses[:default] || { }
+    response_situation = (configuration.situation && responses[configuration.situation.to_sym]) || { }
+    Holoserve::Tool::Merger.new(response_default, response_situation).result
+  end
+
   def not_found
     [ 404, { "Content-Type" => "text/plain" }, [ "no response found for this request" ] ]
   end

data/lib/holoserve/response/composer.rb

@@ -27,7 +27,7 @@ class Holoserve::Response::Composer
       elsif @response.has_key?(:json)
         JSON.dump @response[:json]
       else
-        nil
+        ""
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: holoserve
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-16 00:00:00.000000000 Z
+date: 2012-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70247827043580 !ruby/object:Gem::Requirement
+  requirement: &70196505909820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70247827043580
+  version_requirements: *70196505909820
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70247827042840 !ruby/object:Gem::Requirement
+  requirement: &70196505909260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70247827042840
+  version_requirements: *70196505909260
 - !ruby/object:Gem::Dependency
   name: unicorn
-  requirement: &70247827042360 !ruby/object:Gem::Requirement
+  requirement: &70196505908780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70247827042360
+  version_requirements: *70196505908780
 - !ruby/object:Gem::Dependency
   name: transport
-  requirement: &70247827041740 !ruby/object:Gem::Requirement
+  requirement: &70196505908180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70247827041740
+  version_requirements: *70196505908180
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70247827041200 !ruby/object:Gem::Requirement
+  requirement: &70196505907560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70247827041200
+  version_requirements: *70196505907560
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70247827040660 !ruby/object:Gem::Requirement
+  requirement: &70196505907080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70247827040660
+  version_requirements: *70196505907080
 - !ruby/object:Gem::Dependency
   name: transport
-  requirement: &70247827040180 !ruby/object:Gem::Requirement
+  requirement: &70196505906560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70247827040180
+  version_requirements: *70196505906560
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &70247827039660 !ruby/object:Gem::Requirement
+  requirement: &70196505906040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70247827039660
+  version_requirements: *70196505906040
 description: This tool can be used to fake webservice APIs for testing proposals.
 email: philipp.bruell@skrill.com
 executables:
@@ -147,7 +147,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 460979945885990413
+      hash: -388162576537081624
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: