wordnik 0.3.5 → 0.3.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    wordnik (0.3.4)
+    wordnik (0.3.6)
       activemodel (>= 3.0.3)
       addressable (>= 2.2.4)
       htmlentities (>= 4.2.4)

data/config/pretty_print.xsl

@@ -0,0 +1,46 @@
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:output method="xml" encoding="ISO-8859-1"/>
+  <xsl:param name="indent-increment" select="'   '"/>
+  
+  <xsl:template name="newline">
+    <xsl:text disable-output-escaping="yes">
+</xsl:text>
+  </xsl:template>
+  
+  <xsl:template match="comment() | processing-instruction()">
+    <xsl:param name="indent" select="''"/>
+    <xsl:call-template name="newline"/>    
+    <xsl:value-of select="$indent"/>
+    <xsl:copy />
+  </xsl:template>
+  
+  <xsl:template match="text()">
+    <xsl:param name="indent" select="''"/>
+    <xsl:call-template name="newline"/>    
+    <xsl:value-of select="$indent"/>
+    <xsl:value-of select="normalize-space(.)"/>
+  </xsl:template>
+    
+  <xsl:template match="text()[normalize-space(.)='']"/>
+  
+  <xsl:template match="*">
+    <xsl:param name="indent" select="''"/>
+    <xsl:call-template name="newline"/>    
+    <xsl:value-of select="$indent"/>
+      <xsl:choose>
+       <xsl:when test="count(child::*) > 0">
+        <xsl:copy>
+         <xsl:copy-of select="@*"/>
+         <xsl:apply-templates select="*|text()">
+           <xsl:with-param name="indent" select="concat ($indent, $indent-increment)"/>
+         </xsl:apply-templates>
+         <xsl:call-template name="newline"/>
+         <xsl:value-of select="$indent"/>
+        </xsl:copy>
+       </xsl:when>       
+       <xsl:otherwise>
+        <xsl:copy-of select="."/>
+       </xsl:otherwise>
+     </xsl:choose>
+  </xsl:template>    
+</xsl:stylesheet>

data/lib/wordnik/request.rb

@@ -166,8 +166,8 @@ module Wordnik
   
     def response_headers_pretty
       return unless @response.present?
-      # JSON.pretty_generate(@response.headers).gsub(/\n/, '<br/>').html_safe # <- This was for RestClient
-      @response.headers.gsub(/\n/, '<br/>').html_safe # <- This is for Typhoeus
+      # JSON.pretty_generate(@response.headers).gsub(/\n/, '<br/>') # <- This was for RestClient
+      @response.headers.gsub(/\n/, '<br/>') # <- This is for Typhoeus
     end
 
     # It's an ActiveModel thing..

data/lib/wordnik/response.rb

@@ -3,6 +3,8 @@ module Wordnik
   class Response
     require 'active_model'
     require 'json'
+    require 'nokogiri'
+    require 'htmlentities'
     include ActiveModel::Validations
     include ActiveModel::Conversion
     extend ActiveModel::Naming
@@ -52,9 +54,9 @@ module Wordnik
       return unless body.present?
       case format
       when :json
-        JSON.pretty_generate(body).gsub(/\n/, '<br/>').html_safe
+        JSON.pretty_generate(body).gsub(/\n/, '<br/>')
       when :xml
-        xsl = Nokogiri::XSLT(File.open(Rails.root.join("config", "pretty_print.xsl")))
+        xsl = Nokogiri::XSLT(File.open(File.join(File.dirname(__FILE__), "../../config/pretty_print.xsl")))
         xml = Nokogiri(body)
         coder = HTMLEntities.new
         coder.encode(xsl.apply_to(xml).to_s)
@@ -62,7 +64,7 @@ module Wordnik
     end
 
     def pretty_headers
-      JSON.pretty_generate(headers).gsub(/\n/, '<br/>').html_safe
+      JSON.pretty_generate(headers).gsub(/\n/, '<br/>')
     end
 
     # It's an ActiveModel thing..

data/lib/wordnik/version.rb

@@ -1,3 +1,3 @@
 module Wordnik
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

data/spec/response_spec.rb

@@ -45,5 +45,25 @@ describe Wordnik::Response do
     end
 
   end
+  
+  describe "prettiness" do
+    
+    it "has a pretty json body" do
+      @response.pretty_body.should =~ /\{.*\}/
+    end
+    
+    it "has a pretty xml body" do
+      VCR.use_cassette('xml_response_request', :record => :new_episodes) do
+        @raw = Typhoeus::Request.get("http://api.wordnik.com/v4/word.xml/help")
+      end
+      @response = Wordnik::Response.new(@raw)
+      @response.pretty_body.should =~ /\?xml/
+    end
+    
+    it "has pretty headers" do
+      @response.pretty_headers.should =~ /\{.*\}/
+    end
+
+  end
 
 end

metadata

@@ -2,7 +2,7 @@
 name: wordnik
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors: 
 - Zeke Sikelianos
@@ -142,6 +142,7 @@ files:
 - api_docs/wordLists.json
 - api_docs/wordoftheday.json
 - api_docs/words.json
+- config/pretty_print.xsl
 - lib/wordnik.rb
 - lib/wordnik/configuration.rb
 - lib/wordnik/endpoint.rb