taylorbarstow-nytimes-articles 0.2.1 → 0.3.0

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 2
-:patch: 1
+:minor: 3
+:patch: 0
 :major: 0

data/lib/nytimes_articles/base.rb

@@ -12,6 +12,7 @@ module Nytimes
 
 			@@api_key = nil
 			@@debug = false
+			@@decode_html_entities = true
 
 			##
 			# Set the API key used for operations. This needs to be called before any requests against the API. To obtain an API key, go to http://developer.nytimes.com/
@@ -22,6 +23,12 @@ module Nytimes
 			def self.debug=(flag)
 				@@debug = flag
 			end
+			
+			##
+			# Set whether or not to decode HTML entities when returning text fields.
+			def self.decode_html_entities=(flag)
+			  @@decode_html_entities = flag
+		  end
 
 			##
 			# Returns the current value of the API Key
@@ -34,13 +41,12 @@ module Nytimes
 			def self.build_request_url(params)
 				URI::HTTP.build :host => API_SERVER,
 				:path => API_BASE,
-				:query => params.map {|k,v| "#{URI.escape(k)}=#{URI.escape(v)}"}.join('&')
+				:query => params.map {|k,v| "#{URI.escape(k)}=#{URI.escape(v.to_s)}"}.join('&')
 			end
 			
 			def self.text_field(value)
 				return nil if value.nil?
-				coder = HTMLEntities.new
-				coder.decode(value)
+				@@decode_html_entities ? HTMLEntities.new.decode(value) : value
 			end
 			
 			def self.integer_field(value)

data/lib/nytimes_articles/query.rb

@@ -8,7 +8,7 @@ module Nytimes
 	  #
 	  class Query
       FIELDS = [:only_facets, :except_facets, :begin_date, :end_date, :since, 
-	              :before, :fee, :has_thumbnail, :facets, :fields, :query, :offset] + Article::TEXT_FIELDS.map(&:to_sym)
+	              :before, :fee, :has_thumbnail, :facets, :fields, :query, :offset] + Article::TEXT_FIELDS.map{|f| f.to_sym}
       FIELDS.each {|f| attr_accessor f}
       
       # Produce a hash which uniquely identifies this query

data/test/nytimes/articles/test_base.rb

@@ -88,5 +88,33 @@ class TestNytimes::TestArticles::TestBase < Test::Unit::TestCase
 				end
 			end
 		end
+		
+		context "when passing Integer for offset" do
+		  # note Article.search requries integer for offset
+		  setup do
+				FakeWeb.register_uri(api_url_for('offset' => '1'), :status => ['200', 'OK'], :string => '{}')
+			end
+		  
+		  should "not raise NoMethodError" do
+		    assert_nothing_raised(NoMethodError) { Base.invoke('offset' => 1) }
+	    end
+	  end
 	end
+	
+	context "Base#text_field" do
+    context "when decode_html_entities == true" do
+      should "decode HTML entities in text fields" do
+        assert_equal "foó", Base.text_field("fo&oacute;")
+      end
+    end
+    
+    context "when decode_html_entities == false" do
+      setup { Base.decode_html_entities = false }
+      teardown { Base.decode_html_entities = true }
+      
+      should "not decode HTML entities in text fields" do
+        assert_equal "fo&oacute;", Base.text_field("fo&oacute;")
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: taylorbarstow-nytimes-articles
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jacob Harris
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-01 00:00:00 -08:00
+date: 2009-03-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,18 +37,18 @@ files:
 - lib/nytimes_articles/base.rb
 - lib/nytimes_articles/exceptions.rb
 - lib/nytimes_articles/facet.rb
+- lib/nytimes_articles/query.rb
 - lib/nytimes_articles/result_set.rb
 - lib/nytimes_articles/thumbnail.rb
-- lib/nytimes_articles/query.rb
 - lib/nytimes_articles.rb
 - test/nytimes
 - test/nytimes/articles
 - test/nytimes/articles/test_article.rb
 - test/nytimes/articles/test_base.rb
 - test/nytimes/articles/test_facet.rb
+- test/nytimes/articles/test_query.rb
 - test/nytimes/articles/test_result_set.rb
 - test/nytimes/articles/test_thumbnail.rb
-- test/nytimes/articles/test_query.rb
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/harrisj/nytimes-articles