mirage 3.0.0.alpha.16 → 3.0.0.alpha.17

data/README.md

@@ -24,21 +24,24 @@ What's New?
 #### What's new in the Server:
 ##### 1: Mirage uses JSON as its communucations medium
 Mirage is now configured using JSON. JSON is also used as the output format for Mirage's other operations.
-##### 2: Full Request Data now tracked
+##### 2: Wildcards are now supported in the URI.
+You can now specify wild cards in the URI matcher. This means that a url such as '/*/world' would match '/hello/world' :)
+##### 3: Full Request Data now tracked
 You can now retrieve all data associated with a request that triggers a response. Previously only the the request body/query string was tracked.
 Now the full request, including HTTP headers are returned when querying '/requests/template_id'
-##### 3. Parameters and body content matchers are now specified seperately
+
+##### 4. Parameters and body content matchers are now specified seperately
 Now you can specify as many parameter and body matchers as you want. These can be both litteral strings or Regex's
   
 Previously, it was only possible to specify a single matcher and this would be applied against both the querystring and the request body.
-##### 4. HTTP Header matchers
+##### 5. HTTP Header matchers
 You can now also specify matchers against HTTP headers.
-##### 5. More advanced template resolution.
+##### 6. More advanced template resolution.
 Templates are now scored to find the most appropriate template when finding a match for a particular request. Previously the first potential match was returned even
 if there was a more appropriate template.
 
 Litteral matchers are worth more in the scoring process than regex based ones for example.
-##### 6. The url has changed
+##### 7. The url has changed
 Mirage is now accessible via: http://localhost:7001. I.e. 'mirage' has been removed from all resources 
 
 e.g. responses are now under http://localhost:7001/responses

data/VERSION

@@ -1 +1 @@
-3.0.0.alpha.16
+3.0.0.alpha.17

data/lib/mirage/client/templates.rb

@@ -1,6 +1,7 @@
 module Mirage
   class Templates
     include HTTParty
+
     def initialize base_url
       @url = "#{base_url}/templates"
       @requests = Requests.new(base_url)
@@ -23,19 +24,26 @@ module Mirage
     def put *args, &block
       if args.first.class.is_a?(Template::Model)
         template = args.first
+        template = template.clone
         template.endpoint "#{@url}/#{template.endpoint}" unless template.endpoint.to_s.start_with?(@url)
       else
-        endpoint, response = args
-        template = Mirage::Template.new  "#{@url}/#{endpoint}", response, @default_config
+
+        endpoint, template = args
+        if template.class.is_a?(Template::Model)
+          template = template.clone
+          template.endpoint "#{@url}/#{endpoint}"
+        else
+          template = Mirage::Template.new("#{@url}/#{endpoint}", template, @default_config)
+        end
+
       end
 
       if block
         calling_instance = eval "self", block.binding
         template.caller_binding = calling_instance
-        template.instance_exec(template,&block)
+        template.instance_exec(template, &block)
         template.caller_binding = nil
       end
-
       template.create
     end
   end

data/mirage.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "mirage"
-  s.version = "3.0.0.alpha.16"
+  s.version = "3.0.0.alpha.17"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Leon Davis"]

data/spec/client/templates_spec.rb

@@ -85,33 +85,36 @@ describe 'templates' do
     value = "hello"
     let(:base_url) { "base_url" }
     let!(:templates) { Templates.new(base_url) }
+    let!(:model_class) do
+      Class.new do
+        extend Template::Model
+        endpoint endpoint
+
+        def create
+          self
+        end
+      end
+    end
 
 
     context 'model as parameter' do
       let!(:endpoint) { 'endpoint' }
-      let!(:model_class) do
-        Class.new do
-          extend Template::Model
-          endpoint endpoint
-          def create
-          end
-        end
-      end
+
       before :each do
         @base_url = "base_url"
         @templates = Templates.new(@base_url)
       end
       it 'should take a model as a parameter' do
         template = model_class.new
-        @templates.put template
+        template = @templates.put template
         template.endpoint.should == "#{@base_url}/templates/#{endpoint}"
       end
 
       it 'should prepend base url to the endpoint unless it is set already' do
         template = model_class.new
-        @templates.put template
+        template = @templates.put template
         template.endpoint.should == "#{@base_url}/templates/#{endpoint}"
-        @templates.put template
+        template = @templates.put template
         template.endpoint.should == "#{@base_url}/templates/#{endpoint}"
       end
 
@@ -166,6 +169,17 @@ describe 'templates' do
       end
     end
 
+    context 'endpoint and model as parameters' do
+      it 'should put the given template on the given endpoint' do
+        @base_url = "base_url"
+        @templates = Templates.new(@base_url)
+
+        template = model_class.new
+        template  = @templates.put 'greeting', template
+        template.endpoint.should == "#{@base_url}/templates/greeting"
+      end
+    end
+
     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('', '')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mirage
 version: !ruby/object:Gem::Version
-  version: 3.0.0.alpha.16
+  version: 3.0.0.alpha.17
   prerelease: 6
 platform: ruby
 authors:
@@ -355,7 +355,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4569055939435473462
+      hash: -286461807850956295
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: