foodcritic 3.0.2 → 3.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWNiNzYyZTkwODc2YjJiZDdmMTVlMzk4OTQxZjQxYThhMWZhMGY1Nw==
+    NjUwZWIyMDVhNzYxZjg0YThkNGY5NzQzY2ZkMzA3NjEzZTE4NjNjMg==
   data.tar.gz: !binary |-
-    MmFhODIzYTlhYWZhMjI3MDlmMGE4ZWU1NmEwNTkwNDc0NTJiMDEzOA==
+    ZWIwYWVlOGNhN2JjYmEzODc1ZTlkMjk3OTYxNmE3MTM3ZDE5MWUyZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YjYxNjgwOWNkYTU4ZmQ2MmU4YzRjODc4OWM0NWEyN2MzMTQwYmViNjZiZmMw
-    OWE2MWNjOTI0ZjA3NTQyMTQyYmJhNzMwZjhlOTkxMDFiODM2YzI4ZDhkNTYx
-    ZDhhMDI5MjY3YzQ2YmRjMGY5OTRjNTk1NTcxNmE5MzA3NjIyZGY=
+    N2RiYjFkOTBkNWIxNWUyNWNlYjI5ZTBmYmQ0NWQ3MTkzY2U0NGZiNjllMzA3
+    YzM0OWFiNjUwYzdmOThkNjJhMzgxZGQyNjhmMjUyNDY3MmM2NTBiMDNhNmM2
+    NWM4NjE0MDk2MmZlY2VkYmNlOWQ4NzcxM2U3NDBhOGE5MTllZmE=
   data.tar.gz: !binary |-
-    ODlhNjFlNjBiMjc5YTRjYjgxNWFhNDgwM2Y2NmFjNDYxNTZlMzFjOTNmYzYx
-    MTIyOGJlMDQ4NWQ5ZTNjNzNkODIwMzViNTVhMjk1MTllOWYwYWU4OWNhMGEw
-    NjIyNDBhMGFjN2NiOTBjMGU5Y2NlNTU3OTI5ZGQ2MmM4MTMyZDk=
+    MTBlM2QzM2FmM2Q4ZmIxZDA1NzFhMGRlMTE5NDQ3ODU0NDFlMzc2OWNkOTdj
+    NjMwMTBlMTllYTYwOGUxNjZhMTY1ZjYxMTg1YzZjMzY5Y2I4NzM2YzhkNDFk
+    YWE4ZDdlN2ZkYWU0ZGViMWM3ZmUwZmZlYzVjMTRmNjA5NTMxZjY=

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 3.0.3 (13th October, 2013)
+
+Bugfixes:
+
+  - [FC051: Template partials loop indefinitely](http://foodcritic.io/#FC051)
+    would cause an error for partials included from a subdirectory or where the
+    partial did not exist
+    ([related issue](https://github.com/acrmp/foodcritic/issues/176)). Thanks
+    @claco, @michaelglass.
+
 ## 3.0.2 (5th October, 2013)
 
 Bugfixes:

data/features/051_check_for_template_partial_loops.feature

@@ -20,6 +20,18 @@ Feature: Check for template partial includes cycle
      Then the template partials loop indefinitely warning 051 should be displayed against the templates
       And no error should have occurred
 
+  Scenario: Relative partial
+    Given a template that includes a partial with a relative subdirectory path
+     When I check the cookbook
+     Then the template partials loop indefinitely warning 051 should not be displayed against the templates
+      And no error should have occurred
+
+  Scenario: Missing partial
+    Given a template that includes a missing partial with a relative subdirectory path
+     When I check the cookbook
+     Then the template partials loop indefinitely warning 051 should not be displayed against the templates
+      And no error should have occurred
+
   Scenario Outline: Template directory contains binary files
     Given a template directory that contains a binary file <file> that is not valid UTF-8
      When I check the cookbook

data/features/step_definitions/cookbook_steps.rb

@@ -1467,6 +1467,21 @@ Given /^a template that includes a partial( that includes the original template
   write_file 'cookbooks/example/templates/default/b.erb', content
 end
 
+Given /^a template that includes a (missing )?partial with a relative subdirectory path$/ do |missing|
+  write_recipe %q{
+    template "/tmp/a" do
+      source "a.erb"
+      variables({
+        :config_var => "foo"
+      })
+    end
+  }
+  write_file 'cookbooks/example/templates/default/a.erb', '<%= render "partials/b.erb" %>'
+  unless missing
+    write_file 'cookbooks/example/templates/default/partials/b.erb', 'Partial content'
+  end
+end
+
 Given 'access to the man page documentation' do
 
 end

data/lib/foodcritic/api.rb

@@ -340,10 +340,13 @@ module FoodCritic
         string_literal//tstring_content/@value').map{|p| p.to_s}
       Array(template_path) + partials.map do |included_partial|
         partial_path = Array(all_templates).find do |path|
-          File.basename(path) == included_partial.to_s
+          (Pathname.new(template_path).dirname + included_partial).to_s == path
         end
-        Array(partial_path) + templates_included(all_templates, partial_path, depth + 1)
-      end.flatten.uniq
+        if partial_path
+          Array(partial_path) +
+            templates_included(all_templates, partial_path, depth + 1)
+        end
+      end.flatten.uniq.compact
     end
 
     # Templates in the current cookbook

data/lib/foodcritic/version.rb

@@ -1,4 +1,4 @@
 module FoodCritic
   # The current version of foodcritic
-  VERSION = '3.0.2'
+  VERSION = '3.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foodcritic
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Andrew Crump
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-05 00:00:00.000000000 Z
+date: 2013-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gherkin
@@ -260,5 +260,5 @@ rubyforge_project:
 rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
-summary: foodcritic-3.0.2
+summary: foodcritic-3.0.3
 test_files: []