mirage 3.0.0.alpha.4 → 3.0.0.alpha.5

data/VERSION

@@ -1 +1 @@
-3.0.0.alpha.4
+3.0.0.alpha.5

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

@@ -13,13 +13,15 @@ module Mirage
           clazz.send(:include, HTTParty)
           clazz.send(:include, InstanceMethods)
 
-          clazz.class_eval do
-            def initialize
+          mod = Module.new do
+            def initialize *args
               super self.class.endpoint, ''
               status self.class.status if self.class.status
             end
           end
 
+          clazz.send(:include, mod)
+
           clazz.format :json
           clazz
         end

data/lib/mirage/client/templates.rb

@@ -17,16 +17,15 @@ module Mirage
       @requests.delete_all
     end
 
-    def put *args
+    def put *args, &block
       if args.first.class.is_a?(Template::Model)
         template = args.first
         template.endpoint "#{@url}/#{template.endpoint}"
       else
         endpoint, response = args
         template = Mirage::Template.new  "#{@url}/#{endpoint}", response, @default_config
-        yield template if block_given?
       end
-      yield template if block_given?
+      template.instance_eval &block if block
       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.4"
+  s.version = "3.0.0.alpha.5"
 
   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-24"
+  s.date = "2013-04-26"
   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/spec/client/template/model_spec.rb

@@ -1,9 +1,16 @@
 require 'spec_helper'
 
 describe Template::Model do
+  let(:endpoint){'endpoint'}
   let!(:test_class) do
     Class.new do
       extend Template::Model
+
+      endpoint 'endpoint'
+
+      def initialize
+        super
+      end
     end
   end
   context 'class' do
@@ -11,6 +18,23 @@ describe Template::Model do
       test_class.is_a?(Template::Model::ClassMethods).should == true
       test_class.is_a?(Helpers::MethodBuilder).should == true
     end
+
+    context 'inherited constructor' do
+      it 'should set the endpoint of the class' do
+        test_class.new.endpoint.should == 'endpoint'
+      end
+
+      it 'calls to super should not fail if a constructor has been defined that takes args' do
+        test_class.class_eval do
+          def initialize arg
+            super
+          end
+        end
+        test_class.new('arg').endpoint.should == endpoint
+
+      end
+    end
+
   end
 
   context 'instances' do

data/spec/client/templates_spec.rb

@@ -51,6 +51,8 @@ describe 'templates' do
 
     endpoint = "greeting"
     value = "hello"
+    let(:base_url){ "base_url"}
+    let!(:templates){Templates.new(base_url)}
 
 
 
@@ -74,16 +76,7 @@ describe 'templates' do
         template.endpoint.should == "#{@base_url}/templates/#{endpoint}"
       end
 
-      it 'should accept a block to allow the template to be customised' do
-        block_called = false
-        template = model_class.new
-        template.should_receive(:create)
-        @templates.put(template) do |the_same_template|
-          block_called = true
-          the_same_template.should == template
-        end
-        block_called.should == true
-      end
+
     end
 
     context 'endpoint and value as parameters' do
@@ -100,14 +93,21 @@ describe 'templates' do
         @templates.put(endpoint, value)
       end
 
-      it 'should accept a block to allow the template to be customised' do
-        block_called = false
-        @templates.put(endpoint, value) do |template|
-          block_called = true
-          template.should == @template_mock
+
+    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('','')
+        template.stub(:create)
+        Template.should_receive(:new).and_return(template)
+        templates.put(endpoint, value) do
+          status 404
         end
-        block_called.should == true
+        template.status.should == 404
       end
+
     end
+
   end
 end

data/test.rb

@@ -1,18 +1,50 @@
 require './lib/mirage/client'
+#
+#class ServiceNowResponse
+#  extend Mirage::Template::Model
+#
+#  endpoint 'service_now'
+#
+#  builder_methods :this,:that
+#
+#  def value
+#    "my value : #{this}, #{that}"
+#  end
+#end
+#
+Mirage.stop
+mirage = Mirage.start
+#mirage.put ServiceNowResponse.new.this('foo').that('bar')
+#mirage.put ServiceNowResponse.new.this('foo').that('bar').required_body_content(%w(hello world))
+#mirage.put ServiceNowResponse.new.this('foo').that('bar').required_parameters({:name => 'leon'})
 
-class ServiceNowResponse
+require 'ostruct'
+class UserServiceProfile
   extend Mirage::Template::Model
 
-  endpoint 'service_now'
+  endpoint 'Users'
 
-  builder_methods :this,:that
+  def initialize persona
+    super
+    required_parameters[:token] = persona.token
+    @persona = persona
+  end
 
   def value
-    "my value : #{this}, #{that}"
+    {name: @persona.name}.to_json
   end
 end
 
-Mirage.stop
-mirage = Mirage.start
-mirage.put ServiceNowResponse.new.this('foo').that('bar')
-mirage.put ServiceNowResponse.new.this('foo').that('bar').required_body_content(%w(hello world))
+leon = OpenStruct.new(
+    :name => 'leon',
+    :token => '1234'
+)
+
+mirage.clear
+
+
+leons_user_profile = UserServiceProfile.new leon
+mirage.put leons_user_profile do
+  status 404
+  method :get
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mirage
 version: !ruby/object:Gem::Version
-  version: 3.0.0.alpha.4
+  version: 3.0.0.alpha.5
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2013-04-26 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: -1427932946480660425
+      hash: 4242158940323490709
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: