holoserve-connector 0.1.1 → 0.2.0

data/README.rdoc

@@ -9,15 +9,16 @@ test suite. See {holoserve}[https://github.com/skrill/holoserve] for details abo
   require 'holoserve/connector'
   require 'transport'
 
-  holoserve = Holoserve::Connector.new :host => "localhost", :port => 8080
+  holoserve = Holoserve::Connector.new :host => "localhost"
 
-  holoserve.layouts.upload_yml "./layouts/test.yml"
-  holoserve.layouts.current = "one"
+  holoserve.fixtures.upload "./fixtures/*.json"
+  holoserve.pairs.upload "./pairs/*.yaml"
+  holoserve.situation.name = "one"
 
   Transport::HTTP.request :post, "/test"     # handled in test layout one
   Transport::HTTP.request :delete, "/test"   # unhandled
 
-  holoserve.history.pair_names
+  holoserve.history.pair_ids
   # => [ "test_requested" ]
 
   holoserve.bucket.requsts
@@ -32,13 +33,13 @@ test suite. See {holoserve}[https://github.com/skrill/holoserve] for details abo
   describe "RSpec matchers" do
 
     before :all do
-      @client = Holoserve::Bond.new
-      @client.layouts.upload_yml File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "layouts", "test.yml"))
-      @client.layouts.current = "one"
+      @client = Holoserve::Connector.new
+      @client.pairs.upload File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "pairs", "test.yaml"))
+      @client.situation.name = "one"
     end
 
     it "should test if holoserve received a specified request" do
-      Transport::HTTP.request :post, "http://localhost:8080/test", :expected_status_code => 201
+      Transport::HTTP.request :post, "http://localhost:4250/test", :expected_status_code => 201
       @client.should have_received("test_request")
     end
 

data/lib/holoserve/connector/bucket.rb

@@ -6,7 +6,11 @@ class Holoserve::Connector::Bucket
   end
 
   def requests
-    Transport::JSON.request :get, "#{@client.url}/bucket/requests"
+    Transport::JSON.request :get, "#{@client.url}/bucket"
+  end
+
+  def clear!
+    Transport::JSON.request :delete, "#{@client.url}/bucket"
   end
 
 end

data/lib/holoserve/connector/fixtures.rb

@@ -0,0 +1,42 @@
+
+class Holoserve::Connector::Fixtures
+
+  def initialize(client)
+    @client = client
+  end
+
+  def upload(pattern)
+    Dir[ pattern ].each do |filename|
+      upload_file filename
+    end
+  end
+
+  def download(id)
+    response = Transport::HTTP.request :get,
+                                       "#{@client.url}/fixtures/#{id}.yaml",
+                                       :expected_status_code => 200
+    YAML.load response
+  rescue Transport::UnexpectedStatusCodeError => error
+    raise Holoserve::Connector::Error, error.message unless error.status_code == 404
+    nil
+  end
+
+  def clear!
+    Transport::JSON.request :delete, "#{@client.url}/fixtures"
+  end
+
+  private
+
+  def upload_file(filename)
+    uploader = Holoserve::Connector::Tool::Uploader.new filename,
+                                                       :post,
+                                                       "#{@client.url}/fixtures",
+                                                       :expected_status_code => 200
+    uploader.upload
+    true
+  rescue Transport::UnexpectedStatusCodeError => error
+    raise Holoserve::Connector::Error, error.message unless error.status_code == 400
+    false
+  end
+
+end

data/lib/holoserve/connector/history.rb

@@ -9,8 +9,8 @@ class Holoserve::Connector::History
     Transport::JSON.request :delete, "#{@client.url}/history"
   end
 
-  def pair_names
-    Transport::JSON.request :get, "#{@client.url}/history "
+  def pair_ids
+    Transport::JSON.request :get, "#{@client.url}/history"
   end
 
-end
+end

data/lib/holoserve/connector/pairs.rb

@@ -0,0 +1,43 @@
+require 'yaml'
+
+class Holoserve::Connector::Pairs
+
+  def initialize(client)
+    @client = client
+  end
+
+  def upload(pattern)
+    Dir[ pattern ].each do |filename|
+      upload_file filename
+    end
+  end
+
+  def download(id)
+    response = Transport::HTTP.request :get,
+                                       "#{@client.url}/pairs/#{id}.yaml",
+                                       :expected_status_code => 200
+    YAML.load response
+  rescue Transport::UnexpectedStatusCodeError => error
+    raise Holoserve::Connector::Error, error.message unless error.status_code == 404
+    nil
+  end
+
+  def clear!
+    Transport::JSON.request :delete, "#{@client.url}/pairs"
+  end
+
+  private
+
+  def upload_file(filename)
+    uploader = Holoserve::Connector::Tool::Uploader.new filename,
+                                                       :post,
+                                                       "#{@client.url}/pairs",
+                                                       :expected_status_code => 200
+    uploader.upload
+    true
+  rescue Transport::UnexpectedStatusCodeError => error
+    raise Holoserve::Connector::Error, error.message unless error.status_code == 400
+    false
+  end
+
+end

data/lib/holoserve/connector/situation.rb

@@ -0,0 +1,22 @@
+
+class Holoserve::Connector::Situation
+
+  def initialize(client)
+    @client = client
+  end
+
+  def name=(value)
+    Transport::JSON.request :put, "#{@client.url}/situation", :parameters => { :name => value }
+  end
+
+  def name
+    response = Transport::JSON.request :get, "#{@client.url}/situation"
+    name = response["name"]
+    name == "" ? nil : name
+  end
+
+  def clear!
+    Transport::JSON.request :put, "#{@client.url}/situation", :parameters => { :name => nil }
+  end
+
+end

data/lib/holoserve/connector/tool/uploader.rb

@@ -0,0 +1,40 @@
+require 'transport'
+
+class Holoserve::Connector::Tool::Uploader
+
+  def initialize(filename, http_method, url, options = { })
+    @filename, @http_method, @url, @options = filename, http_method, url, options
+  end
+
+  def upload
+    Transport::HTTP.request @http_method, @url, @options.merge(:headers => headers, :body => body)
+  end
+
+  private
+
+  def headers
+    { "Content-Type" => "multipart/form-data, boundary=#{boundary}" }
+  end
+
+  def body
+    "--#{boundary}\r\n" +
+    "Content-Disposition: form-data; name=\"file\"; filename=\"#{File.basename(@filename)}\"\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
+
+end

data/lib/holoserve/connector/tool.rb

@@ -0,0 +1,6 @@
+
+module Holoserve::Connector::Tool
+
+  autoload :Uploader, File.join(File.dirname(__FILE__), "tool", "uploader")
+
+end

data/lib/holoserve/connector.rb

@@ -2,26 +2,33 @@
 class Holoserve::Connector
 
   autoload :Bucket, File.join(File.dirname(__FILE__), "connector", "bucket")
+  autoload :Fixtures, File.join(File.dirname(__FILE__), "connector", "fixtures")
   autoload :History, File.join(File.dirname(__FILE__), "connector", "history")
-  autoload :Layout, File.join(File.dirname(__FILE__), "connector", "layout")
+  autoload :Pairs, File.join(File.dirname(__FILE__), "connector", "pairs")
+  autoload :Situation, File.join(File.dirname(__FILE__), "connector", "situation")
+  autoload :Tool, File.join(File.dirname(__FILE__), "connector", "tool")
 
   class Error < StandardError; end
 
   attr_reader :host
   attr_reader :port
 
-  attr_reader :layout
   attr_reader :bucket
+  attr_reader :fixtures
   attr_reader :history
+  attr_reader :pairs
+  attr_reader :situation
 
   def initialize(options = { })
     @host, @port = *options.values_at(:host, :port)
     @host ||= "localhost"
     @port ||= 4250
 
-    @layout = Layout.new self
     @bucket = Bucket.new self
+    @fixtures = Fixtures.new self
     @history = History.new self
+    @pairs = Pairs.new self
+    @situation = Situation.new self
   end
 
   def url

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: holoserve-connector
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-17 00:00:00.000000000 Z
+date: 2012-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: transport
-  requirement: &70248250590080 !ruby/object:Gem::Requirement
+  requirement: &70096261721080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70248250590080
+  version_requirements: *70096261721080
 - !ruby/object:Gem::Dependency
   name: holoserve
-  requirement: &70248250588860 !ruby/object:Gem::Requirement
+  requirement: &70096261720480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70248250588860
+  version_requirements: *70096261720480
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70248250587660 !ruby/object:Gem::Requirement
+  requirement: &70096261736180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70248250587660
+  version_requirements: *70096261736180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70248250586220 !ruby/object:Gem::Requirement
+  requirement: &70096261735580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70248250586220
+  version_requirements: *70096261735580
 description: Provides a client for the control interface of holoserve and some RSpec
   matchers.
 email: philipp.bruell@skrill.com
@@ -67,8 +67,12 @@ files:
 - LICENSE
 - Rakefile
 - lib/holoserve/connector/bucket.rb
+- lib/holoserve/connector/fixtures.rb
 - lib/holoserve/connector/history.rb
-- lib/holoserve/connector/layout.rb
+- lib/holoserve/connector/pairs.rb
+- lib/holoserve/connector/situation.rb
+- lib/holoserve/connector/tool/uploader.rb
+- lib/holoserve/connector/tool.rb
 - lib/holoserve/connector.rb
 - lib/rspec/holoserve.rb
 - spec/helper.rb
@@ -88,7 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4236575270905341654
+      hash: -1743870002252913970
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/holoserve/connector/layout.rb

@@ -1,59 +0,0 @@
-require 'transport'
-
-class Holoserve::Connector::Layout
-
-  def initialize(client)
-    @client = client
-
-    @boundary = "xxx12345xxx"
-  end
-
-  def clear!
-    Transport::JSON.request :delete,
-                            "#{@client.url}/layout",
-                            :expected_status_code => 200
-  end
-
-  def upload_yaml(filename)
-    Transport::HTTP.request :post,
-                            "#{@client.url}/layout.yaml",
-                            :body => upload_yaml_file_request_body(filename),
-                            :headers => {
-                              "Content-Type" => "multipart/form-data, boundary=#{@boundary}"
-                            },
-                            :expected_status_code => 200
-    true
-  rescue Transport::UnexpectedStatusCodeError => error
-    raise Holoserve::Connector::Error, error.message
-  end
-
-  def download_yaml
-    response = Transport::HTTP.request :get,
-                                       "#{@client.url}/layout.yaml",
-                                       :expected_status_code => 200
-    YAML.load response
-  rescue Transport::UnexpectedStatusCodeError => error
-    raise Holoserve::Connector::Error, error.message
-  end
-
-  def situation=(value)
-    Transport::JSON.request :put, "#{@client.url}/situation/#{value}"
-  end
-
-  def situation
-    Transport::HTTP.request :get, "#{@client.url}/situation"
-  end
-
-  private
-
-  def upload_yaml_file_request_body(filename)
-    "--#{@boundary}\r\n" +
-      "Content-Disposition: form-data; name=\"file\"; filename=\"#{File.basename(filename)}\"\r\n" +
-      "Content-Type: application/x-yaml\r\n" +
-      "\r\n" +
-      File.read(filename) +
-      "\r\n" +
-      "--#{@boundary}--\r\n"
-  end
-
-end