ultron 0.1.0 → 0.1.2

data/spec/cassettes/searching/should_throw_a_No_Results_exception.yml

@@ -0,0 +1,34 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://gateway.marvel.com/v1/public/comics?apikey=<PUBLIC_KEY>&hash=a304d29c7e65217654f6ddd18daf2b3c&offset=1000000&ts=1392317244
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/json
+      User-Agent:
+      - 'Ultron v0.1.1: https://rubygems.org/gems/ultron'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Etag:
+      - c6221500e62a7317e759c6bd37130ee5c62c0cba
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '150'
+      Date:
+      - Sat, 15 Feb 2014 17:09:20 GMT
+      Connection:
+      - keep-alive
+    body:
+      encoding: ASCII-8BIT
+      string: "{\"code\":200,\"status\":\"Ok\",\"etag\":\"c6221500e62a7317e759c6bd37130ee5c62c0cba\",\"data\":{\"offset\":1000000,\"limit\":20,\"total\":31917,\"count\":0,\"results\":[]}}"
+    http_version: 
+  recorded_at: Thu, 13 Feb 2014 18:47:24 GMT
+recorded_with: VCR 2.8.0

data/spec/cassettes/searching/should_throw_a_Not_Found_exception.yml

@@ -0,0 +1,32 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://gateway.marvel.com/v1/public/comics/1000000?apikey=<PUBLIC_KEY>&hash=a304d29c7e65217654f6ddd18daf2b3c&ts=1392317244
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/json
+      User-Agent:
+      - 'Ultron v0.1.1: https://rubygems.org/gems/ultron'
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '57'
+      Date:
+      - Sat, 15 Feb 2014 16:50:47 GMT
+      Connection:
+      - keep-alive
+    body:
+      encoding: ASCII-8BIT
+      string: "{\"code\":404,\"status\":\"We couldn't find that comic_issue\"}"
+    http_version: 
+  recorded_at: Thu, 13 Feb 2014 18:47:24 GMT
+recorded_with: VCR 2.8.0

data/spec/ultron/characters_spec.rb

@@ -11,17 +11,17 @@ module Ultron
     end
 
     it 'should find a character', :vcr do
-      @character = Characters.find 1009685
-      @character.name.should == 'Ultron'
+      character = Characters.find 1009685
+      character.name.should == 'Ultron'
     end
 
     it 'should find a list of comics featuring the character', :vcr do
-      @character = Characters.find 1009610
-      @character.name.should == 'Spider-Man'
-      @comics = Comics.by_character 1009610
-      @comics.first.title.should == 'Superior Spider-Man (2013) #22'
-      @comics.class.should == Comics
-      @comics.count.should == 20
+      character = Characters.find 1009610
+      character.name.should == 'Spider-Man'
+      comics = Comics.by_character 1009610
+      comics.first.title.should == 'Superior Spider-Man (2013) #22'
+      comics.class.should == Comics
+      comics.count.should == 20
     end
 
     after :each do

data/spec/ultron/comics_spec.rb

@@ -11,8 +11,8 @@ module Ultron
     end
 
     it 'should find a comic', :vcr do
-      @comic = Comics.find 12518
-      @comic.title.should == 'Uncanny X-Men (1963) #67'
+      comic = Comics.find 12518
+      comic.title.should == 'Uncanny X-Men (1963) #67'
     end
 
     after :each do

data/spec/ultron/config_spec.rb

@@ -13,6 +13,10 @@ module Ultron
       @conf['path'].should == '/v1/public/'
     end
 
+    it 'should have a root url' do
+      Ultron::Config.instance.root_url.should == 'http://gateway.marvel.com/v1/public/'
+    end
+
     it 'should let us add arbitrary keys' do
       @conf['doge'] = 'wow'
       @conf['doge'].should == 'wow'

data/spec/ultron/creators_spec.rb

@@ -11,12 +11,12 @@ module Ultron
     end
 
     it 'should find a list of series by the creator', :vcr do
-      @creator = Creators.find 196
-      @creator.fullName.should == 'Jack Kirby'
-      @series = Series.by_creator 196
-      @series[3].title.should == 'Amazing Fantasy (1962)'
-      @series.class.should == Series
-      @series.count.should == 20
+      creator = Creators.find 196
+      creator.fullName.should == 'Jack Kirby'
+      series = Series.by_creator 196
+      series[3].title.should == 'Amazing Fantasy (1962)'
+      series.class.should == Series
+      series.count.should == 20
     end
 
     after :each do

data/spec/ultron/events_spec.rb

@@ -11,12 +11,12 @@ module Ultron
     end
 
     it 'should find a list of stories for the event', :vcr do
-      @event = Events.find 271
-      @event.title.should == 'Secret Wars II'
-      @stories = Stories.by_event 271
-      @stories[4].title.should == 'Doctor Doom Versus the Beyonder'
-      @stories[4].id.should == 12850
-      @stories.class.should == Stories
+      event = Events.find 271
+      event.title.should == 'Secret Wars II'
+      stories = Stories.by_event 271
+      stories[4].title.should == 'Doctor Doom Versus the Beyonder'
+      stories[4].id.should == 12850
+      stories.class.should == Stories
     end
 
     after :each do

data/spec/ultron/searches_spec.rb

@@ -0,0 +1,67 @@
+require 'spec_helper'
+
+module Ultron
+  describe 'searching' do
+    before :each do
+      Timecop.freeze '2014-02-13T18:47:24+00:00'
+    end
+
+    it 'should let us get a comic', :vcr do
+      comic = Comics.find 10588
+      comic.title.should == 'Secret Wars (1984) #6'
+    end
+
+    it 'should let us get comics by a creator', :vcr do
+      comics = Comics.by_creator 196 # Jack Kirby
+      comics[14].title.should == 'INHUMANS: THE ORIGIN OF THE INHUMANS TPB (Trade Paperback)'
+    end
+
+    it 'should let us search with parameters', :vcr do
+      comics = Comics.where sharedAppearances: '1009351,1009718' # Hulk and Wolverine
+      comics[7].title.should == 'Deadpool (2008) #37'
+    end
+
+    it 'should let us search with multiple parameters', :vcr do
+      comics = Comics.where sharedAppearances: '1009610,1009718', events: 302 # Spider-Man and Wolverine, Fear Itself
+      comics.first.title.should == 'Fear Itself (2010) #7'
+    end
+
+    it 'should accept with as a synonym for where', :vcr do
+      comics = Comics.with sharedAppearances: '1009685,1009351' # Ultron and Hulk
+      comics.first.title.should == 'Avengers: First to Last (Hardcover)'
+    end
+
+    it 'should let us get comics by a creator *with params*', :vcr do
+      comics = Comics.by_creator_and_with 214, dateRange: '1980-01-01,1989-12-31'
+      comics.first.resourceURI.should == 'http://gateway.marvel.com/v1/public/comics/8268'
+    end
+
+    it 'should let us get more than the default 20 results', :vcr do
+      comics = Comics.where limit: 50
+      comics.count.should == 50
+    end
+
+    it 'should throw a Not Found exception', :vcr do
+      begin
+        comic = Comics.find 1000000 # there are not a million comics
+      rescue NotFoundException => e
+        e.code.should == 404
+        e.status.should == "We couldn't find that comic_issue"
+      end
+    end
+
+    it 'should throw a No Results exception', :vcr do
+      begin
+        comics = Comics.where offset: 1000000
+      rescue NoResultsException => e
+        e.status.should == 'That search returned no results'
+      end
+    end
+
+    it 'should let us pick a random item'
+
+    after :each do
+      Timecop.return
+    end
+  end
+end

data/spec/ultron/series_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+module Ultron
+  describe Series do
+    before :each do
+      Timecop.freeze '2014-02-13T18:47:24+00:00'
+    end
+
+    it 'should give a default set of series', :vcr do
+      series = Series.get
+      series.count.should == 20
+    end
+
+    after :each do
+      Timecop.return
+    end
+  end
+end

data/spec/ultron/ultron_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+module Ultron
+  describe Entities do
+    it 'should parse params correctly' do
+      hash = {thor: 'Mighty', hulk: 'Incredible'}
+      Entities.by_params(hash).should == 'thor=Mighty&hulk=Incredible&'
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ultron
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - pikesley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curb
@@ -275,7 +275,8 @@ files:
 - lib/ultron/creators.rb
 - lib/ultron/entities.rb
 - lib/ultron/events.rb
-- lib/ultron/helpers.rb
+- lib/ultron/exceptions/no_results_exception.rb
+- lib/ultron/exceptions/not_found_exception.rb
 - lib/ultron/series.rb
 - lib/ultron/stories.rb
 - lib/ultron/version.rb
@@ -288,16 +289,32 @@ files:
 - spec/cassettes/Ultron_Creators/should_find_a_list_of_series_by_the_creator.yml
 - spec/cassettes/Ultron_Events/should_find_a_list_of_stories_for_the_event.yml
 - spec/cassettes/Ultron_Events/should_find_an_event.yml
+- spec/cassettes/Ultron_Series/and_again_here.yml
+- spec/cassettes/Ultron_Series/should_give_a_default_set_of_series.yml
+- spec/cassettes/Ultron_Series/should_let_us_reuse_the_connection_safely.yml
+- spec/cassettes/Ultron_Series/should_let_us_search_with_parameters.yml
+- spec/cassettes/searching/should_accept_with_as_a_synonym_for_where.yml
+- spec/cassettes/searching/should_handle_an_empty_response_gracefully.yml
+- spec/cassettes/searching/should_indicate_Not_Found.yml
+- spec/cassettes/searching/should_let_us_get_a_comic.yml
+- spec/cassettes/searching/should_let_us_get_comics_by_a_creator.yml
+- spec/cassettes/searching/should_let_us_get_comics_by_a_creator_with_params_.yml
+- spec/cassettes/searching/should_let_us_get_more_than_the_default_20_results.yml
+- spec/cassettes/searching/should_let_us_search_with_multiple_parameters.yml
+- spec/cassettes/searching/should_let_us_search_with_parameters.yml
+- spec/cassettes/searching/should_throw_a_No_Results_exception.yml
+- spec/cassettes/searching/should_throw_a_Not_Found_exception.yml
 - spec/spec_helper.rb
 - spec/support/vcr_setup.rb
 - spec/ultron/auth_spec.rb
 - spec/ultron/characters_spec.rb
 - spec/ultron/comics_spec.rb
 - spec/ultron/config_spec.rb
-- spec/ultron/connection_spec.rb
 - spec/ultron/creators_spec.rb
 - spec/ultron/events_spec.rb
-- spec/ultron/helpers_spec.rb
+- spec/ultron/searches_spec.rb
+- spec/ultron/series_spec.rb
+- spec/ultron/ultron_spec.rb
 - ultron.gemspec
 homepage: ''
 licenses:
@@ -333,13 +350,29 @@ test_files:
 - spec/cassettes/Ultron_Creators/should_find_a_list_of_series_by_the_creator.yml
 - spec/cassettes/Ultron_Events/should_find_a_list_of_stories_for_the_event.yml
 - spec/cassettes/Ultron_Events/should_find_an_event.yml
+- spec/cassettes/Ultron_Series/and_again_here.yml
+- spec/cassettes/Ultron_Series/should_give_a_default_set_of_series.yml
+- spec/cassettes/Ultron_Series/should_let_us_reuse_the_connection_safely.yml
+- spec/cassettes/Ultron_Series/should_let_us_search_with_parameters.yml
+- spec/cassettes/searching/should_accept_with_as_a_synonym_for_where.yml
+- spec/cassettes/searching/should_handle_an_empty_response_gracefully.yml
+- spec/cassettes/searching/should_indicate_Not_Found.yml
+- spec/cassettes/searching/should_let_us_get_a_comic.yml
+- spec/cassettes/searching/should_let_us_get_comics_by_a_creator.yml
+- spec/cassettes/searching/should_let_us_get_comics_by_a_creator_with_params_.yml
+- spec/cassettes/searching/should_let_us_get_more_than_the_default_20_results.yml
+- spec/cassettes/searching/should_let_us_search_with_multiple_parameters.yml
+- spec/cassettes/searching/should_let_us_search_with_parameters.yml
+- spec/cassettes/searching/should_throw_a_No_Results_exception.yml
+- spec/cassettes/searching/should_throw_a_Not_Found_exception.yml
 - spec/spec_helper.rb
 - spec/support/vcr_setup.rb
 - spec/ultron/auth_spec.rb
 - spec/ultron/characters_spec.rb
 - spec/ultron/comics_spec.rb
 - spec/ultron/config_spec.rb
-- spec/ultron/connection_spec.rb
 - spec/ultron/creators_spec.rb
 - spec/ultron/events_spec.rb
-- spec/ultron/helpers_spec.rb
+- spec/ultron/searches_spec.rb
+- spec/ultron/series_spec.rb
+- spec/ultron/ultron_spec.rb

data/lib/ultron/helpers.rb

@@ -1,9 +0,0 @@
-module Ultron
-  def self.get_url s
-    URI.join(
-        Config.instance.config['host'],
-        Config.instance.config['path'],
-        s
-    )
-  end
-end

data/spec/ultron/connection_spec.rb

@@ -1,43 +0,0 @@
-require 'spec_helper'
-
-module Ultron
-  describe Connection do
-    before :each do
-      Timecop.freeze '2014-02-08T21:20:00+00:00'
-      @cnxn = Ultron::Connection.new
-      @cnxn.path = 'characters'
-    end
-
-    it 'should have the correct url', :vcr do
-      @cnxn.url.should match /http:\/\/gateway.marvel.com\/v1\/public\/characters/
-    end
-
-    it 'should get a 200', :vcr do
-      @cnxn.perform['code'].should == 200
-    end
-
-    it 'should accept additional params', :vcr do
-      @cnxn.add_params 'foo' => 'bar'
-      @cnxn.url.to_s.should match /&foo=bar/
-    end
-
-    it 'should know how to URL-encode things', :vcr do
-      @cnxn.add_params 'this' => 'has spaces'
-      @cnxn.url.to_s.should match /&this=has%20spaces/
-    end
-
-    it 'should accept parameters in different hash notation', :vcr do
-      @cnxn.add_params limit: 1
-      @cnxn.url.to_s.should match /&limit=1/
-    end
-
-    it 'should let us specify a different path', :vcr do
-      @cnxn.path = 'comics'
-      @cnxn.url.should match /http:\/\/gateway.marvel.com\/v1\/public\/comics/
-    end
-
-    after :each do
-      Timecop.return
-    end
-  end
-end

data/spec/ultron/helpers_spec.rb

@@ -1,11 +0,0 @@
-require 'spec_helper'
-
-module Ultron
-  describe Ultron do
-    context 'helpers' do
-      it 'should return the correct url' do
-        Ultron.get_url('doge').to_s.should == 'http://gateway.marvel.com/v1/public/doge'
-      end
-    end
-  end
-end