harper 0.0.2 → 0.0.3

data/.rvmrc

@@ -1,2 +1,2 @@
 rvm_install_on_use_flag=1
-rvm --create use ruby-1.8.7-p330@harper
+rvm --create use ruby-1.9.3-p0@harper

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    harper (0.0.1)
+    harper (0.0.3)
       httparty
       json (>= 1.4.6)
       sinatra (>= 1.0.0)
@@ -10,45 +10,50 @@ GEM
   remote: http://rubygems.org/
   specs:
     builder (3.0.0)
-    crack (0.1.8)
-    cucumber (0.10.3)
+    cucumber (1.1.4)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (>= 2.3.8)
+      gherkin (~> 2.7.1)
       json (>= 1.4.6)
-      term-ansicolor (>= 1.0.5)
-    cucumber-sinatra (0.3.1)
+      term-ansicolor (>= 1.0.6)
+    cucumber-sinatra (0.4.0)
       templater (>= 1.0.0)
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     extlib (0.9.15)
-    gherkin (2.3.9)
+    gherkin (2.7.6)
       json (>= 1.4.6)
-    highline (1.6.2)
-    httparty (0.7.7)
-      crack (= 0.1.8)
-    json (1.4.6)
-    rack (1.3.0)
-    rack-test (0.6.0)
+    highline (1.6.11)
+    httparty (0.8.1)
+      multi_json
+      multi_xml
+    json (1.6.5)
+    multi_json (1.0.4)
+    multi_xml (0.4.1)
+    rack (1.4.1)
+    rack-protection (1.2.0)
+      rack
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.3)
-    rspec-expectations (2.6.0)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
+    rspec-mocks (2.8.0)
     sham_rack (1.3.3)
       rack
-    sinatra (1.2.6)
-      rack (~> 1.1)
-      tilt (>= 1.2.2, < 2.0)
+    sinatra (1.3.2)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
     templater (1.0.0)
       diff-lcs (>= 1.1.2)
       extlib (>= 0.9.5)
       highline (>= 1.4.0)
-    term-ansicolor (1.0.5)
-    tilt (1.3.1)
+    term-ansicolor (1.0.7)
+    tilt (1.3.3)
 
 PLATFORMS
   ruby

data/bin/harper

@@ -4,4 +4,8 @@ require "harper"
 
 port = ARGV.shift || 4567
 
-Rack::Server.start :app => Harper, :Port => port
+# Harper needs access to the server hosting itself so that it can shut
+# it down on demand
+server = Rack::Server.new :app => Harper::App, :Port => port, :server => 'webrick'
+Harper::App.server(server.server)
+server.start

data/features/step_definitions/http_steps.rb

@@ -14,7 +14,7 @@ When /^the application issues an? "([A-Z]+)" request for "([^"]*)"$/ do |method,
 end
 
 When /^the application issues an? "([A-Z]+)" request to the mock$/ do |method|
-  When %{the application issues a "#{method}" request for "/service"}
+  step %{the application issues a "#{method}" request for "/service"}
 end
 
 Then /^the response code should be "(\d+)"$/ do |expected|

data/features/support/env.rb

@@ -21,5 +21,5 @@ World do
 end
 
 ShamRack.at("example.com").rackup do
-  run Harper.new
+  run Harper::App.new
 end

data/harper.gemspec

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "harper"
+require "harper/version"
 
 Gem::Specification.new do |s|
   s.name        = "harper"

data/lib/harper/app.rb

@@ -0,0 +1,97 @@
+require 'base64'
+require 'sinatra/base'
+require 'logger'
+require 'json'
+
+module Harper
+  class App < Sinatra::Base
+
+    Version = "0.0.2"
+
+    @@mocks = {}
+    @@server = nil
+
+    def self.server(server)
+      @@server = server
+    end
+
+    enable :logging
+
+    configure do
+      LOGGER = Logger.new("sinatra.log")
+    end
+
+    helpers do
+      def logger
+        LOGGER
+      end
+
+      def mock_id(url)
+        [url].pack('m').tr("+/=", "-_.").gsub("\n", '')
+      end
+    end
+
+    post '/h/mocks' do
+      mock = JSON(request.body.read)
+
+      mock['url'] = mock['url'][1..-1] if mock['url'] =~ /^\//
+
+      mock['id'] = mock_id(mock['url'])
+      mock['method'].upcase!
+      mock['delay'] = mock['delay'].to_f / 1000.0
+      @@mocks[mock['id']] = mock
+
+      logger.info("Created mock for endpoint: '#{mock['url']}'")
+      
+      headers['location'] = "/h/mocks/#{mock['id']}"
+      status "201"
+    end
+
+    delete '/h/mocks' do
+      @@mocks = {}
+    end
+
+    get '/h/mocks/:mock_id' do |mock_name|
+      content_type :json
+      status "200"
+      @@mocks[mock_name].to_json
+    end
+
+    delete '/h/mocks/:mock_id' do |mock_name|
+      @@mocks[mock_name] = nil
+
+      status "200"
+    end
+
+    put '/h/control' do
+      cmd = JSON(request.body.read)
+
+      case cmd["command"]
+      when "quit"
+        @@server.shutdown
+      end
+    end
+
+    [:get, :post, :put, :delete].each do |method|
+      self.send(method, '*') do
+        mock_id = mock_id(request.path[1..-1])
+
+        logger.debug("#{request.request_method} request for a mock: '#{request.path}'")
+
+        mock = @@mocks[mock_id]
+        if mock && request.request_method == mock['method']
+          content_type mock['content-type']
+          status mock['status'] || "200"
+          sleep mock['delay']
+          
+          logger.info("Serving mocked body for endpoint: '#{mock['url']}'")
+
+          mock['body']
+        else
+          status "503"
+        end
+      end
+    end
+
+  end
+end

data/lib/harper/version.rb

@@ -0,0 +1,3 @@
+module Harper
+  Version = "0.0.3"
+end

data/lib/harper.rb

@@ -1,81 +1 @@
-require 'base64'
-require 'sinatra/base'
-require 'logger'
-require 'json'
-
-class Harper < Sinatra::Base
-
-  Version = "0.0.2"
-
-  @@mocks = {}
-
-  enable :logging
-
-  configure do
-    LOGGER = Logger.new("sinatra.log")
-  end
-
-  helpers do
-    def logger
-      LOGGER
-    end
-
-    def mock_id(url)
-      [url].pack('m').tr("+/=", "-_.").gsub("\n", '')
-    end
-  end
-
-  post '/h/mocks' do
-    mock = JSON(request.body.read)
-
-    mock['url'] = mock['url'][1..-1] if mock['url'] =~ /^\//
-
-    mock['id'] = mock_id(mock['url'])
-    mock['method'].upcase!
-    mock['delay'] = mock['delay'].to_f / 1000.0
-    @@mocks[mock['id']] = mock
-
-    logger.info("Created mock for endpoint: '#{mock['url']}'")
-    
-    headers['location'] = "/h/mocks/#{mock['id']}"
-    status "201"
-  end
-
-  delete '/h/mocks' do
-    @@mocks = {}
-  end
-
-  get '/h/mocks/:mock_id' do |mock_name|
-    content_type :json
-    status "200"
-    @@mocks[mock_name].to_json
-  end
-
-  delete '/h/mocks/:mock_id' do |mock_name|
-    @@mocks[mock_name] = nil
-
-    status "200"
-  end
-
-  [:get, :post, :put, :delete].each do |method|
-    self.send(method, '*') do
-      mock_id = mock_id(request.path[1..-1])
-
-      logger.debug("#{request.request_method} request for a mock: '#{request.path}'")
-
-      mock = @@mocks[mock_id]
-      if mock && request.request_method == mock['method']
-        content_type mock['content-type']
-        status mock['status'] || "200"
-        sleep mock['delay']
-        
-        logger.info("Serving mocked body for endpoint: '#{mock['url']}'")
-
-        mock['body']
-      else
-        status "503"
-      end
-    end
-  end
-
-end
+require 'harper/app'

data/spec/harper_spec.rb

@@ -1,12 +1,14 @@
+$: << File.dirname(__FILE__) + "/.."
+
 require 'spec/spec_helper'
 require 'harper'
 
-describe Harper do
+describe Harper::App do
   include Rack::Test::Methods
 
   supported_verbs = ["GET", "POST", "PUT", "DELETE"]
 
-  let(:app) { Harper.new }
+  let(:app) { Harper::App.new }
 
   let(:method) { "GET" }
   let(:url) { "/service" }
@@ -148,4 +150,14 @@ describe Harper do
     end
   end
 
+  context "controlling harper" do
+    
+    it "should exit, abruptly, on demand" do
+      host = mock('hosting server')
+      host.should_receive(:shutdown)
+      Harper::App.server(host)
+      put '/h/control', {:command => "quit"}.to_json
+    end
+  end
+
 end

metadata

@@ -1,150 +1,112 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: harper
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.0.3
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
 platform: ruby
-authors: 
+authors:
 - Giles Alexander
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-15 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sinatra
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70267968221820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: httparty
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70267968221820
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: &70267968220540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70267968220540
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70267968218680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 4
-        - 6
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.6
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70267968218680
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &70267968217900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: sham_rack
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70267968217900
+- !ruby/object:Gem::Dependency
+  name: sham_rack
+  requirement: &70267968217200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70267968217200
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70267968216220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70267968216220
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &70267968215240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 10
-        version: "0.10"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.10'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: cucumber-sinatra
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70267968215240
+- !ruby/object:Gem::Dependency
+  name: cucumber-sinatra
+  requirement: &70267968214820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
+  prerelease: false
+  version_requirements: *70267968214820
 description: Dead simple mocking for HTTP services, a Sinatra app
-email: 
+email:
 - giles.alexander@gmail.com
-executables: 
+executables:
 - harper
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rvmrc
 - Gemfile
@@ -160,45 +122,35 @@ files:
 - features/support/paths.rb
 - harper.gemspec
 - lib/harper.rb
+- lib/harper/app.rb
+- lib/harper/version.rb
 - spec/harper_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/gga/harper
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: harper
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Dead simple mocking for HTTP services
-test_files: 
+test_files:
 - features/mock_http_rpc_service.feature
 - features/step_definitions/http_steps.rb
 - features/step_definitions/mock_definition_steps.rb