npr 0.1.2 → 1.1.0

data/spec/support/fake_response.rb

@@ -29,10 +29,11 @@ module FakeResponse
   # response body to the contents of the requested file.
   def respond_with(filename, options)
     content_type = options[:content_type] || "application/json"
-    
-    FakeWeb.register_uri(:get, 
-      %r{^#{NPR::Configuration::API_ROOT}}, 
-      { :body => load_fixture(filename),
+    uri          = options.delete(:uri) || %r{^#{NPR::Configuration::API_ROOT}}
+
+    FakeWeb.register_uri(:get, uri, 
+      { 
+        :body         => load_fixture(filename),
         :content_type => content_type
       }.merge(options))
   end
@@ -47,7 +48,7 @@ module FakeResponse
   #---------------------
   # Select a random response fixture
   def random_filename
-    filename = Dir["#{FIXTURE_ROOT}/**/*story*.rb"].sample
+    filename = Dir["#{FIXTURE_ROOT}/**/*story*.*"].sample
     puts "Responding with #{filename}"
     filename
   end

data/spec/unit/api/client_spec.rb

@@ -8,6 +8,17 @@ describe NPR::API::Client do
       client.params.keys.should_not include :apiKey
     end
     
+    it "sets @url on initialize" do
+      client = NPR::API::Client.new(:url => "http://api.publish2.com")
+      client.url.should eq "http://api.publish2.com"
+      client.params.keys.should_not include :url
+    end
+
+    it "falls back to default NPR API root if URL not passed in" do
+      client = NPR::API::Client.new
+      client.url.should eq NPR::Configuration::API_ROOT
+    end
+
     it "uses global config" do
       NPR.config.sort = "super sort"
       client = NPR::API::Client.new
@@ -24,19 +35,31 @@ describe NPR::API::Client do
   #-----------------
   
   describe "#query" do
-    it "raises NotConfiguredError if apiKey is blank" do
-      client = NPR::API::Client.new
-      lambda { client.query }.should raise_error NPR::NotConfiguredError
+    it 'uses the passed-in path if available' do
+      respond_with("json/01_story_full_media.json", :uri => %r|api\.publish2\.com/list/stories|)
+
+      client = NPR::API::Client.new(:apiKey => "key", :url => "http://api.publish2.com")
+
+      # If this fails, it should be caught by FakeWeb.allow_net_connect = false
+      response = client.query(:path => "/list/stories")
+      # But just incase...
+      response.instance_variable_get(:@_response).env[:url].to_s.should match %r|api\.publish2\.com/list/stories|
     end
-    
-    context "nprml" do
-      it "returns a result in hash format" do
-      end
+
+    it 'returns an API::Response when the API call is a success' do
+      respond_with("json/01_story_full_media.json", :uri => %r|api\.npr\.org|)
+      client = NPR::API::Client.new(:apiKey => "key")
+
+      client.query(:path => "/list/stories").should be_a NPR::API::Response
+    end
+
+    it 'raises NPR::ServerError when the response is not a success' do
+      FakeWeb.register_uri(:get, %r|api\.npr\.org|, :status => ["400", "Bad Request"], :body => nil)
+      client = NPR::API::Client.new(:apiKey => "key")
+
+      lambda {
+        client.query(:path => "/list/stories")
+      }.should raise_error NPR::APIError
     end
-    
-    context "json" do
-      it "returns a result in hash format" do
-      end
-    end    
   end
 end

data/spec/unit/entity/image_spec.rb

@@ -84,4 +84,14 @@ describe NPR::Entity::Image do
     @image.primary?.should eq false
     @image.standard?.should eq true
   end
+
+  it 'finds the crop by its type' do
+    crop = @image.crop("enlargement")
+    crop.should be_a NPR::Entity::Crop
+    crop.type.should eq 'enlargement'
+  end
+
+  it 'returns nil for crop if the type does not exist' do
+    @image.crop("doesntexist").should eq nil
+  end
 end

data/spec/unit/entity/story_spec.rb

@@ -182,7 +182,7 @@ describe NPR::Entity::Story do
     end
     
     it "finds the link for the passed-in type if it exists" do
-      @story.link_for("html").should be_a NPR::Entity::Link
+      @story.link_for("html").should match /^http:\/\//
     end
     
     it "is nil if the type isn't present" do

data/spec/unit/entity/text_spec.rb

@@ -51,4 +51,12 @@ describe NPR::Entity::Text do
     s.should match /Amtrak trains\.$/
     s.should match /\n/
   end
+  
+  it "wraps each paragraph in p tags for #to_html" do
+    s = @text.to_html
+    s.should match /\A\<p\>/
+    s.should match /\<\/p\>\n\z/
+    s.should match /^\<p\>/
+    s.should match /\<\/p\>$/
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: npr
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-30 00:00:00.000000000 Z
+date: 2013-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -122,7 +122,6 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- gemfiles/Gemfile.rb-1.8.7
 - lib/npr.rb
 - lib/npr/api.rb
 - lib/npr/api/client.rb
@@ -281,15 +280,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1451142622533907369
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1451142622533907369
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A Ruby client for the NPR API

data/gemfiles/Gemfile.rb-1.8.7

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in npr.gemspec
-gemspec :path => "../"
-
-gem 'json', '~> 1.7.5'