holoserve 0.4.1 → 0.4.2

data/README.rdoc

@@ -98,11 +98,11 @@ Returns a list of all requests that has been received, but couldn't be handled.
 
 === GET /_control/history
 
-Returns a list of all names of pairs that has been triggered.
+Returns a list of hashes, which include the names/id of pairs that has been triggered, with a request variant and a list of response variants.
 
 ==== Response example
 
-  [ "create_received", "update_received" ]
+  [{"id":"test_request","request_variant":"default","response_variants":["default","alternative"]}]
 
 === DELETE /_control/history
 
@@ -112,9 +112,10 @@ Removes all entries from the history.
 
 The request/response pair file should have the following format.
 
-  - request:
+  requests:
+    default:
       imports:
-        - path: "test_fixture.users.0"
+        - path: "test_fixtures.users.0"
           as: "parameters"
           only: [ "username", "password" ]
       method: "POST"
@@ -123,55 +124,64 @@ The request/response pair file should have the following format.
         HTTP_USER_AGENT: "Ruby"
       oauth:
         oauth_token: "12345"
-    responses:
-      default:
-        status: 200
-      "user_one == :existing":
-        imports:
-          - path: "test_fixture.users.0"
-            as: "json.user"
-        transitions:
-          session_one: "existing"
-      "user_one == :missing":
-        json:
-          message: "user not found"
-  - request:
+  responses:
+    default:
+      status: 200
+    found:
+      condition: "username == :existing"
       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:
-      "user_one == :existing":
-        status: 401
-        json:
-          message: "invalid password"
-      "user_one == :missing":
-        status: 200
-        json:
-          message: "user not found"
-
-The fixture data where this example pair definition relies on, could look like to following.
+        - path: "test_fixtures.users.0"
+          as: "json.user"
+      transitions:
+        session_one: "existing"
+    not_found:
+      condition: "username == :missing"
+      json:
+        message: "user not found"
+
+The fixture data where this example pair definition relies on, could look like the following.
 
   users:
     - email: "one@test.com"
       username: "one"
       password: "valid"
 
-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>.
+This example defines a request/response pair situation. It uses <tt>username=one</tt> and <tt>password=valid</tt>
+as parameters.
 
-If the state includes <tt>user_one == :existing</tt>, the first response would return the complete user object encoded
-as json, while the second one would reply the message "invalid password". In the state includes
-<tt>user_one == :missing</tt>, both requests would be replied with the message "user not found".
+If the state includes <tt>condition: "user_one == :existing"</tt>, the response would return the complete user object encoded
+as json. If the state includes <tt>user_one == :missing</tt>, the request would be replied with the message "user not found".
 
 The <tt>transitions</tt> part of the response allows you set the successor state. If a response is selected, the
 corresponding transitions will be evaluated.
+
+
+  requests:
+    default:
+      imports:
+        - path: "test_fixtures.users.0.email"
+          as: "parameters"
+      method: "POST"
+      path: "/valid_email"
+  responses:
+    default:
+      status: 200
+    found:
+      condition: "email == :existing"
+      imports:
+        - path: "test_fixtures.users.0.username"
+          as: "json.user.username"
+      transitions:
+        session_one: "existing"
+    not_found:
+      condition: "email == :missing"
+      json:
+        message: "email address not found"
+
+This example relies on the same fixture file used above.
+
+This time it uses <tt>email=one@test.com</tt> as a parameter.
+If the state includes <tt>condition: "email == :existing"</tt>, the response would return a username of the email address
+owner as json.
+
+If the state includes <tt>email == :missing</tt>, the response would be a message "email address not found" in json.

data/Rakefile

@@ -5,4 +5,4 @@ load File.join(File.dirname(__FILE__), "tasks", "features.rake")
 load File.join(File.dirname(__FILE__), "tasks", "gem.rake")
 load File.join(File.dirname(__FILE__), "tasks", "goliath.rake")
 load File.join(File.dirname(__FILE__), "tasks", "rdoc.rake")
-load File.join(File.dirname(__FILE__), "tasks", "spec.rake")
+load File.join(File.dirname(__FILE__), "tasks", "spec.rake")

data/lib/holoserve/interface/control/index.rb

@@ -0,0 +1,42 @@
+require 'goliath/api'
+require 'goliath/rack/templates'
+require 'slim'
+require 'sass'
+require 'coffee_script'
+
+module Holoserve::Interface::Control::Index
+
+  class Fetch < Goliath::API
+    include Goliath::Rack::Templates
+    include Holoserve::Interface::Control::Helper
+
+    def response(environment)
+      case environment["REQUEST_URI"]
+        when "/_control"
+          render_slim :index
+        when "/_control/stylesheets/screen.css"
+          render_scss :screen
+        when "/_control/javascripts/all.js"
+          render_coffee :all
+        else
+          not_found
+      end
+    end
+
+    private
+
+    def render_slim(template)
+      ok slim(template, :views => File.join(Holoserve::Interface::ROOT, "views")), "text/html"
+    end
+
+    def render_scss(template)
+      ok scss(template, :views => File.join(Holoserve::Interface::ROOT, "stylesheets")), "text/css"
+    end
+
+    def render_coffee(template)
+      ok coffee(template, :views => File.join(Holoserve::Interface::ROOT, "javascripts")), "text/javascript"
+    end
+
+  end
+
+end

data/lib/holoserve/interface/control.rb

@@ -4,6 +4,7 @@ module Holoserve::Interface::Control
 
   autoload :Bucket, File.join(File.dirname(__FILE__), "control", "bucket")
   autoload :History, File.join(File.dirname(__FILE__), "control", "history")
+  autoload :Index, File.join(File.dirname(__FILE__), "control", "index")
   autoload :Pair, File.join(File.dirname(__FILE__), "control", "pair")
   autoload :State, File.join(File.dirname(__FILE__), "control", "state")
 
@@ -25,6 +26,10 @@ module Holoserve::Interface::Control
       [ 400, { }, [ "bad request" ] ]
     end
 
+    def not_found
+      [ 404, { }, [ "not found" ] ]
+    end
+
     def bucket
       config[:bucket] ||= [ ]
     end

data/lib/holoserve/interface/event.rb

@@ -0,0 +1,38 @@
+require 'json'
+
+class Holoserve::Interface::Event
+
+  def on_open(environment)
+    self.class.handler = environment["handler"]
+  end
+
+  def on_message(environment, message)
+    environment.logger.info "MESSAGE #{message}"
+  end
+
+  def on_close(environment)
+    environment.logger.info("WS CLOSED")
+  end
+
+  def on_error(environment, error)
+    environment.logger.error error
+  end
+
+  def self.handler=(value)
+    @handler = value
+  end
+
+  def self.send_pair_event(id)
+    send_message "pair:#{id}"
+  end
+
+  def self.send_bucket_event(request)
+    send_message "bucket:#{JSON.dump(request)}"
+  end
+
+  def self.send_message(text)
+    return unless @handler
+    @handler.send_text_frame text
+  end
+
+end

data/lib/holoserve/interface/fake.rb

@@ -3,43 +3,58 @@ require 'pp'
 
 class Holoserve::Interface::Fake < Goliath::API
 
+  class NoResponseError < StandardError
+
+    attr_reader :id
+    attr_reader :request_variant
+
+    def initialize(id, request_variant)
+      @id, @request_variant = id, request_variant
+    end
+
+  end
+
   use Goliath::Rack::Params
 
   def response(env)
     request = Holoserve::Request::Decomposer.new(env, params).hash
-    pair = Holoserve::Pair::Finder.new(pairs, request).pair
+    finder = Holoserve::Pair::Finder.new(pairs, request)
+    pair = finder.pair
     if pair
-      id, responses = *pair.values_at(:id, :responses)
-
-      history << id
-      logger.info "received handled request with id '#{id}'"
-
-      selector = Holoserve::Response::Selector.new responses, state, logger
-      default_response, selected_responses = selector.default_response, selector.selected_responses
+      id, request_variant, responses = finder.id, finder.variant, pair[:responses]
+
+      selector = Holoserve::Response::Selector.new responses, state.merge(:request_variant => request_variant), logger
+      response_variant = selector.selection
+
+      response = if response_variant == :default
+        responses[:default] || { }
+      elsif response_variant
+        Holoserve::Tool::Merger.new(responses[:default] || { }, responses[response_variant]).result
+      else
+        raise NoResponseError, id, request_variant
+      end
+      Holoserve::State::Updater.new(state, response[:transitions]).perform
+      history << {:id => id, :request_variant => request_variant, :response_variant => response_variant}
 
-      update_state default_response, selected_responses
+      Holoserve::Interface::Event.send_pair_event id
+      logger.info "handled request [#{id}] with request variant [#{request_variant}] and response variant [#{response_variant}]"
 
-      response = Holoserve::Response::Combiner.new(default_response, selected_responses).response
       Holoserve::Response::Composer.new(response).response_array
     else
       bucket << request
+      Holoserve::Interface::Event.send_bucket_event request
       logger.error "received unhandled request\n" + request.pretty_inspect
 
       not_found
     end
+  rescue NoResponseError => error
+    logger.warn "could not select any response for request [#{error.id}] with request variant [#{error.request_variant}]"
   end
 
   private
 
-  def update_state(default_response, selected_responses)
-    Holoserve::State::Updater.new(state, default_response[:transitions]).perform
-    (selected_responses || [ ]).each do |response|
-      Holoserve::State::Updater.new(state, response[:transitions]).perform
-    end
-  end
-
   def not_found
-    [ 404, { :"Content-Type" => "text/plain" }, [ "no response found for this request" ] ]
+    [ 404, { :"Content-Type" => "text/plain" }, [ "no response found for this request\n" ] ]
   end
 
   def bucket

data/lib/holoserve/interface.rb

@@ -3,8 +3,22 @@ require 'goliath/api'
 class Holoserve::Interface < Goliath::API
 
   autoload :Control, File.join(File.dirname(__FILE__), "interface", "control")
+  autoload :Event, File.join(File.dirname(__FILE__), "interface", "event")
   autoload :Fake, File.join(File.dirname(__FILE__), "interface", "fake")
 
+  ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..", "..")).freeze unless defined?(ROOT)
+
+  use Rack::Static,
+      :root => File.join(ROOT, "public"),
+      :urls => {
+        "/_control/favicon.ico" => "favicon.ico",
+        "/_control/javascripts/vendor/jquery-1.7.2.min.js" => "javascripts/vendor/jquery-1.7.2.min.js",
+        "/_control/javascripts/vendor/jquery.color.js" => "javascripts/vendor/jquery.color.js",
+        "/_control/javascripts/vendor/bootstrap-transition.js" => "javascripts/vendor/bootstrap-transition.js"
+      }
+
+  map "/_control/event", Event
+
   get "/_control/bucket", Control::Bucket::Fetch
   delete "/_control/bucket", Control::Bucket::Delete
 
@@ -18,6 +32,8 @@ class Holoserve::Interface < Goliath::API
   get "/_control/state", Control::State::Fetch
   delete "/_control/state", Control::State::Delete
 
+  get "/_control*", Control::Index::Fetch
+
   map "/*", Fake
 
 end

data/lib/holoserve/pair/finder.rb

@@ -6,9 +6,31 @@ class Holoserve::Pair::Finder
   end
 
   def pair
+    return @pair unless find_pair.nil?
+    nil
+  end
+
+  def id
+    return @id unless find_pair.nil?
+    nil
+  end
+
+  def variant
+    return @variant unless find_pair.nil?
+    nil
+  end
+
+  private
+
+  def find_pair
     return nil unless @pairs
     @pairs.each do |id, pair|
-      return pair.merge(:id => id) if Holoserve::Request::Matcher.new(@request, pair[:request]).match?
+      @variant = Holoserve::Request::Selector.new(@request, pair[:requests]).selection
+      unless @variant.nil?
+        @pair = pair
+        @id = id
+        return ""
+      end
     end
     nil
   end

data/lib/holoserve/pair/loader.rb

@@ -7,6 +7,9 @@ class Holoserve::Pair::Loader
     @fixtures, @pairs = { }, { }
     @fixture_file_pattern, @pair_file_pattern = fixture_file_pattern, pair_file_pattern
     @logger = logger
+    @validator = Holoserve::Pair::Validator.new
+  rescue Holoserve::Pair::Validator::InvalidSchemaError => error
+    @logger.error error.inspect
   end
 
   def pairs
@@ -21,22 +24,33 @@ class Holoserve::Pair::Loader
     Dir[ @fixture_file_pattern ].each do |filename|
       id = extract_id filename
       fixture = load_file filename
-      @fixtures[id] = fixture if fixture
-      @logger.info "loaded fixture '#{id}'"
+      if fixture
+        @fixtures[id] = fixture
+        @logger.info "loaded fixture '#{id}'"
+      end
     end
     @fixtures.freeze
   end
 
   def load_pairs
     Dir[ @pair_file_pattern ].each do |filename|
-      id = extract_id filename
-      pair = load_file filename
-      @pairs[id] = pair_with_imports pair if pair
-      @logger.info "loaded pair '#{id}'"
+      load_pair filename
     end
     @pairs.freeze
   end
 
+  def load_pair(filename)
+    id = extract_id filename
+    pair = load_file filename
+    if pair
+      @validator.validate(pair)
+      @pairs[id] = pair_with_imports pair
+      @logger.info "loaded pair '#{id}'"
+    end
+  rescue Holoserve::Pair::Validator::InvalidError => error
+    @logger.error error.inspect
+  end
+
   def extract_id(filename)
     File.basename filename, ".*"
   end
@@ -52,18 +66,21 @@ class Holoserve::Pair::Loader
         rescue JSON::ParserError
           nil
         end
-      end
+    end
     Holoserve::Tool::Hash::KeySymbolizer.new(data).hash
   end
 
   def pair_with_imports(pair)
-    result = {
-      :request => Holoserve::Fixture::Importer.new(pair[:request], @fixtures).result,
-      :responses => { }
-    }
-    (pair[:responses] || { }).each do |id, response|
-      result[:responses][id] = Holoserve::Fixture::Importer.new(response, @fixtures).result
+    result = { :requests => { }, :responses => { } }
+
+    pair[:requests].each do |variant, request|
+      result[:requests][variant] = Holoserve::Fixture::Importer.new(request, @fixtures).result
     end
+
+    pair[:responses].each do |variant, response|
+      result[:responses][variant] = Holoserve::Fixture::Importer.new(response, @fixtures).result
+    end
+
     result
   end
 

data/lib/holoserve/pair/validator.rb

@@ -0,0 +1,47 @@
+require 'rubygems'
+require 'kwalify'
+
+class Holoserve::Pair::Validator
+
+  class Error < StandardError
+
+    def initialize(errors)
+      @errors = errors
+    end
+
+    def to_s
+      "<#{self.class} error count = #{@errors.size}>"
+    end
+
+    def inspect
+      "#{self.class}\n  " + @errors.join("\n  ")
+    end
+
+  end
+
+  class InvalidError < Error; end
+  class InvalidSchemaError < Error; end
+
+  attr_accessor :schema_path
+
+  def initialize(schema_path = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "schema", "schema.yaml")))
+    @schema_path = schema_path
+    @meta_validator = Kwalify::MetaValidator.instance
+    load_schema
+    @validator = Kwalify::Validator.new(@schema)
+  end
+
+  def validate(hash)
+    errors = @validator.validate(hash)
+    raise InvalidError, errors if errors && !errors.empty?
+  end
+
+  private
+
+  def load_schema
+    @schema = Kwalify::Yaml::load_file(@schema_path)
+    errors = @meta_validator.validate(@schema)
+    raise InvalidSchemaError, errors if errors && !errors.empty?
+  end
+
+end

data/lib/holoserve/pair.rb

@@ -3,5 +3,6 @@ module Holoserve::Pair
 
   autoload :Finder, File.join(File.dirname(__FILE__), "pair", "finder")
   autoload :Loader, File.join(File.dirname(__FILE__), "pair", "loader")
+  autoload :Validator, File.join(File.dirname(__FILE__), "pair", "validator")
 
 end

data/lib/holoserve/request/selector.rb

@@ -0,0 +1,21 @@
+
+class Holoserve::Request::Selector
+
+  attr_accessor :request
+
+  def initialize(request, request_subsets)
+    @request, @request_subsets = request, request_subsets
+  end
+
+  def selection
+    if Holoserve::Tool::Hash::Matcher.new(@request, @request_subsets[:default]).match?
+      @request_subsets.each do |variant, subset|
+        next if variant == :default
+        return variant if Holoserve::Tool::Hash::Matcher.new(@request, subset).match?
+      end
+      return :default
+    end
+    nil
+  end
+
+end

data/lib/holoserve/request.rb

@@ -2,6 +2,6 @@
 module Holoserve::Request
 
   autoload :Decomposer, File.join(File.dirname(__FILE__), "request", "decomposer")
-  autoload :Matcher, File.join(File.dirname(__FILE__), "request", "matcher")
+  autoload :Selector, File.join(File.dirname(__FILE__), "request", "selector")
 
 end

data/lib/holoserve/response/combiner.rb

@@ -7,7 +7,7 @@ class Holoserve::Response::Combiner
 
   def response
     @responses.inject @default do |result, response|
-      Holoserve::Tool::Merger.new(result, response, :fusion).result
+      Holoserve::Tool::Merger.new(result, response).result
     end
   end
 

data/lib/holoserve/response/selector.rb

@@ -24,26 +24,19 @@ class Holoserve::Response::Selector
     @sandbox = Sandbox.new state, logger
   end
 
-  def default_response
-    @responses[:default] ?
-      @responses[:default] :
-      { }
-  end
-
-  def selected_responses
-    result = [ ]
-    (@responses || { }).each do |line, response|
-      next if line.to_s == "default"
+  def selection
+    @responses.each do |key, response|
+      next if key.to_sym == :default
       begin
         match = @sandbox.instance_eval do
-          eval line.to_s
+          eval response[:condition]
         end
-        result << response if match
+        return key.to_sym if match
       rescue Object => error
         @logger.error error.inspect
       end
     end
-    result
+    @responses.has_key?(:default) ? :default : nil
   end
 
 end

data/lib/holoserve/tool/hash/matcher.rb

@@ -0,0 +1,53 @@
+
+class Holoserve::Tool::Hash::Matcher
+
+  attr_accessor :hash
+  attr_accessor :subset
+
+  def initialize(hash, subset)
+    @hash, @subset = hash, subset
+  end
+
+  def match?
+    return false if @hash.length < @subset.length
+    @subset.each do |key, value|
+      if @hash.has_key?(key)
+        return false unless match_value?(@hash[key], value)
+      else
+        return false
+      end
+    end
+    true
+  end
+
+  private
+
+  def match_value?(value_one, value_two)
+    if value_one.is_a?(Hash) && value_two.is_a?(Hash)
+      return false unless match_hash?(value_one, value_two)
+    elsif value_one.is_a?(Array) && value_two.is_a?(Array)
+      return false unless match_array?(value_one, value_two)
+    else
+      return false unless value_one == value_two
+    end
+    true
+  end
+
+  def match_hash?(hash, subset)
+    tmp = Holoserve::Tool::Hash::Matcher.new(hash, subset)
+    return false unless tmp.match?
+    true
+  end
+
+  def match_array?(array, subset)
+    return false if array.length < subset.length
+    subset.each_index do |i|
+      if subset[i].is_a?(Hash) && array[i].is_a?(Hash)
+        return false unless match_hash?(array[i], subset[i])
+      elsif subset[i].is_a?(Array) && array[i].is_a?(Array)
+        return false unless match_array?(array[i], subset[i])
+      end
+    end
+    true
+  end
+end

data/lib/holoserve/tool/hash.rb

@@ -2,5 +2,6 @@
 module Holoserve::Tool::Hash
 
   autoload :KeySymbolizer, File.join(File.dirname(__FILE__), "hash", "key_symbolizer")
+  autoload :Matcher, File.join(File.dirname(__FILE__), "hash", "matcher")
 
 end

data/spec/lib/holoserve/pair/validator_spec.rb

@@ -0,0 +1,52 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "helper"))
+require 'yaml'
+
+describe Holoserve::Pair::Validator do
+
+  let(:valid_schema_path) do
+    File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "..", "schema", "schema.yaml"))
+  end
+
+  let(:invalid_schema_path) do
+    File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "..", "features", "pairs", "invalid", "test_invalid_schema.yaml"))
+  end
+
+  let(:valid_hash) do
+    file = YAML::load_file(File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "..", "features", "pairs", "test_evaluation.yaml")))
+    Holoserve::Tool::Hash::KeySymbolizer.new(file).hash
+  end
+
+  let(:invalid_hash) do
+    file = YAML::load_file(File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "..", "features", "pairs", "invalid", "test_invalid_headers.yaml")))
+    Holoserve::Tool::Hash::KeySymbolizer.new(file).hash
+  end
+
+  subject { described_class.new valid_schema_path }
+
+  describe "#initialize" do
+
+    it "should raise an InvalidSchemaError if the schema file is invalid" do
+      lambda do
+        described_class.new invalid_schema_path
+      end.should raise_error(described_class::InvalidSchemaError)
+    end
+
+  end
+
+  describe "#validate" do
+
+    it "should return true if a valid pair file is provided" do
+      lambda do
+        subject.validate(valid_hash)
+      end.should_not raise_error
+    end
+
+    it "should return false if an invalid pair file is provided" do
+      lambda do
+        subject.validate(invalid_hash)
+      end.should raise_error(described_class::InvalidError)
+    end
+
+  end
+
+end

data/spec/lib/holoserve/request/selector_spec.rb

@@ -0,0 +1,69 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "helper"))
+
+describe Holoserve::Request::Selector do
+
+  let(:subsets) do
+    {
+      :default => {
+        :method => "GET",
+        :path => "/test"
+      },
+      :test => {
+        :headers => {
+          :HTTP_TEST => "value"
+        }
+      }
+    }
+  end
+
+  let(:variant_matching_request) do
+    {
+      :method => "GET",
+      :path => "/test",
+      :headers => {
+        :HTTP_TEST => "value",
+        :HTTP_HOST => "localhost"
+      }
+    }
+  end
+
+  let(:invalid_request) do
+    {
+      :method => "POST",
+      :other_test => {
+        :key => "value"
+      }
+    }
+  end
+
+  let(:default_matching_request) do
+    {
+      :method => "GET",
+      :path => "/test",
+      :parameters => {
+        :test => "value"
+      }
+    }
+  end
+
+  subject { described_class.new invalid_request, subsets }
+
+  describe "#selection" do
+
+    it "should return nil if request is not matching default nor any other subset" do
+      subject.selection.should be_nil
+    end
+
+    it "should return :default if the default subset is matched" do
+      subject.request = default_matching_request
+      subject.selection.should == :default
+    end
+
+    it "should return :test if the corresponding subset is matched" do
+      subject.request = variant_matching_request
+      subject.selection.should == :test
+    end
+
+  end
+
+end

data/spec/lib/holoserve/tool/hash/matcher_spec.rb

@@ -0,0 +1,136 @@
+require File.expand_path("../../../../helper", File.dirname(__FILE__))
+
+describe Holoserve::Tool::Hash::Matcher do
+
+  let(:hash) do
+    {
+      :test => "value",
+      :nested => {
+        :unspecified => "value",
+        :another => "test value"
+      },
+      :unspecified => "value",
+      :nested_array => [{:hash => "value", :unspecified => "value", :morehash => {:test => "value", :unspecified => "value", :array => [{:test => "value"}]}}]
+    }
+  end
+
+  let(:matching_subset) do
+    {
+      :test => "value"
+    }
+  end
+
+  let(:matching_subset_with_nested_hash) do
+    {
+      :nested => {
+        :another => "test value"
+      }
+    }
+  end
+
+  let(:matching_subset_with_nested_array) do
+    {
+      :nested_array => [{:hash => "value"}]
+    }
+  end
+
+  let(:matching_subset_with_nested_array_and_nested_hash) do
+    {
+      :nested_array => [{:hash => "value", :morehash => {:test => "value"}}]
+    }
+  end
+
+  let(:matching_subset_with_nested_array_and_nested_hash_and_nested_array) do
+    {
+      :nested_array => [{:hash => "value", :morehash => {:test => "value", :array => [{:test => "value"}]}}]
+    }
+  end
+
+  let(:mismatching_subset) do
+    {
+      :test => "another value"
+    }
+  end
+
+  let(:mismatching_subset_with_nested_hash) do
+    {
+      :nested => {
+        :another => "another value"
+      }
+    }
+  end
+
+  let(:mismatching_subset_with_nested_array) do
+    {
+      :nested_array => [{:hash => "other value"}]
+    }
+  end
+
+  let(:mismatching_subset_with_nested_array_and_nested_hash) do
+    {
+      :nested_array => [{:hash => "value", :morehash => {:test => "other value"}}]
+    }
+  end
+
+  let(:mismatching_subset_with_nested_array_and_nested_hash_and_nested_array) do
+    {
+      :nested_array => [{:hash => "value", :morehash => {:test => "value", :array => [{:test => "other value"}]}}]
+    }
+  end
+
+  subject { described_class.new hash, matching_subset }
+
+  describe "#match?" do
+
+    it "should return true if a matching subset is provided" do
+      subject.match?.should be_true
+    end
+
+    it "should return false if a mismatching subset is provided" do
+      subject.subset = mismatching_subset
+      subject.match?.should be_false
+    end
+
+    it "should return true if a matching subset with nested hash is provided" do
+      subject.subset = matching_subset_with_nested_hash
+      subject.match?.should be_true
+    end
+
+    it "should return false if a mismatching subset with nested hash is provided" do
+      subject.subset = mismatching_subset_with_nested_hash
+      subject.match?.should be_false
+    end
+
+    it "should return true if a matching subset with nested array is provided" do
+      subject.subset = matching_subset_with_nested_array
+      subject.match?.should be_true
+    end
+
+    it "should return false if a mismatching subset with nested array is provided" do
+      subject.subset = mismatching_subset_with_nested_array
+      subject.match?.should be_false
+    end
+
+    it "should return true if a matching subset with nested array and nested hash is provided" do
+      subject.subset = matching_subset_with_nested_array_and_nested_hash
+      subject.match?.should be_true
+    end
+
+    it "should return false if a mismatching subset with nested array and nested hash is provided" do
+      subject.subset = mismatching_subset_with_nested_array_and_nested_hash
+      subject.match?.should be_false
+    end
+
+    it "should return true if a matching subset with nested array and nested hash and nested array is provided" do
+      subject.subset = matching_subset_with_nested_array_and_nested_hash_and_nested_array
+      subject.match?.should be_true
+    end
+
+    it "should return false if a mismatching subset with nested array and nested hash and nested array is provided" do
+      subject.subset = mismatching_subset_with_nested_array_and_nested_hash_and_nested_array
+      subject.match?.should be_false
+    end
+
+  end
+
+end

metadata

@@ -1,19 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: holoserve
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
 - Philipp Brüll
+- Maximilian Hoffmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-05 00:00:00.000000000 Z
+date: 2012-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: goliath
-  requirement: &70271201827600 !ruby/object:Gem::Requirement
+  requirement: &70242257528700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +22,54 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70271201827600
+  version_requirements: *70242257528700
+- !ruby/object:Gem::Dependency
+  name: slim
+  requirement: &70242257527940 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70242257527940
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: &70242257526740 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70242257526740
+- !ruby/object:Gem::Dependency
+  name: coffee-script
+  requirement: &70242257526220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70242257526220
+- !ruby/object:Gem::Dependency
+  name: kwalify
+  requirement: &70242257525580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70242257525580
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70271205878240 !ruby/object:Gem::Requirement
+  requirement: &70242257523600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70271205878240
+  version_requirements: *70242257523600
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70271201838000 !ruby/object:Gem::Requirement
+  requirement: &70242257522300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70271201838000
+  version_requirements: *70242257522300
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70271201834120 !ruby/object:Gem::Requirement
+  requirement: &70242257537280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70271201834120
+  version_requirements: *70242257537280
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70271201831820 !ruby/object:Gem::Requirement
+  requirement: &70242257536160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70271201831820
+  version_requirements: *70242257536160
 - !ruby/object:Gem::Dependency
   name: transport
-  requirement: &70271205892940 !ruby/object:Gem::Requirement
+  requirement: &70242257535520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70271205892940
+  version_requirements: *70242257535520
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &70271205890640 !ruby/object:Gem::Requirement
+  requirement: &70242257534980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +132,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70271205890640
+  version_requirements: *70242257534980
 description: This tool can be used to fake webservice APIs for testing proposals.
 email: philipp.bruell@skrill.com
 executables:
@@ -105,16 +150,19 @@ files:
 - lib/holoserve/fixture.rb
 - lib/holoserve/interface/control/bucket.rb
 - lib/holoserve/interface/control/history.rb
+- lib/holoserve/interface/control/index.rb
 - lib/holoserve/interface/control/pair.rb
 - lib/holoserve/interface/control/state.rb
 - lib/holoserve/interface/control.rb
+- lib/holoserve/interface/event.rb
 - lib/holoserve/interface/fake.rb
 - lib/holoserve/interface.rb
 - lib/holoserve/pair/finder.rb
 - lib/holoserve/pair/loader.rb
+- lib/holoserve/pair/validator.rb
 - lib/holoserve/pair.rb
 - lib/holoserve/request/decomposer.rb
-- lib/holoserve/request/matcher.rb
+- lib/holoserve/request/selector.rb
 - lib/holoserve/request.rb
 - lib/holoserve/response/combiner.rb
 - lib/holoserve/response/composer.rb
@@ -124,6 +172,7 @@ files:
 - lib/holoserve/state.rb
 - lib/holoserve/tool/data_path.rb
 - lib/holoserve/tool/hash/key_symbolizer.rb
+- lib/holoserve/tool/hash/matcher.rb
 - lib/holoserve/tool/hash.rb
 - lib/holoserve/tool/merger.rb
 - lib/holoserve/tool/uploader.rb
@@ -131,7 +180,10 @@ files:
 - lib/holoserve.rb
 - spec/helper.rb
 - spec/lib/holoserve/fixture/importer_spec.rb
+- spec/lib/holoserve/pair/validator_spec.rb
+- spec/lib/holoserve/request/selector_spec.rb
 - spec/lib/holoserve/tool/data_path_spec.rb
+- spec/lib/holoserve/tool/hash/matcher_spec.rb
 - spec/lib/holoserve/tool/merger_spec.rb
 - spec/lib/holoserve_spec.rb
 homepage: http://github.com/skrill/holoserve
@@ -148,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4367529671340100891
+      hash: 3487198030302980531
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -163,6 +215,9 @@ specification_version: 3
 summary: Tool to fake HTTP APIs.
 test_files:
 - spec/lib/holoserve/fixture/importer_spec.rb
+- spec/lib/holoserve/pair/validator_spec.rb
+- spec/lib/holoserve/request/selector_spec.rb
 - spec/lib/holoserve/tool/data_path_spec.rb
+- spec/lib/holoserve/tool/hash/matcher_spec.rb
 - spec/lib/holoserve/tool/merger_spec.rb
 - spec/lib/holoserve_spec.rb

data/lib/holoserve/request/matcher.rb

@@ -1,74 +0,0 @@
-
-class Holoserve::Request::Matcher
-
-  def initialize(request, request_subset)
-    @request, @request_subset = request, request_subset
-  end
-
-  def match?
-    match_method? &&
-      match_path? &&
-      match_headers? &&
-      match_body? &&
-      match_parameters? &&
-      match_oauth? &&
-      match_json?
-  end
-
-  private
-
-  def match_method?
-    @request_subset[:method] ?
-      @request[:method] == @request_subset[:method] :
-      true
-  end
-
-  def match_path?
-    @request_subset[:path] ?
-      @request[:path] == @request_subset[:path] :
-      true
-  end
-
-  def match_headers?
-    match = true
-    (@request_subset[:headers] || { }).each do |key, value|
-      match &&= @request[:headers][key] == value
-    end
-    match
-  end
-
-  def match_body?
-    @request_subset[:body] ?
-      @request[:body] == @request_subset[:body] :
-      true
-  end
-
-  def match_parameters?
-    match = true
-    (@request_subset[:parameters] || { }).each do |key, value|
-      match &&= @request[:parameters].is_a?(Hash) && (@request[:parameters][key] == value)
-    end
-    match
-  end
-
-  def match_oauth?
-    match = true
-    (@request_subset[:oauth] || { }).each do |key, value|
-      match &&= @request[:oauth].is_a?(Hash) && (@request[:oauth][key] == value)
-    end
-    match
-  end
-
-  def match_json?
-    match_hash? :json
-  end
-
-  def match_hash?(hash_key)
-    match = true
-    (@request_subset[hash_key] || { }).each do |key, value|
-      match &&= @request[hash_key].is_a?(Hash) && (@request[hash_key][key] == value)
-    end
-    match
-  end
-
-end