holoserve 0.4.3 → 0.4.4

data/lib/holoserve/interface.rb

@@ -8,32 +8,56 @@ class Holoserve::Interface < Goliath::API
 
   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"
+  use Goliath::Rack::Params
+
+  def initialize
+    @router = Holoserve::Request::Router.new [
+      {
+        :method => :get,
+        :path => "/_control/bucket",
+        :handler => Control::Bucket::Fetch.new
+      }, {
+        :method => :delete,
+        :path => "/_control/bucket",
+        :handler => Control::Bucket::Delete.new
+      }, {
+        :method => :get,
+        :path => "/_control/history",
+        :handler => Control::History::Fetch.new
+      }, {
+        :method => :delete,
+        :path => "/_control/history",
+        :handler => Control::History::Delete.new
+      }, {
+        :method => :get,
+        :path => "/_control/pairs",
+        :handler => Control::Pair::Index.new
+      }, {
+        :method => :get,
+        :path => "/_control/pairs/:id",
+        :handler => Control::Pair::Fetch.new
+      }, {
+        :method => :put,
+        :path => "/_control/state",
+        :handler => Control::State::Update.new
+      }, {
+        :method => :get,
+        :path => "/_control/state",
+        :handler => Control::State::Fetch.new
+      }, {
+        :method => :delete,
+        :path => "/_control/state",
+        :handler => Control::State::Delete.new
+      }, {
+        :path => /^\//,
+        :handler => Fake.new
       }
+    ]
+  end
 
-  map "/_control/event", Event
-
-  get "/_control/bucket", Control::Bucket::Fetch
-  delete "/_control/bucket", Control::Bucket::Delete
-
-  get "/_control/history", Control::History::Fetch
-  delete "/_control/history", Control::History::Delete
-
-  get "/_control/pairs", Control::Pair::Index
-  get "/_control/pairs/:id", Control::Pair::Fetch
-
-  put "/_control/state", Control::State::Update
-  get "/_control/state", Control::State::Fetch
-  delete "/_control/state", Control::State::Delete
-
-  get "/_control*", Control::Index::Fetch
-
-  map "/*", Fake
+  def response(environment)
+    environment["parameters"] = environment.params
+    @router.dispatch environment
+  end
 
 end

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

@@ -15,7 +15,7 @@ module Holoserve::Interface::Control::Pair
     include Holoserve::Interface::Control::Helper
 
     def response(environment)
-      pair = pairs[params[:id]]
+      pair = pairs[ environment["parameters"][:id] ]
       respond_json pair
     end
 

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

@@ -4,11 +4,12 @@ module Holoserve::Interface::Control::State
 
   class Update < Goliath::API
     include Holoserve::Interface::Control::Helper
+    include Goliath::Rack::Types
 
     use Goliath::Rack::Params
 
     def response(environment)
-      state.merge! Holoserve::Tool::Hash::KeySymbolizer.new(params).hash
+      state.merge! environment.parameters
       logger.info "set state to '#{state.inspect}'"
       respond_json_acknowledgement
     end

data/lib/holoserve/interface/fake.rb

@@ -17,7 +17,7 @@ class Holoserve::Interface::Fake < Goliath::API
   use Goliath::Rack::Params
 
   def response(env)
-    request = Holoserve::Request::Decomposer.new(env, params).hash
+    request = Holoserve::Request::Decomposer.new(env, env["parameters"]).hash
     finder = Holoserve::Pair::Finder.new(pairs, request)
     pair = finder.pair
     if pair
@@ -49,6 +49,8 @@ class Holoserve::Interface::Fake < Goliath::API
     end
   rescue NoResponseError => error
     logger.warn "could not select any response for request [#{error.id}] with request variant [#{error.request_variant}]"
+  rescue Object => error
+    p error
   end
 
   private

data/lib/holoserve/request.rb

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

data/lib/holoserve/request/router.rb

@@ -0,0 +1,57 @@
+
+class Holoserve::Request::Router
+
+  def initialize(routes)
+    @routes = routes
+    substitute_paths
+  end
+
+  def dispatch(environment)
+    route = find_route environment["REQUEST_METHOD"].downcase.to_sym,
+                       environment["PATH_INFO"]
+
+    if route
+      if @parameters
+        environment["parameters"] ||= { }
+        environment["parameters"].merge! @parameters
+      end
+      route[:handler].response environment
+    else
+      nil
+    end
+  end
+
+  private
+
+  def substitute_paths
+    @routes.each do |route|
+      path = route[:path]
+      if path.is_a?(String) && path =~ /:\w+/
+        pattern = path.gsub(/:\w+/) do |match|
+          name = match[1..-1]
+          "(?<#{name}>.+)"
+        end
+        route[:path] = Regexp.new(pattern)
+      end
+    end
+  end
+
+  def find_route(method, path)
+    @routes.detect do |route|
+      (route.has_key?(:method) ? route[:method] == method : true) &&
+        (route[:path].is_a?(Regexp) ? begin
+        match = route[:path].match path
+        if match
+          @parameters = match.names.inject({ }) do |result, name|
+            result[name.to_sym] = match[name]
+            result
+          end
+          true
+        else
+          false
+        end
+      end : route[:path] == path)
+    end
+  end
+
+end

data/lib/holoserve/response/selector.rb

@@ -26,14 +26,14 @@ class Holoserve::Response::Selector
 
   def selection
     @responses.each do |key, response|
-      next if key.to_sym == :default
+      next if key.to_sym == :default || !response.has_key?(:condition)
       begin
         match = @sandbox.instance_eval do
           eval response[:condition]
         end
         return key.to_sym if match
       rescue Object => error
-        @logger.error error.inspect
+        @logger.error "error evaluating condition: [#{response[:condition]}] #{error.inspect}"
       end
     end
     @responses.has_key?(:default) ? :default : nil

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

@@ -27,6 +27,10 @@ class Holoserve::Tool::Hash::Matcher
       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)
+    elsif value_one.is_a?(TrueClass) || value_one.is_a?(FalseClass)
+      return false unless match_boolean?(value_one, value_two)
+    elsif value_two.is_a?(TrueClass) || value_two.is_a?(FalseClass)
+      return false unless match_boolean?(value_two, value_one)
     else
       return false unless value_one == value_two
     end
@@ -50,4 +54,11 @@ class Holoserve::Tool::Hash::Matcher
     end
     true
   end
+
+  def match_boolean?(boolean, value)
+    (return true if boolean.to_s.downcase == value.downcase) if value.is_a?(String)
+    return true if (boolean ? 1 : 0) == value
+    false
+  end
+
 end

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

@@ -0,0 +1,68 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "..", "helper"))
+
+describe Holoserve::Request::Router do
+
+  let(:test_handler_one) { Object.new }
+  let(:test_handler_two) { Object.new }
+  let(:test_handler_three) { Object.new }
+
+  let(:routes) do
+    [
+      {
+        :method => :get,
+        :path => "/test",
+        :handler => test_handler_one
+      }, {
+        :method => :get,
+        :path => /\/test\/\d+/,
+        :handler => test_handler_two
+      }, {
+        :method => :get,
+        :path => "/test/:id_one/path/:id_two",
+        :handler => test_handler_three
+      }
+    ]
+  end
+
+  subject { described_class.new routes }
+
+  before :each do
+    test_handler_one.stub(:response).and_return(:test_response_one)
+    test_handler_two.stub(:response).and_return(:test_response_two)
+    test_handler_three.stub(:response).and_return(:test_response_three)
+  end
+
+  def environment(method, path)
+    {
+      "REQUEST_METHOD" => method.to_s.upcase,
+      "PATH_INFO" => path
+    }
+  end
+
+  describe "#dispatch" do
+
+    it "should return the handler response if the given environment matches a route" do
+      result = subject.dispatch environment(:get, "/test")
+      result.should == :test_response_one
+    end
+
+    it "should match routes that defined via regular expressions" do
+      result = subject.dispatch environment(:get, "/test/123")
+      result.should == :test_response_two
+    end
+
+    it "should extract parameters from the route path and place it in the environment" do
+      test_handler_three.should_receive(:response).with(
+        hash_including("parameters" => { :id_one => "abc", :id_two => "def" }))
+      result = subject.dispatch environment(:get, "/test/abc/path/def")
+      result.should == :test_response_three
+    end
+
+    it "should return nil if the no route are matched" do
+      result = subject.dispatch environment(:get, "/unhandled")
+      result.should be_nil
+    end
+
+  end
+
+end

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

@@ -5,12 +5,13 @@ describe Holoserve::Tool::Hash::Matcher do
   let(:hash) do
     {
       :test => "value",
+      :boolean => "true",
       :nested => {
         :unspecified => "value",
         :another => "test value"
       },
       :unspecified => "value",
-      :nested_array => [{:hash => "value", :unspecified => "value", :morehash => {:test => "value", :unspecified => "value", :array => [{:test => "value"}]}}]
+      :nested_array => [{:hash => "value", :unspecified => "value", :morehash => {:test => "value", :unspecified => "value", :array => [{:test => "value", :boolean => 0}]}}]
     }
   end
 
@@ -78,6 +79,32 @@ describe Holoserve::Tool::Hash::Matcher do
     }
   end
 
+  let(:matching_subset_with_nested_array_and_nested_hash_and_nested_array_and_boolean) do
+    {
+      :nested_array => [{:hash => "value", :morehash => {:test => "value", :array => [{:test => "value", :boolean => false}]}}]
+    }
+  end
+
+  let(:mismatching_subset_with_nested_array_and_nested_hash_and_nested_array_and_boolean) do
+    {
+      :nested_array => [{:hash => "value", :morehash => {:test => "value", :array => [{:test => "other value", :boolean => true}]}}]
+    }
+  end
+
+  let(:matching_subset_with_boolean_value) do
+    {
+      :test => "value",
+      :boolean => true
+    }
+  end
+
+  let(:mismatching_subset_with_boolean_value) do
+    {
+      :test => "value",
+      :boolean => false
+    }
+  end
+
   subject { described_class.new hash, matching_subset }
 
   describe "#match?" do
@@ -131,6 +158,26 @@ describe Holoserve::Tool::Hash::Matcher do
       subject.match?.should be_false
     end
 
+    it "should return true if a matching subset with a boolean value is provided" do
+      subject.subset = matching_subset_with_boolean_value
+      subject.match?.should be_true
+    end
+
+    it "should return false if a mismatching subset with a boolean value is provided" do
+      subject.subset = mismatching_subset_with_boolean_value
+      subject.match?.should be_false
+    end
+
+    it "should return true if a matching subset with nested array and nested hash and nested array and a boolean is provided" do
+      subject.subset = matching_subset_with_nested_array_and_nested_hash_and_nested_array_and_boolean
+      subject.match?.should be_true
+    end
+
+    it "should return false if a mismatching subset with nested array and nested hash and nested array and a boolean is provided" do
+      subject.subset = mismatching_subset_with_nested_array_and_nested_hash_and_nested_array_and_boolean
+      subject.match?.should be_false
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: holoserve
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-22 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: goliath
-  requirement: &70133939968440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70133939968440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: slim
-  requirement: &70133939967800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70133939967800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70133939967140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +54,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70133939967140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &70133939966520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +70,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70133939966520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: kwalify
-  requirement: &70133939965900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +86,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70133939965900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70133939965320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +102,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70133939965320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70133939964620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +118,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70133939964620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70133939963660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +134,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70133939963660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70133939986480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +150,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70133939986480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: transport
-  requirement: &70133939985080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +166,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70133939985080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &70133939983100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,9 +182,14 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70133939983100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This tool can be used to fake webservice APIs for testing proposals.
-email: philipp.bruell@skrill.com
+email: b.phifty@gmail.com
 executables:
 - holoserve
 extensions: []
@@ -145,49 +200,50 @@ files:
 - LICENSE
 - Rakefile
 - bin/holoserve
-- bin/test.log
-- lib/holoserve/fixture/importer.rb
-- lib/holoserve/fixture.rb
+- lib/holoserve.rb
+- lib/holoserve/tool.rb
+- lib/holoserve/interface.rb
+- lib/holoserve/interface/fake.rb
+- lib/holoserve/interface/control.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/history.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/selector.rb
-- lib/holoserve/request.rb
-- lib/holoserve/response/combiner.rb
-- lib/holoserve/response/composer.rb
-- lib/holoserve/response/selector.rb
-- lib/holoserve/response.rb
 - lib/holoserve/state/updater.rb
-- lib/holoserve/state.rb
-- lib/holoserve/tool/data_path.rb
+- lib/holoserve/fixture/importer.rb
+- lib/holoserve/response.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/data_path.rb
+- lib/holoserve/tool/hash.rb
 - lib/holoserve/tool/uploader.rb
-- lib/holoserve/tool.rb
-- lib/holoserve.rb
+- lib/holoserve/response/composer.rb
+- lib/holoserve/response/combiner.rb
+- lib/holoserve/response/selector.rb
+- lib/holoserve/fixture.rb
+- lib/holoserve/pair/loader.rb
+- lib/holoserve/pair/validator.rb
+- lib/holoserve/pair/finder.rb
+- lib/holoserve/request/selector.rb
+- lib/holoserve/request/decomposer.rb
+- lib/holoserve/request/router.rb
+- lib/holoserve/pair.rb
+- lib/holoserve/request.rb
+- lib/holoserve/state.rb
 - spec/helper.rb
+- spec/lib/holoserve_spec.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
+- spec/lib/holoserve/tool/data_path_spec.rb
+- spec/lib/holoserve/pair/validator_spec.rb
+- spec/lib/holoserve/request/selector_spec.rb
+- spec/lib/holoserve/request/router_spec.rb
 - schema/schema.yaml
-homepage: http://github.com/skrill/holoserve
+homepage: http://github.com/phifty/holoserve
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -201,7 +257,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3598862315231191146
+      hash: 1715739372282684694
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -210,15 +266,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: holoserve
-rubygems_version: 1.8.15
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Tool to fake HTTP APIs.
 test_files:
+- spec/lib/holoserve_spec.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
+- spec/lib/holoserve/tool/data_path_spec.rb
+- spec/lib/holoserve/pair/validator_spec.rb
+- spec/lib/holoserve/request/selector_spec.rb
+- spec/lib/holoserve/request/router_spec.rb

data/bin/test.log

@@ -1,4 +0,0 @@
-[690:INFO] 2012-04-02 21:19:51 :: Starting server on 0.0.0.0:4250 in production mode. Watch out for stones.
-[708:INFO] 2012-04-02 21:20:17 :: Starting server on 0.0.0.0:4250 in production mode. Watch out for stones.
-[712:INFO] 2012-04-02 21:20:24 :: Starting server on 0.0.0.0:4250 in production mode. Watch out for stones.
-[724:INFO] 2012-04-02 21:20:33 :: Starting server on 0.0.0.0:4250 in production mode. Watch out for stones.