mirage 3.0.0.alpha.9 → 3.0.0.alpha.10

data/README.md

@@ -92,7 +92,8 @@ on a variable.
       status 404
       required_parameters[:name] = /joe.*/
     end
-
+#### What you don't get
+A better UI :) it's on its way though!
 
 ### 2.4.0
 ---------

data/VERSION

@@ -1 +1 @@
-3.0.0.alpha.9
+3.0.0.alpha.10

data/lib/mirage/client/client.rb

@@ -9,7 +9,7 @@ module Mirage
 
     attr_reader :url
 
-    def initialize options={:url => "http://localhost:7001/mirage"}
+    def initialize options={:url => "http://localhost:7001/mirage"}, &block
       if options.is_a?(String) && options =~ URI.regexp
         warn("Client.new(url): Deprecated usage, please use :url => url | :port => port")
         @url = options
@@ -20,6 +20,8 @@ module Mirage
       else
         raise "specify a valid URL or port"
       end
+
+      templates.default_config &block if block
     end
 
     def templates id=nil

data/lib/mirage/client/template/configuration.rb

@@ -1,7 +1,11 @@
+require 'client/helpers/method_builder'
+
 module Mirage
   class Template
     class Configuration
-      attr_accessor :http_method, :status, :delay, :content_type, :default
+      extend Helpers::MethodBuilder
+      builder_methods :http_method, :status, :delay, :content_type, :default
+      attr_accessor :caller_binding
       DEFAULT_HTTP_METHOD=:get
       DEFAULT_STATUS=200
       DEFAULT_DELAY=0
@@ -20,6 +24,11 @@ module Mirage
         @default = DEFAULT_DEFAULT
       end
 
+
+      def method_missing(method, *args, &block)
+        @caller_binding.send method, *args, &block if @caller_binding
+      end
+
     end
   end
 end

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

@@ -5,6 +5,8 @@ module Mirage
         extend Helpers::MethodBuilder
         include CommonMethods
 
+        attr_accessor :caller_binding
+
         def initialize *args
           if args.last.is_a?(Template::Configuration)
             default_config = args.delete_at(-1)
@@ -77,6 +79,16 @@ module Mirage
         def encode(value)
           value.is_a?(Regexp) ? "%r{#{value.source}}" : value
         end
+
+        def method_missing(method, *args, &block)
+
+          if @caller_binding
+            @caller_binding.send method, *args, &block
+          else
+            super method, *args, &block
+          end
+
+        end
       end
 
     end

data/lib/mirage/client/templates.rb

@@ -9,7 +9,10 @@ module Mirage
 
     def default_config &block
       return @default_config unless block_given?
-      yield @default_config
+      calling_instance = eval "self", block.binding
+      @default_config.caller_binding = calling_instance
+      @default_config.instance_eval &block
+      @default_config.caller_binding = nil
     end
 
     def delete_all
@@ -25,7 +28,14 @@ module Mirage
         endpoint, response = args
         template = Mirage::Template.new  "#{@url}/#{endpoint}", response, @default_config
       end
-      template.instance_eval &block if block
+
+      if block
+        calling_instance = eval "self", block.binding
+        template.caller_binding = calling_instance
+        template.instance_exec(template,&block)
+        template.caller_binding = nil
+      end
+
       template.create
     end
   end

data/mirage.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "mirage"
-  s.version = "3.0.0.alpha.9"
+  s.version = "3.0.0.alpha.10"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Leon Davis"]
-  s.date = "2013-04-30"
+  s.date = "2013-05-02"
   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 = [

data/server/mock_response.rb

@@ -69,7 +69,8 @@ module Mirage
       def add(new_response)
         response_set = responses_for_endpoint(new_response)
         method_specific_responses = response_set[new_response.request_spec['http_method'].upcase]||=[]
-        old_response = method_specific_responses.delete_at(method_specific_responses.index(new_response)) if method_specific_responses.index(new_response)
+        duplicate_response_location = method_specific_responses.index{|response| response.request_spec == new_response.request_spec}
+        old_response = method_specific_responses.delete_at(duplicate_response_location) if duplicate_response_location
         if old_response
           new_response.response_id = old_response.response_id
         else

data/spec/client/client_spec.rb

@@ -29,6 +29,18 @@ describe Mirage::Client do
       expect { Client.new({}) }.to raise_error()
       expect { Client.new("rubbish") }.to raise_error()
     end
+
+
+    it 'can be configured with template defaults' do
+      templates, config = Templates.new("url"), proc{}
+      Templates.should_receive(:new).and_return(templates)
+      templates.should_receive(:default_config) do |&block|
+        block.should == config
+      end
+      Client.new &config
+    end
+
+
   end
 
   it 'should clear mirage' do

data/spec/client/template/configuration_spec.rb

@@ -12,11 +12,11 @@ describe Template::Configuration do
 
   it 'should be reset' do
     configuration = Template::Configuration.new
-    configuration.http_method = :post
-    configuration.status = 202
-    configuration.delay = 3
-    configuration.default = true
-    configuration.content_type = "text/xml"
+    configuration.http_method :post
+    configuration.status 202
+    configuration.delay 3
+    configuration.default true
+    configuration.content_type "text/xml"
 
     configuration.reset
     assert_defaults configuration

data/spec/client/template/model/instance_methods_spec.rb

@@ -26,15 +26,15 @@ describe Template::Model::InstanceMethods do
       endpoint, value = 'endpoint', 'value'
       instance = model.new endpoint, value
       instance.endpoint.should == endpoint
-      instance.value.should == value
+      instance.body.should == value
     end
 
     it 'can use configuration for all http related config' do
       config = Mirage::Template::Configuration.new
-      config.content_type='content_type'
-      config.http_method='method'
-      config.status='status'
-      config.default=true
+      config.content_type 'content_type'
+      config.http_method 'method'
+      config.status 'status'
+      config.default true
 
       instance = model.new 'endpoint', 'value', config
       instance.content_type.should == config.content_type

data/spec/client/template_spec.rb

@@ -9,7 +9,7 @@ describe Mirage::Template do
       endpoint = "endpoint"
       id = 1
       requests_url = 'request_url'
-      value = "Hello"
+      body = "Hello"
       default = false
       delay = 1.2
       content_type = "application/json"
@@ -28,7 +28,7 @@ describe Mirage::Template do
           requests_url: requests_url,
           response:{
               default: default,
-              body: value,
+              body: body,
               delay: delay,
               content_type: content_type,
               status: status,
@@ -46,7 +46,7 @@ describe Mirage::Template do
       Template.should_receive(:backedup_get).with(template_url, :format => :json).and_return(template_json)
 
       template = Template.get(template_url)
-      template.value.should == value
+      template.body.should == body
       template.endpoint.should == endpoint
       template.id.should == id
 
@@ -122,4 +122,18 @@ describe Mirage::Template do
     end
 
   end
+
+  describe 'method missing' do
+    it 'should delagate to the caller if it is set' do
+      caller = Object.new
+      caller.should_receive(:some_method)
+      template = Template.new('endpoint')
+      template.caller_binding = caller
+      template.some_method
+    end
+
+    it 'should throw a standard method missing error if a caller binding is not set' do
+      expect{Template.new('endpoint').some_method}.should raise_error(NameError)
+    end
+  end
 end

data/spec/client/templates_spec.rb

@@ -18,6 +18,7 @@ describe 'templates' do
   end
 
   describe 'setting default config' do
+
     it 'should preset configuration for templates' do
       Template.stub(:put).and_return(convert_keys_to_strings({:id => 1}))
       templates = Templates.new "base_url"
@@ -28,12 +29,12 @@ describe 'templates' do
       delay = 2
       content_type = "text/xml"
 
-      templates.default_config do |defaults|
-        defaults.http_method = http_method
-        defaults.status = status
-        defaults.default = default
-        defaults.delay = delay
-        defaults.content_type = content_type
+      templates.default_config do
+        http_method http_method
+        status status
+        default default
+        delay delay
+        content_type content_type
       end
 
       template = templates.put('greeting', 'hello')
@@ -44,6 +45,37 @@ describe 'templates' do
       template.delay.should == delay
       template.content_type.should == content_type
     end
+
+    it 'should fall over to methods on the caller if the method does not exist on the configuration object' do
+      templates_wrapper = Class.new do
+        def initialize
+          @templates = Templates.new "base_url"
+          @outer_method_called = false
+        end
+
+        def outer_method_call
+          @outer_method_called = true
+        end
+
+
+        def outer_method_called?
+          @outer_method_called
+        end
+
+        def test
+          @templates.default_config do
+            outer_method_call
+          end
+        end
+      end
+
+
+      wrapper = templates_wrapper.new
+
+      wrapper.test
+      wrapper.outer_method_called?.should == true
+
+    end
   end
 
   describe 'putting templates' do
@@ -51,14 +83,12 @@ describe 'templates' do
 
     endpoint = "greeting"
     value = "hello"
-    let(:base_url){ "base_url"}
-    let!(:templates){Templates.new(base_url)}
-
-
+    let(:base_url) { "base_url" }
+    let!(:templates) { Templates.new(base_url) }
 
 
     context 'model as parameter' do
-      let!(:endpoint){'endpoint'}
+      let!(:endpoint) { 'endpoint' }
       let!(:model_class) do
         Class.new do
           extend Template::Model
@@ -76,6 +106,40 @@ describe 'templates' do
         template.endpoint.should == "#{@base_url}/templates/#{endpoint}"
       end
 
+      it 'should fall over to methods on the caller if the method does not exist on the template object' do
+        template_wrapper = Class.new do
+          def initialize
+            @templates = Templates.new "base_url"
+            @outer_method_called = false
+          end
+
+          def outer_method_call
+            @outer_method_called = true
+          end
+
+          def outer_method_called?
+            @outer_method_called
+          end
+
+          def test
+            template = Template.new 'endpoint'
+            Template.should_receive(:new).and_return template
+            template.stub(:create).and_return(template)
+            @templates.put('endpoint', 'value') do |response|
+              puts response
+              outer_method_call
+            end
+          end
+        end
+
+        wrapper = template_wrapper.new
+
+        template = wrapper.test
+        wrapper.outer_method_called?.should == true
+        template.caller_binding.should == nil
+
+      end
+
 
     end
 
@@ -98,7 +162,7 @@ describe 'templates' do
 
     describe 'block parameter that can be used for template customisation' do
       it 'it is called in the context of the template' do
-        template = Template.new('','')
+        template = Template.new('', '')
         template.stub(:create)
         Template.should_receive(:new).and_return(template)
         templates.put(endpoint, value) do

data/spec/server/mock_response_spec.rb

@@ -470,6 +470,7 @@ describe Mirage::MockResponse do
                                                 }
                                             })
     response1 = MockResponse.new("greeting", response_spec)
+    response_spec['response']['body'] = 'response2'
     response2 = MockResponse.new("greeting", response_spec)
 
     response1.response_id.should_not == nil

data/test.rb

@@ -1,19 +1,20 @@
 require './lib/mirage/client'
-class UserProfile
-  extend Mirage::Template::Model
 
-  endpoint '/users'
-  http_method :get
-  status 200
-  content_type 'application/json'
-  required_body_content %w(leon davis)
 
-  builder_methods :firstname, :lastname, :age
+Mirage.stop
+mirage = Mirage.start
+
 
-  def body
-    {firstname: firstname, lastname: lastname, age: age}.to_json
-  end
+mirage.put('FindCis.do', 'value1') do
+  http_method :post
+  content_type "text/xml"
+  required_body_content ['value']
+  status 200
 end
 
-mirage = Mirage.start
-mirage.put UserProfile.new.firstname('leon').lastname('davis').age(30)
+mirage.put('FindCis.do', 'value2') do
+  http_method :post
+  content_type "text/xml"
+  required_body_content ['value']
+  status 200
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mirage
 version: !ruby/object:Gem::Version
-  version: 3.0.0.alpha.9
+  version: 3.0.0.alpha.10
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-30 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -349,7 +349,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3137989588752849454
+      hash: 3670135109747540376
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: