style-guide 0.7.2 → 0.7.3

data/LICENSE

@@ -1,7 +1,21 @@
-Copyright 2012 Pivotal Labs
+The MIT License
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Copyright (c) 2012 Pivotal Labs
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/app/helpers/style_guide/application_helper.rb

@@ -1,4 +1,7 @@
 module StyleGuide
   module ApplicationHelper
+    def escape_for_display(content)
+      content.gsub(/\</, "&lt;").gsub(/\>/, "&gt;").html_safe
+    end
   end
 end

data/app/views/style_guide/style/_partial.erb

@@ -1,3 +1,5 @@
+<% content = render(:file => partial.path) %>
+
 <div class="style-guide-partial" id="<%= partial.id %>">
   <div class="style-guide-partial-title">
     <%= partial.title %>
@@ -10,7 +12,7 @@
   <% end %>
 
   <div class="style-guide-partial-rendered">
-    <%= render :file => partial.path %>
+    <%= content %>
   </div>
 
   <% if partial.identifiers.any? %>
@@ -23,7 +25,7 @@
 
   <input id="style-guide-toggle-<%= partial.id %>" type="checkbox" />
   <label for="style-guide-toggle-<%= partial.id %>">
-    <pre class="style-guide-partial-source prettyprint linenums"><%= partial.content %></pre>
+    <pre class="style-guide-partial-source prettyprint linenums"><%= escape_for_display(content) %></pre>
     <div class="style-guide-toggle show">Show source code</div>
     <div class="style-guide-toggle hide">Hide source code</div>
   </label>

data/lib/style_guide/partial.rb

@@ -19,10 +19,6 @@ module StyleGuide
       @title ||= File.basename(path, File.extname(path)).titleize.strip
     end
 
-    def content
-      rendered.gsub(/\</, "&lt;").gsub(/\>/, "&gt;").html_safe
-    end
-
     def description
       @description ||= GitHub::Markdown.render_gfm(translated_description)
     end
@@ -49,10 +45,6 @@ module StyleGuide
 
     private
 
-    def rendered
-      @rendered ||= Tilt.new(path).render
-    end
-
     def style_guide_scope
       [:style_guide, section.id.to_sym]
     end
@@ -66,5 +58,9 @@ module StyleGuide
     def parsed
       @parsed ||= Nokogiri::HTML.parse(rendered)
     end
+
+    def rendered
+      @rendered ||= Tilt.new(path).render
+    end
   end
 end

data/lib/style_guide/version.rb

@@ -1,3 +1,3 @@
 module StyleGuide
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

data/spec/lib/style_guide/partial_spec.rb

@@ -45,15 +45,6 @@ describe StyleGuide::Partial do
     end
   end
 
-  describe "#content" do
-    let(:tilt) { double(:tilt, :render => "reading is for chumps") }
-    before { Tilt.stub(:new => tilt) }
-
-    subject { partial.content }
-
-    it { should == "reading is for chumps" }
-  end
-
   describe "#description" do
     subject { partial.description }
 

data/style-guide.gemspec

@@ -4,6 +4,7 @@ require "style_guide/version"
 Gem::Specification.new do |s|
   s.name        = "style-guide"
   s.version     = StyleGuide::VERSION
+  s.license     = "MIT"
   s.authors     = ["Doc Ritezel"]
   s.email       = ["doc@pivotallabs.com"]
   s.homepage    = "https://github.com/pivotal/style-guide"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: style-guide
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-03 00:00:00.000000000 Z
+date: 2013-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -426,7 +426,8 @@ files:
 - spec/spec_helper.rb
 - style-guide.gemspec
 homepage: https://github.com/pivotal/style-guide
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths: