harrisj-nytimes-articles 0.1.3 → 0.2.0

data/VERSION.yml

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

data/lib/nytimes_articles/article.rb

@@ -57,7 +57,7 @@ module Nytimes
 				:author => text_field(params['author']),
 				:body => text_field(params['body']),
 				:byline => text_field(params['byline']),
-				:fee => params['fee'] || false,
+				:fee => boolean_field(params['fee']),
 				:lead_paragraph => text_field(params['lead_paragraph']),
 				:nytd_title => text_field(params['nytd_title']),
 				:nytd_lead_paragraph => text_field(params['nytd_lead_paragraph']),
@@ -302,15 +302,11 @@ module Nytimes
 			end
 			
 			def self.facet_argument(name, value, exclude = false)
-				unless value.is_a? Array
-					value = [value]
-				end
-				
 				if name.is_a? Symbol
 					name = Facet.symbol_name(name)
 				end
 				
-				"#{'-' if exclude}#{name}:[#{value.join(',')}]"
+				"#{'-' if exclude}#{name}:[#{value}]"
 			end
 
 			def self.parse_facet_params(facets, exclude = false)
@@ -338,11 +334,19 @@ module Nytimes
 					end
 					
 					facet_hash.each_pair do |k,v|
-						facet_args << facet_argument(k, v, exclude)
+						if v.is_a? Array
+							facet_args += v.map {|el| facet_argument(k, el, exclude)}
+						else
+							facet_args << facet_argument(k, v, exclude)
+						end
 					end
 				when Hash
 					facets.each_pair do |k,v|
-						facet_args << facet_argument(k, v, exclude)
+						if v.is_a? Array
+							facet_args += v.map {|el| facet_argument(k, el, exclude)}
+						else
+							facet_args << facet_argument(k, v, exclude)
+						end
 					end
 				end
 				

data/lib/nytimes_articles/base.rb

@@ -52,6 +52,23 @@ module Nytimes
 				return nil unless value =~ /^\d{8}$/
 				Date.strptime(value, "%Y%m%d")
 			end
+			
+			def self.boolean_field(value)
+				case value
+				when nil
+					false
+				when TrueClass
+					true
+				when FalseClass
+					false
+				when 'Y'
+					true
+				when 'N'
+					false
+				else
+					false
+				end
+			end
 
 			def self.invoke(params={})
 				begin

data/test/nytimes/articles/test_article.rb

@@ -159,7 +159,7 @@ class TestNytimes::TestArticles::TestArticle < Test::Unit::TestCase
 			end
 			
 			should "accept an Facet string hashed to an array terms" do
-				Article.expects(:invoke).with(has_entry("query", "#{Facet::GEO}:[CALIFORNIA,GREAT BRITAIN]"))
+				Article.expects(:invoke).with(has_entry("query", "#{Facet::GEO}:[CALIFORNIA] #{Facet::GEO}:[GREAT BRITAIN]"))
 				Article.search :only_facets => {Facet::GEO => ['CALIFORNIA', 'GREAT BRITAIN']}
 			end
 			
@@ -181,7 +181,7 @@ class TestNytimes::TestArticles::TestArticle < Test::Unit::TestCase
 				f = Facet.new(Facet::GEO, 'CALIFORNIA', 2394)
 				f2 = Facet.new(Facet::GEO, 'IOWA', 12)
 				
-				Article.expects(:invoke).with(has_entry("query", "#{Facet::GEO}:[CALIFORNIA,IOWA]"))
+				Article.expects(:invoke).with(has_entry("query", "#{Facet::GEO}:[CALIFORNIA] #{Facet::GEO}:[IOWA]"))
 				Article.search :only_facets => [f, f2]
 			end
 			
@@ -203,7 +203,7 @@ class TestNytimes::TestArticles::TestArticle < Test::Unit::TestCase
 			end
 			
 			should "accept an Facet string hashed to an array terms" do
-				Article.expects(:invoke).with(has_entry("query", "-#{Facet::GEO}:[CALIFORNIA,GREAT BRITAIN]"))
+				Article.expects(:invoke).with(has_entry("query", "-#{Facet::GEO}:[CALIFORNIA] -#{Facet::GEO}:[GREAT BRITAIN]"))
 				Article.search :except_facets => {Facet::GEO => ['CALIFORNIA', 'GREAT BRITAIN']}
 			end
 			
@@ -225,7 +225,7 @@ class TestNytimes::TestArticles::TestArticle < Test::Unit::TestCase
 				f = Facet.new(Facet::GEO, 'CALIFORNIA', 2394)
 				f2 = Facet.new(Facet::GEO, 'IOWA', 12)
 				
-				Article.expects(:invoke).with(has_entry("query", "-#{Facet::GEO}:[CALIFORNIA,IOWA]"))
+				Article.expects(:invoke).with(has_entry("query", "-#{Facet::GEO}:[CALIFORNIA] -#{Facet::GEO}:[IOWA]"))
 				Article.search :except_facets => [f, f2]
 			end
 			
@@ -488,10 +488,22 @@ class TestNytimes::TestArticles::TestArticle < Test::Unit::TestCase
 				assert_equal false, article.free?
 			end
 			
+			should "be true if returned as Y from the API" do
+				article = Article.init_from_api('fee' => 'Y')
+				assert_equal true, article.fee?
+				assert_equal false, article.free?
+			end
+			
 			should "default to false if not specified in the hash" do
 				assert_equal false, @article.fee?
 				assert_equal true, @article.free?
 			end
+			
+			should "default to false if returned as N from the API" do
+				article = Article.init_from_api('fee' => 'N')
+				assert_equal false, article.fee?
+				assert_equal true, article.free?
+			end
 		end
 		
 		context "@url" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: harrisj-nytimes-articles
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jacob Harris
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-23 00:00:00 -08:00
+date: 2009-02-27 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency