mirage 3.0.6 → 3.0.7

data/Gemfile.lock

@@ -18,6 +18,7 @@ GEM
       multipart-post (~> 1.2.0)
     ffi (1.9.0)
     ffi (1.9.0-java)
+    ffi (1.9.0-x86-mingw32)
     gherkin (2.12.2)
       multi_json (~> 1.3)
     gherkin (2.12.2-java)

data/HISTORY

@@ -1,3 +1,4 @@
+V3.0.6 - bug fix
 V3.0.5 - fixed bug in builder methods
 V3.0.1 - updating gem post install message to point people towards the readme due checkout the differences between version 2 and 3 of Mirage
 V3.0.0 - Major update see README.md

data/VERSION

@@ -1 +1 @@
-3.0.6
+3.0.7

data/mirage.gemspec

@@ -2,16 +2,14 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: mirage 3.0.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "mirage"
-  s.version = "3.0.6"
+  s.version = "3.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
   s.authors = ["Leon Davis"]
-  s.date = "2014-01-23"
+  s.date = "2014-06-05"
   s.description = "Mirage aids testing of your applications by hosting mock responses so that your applications do not have to talk to real endpoints. Its accessible via HTTP and has a RESTful interface."
   s.executables = ["mirage"]
   s.extra_rdoc_files = [
@@ -90,6 +88,8 @@ Gem::Specification.new do |s|
     "server/extensions/hash.rb",
     "server/extensions/object.rb",
     "server/helpers.rb",
+    "server/helpers/http_headers.rb",
+    "server/helpers/template_requirements.rb",
     "server/mock_response.rb",
     "server/server.rb",
     "spec/client/cli_bridge_spec.rb",
@@ -106,7 +106,8 @@ Gem::Specification.new do |s|
     "spec/client/templates_spec.rb",
     "spec/resources/binary.file",
     "spec/server/binary_data_checker_spec.rb",
-    "spec/server/helpers_spec.rb",
+    "spec/server/helpers/http_headers_spec.rb",
+    "spec/server/helpers/template_requirements_spec.rb",
     "spec/server/mock_response_spec.rb",
     "spec/server/server_spec.rb",
     "spec/spec_helper.rb",
@@ -119,11 +120,12 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/lashd/mirage"
   s.licenses = ["MIT"]
   s.post_install_message = "\n===============================================================================\nMirage v3:\n\nMirage has just gone up a major version from 2 to 3. If your project uses\na previous version take a look at https://github.com/lashd/mirage to see\nwhat's changed\n===============================================================================\n"
-  s.rubygems_version = "2.2.0"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.25"
   s.summary = "Mirage is a easy mock server for testing your applications"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 4
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sinatra>, [">= 0"])

data/server/helpers.rb

@@ -1,28 +1,3 @@
-require 'tempfile'
-require 'ptools'
-module Mirage
-  class Server < Sinatra::Base
-    module Helpers
-      def convert_raw_required_params raw_requirements
-        raw_requirements.collect { |requirement| requirement.split(":") }.inject({}) do |hash, pair|
-          parameter, value = pair.collect { |string| string.strip }
-          value = convert_value(value)
-          hash[parameter] =value; hash
-        end
-      end
-
-      def convert_raw_required_body_content_requirements raw_requirements
-        raw_requirements.collect do |string|
-          string.start_with?("%r{") && string.end_with?("}") ? eval(string) : string
-        end
-      end
-
-
-
-      private
-      def convert_value(value)
-        value.start_with?("%r{") && value.end_with?("}") ? eval(value) : value
-      end
-    end
-  end
-end
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'helpers/template_requirements'
+require 'helpers/http_headers'

data/server/helpers/http_headers.rb

@@ -0,0 +1,30 @@
+require 'rack/utils'
+require 'sinatra/base'
+module Mirage
+  class Server < Sinatra::Base
+    module Helpers
+      module HttpHeaders
+        def extract_http_headers(env)
+          headers = env.reject do |k, v|
+            k.to_s.upcase != 'CONTENT_TYPE' && (!(/^HTTP_[A-Z_]+$/ === k) || v.nil?)
+          end.map do |k, v|
+            [reconstruct_header_name(k), v]
+          end.inject(Rack::Utils::HeaderHash.new) do |hash, k_v|
+            k, v = k_v
+            hash[k] = v
+            hash
+          end
+
+          x_forwarded_for = (headers["X-Forwarded-For"].to_s.split(/, +/) << env["REMOTE_ADDR"]).join(", ")
+
+          headers.merge!("X-Forwarded-For" => x_forwarded_for)
+        end
+
+        def reconstruct_header_name(name)
+          name.sub(/^HTTP_/, "").gsub("_", "-")
+        end
+      end
+    end
+  end
+
+end

data/server/helpers/template_requirements.rb

@@ -0,0 +1,33 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'tempfile'
+require 'ptools'
+require 'sinatra/base'
+require 'helpers/http_headers'
+
+module Mirage
+  class Server < Sinatra::Base
+    module Helpers
+      module TemplateRequirements
+        def convert_raw_required_params raw_requirements
+          raw_requirements.collect { |requirement| requirement.split(":") }.inject({}) do |hash, pair|
+            parameter, value = pair.collect { |string| string.strip }
+            value = convert_value(value)
+            hash[parameter] =value; hash
+          end
+        end
+
+        def convert_raw_required_body_content_requirements raw_requirements
+          raw_requirements.collect do |string|
+            string.start_with?("%r{") && string.end_with?("}") ? eval(string) : string
+          end
+        end
+
+
+        private
+        def convert_value(value)
+          value.start_with?("%r{") && value.end_with?("}") ? eval(value) : value
+        end
+      end
+    end
+  end
+end

data/server/server.rb

@@ -7,7 +7,7 @@ module Mirage
 
     REQUESTS = {}
 
-    helpers Mirage::Server::Helpers
+    helpers Helpers::TemplateRequirements, Helpers::HttpHeaders
 
     put '/templates/*' do |name|
       content_type :json
@@ -23,7 +23,7 @@ module Mirage
       send(http_method, '/responses/*') do |name|
         body, query_string = Rack::Utils.unescape(request.body.read.to_s), request.query_string
 
-        options = {:body => body,
+          options = {:body => body,
                    :http_method => http_method,
                    :endpoint => name,
                    :params => request.params,
@@ -178,25 +178,7 @@ module Mirage
         mock_response.value(body, request, query_string)
       end
 
-      def extract_http_headers(env)
-        headers = env.reject do |k, v|
-          !(/^HTTP_[A-Z_]+$/ === k) || v.nil?
-        end.map do |k, v|
-          [reconstruct_header_name(k), v]
-        end.inject(Rack::Utils::HeaderHash.new) do |hash, k_v|
-          k, v = k_v
-          hash[k] = v
-          hash
-        end
-
-        x_forwarded_for = (headers["X-Forwarded-For"].to_s.split(/, +/) << env["REMOTE_ADDR"]).join(", ")
 
-        headers.merge!("X-Forwarded-For" => x_forwarded_for)
-      end
-
-      def reconstruct_header_name(name)
-        name.sub(/^HTTP_/, "").gsub("_", "-")
-      end
     end
   end
 end

data/spec/server/helpers/http_headers_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+require 'helpers/http_headers'
+describe Mirage::Server::Helpers::HttpHeaders do
+  describe '#extract_http_headers' do
+    it 'returns content-type' do
+      helpers = Object.new
+      helpers.extend(described_class)
+      expected = {'CONTENT_TYPE' => 'application/json'}
+      expect(helpers.extract_http_headers(expected)['Content-Type']).to eq('application/json')
+    end
+
+  end
+end

data/spec/server/{helpers_spec.rb → helpers/template_requirements_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 require 'sinatra'
-require 'helpers'
+require 'helpers/template_requirements'
 
 
 describe "helpers" do
@@ -8,7 +8,7 @@ describe "helpers" do
 
   before :each do
     @helper = Object.new
-    @helper.extend(Mirage::Server::Helpers)
+    @helper.extend(Mirage::Server::Helpers::TemplateRequirements)
   end
 
   describe 'converting raw parameter requirements' do

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: mirage
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.0.7
+  prerelease: 
 platform: ruby
 authors:
 - Leon Davis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2014-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: waitforit
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ptools
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -125,6 +142,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -132,6 +150,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -139,6 +158,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -146,6 +166,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -153,6 +174,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -160,6 +182,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -167,6 +190,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: jruby-openssl
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -174,6 +198,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -260,6 +285,8 @@ files:
 - server/extensions/hash.rb
 - server/extensions/object.rb
 - server/helpers.rb
+- server/helpers/http_headers.rb
+- server/helpers/template_requirements.rb
 - server/mock_response.rb
 - server/server.rb
 - spec/client/cli_bridge_spec.rb
@@ -276,7 +303,8 @@ files:
 - spec/client/templates_spec.rb
 - spec/resources/binary.file
 - spec/server/binary_data_checker_spec.rb
-- spec/server/helpers_spec.rb
+- spec/server/helpers/http_headers_spec.rb
+- spec/server/helpers/template_requirements_spec.rb
 - spec/server/mock_response_spec.rb
 - spec/server/server_spec.rb
 - spec/spec_helper.rb
@@ -288,7 +316,6 @@ files:
 homepage: https://github.com/lashd/mirage
 licenses:
 - MIT
-metadata: {}
 post_install_message: ! '
 
   ===============================================================================
@@ -309,19 +336,24 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 823988503959653715
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Mirage is a easy mock server for testing your applications
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MDU3ZDM3N2QxMDg4MzZjY2EzZDk1NWNhYzc1ZTZlNWU5ZmJlZjk5Mg==
-  data.tar.gz: !binary |-
-    YzY2OTZjMTJjNDVkMDk3MDA5YmU4YzY4OWExNjUxNWZmOGNlNjIxNw==
-SHA512:
-  metadata.gz: !binary |-
-    NzIxMDk3OThkNTgwOGQ0MDhhYThlZjNjNDk0MWI1ZmMxZWNiMjliZTE5M2Yw
-    NjI3Y2EzZDI5MmNiNGFhYzFhMDBkODQyMjA0MDRlNmQ1NWZjNDNlMWJkYjg2
-    NjgxNjRkYmNjMjM2MzA3Mzg1OTMwMGFlZjQ1Yjk4Yzc1NTZiNTQ=
-  data.tar.gz: !binary |-
-    MGUzZmQ1OTgyMDIwOTdjNWMwZmVkN2JjYjIyZWEyYTE1YWY2YWFlMDIwMTg5
-    NGQwOWE0ZGY4MGIxMDg3YjUyNjZkMTU1ZDgzMDBlMDVkNGFlOWFlMzdiYjdk
-    NmFkMzZmNmE5MWViODA4OTY1NWUxN2IxZTE5YTE5NGFmYjU2YmM=