holoserve 0.4.0 → 0.4.1

data/README.rdoc

@@ -130,6 +130,8 @@ The request/response pair file should have the following format.
         imports:
           - path: "test_fixture.users.0"
             as: "json.user"
+        transitions:
+          session_one: "existing"
       "user_one == :missing":
         json:
           message: "user not found"
@@ -170,3 +172,6 @@ are posted and the second one reacts on the transmission of <tt>username=one</tt
 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".
+
+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.

data/bin/holoserve

@@ -14,6 +14,9 @@ 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", "--log-file FILE", "The file where the messages go to.") do |value|
+    options[:log_filename] = value
+  end
   parser.on("-f", "--fixture-files PATTERN", "Load the specified fixture files on startup.") do |value|
     options[:fixture_file_pattern] = value
   end

data/bin/test.log

@@ -0,0 +1,4 @@
+[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.

data/lib/holoserve/fixture/importer.rb

@@ -33,7 +33,7 @@ class Holoserve::Fixture::Importer
   end
 
   def merge
-    @result = Holoserve::Tool::Merger.new(@result, hash_without_imports).result
+    @result = Holoserve::Tool::Merger.new(@result, hash_without_imports, :fusion).result
   end
 
   def hash_without_imports

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

@@ -8,7 +8,7 @@ module Holoserve::Interface::Control::State
     use Goliath::Rack::Params
 
     def response(environment)
-      state.merge! params
+      state.merge! Holoserve::Tool::Hash::KeySymbolizer.new(params).hash
       logger.info "set state to '#{state.inspect}'"
       respond_json_acknowledgement
     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).result
+      Holoserve::Tool::Merger.new(result, response, :fusion).result
     end
   end
 

data/lib/holoserve/response/selector.rb

@@ -3,7 +3,8 @@ class Holoserve::Response::Selector
 
   class Sandbox
 
-    def initialize(state)
+    def initialize(state, logger)
+      @logger = logger
       state.each do |resource, value|
         define_singleton_method resource.to_sym do
           value ? value.to_sym : nil
@@ -11,11 +12,16 @@ class Holoserve::Response::Selector
       end
     end
 
+    def method_missing(method_name, *arguments, &block)
+      @logger.warn "tried to use undefined state key '#{method_name}'"
+      nil
+    end
+
   end
 
   def initialize(responses, state, logger)
     @responses, @logger = responses, logger
-    @sandbox = Sandbox.new state
+    @sandbox = Sandbox.new state, logger
   end
 
   def default_response

data/lib/holoserve/tool/data_path.rb

@@ -36,17 +36,19 @@ class Holoserve::Tool::DataPath
     path = @path ? @path.split(PATH_SEPARATOR) : [ ]
     return Holoserve::Tool::Merger.new(@data, value).result if path.empty?
 
-    result = selected = clone @data
+    result = selected = clone(@data)
     key = parse_key path.shift
 
     while path.length > 0
       break unless selected.respond_to?(:[])
 
-      selected[key] ||= { }
+      selected[key] ||= path.first.to_s == "@" ? [ ] : { }
       selected = selected[key]
       key = parse_key path.shift
     end
 
+    key = selected.length if key.to_s == "@"
+
     selected[key] = value
     result
   end

data/lib/holoserve/tool/merger.rb

@@ -1,8 +1,10 @@
 
 class Holoserve::Tool::Merger
 
-  def initialize(hash_or_array_one, hash_or_array_two)
-    @hash_or_array_one, @hash_or_array_two = hash_or_array_one, hash_or_array_two
+  attr_accessor :mode
+
+  def initialize(hash_or_array_one, hash_or_array_two, mode = :union)
+    @hash_or_array_one, @hash_or_array_two, @mode = hash_or_array_one, hash_or_array_two, mode
   end
 
   def result
@@ -20,24 +22,32 @@ class Holoserve::Tool::Merger
   def merged_hash
     result = { }
     (@hash_or_array_one.keys + @hash_or_array_two.keys).uniq.each do |key|
-      value_one, value_two = @hash_or_array_one[key],@hash_or_array_two[key]
+      value_one, value_two = @hash_or_array_one[key], @hash_or_array_two[key]
       result[key] = if values_mergeable?(value_one, value_two)
-        self.class.new(value_one, value_two).result
+        self.class.new(value_one, value_two, @mode).result
       else
-        value_two || value_one
+        @hash_or_array_two.has_key?(key) ? value_two : value_one
       end
     end
     result
   end
 
   def merged_array
+    send :"#{@mode}_array"
+  end
+
+  def fusion_array
+    @hash_or_array_one + @hash_or_array_two
+  end
+
+  def union_array
     result = Array.new [ @hash_or_array_one.length, @hash_or_array_two.length ].max
     result.each_index do |index|
       value_one, value_two = @hash_or_array_one[index], @hash_or_array_two[index]
       result[index] = if values_mergeable?(value_one, value_two)
-        self.class.new(value_one, value_two).result
+        self.class.new(value_one, value_two, @mode).result
       else
-        value_two || value_one
+        index < @hash_or_array_two.length ? value_two : value_one
       end
     end
     result

data/lib/holoserve.rb

@@ -14,7 +14,7 @@ class Holoserve
   def initialize(options = { })
     @port = options[:port] || 4250
     @pid_filename = options[:pid_filename] || File.expand_path(File.join(File.dirname(__FILE__), "..", "holoserve.pid"))
-    @log_filename = options[:log_filename] || File.expand_path(File.join(File.dirname(__FILE__), "..", "holoserve.log"))
+    @log_filename = options[:log_filename]
     @fixture_file_pattern = options[:fixture_file_pattern]
     @pair_file_pattern = options[:pair_file_pattern]
     @state = options[:state] || { }
@@ -52,7 +52,7 @@ class Holoserve
   private
 
   def initialize_logger
-    @logger = Logger.new @log_filename
+    @logger = Logger.new(@log_filename ? @log_filename : $stdout)
   end
 
   def load_pairs
@@ -64,13 +64,13 @@ class Holoserve
 
     runner = Goliath::Runner.new [
       "-P", @pid_filename,
-      "-l", @log_filename,
+      @log_filename ? [ "-l", @log_filename ] : "-s",
       "-e", "production",
       "-p", @port.to_s,
-      daemonize ? "-d" : "-s"
-    ], nil
+      daemonize ? "-d" : nil
+    ].flatten.compact, nil
     runner.options[:pairs] = @pairs
-    runner.options[:state] = @state
+    runner.options[:state] = Tool::Hash::KeySymbolizer.new(@state).hash
     runner.api = Interface.new
     runner.app = Goliath::Rack::Builder.build Interface, runner.api
     runner.run

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

@@ -40,6 +40,25 @@ describe Holoserve::Fixture::Importer do
       subject.result.should == { :test => 1 }
     end
 
+    it "should return a hash with imported fixtures at a new target array" do
+      subject.hash = {
+        :imports => [
+          { :path => "one.first", :as => "test.@" }
+        ]
+      }
+      subject.result.should == { :test => [ 1 ] }
+    end
+
+    it "should return a hash with imported fixtures at an existing target array" do
+      subject.hash = {
+        :imports => [
+          { :path => "one.second", :as => "test.@" }
+        ],
+        :test => [ 1 ]
+      }
+      subject.result.should == { :test => [ 2, 1 ] }
+    end
+
     it "should return a hash with imported and white-list filtered fixtures" do
       subject.hash = {
         :imports => [

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

@@ -82,6 +82,18 @@ describe Holoserve::Tool::DataPath do
       subject.store("value").should == { :test => "value", :another => { :test => "value" } }
     end
 
+    it "should store the given value at the specified path and place it in a new array" do
+      subject.path = "test.@"
+      subject.data = { }.freeze
+      subject.store("value").should == { :test => [ "value" ] }
+    end
+
+    it "should store the given value at the specified path and place it in an existing array" do
+      subject.path = "test.@"
+      subject.data = { :test => [ 1 ] }.freeze
+      subject.store(2).should == { :test => [ 1, 2 ] }
+    end
+
   end
 
 end

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

@@ -17,6 +17,17 @@ describe Holoserve::Tool::Merger do
 
     end
 
+    context "of two hashes with boolean values" do
+
+      let(:argument_one) { { :one => false, :two => true } }
+      let(:argument_two) { { :one => true, :two => false } }
+
+      it "should merge hashes with boolean values" do
+        subject.result.should == { :one => true, :two => false }
+      end
+
+    end
+
     context "of two nested hashes" do
 
       let(:argument_one) { { :test => { :regular =>"value", :nested => "value" } } }
@@ -56,6 +67,21 @@ describe Holoserve::Tool::Merger do
 
     end
 
+    context "of two arrays in fusion mode" do
+
+      before :each do
+        subject.mode = :fusion
+      end
+
+      let(:argument_one) { [ 1 ] }
+      let(:argument_two) { [ 2, 3 ] }
+
+      it "should combine all arrays" do
+        subject.result.should == [ 1, 2, 3 ]
+      end
+
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: holoserve
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-13 00:00:00.000000000 Z
+date: 2012-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: goliath
-  requirement: &70166500305240 !ruby/object:Gem::Requirement
+  requirement: &70271201827600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70166500305240
+  version_requirements: *70271201827600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70166500304380 !ruby/object:Gem::Requirement
+  requirement: &70271205878240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166500304380
+  version_requirements: *70271205878240
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70166500303920 !ruby/object:Gem::Requirement
+  requirement: &70271201838000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166500303920
+  version_requirements: *70271201838000
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70166500303360 !ruby/object:Gem::Requirement
+  requirement: &70271201834120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166500303360
+  version_requirements: *70271201834120
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70166500302680 !ruby/object:Gem::Requirement
+  requirement: &70271201831820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166500302680
+  version_requirements: *70271201831820
 - !ruby/object:Gem::Dependency
   name: transport
-  requirement: &70166500294600 !ruby/object:Gem::Requirement
+  requirement: &70271205892940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166500294600
+  version_requirements: *70271205892940
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &70166500293740 !ruby/object:Gem::Requirement
+  requirement: &70271205890640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166500293740
+  version_requirements: *70271205890640
 description: This tool can be used to fake webservice APIs for testing proposals.
 email: philipp.bruell@skrill.com
 executables:
@@ -100,6 +100,7 @@ files:
 - LICENSE
 - Rakefile
 - bin/holoserve
+- bin/test.log
 - lib/holoserve/fixture/importer.rb
 - lib/holoserve/fixture.rb
 - lib/holoserve/interface/control/bucket.rb
@@ -147,7 +148,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1981031091455740716
+      hash: -4367529671340100891
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: