holoserve 0.2.1 → 0.3.0

data/README.rdoc

@@ -6,14 +6,18 @@ run faster and be independent from other API and network problems.
 
 == Concept
 
-HoloServe runs a rack application server, that matches any incoming request to a list of request profiles defined in
-the server layout. If a match is found, the defined static response is returned. The response is defined by a default
-and the current server situation.
-The name of the matched request/response pair is saved in a request history. If no match is found, a 404 is returned and
-the request data is stored in the bucket for unhandeled requests. These informations can be used to extend the server
-layout with missing request handlers.
+HoloServe runs a rack application server, that matches any incoming request to a list of request profiles. These
+profiles are defined in set of request/response-pairs. If a match is found, the defined static response is returned. The
+other half of the matched profile contains a set of responses. One for each situation the faked API can be possibily in.
+The response for the currently set situation will be merged with a default response and returned. The name of the
+matched request/response pair is saved in a request history. If no match is found, a 404 is returned and the request
+data is stored in the bucket for unhandeled requests. These informations can be used to extend the server layout with
+missing request handlers.
 
-The layout, situation, history and bucket can be accessed via control routes, which are described below.
+To avoid too much duplication in the definition of the request/response-pairs, it is possible upload some fixture data
+that is shared between all pair definitions. The pair can than refer to these fixtures.
+
+The pairs, fixtures, situation, history and bucket can be accessed via control routes, which are described below.
 
 == Installation
 
@@ -27,48 +31,58 @@ To start up an empty Holoserve instance, type...
 
   holoserve
 
-To load a server layout and define a situation during start up, use these parameters.
+To load the server with a couple of pairs, fixtures and define a situation during start up, use these parameters.
 
-  holoserve -l layout.yaml -s backend_without_users
+  holoserve -d path/to/pairs/*.yaml -f path/to/fixtures/*.yaml -s backend_without_users
 
-Notice, that the layout file must have either the <tt>.yaml</tt> or the <tt>.json</tt> extension.
+Notice, that the files must have either the <tt>.yaml</tt> or the <tt>.json</tt> extension.
 
 == Control routes
 
 If you're using Ruby, you can control Holoserve via the
 {Holoserve Connector}[https://github.com/skrill/holoserve-connector] gem.
 
-=== POST /_control/layout.:format
+=== POST /_control/pairs
 
-It should receive a parameter named <tt>file</tt> that contains a file with the server layout. The format of the file
-should fit the specified format. The format can be <tt>yaml</tt> or <tt>json</tt>. See
-{Layout file format}[rdoc-label:Layout-file-format] below.
+Adds a pair definition to Holoserve. It should receive a parameter named <tt>file</tt> that contains a file with exactly
+one pair. The format of the file should fit the specified format. The format can be <tt>yaml</tt> or <tt>json</tt>. See
+{Pair file format}[rdoc-label:Pair-file-format] below. The basename of the transmitted file will be taken as the pair
+id.
 
-=== GET /_control/layout.:format
+=== GET /_control/pairs/:id.:format
 
-Returns the server layout in the requested format.
+Returns the pair definition in the requested format.
 
-=== DELETE /_control/layout
+=== DELETE /_control/pairs
 
-Removes the server layout.
+Removes all pairs.
 
-=== PUT /_control/situation/:name
+=== POST /_control/fixtures
 
-Sets the current situation.
+Adds fixture data to Holoserve. The request is similar to <tt>POST /_control/pairs</tt>. The upload file can contain any
+yaml or json formatted data. The basename of the file will be taken as the fixture id.
 
-=== GET /_control/situation
+=== GET /_control/fixtures/:id
 
-Returns the name of the current situation.
+Returns the requested fixture.
+
+=== DELETE /_control/fixtures
+
+Removes all fixtures.
 
-=== DELETE /_control/situation
+=== PUT /_control/situation
 
-Clears the current situation.
+Sets the current situation with the transmitted <tt>name</tt> parameter.
+
+=== GET /_control/situation
+
+Returns the name of the current situation.
 
 ==== Response example
 
   backend_without_users
 
-=== GET /_control/bucket/requests
+=== GET /_control/bucket
 
 Returns a list of all requests that has been received, but couldn't be handled.
 
@@ -110,50 +124,65 @@ Returns a list of all names of pairs that has been triggered.
 
 Removes all entries from the history.
 
-== Layout file format
+== Pair file format
 
-The server layout file should have the following format.
+The request/response pair file should have the following format.
 
-  -
-    name: "test_received"
-    request:
+  - request:
+      imports:
+        - path: "test_fixture.users.0"
+          as: "parameters"
+          only: [ "username", "password" ]
       method: "POST"
-      path: "/test"
+      path: "/session"
       headers:
         HTTP_USER_AGENT: "Ruby"
-        HTTP_AUTHORIZATION: "OAuth oauth_token=12345"
-      body:
-        "test=value"
-      parameters:
-        test: "value"
       oauth:
         oauth_token: "12345"
     responses:
       default:
         status: 200
-      one:
-        body:
-          "ok"
-  -
-    request:
-      method: "GET"
-      path: "/test"
+      user_exists:
+        imports:
+          - path: "test_fixture.users.0"
+            as: "json.user"
+      user_is_missing:
+        json:
+          message: "user not found"
+  - request:
+      imports:
+        - path: "test_fixture.users.0"
+          as: "parameters"
+          only: "username"
+      method: "POST"
+      path: "/session"
+      headers:
+        HTTP_USER_AGENT: "Ruby"
+      parameters:
+        password: "invalid"
+      oauth:
+        oauth_token: "12345"
     responses:
-      default:
+      user_exists:
+        status: 401
+        json:
+          message: "invalid password"
+      user_is_missing:
         status: 200
-        body:
-          "ok too"
+        json:
+          message: "user not found"
 
-This example would define a server layout that has two request/response pairs. The first pair would have the name
-<tt>test_received</tt> and would match a <tt>POST</tt> request to the path <tt>/test</tt>.
+The fixture data where this example pair definition relies on, could look like to following.
 
-Notice, that the given request attributes are the _minimal_ values that have to match the incomong one. An incoming
-request may has much more attributes (see bucket example above). If a request is matched, the corresponding pair name is
-placed in the history.
+  users:
+    - email: "one@test.com"
+      username: "one"
+      password: "valid"
 
-As the sections <tt>headers</tt> and <tt>body</tt> are raw values from the request, the sections <tt>parameters</tt> and
-<tt>oauth</tt> contain high-level values. The <tt>parameters</tt> hash is taken from the request body or the query and
-the hash containing the OAuth values is parsed from a fitting <tt>HTTP_AUTHORIZATION</tt> header.
+This example defines two request/response pairs and two situations. The two pairs differs only the parameters that they
+match against. The first one handles the case in which the parameters <tt>username=one</tt> and <tt>password=valid</tt>
+are posted and the second one reacts on the transmission of <tt>username=one</tt> and <tt>password=invalid</tt>.
 
-The response is defined in the <tt>responses</tt> section of each pair. The server will response a merge of default
-response and the response defined by the current situation.
+If the situation is set to <tt>user_exists</tt>, the first situation would return the complete user object encoded as
+json, while the second one would reply the message "invalid password". In the situation "user_is_missing", both requests
+would be replied with the message "user not found".

data/bin/holoserve

@@ -14,8 +14,11 @@ OptionParser.new do |parser|
   parser.on("-p", "--port PORT", Integer, "The port holoserve should listen to.") do |value|
     options[:port] = value
   end
-  parser.on("-l", "--layout-file FILE", "Load the specified layout file on startup.") do |value|
-    options[:layout_filename] = value
+  parser.on("-f", "--fixture-files PATTERN", "Load the specified fixture files on startup.") do |value|
+    options[:fixture_file_pattern] = value
+  end
+  parser.on("-d", "--pair-files PATTERN", "Load the specified pair files on startup.") do |value|
+    options[:pair_file_pattern] = value
   end
   parser.on("-s", "--situation SITUATION", "Sets the situation.") do |value|
     options[:situation] = value

data/lib/holoserve/fixture/importer.rb

@@ -0,0 +1,44 @@
+
+class Holoserve::Fixture::Importer
+
+  attr_accessor :fixtures
+
+  def initialize(hash, fixtures)
+    @fixtures = fixtures
+    self.hash = hash
+  end
+
+  def hash=(value)
+    @imports = value.respond_to?(:delete) && value.delete(:imports) || [ ]
+    @hash = value
+  end
+
+  def hash
+    import
+    merge
+    @result
+  end
+
+  private
+
+  def import
+    @imports.each do |import|
+      path = import[:path]
+      as = import[:as] || path
+      only = import[:only]
+
+      value = Holoserve::Tool::DataPath.new(path, @fixtures).fetch
+
+      value.delete_if do |key, v|
+        ![ only ].flatten.compact.include?(key.to_s)
+      end if only.respond_to?(:include?) && value.respond_to?(:delete_if)
+
+      @result = Holoserve::Tool::DataPath.new(as, @result || { }).store value
+    end
+  end
+
+  def merge
+    @result = Holoserve::Tool::Merger.new(@result, @hash).result if @hash
+  end
+
+end

data/lib/holoserve/fixture.rb

@@ -0,0 +1,6 @@
+
+module Holoserve::Fixture
+
+  autoload :Importer, File.join(File.dirname(__FILE__), "fixture", "importer")
+
+end

data/lib/holoserve/interface/control.rb

@@ -7,60 +7,67 @@ class Holoserve::Interface::Control < Sinatra::Base
   mime_type :yaml, "application/x-yaml"
   mime_type :json, "application/json"
 
-  post "/_control/layout.:format" do |format|
-    begin
-      if format == "yaml"
-        configuration.load_layout_from_yaml_file params["file"][:tempfile]
-        respond_json_acknowledgement
-      elsif format == "json"
-        configuration.load_layout_from_json_file params["file"][:tempfile]
-        respond_json_acknowledgement
-      else
-        not_acceptable
-      end
-    rescue Holoserve::Configuration::InvalidFormatError => error
-      error 400, error.inspect
+  post "/_control/pairs" do
+    load_file_into(pairs) ?
+      acknowledgement :
+      bad_request
+  end
+
+  get "/_control/pairs/:id.:format" do |id, format|
+    pair = pairs[id.to_sym]
+    if pair
+      respond_formatted pair, format
+    else
+      not_found
     end
   end
 
-  get "/_control/layout.:format" do |format|
-    if format == "yaml"
-      respond_yaml configuration.layout
-    elsif format == "json"
-      respond_json configuration.layout
+  delete "/_control/pairs" do
+    pairs.clear
+  end
+
+  post "/_control/fixtures" do
+    load_file_into(fixtures) ?
+      acknowledgement :
+      bad_request
+  end
+
+  get "/_control/fixtures/:id.:format" do |id, format|
+    fixture = fixtures[id.to_sym]
+    if fixture
+      respond_formatted fixture, format
     else
-      not_acceptable
+      not_found
     end
   end
 
-  delete "/_control/layout" do
-    configuration.clear_layout!
-    respond_json_acknowledgement
+  delete "/_control/fixtures" do
+    fixtures.clear
   end
 
-  put "/_control/situation/:name" do |situation|
-    configuration.situation = situation
+  put "/_control/situation" do
+    configuration[:situation] = params[:name]
     respond_json_acknowledgement
   end
 
   get "/_control/situation" do
-    configuration.situation.to_s
+    respond_json :name => configuration[:situation]
   end
 
-  delete "/_control/situation" do
-    configuration.clear_situation!
+  get "/_control/bucket" do
+    respond_json bucket
   end
 
-  get "/_control/bucket/requests" do
-    respond_json bucket.requests
+  delete "/_control/bucket" do
+    bucket.clear
   end
 
   get "/_control/history" do
-    respond_json history.pair_names
+    respond_json history
   end
 
   delete "/_control/history" do
-    history.clear!
+    history.clear
     respond_json_acknowledgement
   end
 
@@ -70,6 +77,16 @@ class Holoserve::Interface::Control < Sinatra::Base
     respond_json :ok => true
   end
 
+  def respond_formatted(data, format)
+    if format == "yaml"
+      respond_yaml data
+    elsif format == "json"
+      respond_json data
+    else
+      bad_request
+    end
+  end
+
   def respond_json(object)
     content_type :json
     JSON.dump object
@@ -80,16 +97,50 @@ class Holoserve::Interface::Control < Sinatra::Base
     object.to_yaml
   end
 
+  def acknowledgement
+    [ 200, { }, [ "" ] ]
+  end
+
+  def bad_request
+    [ 400, { }, [ "bad request" ] ]
+  end
+
   def not_acceptable
     [ 406, { }, [ "format not acceptable" ] ]
   end
 
+  def load_file_into(hash)
+    data = load_file params["file"][:tempfile]
+    return false unless data
+    id = File.basename params["file"][:filename], ".*"
+    hash[id.to_sym] = Holoserve::Tool::Hash::KeySymbolizer.new(data).hash
+    true
+  end
+
+  def load_file(filename)
+    YAML::load_file filename
+  rescue Psych::SyntaxError
+    begin
+      JSON.parse File.read(filename)
+    rescue JSON::ParserError
+      nil
+    end
+  end
+
+  def pairs
+    configuration[:pairs]
+  end
+
+  def fixtures
+    configuration[:fixtures]
+  end
+
   def bucket
-    Holoserve.instance.bucket
+    configuration[:bucket]
   end
 
   def history
-    Holoserve.instance.history
+    configuration[:history]
   end
 
   def configuration

data/lib/holoserve/interface/fake.rb

@@ -7,10 +7,10 @@ class Holoserve::Interface::Fake
     pair = Holoserve::Pair::Finder.new(configuration, request).pair
     if pair
       if name = pair[:name]
-        history.pair_names << name
+        history << name
         logger.info "received handled request with name '#{name}'"
       end
-      response = compose_response pair
+      response = Holoserve::Response::Combiner.new(pair[:responses], configuration).response
       if response.empty?
         logger.warn "received request #{pair[:name]} with undefined response"
         not_found
@@ -18,7 +18,7 @@ class Holoserve::Interface::Fake
         Holoserve::Response::Composer.new(response).response_array
       end
     else
-      bucket.requests << request
+      bucket << request
       logger.error "received unhandled request\n" + request.pretty_inspect
       not_found
     end
@@ -26,31 +26,24 @@ 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
 
   def logger
-    configuration.logger
+    Holoserve.instance.logger
   end
 
-  def layout
-    configuration.layout
+  def pairs
+    configuration[:pairs]
   end
 
   def bucket
-    Holoserve.instance.bucket
+    configuration[:bucket]
   end
 
   def history
-    Holoserve.instance.history
+    configuration[:history]
   end
 
   def configuration

data/lib/holoserve/pair/finder.rb

@@ -6,16 +6,21 @@ class Holoserve::Pair::Finder
   end
 
   def pair
-    return nil unless layout
-    layout.detect do |pair|
-      Holoserve::Request::Matcher.new(@request, pair[:request]).match?
+    return nil unless pairs
+    pairs.each do |name, pair|
+      return pair.merge(:name => name) if Holoserve::Request::Matcher.new(@request, pair[:request], fixtures).match?
     end
+    nil
   end
 
   private
 
-  def layout
-    @configuration.layout
+  def pairs
+    @configuration[:pairs]
+  end
+
+  def fixtures
+    @configuration[:fixtures]
   end
 
 end

data/lib/holoserve/request/matcher.rb

@@ -1,8 +1,9 @@
 
 class Holoserve::Request::Matcher
 
-  def initialize(request, request_subset)
-    @request, @request_subset = request, request_subset
+  def initialize(request, request_subset, fixtures)
+    @request = request
+    @request_subset = Holoserve::Fixture::Importer.new(request_subset, fixtures).hash
   end
 
   def match?
@@ -15,7 +16,7 @@ class Holoserve::Request::Matcher
   end
 
   private
-  
+
   def match_method?
     @request_subset[:method] ?
       @request[:method] == @request_subset[:method] :

data/lib/holoserve/response/combiner.rb

@@ -0,0 +1,34 @@
+
+class Holoserve::Response::Combiner
+
+  def initialize(responses, configuration)
+    @responses, @configuration = responses, configuration
+  end
+
+  def response
+    Holoserve::Tool::Merger.new(default_response, situation_response).result
+  end
+
+  private
+
+  def default_response
+    @responses[:default] ?
+      Holoserve::Fixture::Importer.new(@responses[:default], fixtures).hash :
+      { }
+  end
+
+  def situation_response
+    situation && @responses[situation.to_sym] ?
+      Holoserve::Fixture::Importer.new(@responses[situation.to_sym], fixtures).hash :
+      { }
+  end
+  
+  def fixtures
+    @configuration[:fixtures]
+  end
+
+  def situation
+    @configuration[:situation]
+  end
+
+end

data/lib/holoserve/response.rb

@@ -1,6 +1,7 @@
 
 module Holoserve::Response
 
+  autoload :Combiner, File.join(File.dirname(__FILE__), "response", "combiner")
   autoload :Composer, File.join(File.dirname(__FILE__), "response", "composer")
 
 end

data/lib/holoserve/runner.rb

@@ -7,7 +7,8 @@ class Holoserve::Runner
 
   def initialize(options = { })
     @port = options[:port] || 4250
-    @layout_filename = options[:layout_filename]
+    @fixture_file_pattern = options[:fixture_file_pattern]
+    @pair_file_pattern = options[:pair_file_pattern]
     @situation = options[:situation]
 
     @rackup_options = Unicorn::Configurator::RACKUP
@@ -20,7 +21,8 @@ class Holoserve::Runner
 
   def start
     @unicorn.start
-    upload_layout if @layout_filename
+    upload_fixtures if @fixture_file_pattern
+    upload_pairs if @pair_file_pattern
     set_situation if @situation
   end
 
@@ -42,15 +44,22 @@ class Holoserve::Runner
 
   private
 
-  def upload_layout
-    format = File.extname(@layout_filename).sub(/^\./, "")
+  def upload_fixtures
+    Dir[ @fixture_file_pattern ].each do |filename|
+      upload_file "http://localhost:#{port}/_control/fixtures", filename
+    end
+  end
+
+  def upload_pairs
+    Dir[ @pair_file_pattern ].each do |filename|
+      upload_file "http://localhost:#{port}/_control/pairs", filename
+    end
+  end
+
+  def upload_file(url, filename)
+    format = File.extname(filename).sub(/^\./, "")
     raise ArgumentError, "file extension indicates wrong format '#{format}' (choose yaml or json)" unless [ "yaml", "json" ].include?(format)
-    Holoserve::Tool::Uploader.new(
-      @layout_filename,
-      :post,
-      "http://localhost:#{port}/_control/layout.#{format}",
-      :expected_status_code => 200
-    ).upload
+    Holoserve::Tool::Uploader.new(filename, :post, url, :expected_status_code => 200).upload
     nil
   end
 

data/lib/holoserve/tool/data_path.rb

@@ -0,0 +1,56 @@
+
+class Holoserve::Tool::DataPath
+
+  PATH_SEPARATOR = ".".freeze unless defined?(PATH_SEPARATOR)
+
+  attr_accessor :path
+  attr_accessor :data
+
+  def initialize(path, data)
+    @path, @data = path, data
+  end
+
+  def fetch
+    path = @path ? @path.split(PATH_SEPARATOR) : [ ]
+    return @data if path.empty?
+
+    selected = @data
+    key = parse_key path.shift
+
+    while path.length > 0
+      return nil unless selected.respond_to?(:[])
+      selected = selected[key]
+
+      key = parse_key path.shift
+    end
+
+    return nil unless selected.respond_to?(:[])
+    selected[key]
+  end
+
+  def store(value)
+    path = @path ? @path.split(PATH_SEPARATOR) : [ ]
+    return value if path.empty?
+
+    selected = @data
+    key = parse_key path.shift
+
+    while path.length > 0
+      break unless selected.respond_to?(:[])
+
+      selected[key] ||= { }
+      selected = selected[key]
+      key = parse_key path.shift
+    end
+
+    selected[key] = value
+    @data
+  end
+
+  private
+
+  def parse_key(key)
+    key =~ /^\d+$/ ? key.to_i : key.to_sym
+  end
+
+end

data/lib/holoserve/tool/uploader.rb

@@ -7,10 +7,7 @@ class Holoserve::Tool::Uploader
   end
 
   def upload
-    options = @options
-    options[:headers] = (@options[:headers] || { }).merge(headers)
-    options[:body] = body
-    Transport::HTTP.request @http_method, @url, options
+    Transport::HTTP.request @http_method, @url, @options.merge(:headers => headers, :body => body)
   end
 
   private
@@ -22,13 +19,20 @@ class Holoserve::Tool::Uploader
   def body
     "--#{boundary}\r\n" +
     "Content-Disposition: form-data; name=\"file\"; filename=\"#{File.basename(@filename)}\"\r\n" +
-    "Content-Type: application/x-yaml\r\n" +
+    "Content-Type: #{content_type}\r\n" +
     "\r\n" +
     File.read(@filename) +
     "\r\n" +
     "--#{boundary}--\r\n"
   end
 
+  def content_type
+    {
+      "yaml" => "application/x-yaml",
+      "json" => "application/json"
+    }[ File.extname(@filename) ] || "text/plain"
+  end
+
   def boundary
     "xxx12345xxx"
   end

data/lib/holoserve/tool.rb

@@ -1,6 +1,7 @@
 
 module Holoserve::Tool
 
+  autoload :DataPath, File.join(File.dirname(__FILE__), "tool", "data_path")
   autoload :Hash, File.join(File.dirname(__FILE__), "tool", "hash")
   autoload :Merger, File.join(File.dirname(__FILE__), "tool", "merger")
   autoload :Uploader, File.join(File.dirname(__FILE__), "tool", "uploader")

data/lib/holoserve.rb

@@ -3,9 +3,7 @@ require 'logger'
 
 class Holoserve
 
-  autoload :Bucket, File.join(File.dirname(__FILE__), "holoserve", "bucket")
-  autoload :Configuration, File.join(File.dirname(__FILE__), "holoserve", "configuration")
-  autoload :History, File.join(File.dirname(__FILE__), "holoserve", "history")
+  autoload :Fixture, File.join(File.dirname(__FILE__), "holoserve", "fixture")
   autoload :Interface, File.join(File.dirname(__FILE__), "holoserve", "interface")
   autoload :Pair, File.join(File.dirname(__FILE__), "holoserve", "pair")
   autoload :Request, File.join(File.dirname(__FILE__), "holoserve", "request")
@@ -15,15 +13,11 @@ class Holoserve
 
   attr_reader :logger
   attr_reader :configuration
-  attr_reader :bucket
-  attr_reader :history
   attr_reader :rack
 
   def initialize
     initialize_logger
     initialize_configuration
-    initialize_bucket
-    initialize_history
     initialize_rack
   end
 
@@ -34,15 +28,13 @@ class Holoserve
   end
 
   def initialize_configuration
-    @configuration = Configuration.new @logger
-  end
-
-  def initialize_bucket
-    @bucket = Bucket.new
-  end
-
-  def initialize_history
-    @history = History.new
+    @configuration = {
+      :pairs => { },
+      :fixtures => { },
+      :situation => nil,
+      :bucket => [ ],
+      :history => [ ]
+    }
   end
 
   def initialize_rack

data/spec/lib/holoserve/fixture/importer_spec.rb

@@ -0,0 +1,79 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "helper"))
+
+describe Holoserve::Fixture::Importer do
+
+  let(:fixtures) { { :test => { :nested => "value", :second => "value" }, :another => "value" } }
+
+  subject { described_class.new nil, fixtures }
+
+  describe "hash" do
+
+    it "should return the original hash if there is no imports section" do
+      subject.hash = {
+        :test => "value"
+      }
+      subject.hash.should == { :test => "value" }
+    end
+
+    it "should return a hash with imported fixtures" do
+      subject.hash = {
+        :imports => [
+          { :path => "test.nested" }
+        ]
+      }
+      subject.hash.should == { :test => { :nested => "value" } }
+    end
+
+    it "should return a hash with imported fixtures at a target path" do
+      subject.hash = {
+        :imports => [
+          { :path => "test.nested", :as => "test" }
+        ]
+      }
+      subject.hash.should == { :test => "value" }
+    end
+
+    it "should return a hash with imported and filtered fixtures" do
+      subject.hash = {
+        :imports => [
+          { :path => "test", :as => "test", :only => [ "second" ] }
+        ]
+      }
+      subject.hash.should == { :test => { :second => "value" } }
+    end
+
+    it "should return a hash where all the imports are imported" do
+      subject.hash = {
+        :imports => [
+          { :path => "test.nested", :as => "test" },
+          { :path => "another", :as => "another.test" }
+        ]
+      }
+      subject.hash.should == { :test => "value", :another => { :test => "value" } }
+    end
+
+    it "should return a hash where the data is merged with the imports" do
+      subject.hash = {
+        :imports => [
+          { :path => "test.nested", :as => "test" }
+        ],
+        :another => "value"
+      }
+      subject.hash.should == { :test => "value", :another => "value" }
+    end
+
+    it "should return a hash where the data is deep merged with the imports" do
+      subject.hash = {
+        :imports => [
+          { :path => "test.nested", :as => "test.nested" }
+        ],
+        :test => {
+          :another => "value"
+        }
+      }
+      subject.hash.should == { :test => { :nested => "value", :another => "value" } }
+    end
+
+  end
+
+end

data/spec/lib/holoserve/tool/data_path_spec.rb

@@ -0,0 +1,75 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "helper"))
+
+describe Holoserve::Tool::DataPath do
+
+  subject { described_class.new nil, nil }
+
+  describe "fetch" do
+
+    it "should return the given data if no path is specified" do
+      subject.path = nil
+      subject.data = { :test => "value" }
+      subject.fetch.should == { :test => "value" }
+    end
+
+    it "should return the value specified by the given path" do
+      subject.path = "test"
+      subject.data = { :test => "value" }
+      subject.fetch.should == "value"
+    end
+
+    it "should return the nested value specified by the given path" do
+      subject.path = "test.nested"
+      subject.data = { :test => { :nested => "value" } }
+      subject.fetch.should == "value"
+    end
+
+    it "should return nil if the path points to nowhere" do
+      subject.path = "test.nested"
+      subject.data = { :test => true }
+      subject.fetch.should be_nil
+    end
+
+    it "should return nil if the last path element doesn't exists'" do
+      subject.path = "test.nested"
+      subject.data = { :test => { :another => "value" } }
+      subject.fetch.should be_nil
+    end
+
+    it "should return in an array nested value specified by the given path" do
+      subject.path = "test.1.nested"
+      subject.data = { :test => [ { }, { :nested => "value" } ] }
+      subject.fetch.should == "value"
+    end
+
+  end
+
+  describe "store" do
+
+    it "should return the given value if no path is specified" do
+      subject.path = nil
+      subject.data = { :test => "value" }
+      subject.store("value").should == "value"
+    end
+
+    it "should store the given value at the specified path" do
+      subject.path = "another"
+      subject.data = { :test => "value" }
+      subject.store("value").should == { :test => "value", :another => "value" }
+    end
+
+    it "should store the given value in a nested hash" do
+      subject.path = "test.another"
+      subject.data = { :test => { :nested => "value" } }
+      subject.store("value").should == { :test => { :nested => "value", :another => "value" } }
+    end
+
+    it "should store the given value at the specified path and create it if missing" do
+      subject.path = "another.test"
+      subject.data = { :test => "value" }
+      subject.store("value").should == { :test => "value", :another => { :test => "value" } }
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: holoserve
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-03 00:00:00.000000000 Z
+date: 2012-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70196505909820 !ruby/object:Gem::Requirement
+  requirement: &70132546243580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70196505909820
+  version_requirements: *70132546243580
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70196505909260 !ruby/object:Gem::Requirement
+  requirement: &70132546257040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70196505909260
+  version_requirements: *70132546257040
 - !ruby/object:Gem::Dependency
   name: unicorn
-  requirement: &70196505908780 !ruby/object:Gem::Requirement
+  requirement: &70132546255800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70196505908780
+  version_requirements: *70132546255800
 - !ruby/object:Gem::Dependency
   name: transport
-  requirement: &70196505908180 !ruby/object:Gem::Requirement
+  requirement: &70132546254300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70196505908180
+  version_requirements: *70132546254300
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70196505907560 !ruby/object:Gem::Requirement
+  requirement: &70132546252800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70196505907560
+  version_requirements: *70132546252800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70196505907080 !ruby/object:Gem::Requirement
+  requirement: &70132546265600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70196505907080
+  version_requirements: *70132546265600
 - !ruby/object:Gem::Dependency
   name: transport
-  requirement: &70196505906560 !ruby/object:Gem::Requirement
+  requirement: &70132546264780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70196505906560
+  version_requirements: *70132546264780
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &70196505906040 !ruby/object:Gem::Requirement
+  requirement: &70132546263580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70196505906040
+  version_requirements: *70132546263580
 description: This tool can be used to fake webservice APIs for testing proposals.
 email: philipp.bruell@skrill.com
 executables:
@@ -111,9 +111,8 @@ files:
 - LICENSE
 - Rakefile
 - bin/holoserve
-- lib/holoserve/bucket.rb
-- lib/holoserve/configuration.rb
-- lib/holoserve/history.rb
+- lib/holoserve/fixture/importer.rb
+- lib/holoserve/fixture.rb
 - lib/holoserve/interface/control.rb
 - lib/holoserve/interface/fake.rb
 - lib/holoserve/interface.rb
@@ -122,9 +121,11 @@ files:
 - lib/holoserve/request/decomposer.rb
 - lib/holoserve/request/matcher.rb
 - lib/holoserve/request.rb
+- lib/holoserve/response/combiner.rb
 - lib/holoserve/response/composer.rb
 - lib/holoserve/response.rb
 - lib/holoserve/runner.rb
+- lib/holoserve/tool/data_path.rb
 - lib/holoserve/tool/hash/key_symbolizer.rb
 - lib/holoserve/tool/hash.rb
 - lib/holoserve/tool/merger.rb
@@ -132,6 +133,8 @@ files:
 - lib/holoserve/tool.rb
 - lib/holoserve.rb
 - spec/helper.rb
+- spec/lib/holoserve/fixture/importer_spec.rb
+- spec/lib/holoserve/tool/data_path_spec.rb
 - spec/lib/holoserve/tool/merger_spec.rb
 homepage: http://github.com/skrill/holoserve
 licenses: []
@@ -147,7 +150,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -388162576537081624
+      hash: 4596962680025174660
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -161,4 +164,6 @@ signing_key:
 specification_version: 3
 summary: Tool to fake HTTP APIs.
 test_files:
+- spec/lib/holoserve/fixture/importer_spec.rb
+- spec/lib/holoserve/tool/data_path_spec.rb
 - spec/lib/holoserve/tool/merger_spec.rb

data/lib/holoserve/bucket.rb

@@ -1,10 +0,0 @@
-
-class Holoserve::Bucket
-
-  attr_reader :requests
-
-  def initialize
-    @requests = [ ]
-  end
-
-end

data/lib/holoserve/configuration.rb

@@ -1,50 +0,0 @@
-require 'yaml'
-
-class Holoserve::Configuration
-
-  class InvalidFormatError < StandardError; end
-
-  attr_reader :logger
-
-  attr_reader :layout
-  attr_reader :situation
-
-  def initialize(logger)
-    @logger = logger
-  end
-
-  def layout=(hash_or_array)
-    @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_situation!
-    @situation = nil
-    logger.info "cleared the current situation"
-  end
-
-  def load_layout_from_yaml_file(file)
-    self.layout = YAML::load_file file
-    logger.info "loaded layouts from yaml file #{file.path}"
-  rescue Psych::SyntaxError => error
-    self.clear_layout!
-    raise InvalidFormatError, error.to_s
-  end
-
-  def load_layout_from_json_file(file)
-    self.layout = JSON.parse File.read(file)
-    logger.info "loaded layouts from json file #{file.path}"
-  rescue JSON::ParserError => error
-    self.clear_layout!
-    raise InvalidFormatError, error.to_s
-  end
-
-end

data/lib/holoserve/history.rb

@@ -1,14 +0,0 @@
-
-class Holoserve::History
-
-  attr_reader :pair_names
-
-  def initialize
-    @pair_names = [ ]
-  end
-
-  def clear!
-    @pair_names.clear
-  end
-
-end