pact 1.0.12 → 1.0.13

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 1.0.13 (10 October 2013)
+
+* Fixed bug deserialising Pact::SomethingLike [Beth Skurrie]
+
 ### 1.0.12 (9 October 2013)
 
 * Changing default pactfile_write_mode to :overwrite, and adding :smart option to dynamically determine whether rake is running. [Beth Skurrie]

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pact (1.0.12)
+    pact (1.0.13)
       awesome_print (~> 1.1.0)
       find_a_port (~> 1.0.1)
       json

data/lib/pact/shared/dsl.rb

@@ -1,34 +1,56 @@
-require 'delegate'
-
 module Pact
 
-  class DslDelegator < SimpleDelegator
-    def instance_eval_with_previous_context_available(*args, &b)
+  class DslDelegator
+
+    def initialize delegation_target
+      @delegation_target = delegation_target
+    end
+
+    def instance_eval_with_previous_context_available(*args, &block)
+      with_previous_context_available(block.binding) do
+        bind_block_as_instance_method_on_self(&block).call(*args)
+      end
+    end
+
+    protected
+
+    def method_missing(method, *args, &block)
+      if delegation_target_responds_to? method
+        delegation_target.send(method, *args, &block)
+      else
+        previous_context.send(method, *args, &block)
+      end
+    end
+
+    private
+
+    attr_accessor :delegation_target, :previous_context
+
+    def bind_block_as_instance_method_on_self(&block)
+      create_instance_method_from_block(&block).bind(self)
+    end
+
+
+    def create_instance_method_from_block &block
       meth = self.class.class_eval do
-        define_method :cloaker_, &b
-        meth = instance_method :cloaker_
-        remove_method :cloaker_
+        define_method :block_as_instance_method_, &block
+        meth = instance_method :block_as_instance_method_
+        remove_method :block_as_instance_method_
         meth
       end
-      with_previous_context(b.binding) {meth.bind(self).call(*args)}
     end
 
-    def with_previous_context(binding, &block)
+    def with_previous_context_available(binding, &block)
       @previous_context = binding.eval('self')
       result = block.call
       @previous_context = nil
       result
     end
 
-    def method_missing(method, *args, &block)
-      if __getobj__().respond_to? method
-        super
-      elsif @previous_context
-        @previous_context.send(method, *args, &block)
-      else
-        super
-      end
+    def delegation_target_responds_to?(method)
+      delegation_target.respond_to? method
     end
+
   end
 
 
@@ -37,17 +59,18 @@ module Pact
   # to access variables and methods defined in the calling scope.
   module DSL
     def build(*args, &block)
-      base = self.new(*args)
-      delegator_klass = self.const_get('DSL_DELEGATOR')
-      delegator = delegator_klass.new(base)
-      delegator.instance_eval_with_previous_context_available(&block)
-      base.finalize
-      base
+      new_instance_of_delegation_target_class = self.new(*args)
+      dsl_delegator_class = self.const_get('DSL_DELEGATOR_CLASS')
+      dsl_delegator = dsl_delegator_class.new(new_instance_of_delegation_target_class)
+      dsl_delegator.instance_eval_with_previous_context_available(&block)
+      new_instance_of_delegation_target_class.finalize
+      new_instance_of_delegation_target_class
     end
 
     def dsl(&block)
-      delegator_klass = Class.new(DslDelegator, &block)
-      self.const_set('DSL_DELEGATOR', delegator_klass)
+      dsl_delegator_class = Class.new(DslDelegator, &block)
+      self.const_set('DSL_DELEGATOR_CLASS', dsl_delegator_class)
     end
+
   end
 end

data/lib/pact/something_like.rb

@@ -25,7 +25,15 @@ module Pact
     end
 
     def self.json_create hash
-      new(symbolize_keys(hash))
+      new(symbolize_keys(hash)[:contents])
+    end
+
+    def eq other
+      self == other
+    end
+
+    def == other
+      other.is_a?(SomethingLike) && other.contents == self.contents
     end
 
     def generate

data/lib/pact/version.rb

@@ -1,3 +1,3 @@
 module Pact
-  VERSION = "1.0.12"
+  VERSION = "1.0.13"
 end

data/spec/lib/pact/shared/dsl_spec.rb

@@ -1,12 +1,13 @@
 require 'spec_helper'
 require 'pact/shared/dsl'
+require 'support/dsl_spec_support'
 
 module Pact
   describe DSL do
 
     class TestDSL
       extend DSL
-      attr_accessor :thing, :blah, :finally
+      attr_accessor :thing, :blah, :global, :the_block, :another_block, :finalized
 
       dsl do
         def with_thing thing
@@ -15,29 +16,70 @@ module Pact
         def with_blah blah
           self.blah = blah
         end
+        def with_global global
+          self.global = global
+        end
+
+        def with_block &the_block
+          self.the_block = the_block
+        end
+
+        def with_another_block &the_block
+          self.another_block = the_block
+        end
+
       end
 
       def finalize
-        @finally = 'yay'
+        @finalized = true
       end
     end
 
     describe "build" do
-       it "should support calling other variables and methods in scope" do
-          def my_method
+       before do
+          def my_local_method
              'LA LA LA'
           end
 
           my_local_var = 123
 
-          test = TestDSL.build do
-            with_thing my_method
+          local_app = "I'm a local app"
+
+          @test = TestDSL.build do
+            with_thing my_local_method
             with_blah my_local_var
+            with_global global_method
+            with_block do
+              global_app
+            end
+            with_another_block do
+              local_app
+            end
           end
+       end
+
+       it "supports using a local variable" do
+          expect(@test.blah).to eq 123
+       end
+
+       it "supports using a local method" do
+          expect(@test.thing).to eq 'LA LA LA'
+       end
+
+       it "supports using global methods from other files" do
+         expect(@test.global).to eq "I'm global"
+       end
+
+       it "supports using a local method to provide the app" do
+         expect(@test.another_block.call).to eq("I'm a local app")
+       end
+
+       it "should support using a global method to provide the app but it doesn't" do
+         expect(@test.the_block.call).to eq("I'm a global app")
+       end
 
-          expect(test.thing).to eq my_method
-          expect(test.blah).to eq my_local_var
-          expect(test.finally).to eq 'yay'
+       it "calls finalize" do
+        expect(@test.finalized).to be_true
        end
     end
   end

data/spec/lib/pact/something_like_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+module Pact
+  describe SomethingLike do
+    describe 'json_create' do
+      let(:json) do
+'
+{
+    "json_class": "Pact::SomethingLike",
+    "contents" : { "thing" : "blah" }
+}
+'
+      end
+      subject { SomethingLike.json_create(JSON.parse(json)) }
+      it "creates a SomethingLike object from json" do
+        expect(subject).to eq(SomethingLike.new({"thing" => "blah"}))
+      end
+    end
+  end
+
+end

data/spec/support/dsl_spec_support.rb

@@ -0,0 +1,7 @@
+def global_method
+  "I'm global"
+end
+
+def global_app
+  "I'm a global app"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-10 00:00:00.000000000 Z
+date: 2013-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -385,12 +385,14 @@ files:
 - spec/lib/pact/provider/test_methods_spec.rb
 - spec/lib/pact/reification_spec.rb
 - spec/lib/pact/shared/dsl_spec.rb
+- spec/lib/pact/something_like_spec.rb
 - spec/lib/pact/term_spec.rb
 - spec/lib/pact/verification_task_spec.rb
 - spec/spec_helper.rb
 - spec/support/a_consumer-a_producer.json
 - spec/support/a_consumer-a_provider.json
 - spec/support/consumer_contract_template.json
+- spec/support/dsl_spec_support.rb
 - spec/support/factories.rb
 - spec/support/pact_helper.rb
 - spec/support/shared_examples_for_request.rb
@@ -410,12 +412,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1516639792059640389
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1516639792059640389
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -453,12 +461,14 @@ test_files:
 - spec/lib/pact/provider/test_methods_spec.rb
 - spec/lib/pact/reification_spec.rb
 - spec/lib/pact/shared/dsl_spec.rb
+- spec/lib/pact/something_like_spec.rb
 - spec/lib/pact/term_spec.rb
 - spec/lib/pact/verification_task_spec.rb
 - spec/spec_helper.rb
 - spec/support/a_consumer-a_producer.json
 - spec/support/a_consumer-a_provider.json
 - spec/support/consumer_contract_template.json
+- spec/support/dsl_spec_support.rb
 - spec/support/factories.rb
 - spec/support/pact_helper.rb
 - spec/support/shared_examples_for_request.rb