mirage 3.0.14 → 4.0.0.alpha1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NjNiNzU3NTM2Zjk4YzE0MGNlYzE1YWVlMGQ4OWJhMmQ4M2FkOTdkMA==
-  data.tar.gz: !binary |-
-    ZjFiYmQzYjZlYzMxYWFiNmZlNTUxMWQ2MWUzOTQyMGU0NjIyMmEyMw==
+SHA1:
+  metadata.gz: f6e9871a63a2b39f0502f30432f05d8bdfb622c4
+  data.tar.gz: 0c5bac0bdb4dae476950e56ab1f1af2092fef881
 SHA512:
-  metadata.gz: !binary |-
-    Y2FmMjAwOTc1YzhlMzZlODIwMzVkODcyYzcyY2E2ZDQ5NmNlZDExZmVhMWZh
-    N2M0MDgyOWE0OTdkMzVlOWMzOWFhNWM0YTY5MDZjYmZhZDBiZjQ5YzI4YzE1
-    YTM1OWQ3MzZlZDg0MDkwMmJiNGM5NGVmODY2YzJhNjE2YmNhZTA=
-  data.tar.gz: !binary |-
-    NzNiMTIyOGQxMzlhYmM1NmM0ZDQyOTgzMWIwYmM3MDdkMmQ3ZDAyODI2MDMy
-    NjM1NmUzZWQxZjY3ZDc2NjAyNjQ1NGEzNTczZTE2ZDNiYjg3YTJjMjc4NDI4
-    YmY3ODhkYjZmMGNhY2NiODYzMDk3NjI2YzY3MGQ5MzJlOGYyOTQ=
+  metadata.gz: dd838a9538c6eff9e445dfe3e03043525b8fc5661e56f6de10bfb23c5638984dedeceeca9fbeb2fdec7c1f5c96d651717b9d5d78501e7e737ce2bf97977de25b
+  data.tar.gz: 857b213ff50e989b6006f06fb3ccbc7b5960e89c2fe4dcc0a07685fc626433a499f5a94372a62f4f97942637e8edb3a6861be0e95e79920ec7ad8c436dd8a1c7

data/lib/mirage/client/client.rb

@@ -17,7 +17,7 @@ module Mirage
       elsif options.kind_of?(Hash) && options[:url]
         @url = options[:url]
       else
-        raise "specify a valid URL or port"
+        raise ArgumentError, "specify a valid URL or port"
       end
 
       @templates = Templates.new(@url)
@@ -38,8 +38,8 @@ module Mirage
     end
 
     def requests id=nil
-      return Request.get "#{@url}/requests/#{id}" if id
-      Requests.new(@url)
+      return Requests.get "#{@url}/requests/#{id}" if id
+      Requests.new("#{@url}/requests")
     end
 
     def prime

data/lib/mirage/client/request.rb

@@ -1,30 +1,6 @@
 require 'hashie/mash'
 module Mirage
   class Request
-    include HTTParty
-
-    class << self
-      alias_method :backedup_get, :get
-      def get url
-        result = Hashie::Mash.new(backedup_get(url, format: :json))
-        request = new
-        request.parameters = result.parameters
-        request.headers = result.headers
-        request.request_url = result.request_url
-        request.body = result.body
-        request.id = result.id
-        request
-      rescue
-        raise NotReceivedException.new('Mirage has not received a request for this id')
-      end
-    end
-
     attr_accessor :parameters, :headers, :body, :request_url, :id
-
-    def delete
-      self.class.delete(id)
-    end
-
-    class NotReceivedException < StandardError ; end
   end
 end

data/lib/mirage/client/requests.rb

@@ -1,13 +1,38 @@
 module Mirage
-  class Requests
+  class Requests < Array
+    class NotReceivedException < StandardError ; end
+
     include HTTParty
 
+    class << self
+      alias_method :backedup_get, :get
+      def get url
+        response = backedup_get(url, format: :json)
+        requests = new(url)
+        response.each do |request_data|
+          request_data_hash = Hashie::Mash.new(request_data)
+          request = Request.new
+          request.parameters = request_data_hash.parameters
+          request.headers = request_data_hash.headers
+          request.request_url = request_data_hash.request_url
+          request.body = request_data_hash.body
+          request.id = request_data_hash.id
+          requests << request
+        end
+        requests
+      rescue Exception => e
+        raise NotReceivedException.new('Mirage has not received a request for this id')
+      end
+    end
+
     def initialize base_url
-      @url = "#{base_url}/requests"
+      @url = base_url
     end
 
     def delete_all
       self.class.delete(@url)
     end
+
+    alias delete delete_all
   end
 end

data/lib/mirage/client/template.rb

@@ -1,7 +1,7 @@
 require 'ostruct'
 require 'json'
 require 'httparty'
-require 'hashie/mash'
+require 'hashie/mash_ext'
 
 require 'client/template/configuration'
 require 'client/template/model'

data/lib/mirage/client/template/model/instance_methods.rb

@@ -38,7 +38,7 @@ module Mirage
 
         def delete
           self.class.delete(url)
-          Request.delete requests_url
+          Requests.delete requests_url
         end
 
 

data/lib/mirage/hashie/mash_ext.rb

@@ -0,0 +1,8 @@
+require 'hashie/mash'
+module Mirage
+  module Hashie
+    class Mash < ::Hashie::Mash
+      disable_warnings
+    end
+  end
+end

data/server/errors.rb

@@ -0,0 +1,11 @@
+module Mirage
+  class Server < Sinatra::Base
+    error ServerResponseNotFound do
+      404
+    end
+
+    error do
+      erb request.env['sinatra.error'].message
+    end
+  end
+end

data/server/helpers.rb

@@ -1,3 +1,36 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'helpers/template_requirements'
-require 'helpers/http_headers'
+require 'helpers/http_headers'
+
+module Mirage
+  class Server < Sinatra::Base
+    helpers do
+
+      def synchronize &block
+        Mutex.new.synchronize &block
+      end
+
+      def response_id
+        params[:id].to_i
+      end
+
+      def prime &block
+        block.call Mirage::Client.new "http://localhost:#{settings.port}"
+      end
+
+      def send_response(mock_response, body='', request={}, query_string='')
+        sleep mock_response.response_spec['delay']
+        content_type(mock_response.response_spec['content_type'])
+        status mock_response.response_spec['status']
+        headers mock_response.headers
+        mock_response.value(body, request, query_string)
+      end
+
+      def tracked_requests response_id
+        REQUESTS[response_id] ||= []
+      end
+
+
+    end
+  end
+end

data/server/routes.rb

@@ -0,0 +1,21 @@
+require 'routes/defaults'
+require 'routes/templates'
+require 'routes/requests'
+require 'routes/backup'
+require 'routes/responses'
+require 'routes/pid'
+module Mirage
+  class Server < Sinatra::Base
+    get '/' do
+      haml :index
+    end
+
+    put '/' do
+      synchronize do
+        MockResponse.revert
+      end
+
+      200
+    end
+  end
+end

data/server/routes/backup.rb

@@ -0,0 +1,11 @@
+module Mirage
+  class Server < Sinatra::Base
+    put '/backup' do
+      synchronize do
+        MockResponse.backup
+      end
+
+      200
+    end
+  end
+end

data/server/routes/defaults.rb

@@ -0,0 +1,20 @@
+module Mirage
+
+  class Server < Sinatra::Base
+    put '/defaults' do
+      synchronize do
+        MockResponse.delete_all
+        if File.directory?(settings.defaults.to_s)
+          Dir["#{settings.defaults}/**/*.rb"].each do |default|
+            begin
+              eval File.read(default)
+            rescue Exception => e
+              raise "Unable to load default responses from: #{default}"
+            end
+          end
+        end
+      end
+      200
+    end
+  end
+end

data/server/routes/pid.rb

@@ -0,0 +1,7 @@
+module Mirage
+  class Server < Sinatra::Base
+    get '/pid' do
+      "#{$$}"
+    end
+  end
+end

data/server/routes/requests.rb

@@ -0,0 +1,43 @@
+module Mirage
+  class Server < Sinatra::Base
+    REQUESTS = {}
+    delete '/requests' do
+      synchronize do
+        REQUESTS.clear
+      end
+
+      200
+    end
+
+    delete '/requests/:id' do
+      synchronize do
+        REQUESTS.delete(response_id)
+      end
+
+      200
+    end
+
+    get '/requests/:id' do
+      content_type :json
+      tracked_requests = tracked_requests(response_id)
+      response = []
+      if tracked_requests
+        tracked_requests.collect do |tracked_request|
+          tracked_request.body.rewind
+          body = tracked_request.body.read
+
+          parameters = tracked_request.params.dup.select { |key, value| key != body }
+
+          response << {id: request.url,
+           request_url: tracked_request.url,
+           headers: extract_http_headers(tracked_request.env),
+           parameters: parameters,
+           body: body}
+        end
+        response.to_json
+      else
+        404
+      end
+    end
+  end
+end

data/server/routes/responses.rb

@@ -0,0 +1,27 @@
+module Mirage
+  class Server < Sinatra::Base
+    %w(get post delete put options).each do |http_method|
+      send(http_method, '/responses/*') do |name|
+        body, query_string = Rack::Utils.unescape(request.body.read.to_s), request.query_string
+
+        options = {:body => body,
+                   :http_method => http_method,
+                   :endpoint => name,
+                   :params => request.params,
+                   :headers => extract_http_headers(env)}
+        begin
+          record = MockResponse.find(options)
+        rescue ServerResponseNotFound
+          record = MockResponse.find_default(options)
+        end
+
+        synchronize do
+          tracked_requests(record.response_id) << request.dup
+        end
+
+
+        send_response(record, body, request, query_string)
+      end
+    end
+  end
+end

data/server/routes/templates.rb

@@ -0,0 +1,41 @@
+module Mirage
+  class Server < Sinatra::Base
+    get '/templates/:id/preview' do
+      send_response(MockResponse.find_by_id(response_id), '', {}, '')
+    end
+
+    delete '/templates/:id' do
+      synchronize do
+        MockResponse.delete(response_id)
+        REQUESTS.delete(response_id)
+      end
+
+      200
+    end
+
+    put '/templates/*' do |name|
+      content_type :json
+      mock_response = synchronize do
+        MockResponse.new(name, JSON.parse(request.body.read))
+      end
+
+      mock_response.requests_url = request.url.gsub("/templates/#{name}", "/requests/#{mock_response.response_id}")
+      {:id => mock_response.response_id}.to_json
+    end
+
+
+    delete '/templates' do
+      synchronize do
+        REQUESTS.clear
+        MockResponse.delete_all
+      end
+
+      200
+    end
+
+    get '/templates/:id' do
+      MockResponse.find_by_id(response_id).raw
+    end
+
+  end
+end

data/server/server.rb

@@ -1,184 +1,10 @@
 require 'sinatra'
 require 'helpers'
 require 'base64'
+require 'routes'
+require 'errors'
 module Mirage
-
   class Server < Sinatra::Base
-
-    REQUESTS = {}
-
     helpers Helpers::TemplateRequirements, Helpers::HttpHeaders
-
-    put '/templates/*' do |name|
-      content_type :json
-      mock_response = synchronize do
-        MockResponse.new(name, JSON.parse(request.body.read))
-      end
-
-      mock_response.requests_url = request.url.gsub("/templates/#{name}", "/requests/#{mock_response.response_id}")
-      {:id => mock_response.response_id}.to_json
-    end
-
-    %w(get post delete put options).each do |http_method|
-      send(http_method, '/responses/*') do |name|
-        body, query_string = Rack::Utils.unescape(request.body.read.to_s), request.query_string
-
-          options = {:body => body,
-                   :http_method => http_method,
-                   :endpoint => name,
-                   :params => request.params,
-                   :headers => extract_http_headers(env)}
-        begin
-          record = MockResponse.find(options)
-        rescue ServerResponseNotFound
-          record = MockResponse.find_default(options)
-        end
-
-        synchronize do
-          REQUESTS[record.response_id] = request.dup
-        end
-
-
-        send_response(record, body, request, query_string)
-      end
-    end
-
-    get '/templates/:id/preview' do
-      send_response(MockResponse.find_by_id(response_id), '', {}, '')
-    end
-
-    delete '/templates/:id' do
-      synchronize do
-        MockResponse.delete(response_id)
-        REQUESTS.delete(response_id)
-      end
-
-      200
-    end
-
-    delete '/requests' do
-      synchronize do
-        REQUESTS.clear
-      end
-
-      200
-    end
-
-    delete '/requests/:id' do
-      synchronize do
-        REQUESTS.delete(response_id)
-      end
-
-      200
-    end
-
-    delete '/templates' do
-      synchronize do
-        REQUESTS.clear
-        MockResponse.delete_all
-      end
-
-      200
-    end
-
-    get '/templates/:id' do
-      MockResponse.find_by_id(response_id).raw
-    end
-
-    get '/requests/:id' do
-      content_type :json
-      tracked_request = REQUESTS[response_id]
-      if tracked_request
-
-        tracked_request.body.rewind
-        body = tracked_request.body.read
-
-        parameters = tracked_request.params.dup.select { |key, value| key != body }
-
-        {id: request.url,
-         request_url: tracked_request.url,
-         headers: extract_http_headers(tracked_request.env),
-         parameters: parameters,
-         body: body}.to_json
-
-      else
-        404
-      end
-    end
-
-    get '/' do
-      haml :index
-    end
-
-
-    put '/defaults' do
-      synchronize do
-        MockResponse.delete_all
-        if File.directory?(settings.defaults.to_s)
-          Dir["#{settings.defaults}/**/*.rb"].each do |default|
-            begin
-              eval File.read(default)
-            rescue Exception => e
-              raise "Unable to load default responses from: #{default}"
-            end
-          end
-        end
-      end
-      200
-    end
-#
-    put '/backup' do
-      synchronize do
-        MockResponse.backup
-      end
-
-      200
-    end
-
-
-    put '/' do
-      synchronize do
-        MockResponse.revert
-      end
-
-      200
-    end
-
-    get '/pid' do
-      "#{$$}"
-    end
-
-    error ServerResponseNotFound do
-      404
-    end
-
-    error do
-      erb request.env['sinatra.error'].message
-    end
-
-    helpers do
-
-      def synchronize &block
-        Mutex.new.synchronize &block
-      end
-
-      def response_id
-        params[:id].to_i
-      end
-
-      def prime &block
-        block.call Mirage::Client.new "http://localhost:#{settings.port}"
-      end
-
-      def send_response(mock_response, body='', request={}, query_string='')
-        sleep mock_response.response_spec['delay']
-        content_type(mock_response.response_spec['content_type'])
-        status mock_response.response_spec['status']
-        headers mock_response.headers
-        mock_response.value(body, request, query_string)
-      end
-
-
-    end
   end
 end

metadata

@@ -1,167 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: mirage
 version: !ruby/object:Gem::Version
-  version: 3.0.14
+  version: 4.0.0.alpha1
 platform: ruby
 authors:
 - Leon Davis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-11 00:00:00.000000000 Z
+date: 2017-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ptools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jruby-openssl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Mirage aids testing of your applications by hosting mock responses so
@@ -190,10 +190,12 @@ files:
 - lib/mirage/client/template/model/common_methods.rb
 - lib/mirage/client/template/model/instance_methods.rb
 - lib/mirage/client/templates.rb
+- lib/mirage/hashie/mash_ext.rb
 - lib/mirage/wait_methods.rb
 - mirage_server.rb
 - server/app.rb
 - server/binary_data_checker.rb
+- server/errors.rb
 - server/extensions/hash.rb
 - server/extensions/object.rb
 - server/helpers.rb
@@ -201,6 +203,13 @@ files:
 - server/helpers/template_requirements.rb
 - server/mock_response.rb
 - server/mock_response_set.rb
+- server/routes.rb
+- server/routes/backup.rb
+- server/routes/defaults.rb
+- server/routes/pid.rb
+- server/routes/requests.rb
+- server/routes/responses.rb
+- server/routes/templates.rb
 - server/server.rb
 - views/index.haml
 - views/response.haml
@@ -208,38 +217,31 @@ homepage: https://github.com/lashd/mirage
 licenses:
 - MIT
 metadata: {}
-post_install_message: ! '
+post_install_message: |2
 
   ===============================================================================
-
   Mirage v3:
 
-
   Mirage has just gone up a major version from 2 to 3. If your project uses
-
   a previous version take a look at https://github.com/lashd/mirage to see
-
-  what''s changed
-
+  what's changed
   ===============================================================================
-
-'
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Mirage is a easy mock server for testing your applications