chemtrail 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cea4ac78802e46bcfa27fd2d3ce436f104dbd89
-  data.tar.gz: 35c9eeaf91b64f21d96299b1833a968176ce7c92
+  metadata.gz: f6f3afd7c29489b71c0d0b8d2b59947a44cd472a
+  data.tar.gz: ed9adb837ceb0072b07e7934c2b1d2452e639852
 SHA512:
-  metadata.gz: a1554bfd2d565f01113e4c2461320d74994dfd1a65afdcc2b6a41edb5545d78b04ea1fdb649cc84a568296341cb5f6e6d9521d15da6ab55472e9bbcc31aa91a0
-  data.tar.gz: bd66df7c9d4448ce81e6e12d7d8771072a2374bb9a74bcd84c52aa61c8c897c84e3f813deac044025c926ccb181e8ef8e2302441f001d5a9414d4fc7ede1af99
+  metadata.gz: b304273953e18de87ef54a888c5396ebb91f9bf25d5f9f2b8f24f18c452b7e6d6a375b95bb58483406c0db84ec8e99d7cb2160fab447b852ae41df0411a4e043
+  data.tar.gz: 83a08006a5b810b6529dbc55fa0a267ea643a99117f627498d3279ec4a08359a48fbb4a535f10509d6f1a5e63c2fdcf8d4867355d7f4360b4ba69786fe733bbd

data/lib/chemtrail/matchers/have_field.rb

@@ -36,7 +36,7 @@ module Chemtrail::RSpec
         expected_field = @value || @included_value
         %(expected parameter #{parameter.id} field #{field_name.inspect} to have value #{expected_field.inspect}, but got #{field.inspect})
       else
-        %(expected parameter #{parameter.id} to have type #{field_name.inspect})
+        %(expected parameter #{parameter.id} to have field #{field_name.inspect})
       end
     end
   end

data/lib/chemtrail/matchers/have_parameter.rb

@@ -23,9 +23,9 @@ module Chemtrail::RSpec
 
     failure_message_for_should do |parameter_list|
       if parameter = parameter_for(parameter_list)
-        %(expected parameter #{parameter_id.inspect} to have type #{@type.inspect}, but got #{parameter.type.inspect})
+        %(expected #{parameter_id.inspect} to have type #{@type.inspect}, but got #{parameter.type.inspect})
       else
-        %(expected to find parameter #{parameter_id.inspect}, but got nothing)
+        %(expected to find #{parameter_id.inspect}, but got nothing)
       end
     end
   end

data/lib/chemtrail/matchers/have_property.rb

@@ -9,7 +9,9 @@ module Chemtrail::RSpec
     end
 
     define_method :matches_value? do |property|
-      if @value
+      if @finder
+        property == Chemtrail::Function.new("Fn::FindInMap", *@finder).to_hash
+      elsif @value
         property == @value
       elsif @reference
         property.id == @reference
@@ -59,9 +61,15 @@ module Chemtrail::RSpec
       @reference = reference
     end
 
+    chain :with_finder do |mapping_name, key, subkey|
+      @finder = [mapping_name, key, subkey]
+    end
+
     failure_message_for_should do |resource|
       if property = property_for(resource)
-        if @value
+        if @finder
+          %(expected resource #{resource.id} property #{property_name.inspect} to have searched #{@finder[0]} for #{@finder[1]} #{@finder[2]})
+        elsif @value
           %(expected resource #{resource.id} property #{property_name.inspect} to have value #{@value.inspect}, but got #{property.inspect})
         else
           %(expected resource #{resource.id} property #{property_name.inspect} to refer to #{@reference.inspect}, but got #{property.id.inspect})

data/lib/chemtrail/matchers/have_resource.rb

@@ -1,32 +1,8 @@
 require "rspec/expectations"
+require_relative "have_parameter"
 
 module Chemtrail::RSpec
   extend RSpec::Matchers::DSL
 
-  matcher :have_resource do |resource_id|
-    define_method :resource_for do |resource_list|
-      resource_list.detect { |resource| resource.id == resource_id }
-    end
-
-    define_method :matches_type? do |resource|
-      @type.nil? || resource.type == @type
-    end
-
-    match do |resource_list|
-      resource = resource_for(resource_list)
-      !resource.nil? && matches_type?(resource)
-    end
-
-    chain :with_type do |type|
-      @type = type
-    end
-
-    failure_message_for_should do |resource_list|
-      if resource = resource_for(resource_list)
-        %(expected resource #{resource_id.inspect} to have type #{@type.inspect}, but got #{resource.type.inspect})
-      else
-        %(expected to find resource #{resource_id.inspect}, but got nothing)
-      end
-    end
-  end
+  alias :have_resource :have_parameter
 end

data/lib/chemtrail/version.rb

@@ -1,3 +1,3 @@
 module Chemtrail
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/script/ci.sh

@@ -1,3 +1,5 @@
 #!/bin/bash
 
 bundle exec rspec
+
+cd examples && bundle exec rspec

data/spec/lib/chemtrail/section_presenter_spec.rb

@@ -18,5 +18,12 @@ describe Chemtrail::SectionPresenter do
 
       its(:to_hash) { should == {"Socks" => {tacos: "great"}} }
     end
+
+    context "when there are two entries" do
+      let(:other_entry) { double(:entry, to_hash: {teeth: "amazing"}) }
+      let(:entries) { [entry, other_entry] }
+
+      its(:to_hash) { should == {"Socks" => {tacos: "great", teeth: "amazing"}} }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chemtrail
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Doc Ritezel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-17 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core