marvel_api 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9d7479fcdd1929f6bfcb85144acf86da8e50be4
-  data.tar.gz: 822114459097dfb00cfea66892df24aac463c6a3
+  metadata.gz: 9133e1fdec31b9c7841f6e23729cd412a10aa310
+  data.tar.gz: 96b3b3becbda0afe29f29938444b042f7ec1d974
 SHA512:
-  metadata.gz: 1f2ec4602b49b535665b5fb094e15c6a420c6aa34d5042e547308295fafccaa32451c485fd3bf6d552882a0483df3cb4a3f7e6100344328657949af8f7edcd48
-  data.tar.gz: 42404bc7490247d9afc2b9ef7ed54edce56efb7f4537158964681b42380e0a67ead434a61b0498fdb1fa91c35978c542475ff89b90592bd80048233aee746912
+  metadata.gz: 9410f5d4c555781945893a5e618ecfdef1dc48a4bb7d522a8b2f9b6af5f3bcab6d669aac104d88f67ad855e2790796d41f249d09686f56e88af58b323b9325d0
+  data.tar.gz: 85b4a94ee6394355350f55819009b6c00c0687b14abf1f84384bba2780a02752edbbd3be441cd375e0bc8e84cfc9628c51fd3c33f1c7c17e6d0a771a5537ac56

data/Gemfile

@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 
-gem 'faraday', '~> 0.8.9'
+gem 'faraday'
+gem 'faraday_middleware'
 gem 'hashie' 
 
 group :development do

data/README.md

@@ -1,14 +1,313 @@
 # marvel_api
 
-Ruby bindings for the [Marvel API](http://developer.marvel.com/). Still under construction... Feel free to contribute!
+Ruby bindings for the [Marvel API](http://developer.marvel.com/). Still under construction... Feel free to contribute! In the meantime, check out the [marvelite](https://github.com/antillas21/marvelite/) gem for something that's further along in development (and likely a lot stabler :-).
 
 ## Installation
 
 `gem install 'marvel_api'` or add `gem 'marvel_api'` to your Gemfile.
 
-## Documentation
+## Configuration
 
-Coming soon.
+You'll need an API key — get yours [here](http://developer.marvel.com). Configure like so:
+
+```ruby
+@client = Marvel::Client.new
+
+@client.configure do |config|
+  config.api_key = 'YOUR_API_KEY'
+  config.private_key = 'YOUR_PRIVATE_KEY'
+end
+```
+
+## Usage
+
+Descriptions and examples of the supported actions are below. Note, all methods currently return a `Hashie:Mash` object if successful. For a more detailed explanation of available actions and an exhaustive list of acceptable query parameters, see Marvel's own developer [documentation](http://developer.marvel.com/docs). Each method described below links to the associated call in Marvel's interactive API tester.
+
+### Characters
+
+- Fetches lists of characters. [`GET /v1/public/characters`](http://developer.marvel.com/docs#!/public/getCreatorCollection_get_0)
+
+```ruby
+@client.characters
+@client.characters(name: 'Thanos')
+@client.characters(nameStartsWith: 'Th', orderBy: 'modified')
+```
+
+- Fetches a single character by id. [`GET /v1/public/characters/{characterId}`](http://developer.marvel.com/docs#!/public/getCharacterIndividual_get_1)
+
+```ruby
+@client.character(1009652)
+```
+
+- Fetches lists of comics filtered by a character id. [`GET /v1/public/characters/{characterId}/comics`](http://developer.marvel.com/docs#!/public/getComicsCharacterCollection_get_2)
+
+```ruby
+@client.character_comics(1009652)
+@client.character_comics(1009652, titleStartsWith: 'Infinity', hasDigitalIssue: true)
+```
+
+- Fetches lists of events filtered by a character id. [`GET /v1/public/characters/{characterId}/events`](http://developer.marvel.com/docs#!/public/getCharacterEventsCollection_get_3)
+
+```ruby
+@client.character_events(1009652)
+@client.character_events(1009652, name: 'Infinity Gauntlet')
+```
+
+- Fetches lists of series filtered by a character id. [`GET /v1/public/characters/{characterId}/series`](http://developer.marvel.com/docs#!/public/getCharacterSeriesCollection_get_4)
+
+```ruby
+@client.character_series(1009652)
+@client.character_series(1009652, contains: 'hardcover')
+```
+
+- Fetches lists of stories filtered by a character id. [`GET /v1/public/characters/{characterId}/stories`](http://developer.marvel.com/docs#!/public/getCharacterStoryCollection_get_5)
+
+```ruby
+@client.character_stories(1009652)
+@client.character_stories(1009652, limit: 50)
+```
+
+### Comics
+
+- Fetches lists of comics. [`GET /v1/public/comics`](http://developer.marvel.com/docs#!/public/getComicsCollection_get_6)
+
+```ruby
+@client.comics
+@client.comics(title: 'Daredevil')
+@client.comics(startYear: 1950, issueNumber: 1)
+```
+
+- Fetches a single comic by id. [`GET /v1/public/comics/{comicId}`](http://developer.marvel.com/docs#!/public/getComicIndividual_get_7)
+
+```ruby
+@client.comic(29380)
+```
+
+- Fetches lists of characters filtered by a comic id. [`GET /v1/public/comics/{comicId}/characters`](http://developer.marvel.com/docs#!/public/getComicCharacterCollection_get_8)
+
+```ruby
+@client.comic_characters(34249)
+@client.comic_characters(34249, orderBy: 'name')
+```
+
+- Fetches lists of creators filtered by a comic id. [`GET /v1/public/comics/{comicId}/creators`](http://developer.marvel.com/docs#!/public/getCreatorCollection_get_9)
+
+```ruby
+@client.comic_creators(34249)
+@client.comic_creators(34249, lastNameStartsWith: 'V')
+```
+
+- Fetches lists of events filtered by a comic id. [`GET /v1/public/comics/{comicId}/events`](http://developer.marvel.com/docs#!/public/getIssueEventsCollection_get_10)
+
+```ruby
+@client.comic_events(27272)
+@client.comic_events(27272, orderBy: '-startDate')
+```
+
+- Fetches lists of stories filtered by a comic id. [`GET /v1/public/comics/{comicId}/stories`](http://developer.marvel.com/docs#!/public/getComicStoryCollection_get_11)
+
+```ruby
+@client.comic_stories(27272)
+@client.comic_stories(27272, creators: [600, 801])
+```
+
+### Creators
+
+- Fetches lists of creators. [`GET /v1/public/creators`](http://developer.marvel.com/docs#!/public/getCreatorCollection_get_12)
+
+```ruby
+@client.creators
+@client.creators(firstName: 'Frank', lastName: 'Miller')
+@client.creators(lastNameStartsWith: 'Mo', limit: 20, offset: 20)
+
+```
+
+- Fetches a single creator by id. [`GET /v1/public/creators/{creatorId}`](http://developer.marvel.com/docs#!/public/getCreatorIndividual_get_13)
+
+```ruby
+@client.creator(15)
+```
+
+- Fetches lists of comics filtered by a creator id. [`GET /v1/public/creators/{creatorId}/comics`](http://developer.marvel.com/docs#!/public/getComicsCollection_get_14)
+
+```ruby
+@client.creator_comics(15)
+@client.creator_comics(15, format: 'trade paperback')
+```
+
+- Fetches lists of events filtered by a creator id. [`GET /v1/public/creators/{creatorId}/events`](http://developer.marvel.com/docs#!/public/getCreatorEventsCollection_get_15)
+
+```ruby
+@client.creator_events(30)
+@client.creator_events(30, nameStartsWith: 'Civil')
+```
+
+- Fetches lists of series filtered by a creator id. [`GET /v1/public/creators/{creatorId}/series`](http://developer.marvel.com/docs#!/public/getCreatorSeriesCollection_get_16)
+
+```ruby
+@client.creator_series(30)
+@client.creator_series(30, seriesType: 'limited')
+```
+
+- Fetches lists of stories filtered by a creator id. [`GET /v1/public/creators/{creatorId}/stories`](http://developer.marvel.com/docs#!/public/getCreatorStoryCollection_get_17)
+
+```ruby
+@client.creator_stories(30)
+@client.creator_stories(30, limit: 40, offset: 7750)
+```
+
+### Events
+
+- Fetches lists of events. [`GET /v1/public/events`](http://developer.marvel.com/docs#!/public/getEventsCollection_get_18)
+
+```ruby
+@client.events
+@client.events(name: 'Infinity Gauntlet')
+@client.events(characters: [1009156, 1009652])
+```
+
+- Fetches a single event by id. [`GET /v1/public/events/{eventId}`](http://developer.marvel.com/docs#!/public/getEventIndividual_get_19)
+
+```ruby
+@client.event(227)
+```
+
+- Fetches lists of characters filtered by an event id. [`GET /v1/public/events/{eventId}/characters`](http://developer.marvel.com/docs#!/public/getEventCharacterCollection_get_20)
+
+```ruby
+@client.event_characters(227)
+@client.event_characters(227, modifiedSince: '2014-04-29')
+```
+
+- Fetches lists of comics filtered by an event id. [`GET /v1/public/events/{eventId}/comics`](http://developer.marvel.com/docs#!/public/getComicsCollection_get_21)
+
+```ruby
+@client.event_comics(227)
+@client.event_comics(227, hasDigitalIssue: true, orderBy: 'onsaleDate')
+```
+
+- Fetches lists of creators filtered by an event id. [`GET /v1/public/events/{eventId}/creators`](http://developer.marvel.com/docs#!/public/getCreatorCollection_get_22)
+
+```ruby
+@client.event_creators(227)
+@@client.event_creators(227, lastNameStartsWith: 'Lar')
+```
+
+- Fetches lists of series filtered by an event id. [`GET /v1/public/events/{eventId}/series`](http://developer.marvel.com/docs#!/public/getEventSeriesCollection_get_23)
+
+```ruby
+@client.event_series(227)
+@client.event_series(227, startYear: 1995, seriesType: 'limited')
+```
+
+- Fetches lists of stories filtered by an event id. [`GET /v1/public/events/{eventId}/stories`](http://developer.marvel.com/docs#!/public/getEventStoryCollection_get_24)
+
+```ruby
+@client.event_stories(227)
+@client.event_stories(227, orderBy: 'id', limit: 30, offset: 20)
+```
+
+### Series
+
+- Fetches lists of series. [`GET /v1/public/series`](http://developer.marvel.com/docs#!/public/getSeriesCollection_get_25)
+
+```ruby
+@client.series
+@client.series(title: 'Uncanny X-Men')
+@client.series(titleStartsWith: 'Astonishing', orderBy: 'startDate', limit: 100)
+```
+
+- Fetches a single comic series by id. [`GET /v1/public/series/{seriesId}`](http://developer.marvel.com/docs#!/public/getSeriesIndividual_get_26)
+
+```ruby
+@client.serie(354)
+```
+
+- Fetches lists of characters filtered by a series id. [`GET /v1/public/series/{seriesId}/characters`](http://developer.marvel.com/docs#!/public/getSeriesCharacterWrapper_get_27)
+
+```ruby
+@client.series_characters(354)
+@client.series_characters(354, nameStartsWith: 'Iron')
+```
+
+- Fetches lists of comics filtered by a series id. [`GET /v1/public/series/{seriesId}/comics`](http://developer.marvel.com/docs#!/public/getComicsCollection_get_28)
+
+```ruby
+@client.series_comics(354)
+@client.series_comics(354, issueNumber: 1)
+```
+
+- Fetches lists of creators filtered by a series id. [`GET /v1/public/series/{seriesId}/creators`](http://developer.marvel.com/docs#!/public/getCreatorCollection_get_29)
+
+```ruby
+@client.series_creators(354)
+@client.series_creators(354, lastName: 'Kirby')
+```
+
+- Fetches lists of events filtered by a series id. [`GET /v1/public/series/{seriesId}/events`](http://developer.marvel.com/docs#!/public/getEventsCollection_get_30)
+
+```ruby
+@client.series_events(354)
+@client.series_events(354, orderBy: 'startDate')
+```
+
+- Fetches lists of stories filtered by a series id. [`GET /v1/public/series/{seriesId}/stories`](http://developer.marvel.com/docs#!/public/getSeriesStoryCollection_get_31)
+
+```ruby
+@client.series_stories(354)
+@client.series_stories(354, modifiedSince: '2013-06-01')
+```
+
+### Stories
+
+- Fetches lists of stories. [`GET /v1/public/stories`](http://developer.marvel.com/docs#!/public/getStoryCollection_get_32)
+
+```ruby
+@client.stories
+@client.stories(creators: 15)
+@client.stories(characters: [1009156, 1009652], orderBy: '-modified')
+```
+
+- Fetches a single comic story by id. [`GET /v1/public/stories/{storyId}`](http://developer.marvel.com/docs#!/public/getStoryIndividual_get_33)
+
+```ruby
+@client.story(6320)
+```
+
+- Fetches lists of characters filtered by a story id. [`GET /v1/public/stories/{storyId}/characters`](http://developer.marvel.com/docs#!/public/getCreatorCollection_get_34)
+
+```ruby
+@client.story_characters(14410)
+@client.story_characters(14410, nameStartsWith: 'D')
+```
+
+- Fetches lists of comics filtered by a story id. [`GET /v1/public/stories/{storyId}/comics`](http://developer.marvel.com/docs#!/public/getComicsCollection_get_35)
+
+```ruby
+@client.story_comics(126)
+@client.story_comics(126, format: 'trade paperback')
+```
+
+- Fetches lists of creators filtered by a story id. [`GET /v1/public/stories/{storyId}/creators`](http://developer.marvel.com/docs#!/public/getCreatorCollection_get_36)
+
+```ruby
+@client.story_creators(126)
+@client.story_creators(126, lastNameStartsWith: 'S')
+```
+
+- Fetches lists of events filtered by a story id. [`GET /v1/public/stories/{storyId}/events`](http://developer.marvel.com/docs#!/public/getEventsCollection_get_37)
+
+```ruby
+@client.story_events(12964)
+@client.story_events(12964, orderBy: 'name')
+```
+
+- Fetches lists of series filtered by a story id. [`GET /v1/public/stories/{storyId}/series`](http://developer.marvel.com/docs#!/public/getStorySeriesCollection_get_38)
+
+```ruby
+@client.story_series(126)
+@client.story_series(126, titleStartsWith: 'Infinity')
+```
 
 ## Contributing to marvel_api
  

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/lib/marvel/client.rb

@@ -37,234 +37,248 @@ module Marvel
     # Characters: 
 
     # fetches lists of characters
-    def get_characters
+    def characters(options = {})
       # v1/public/characters
+      get('characters', options)
     end
 
     # fetches a single character by id
-    def get_character(id)
+    def character(id, options = {})
       # v1/public/characters/{characterId}
-      get("characters/#{id}#{auth}")
+      get("characters/#{id}", options)
     end
 
     # fetches lists of comics filtered by a character id
-    def get_comics_by_character_id(id)
+    def character_comics(id, options = {})
       # v1/public/characters/{characterId}/comics
-      get("characters/#{id}/comics#{auth}")
+      get("characters/#{id}/comics", options)
     end
 
     # fetches lists of events filtered by a character id
-    def get_events_by_character_id(id)
+    def character_events(id, options = {})
       # v1/public/characters/{characterId}/events
-      get("characters/#{id}/events#{auth}")
+      get("characters/#{id}/events", options)
+    end
+
+    # fetches lists of series filtered by a character id
+    def character_series(id, options = {})
+      # vi/public/characters/{characterId}/series
+      get("characters/#{id}/series", options)
     end
 
     # fetches lists of stories filtered by a character id
-    def get_stories_by_character_id(id)
+    def character_stories(id, options = {})
       # v1/public/characters/{characterId}/stories
-      get("characters/#{id}/stories#{auth}")
+      get("characters/#{id}/stories", options)
     end
 
     # Comics:
 
     # fetches lists of comics
-    def get_comics
+    def comics(options = {})
       # v1/public/comics
+      get('comics', options)
     end
 
     # fetches a single comic by id
-    def get_comic(id)
+    def comic(id, options = {})
       # v1/public/comics/{comicId}
-      get("comics/#{id}#{auth}")
+      get("comics/#{id}", options)
     end
 
     # fetches lists of characters filtered by a comic id
-    def get_characters_by_comic_id(id)
+    def comic_characters(id, options = {})
       # v1/public/comics/{comicId}/characters
-      get("comics/#{id}/characters#{auth}")
+      get("comics/#{id}/characters", options)
     end
 
     # fetches lists of creators filtered by a comic id
-    def get_creators_by_comic_id(id)
+    def comic_creators(id, options = {})
       # v1/public/comics/{comicId}/creators
-      get("comics/#{id}/creators#{auth}")
+      get("comics/#{id}/creators", options)
     end
 
     # fetches lists of events filtered by a comic id
-    def get_events_by_comic_id(id)
+    def comic_events(id, options = {})
       # v1/public/comics/{comicId}/events
-      get("comics/#{id}/events#{auth}")
+      get("comics/#{id}/events", options)
     end
 
     # fetches lists of stories filtered by a comic id
-    def get_stories_by_comic_id(id)
+    def comic_stories(id, options = {})
       # v1/public/comics/{comicId}/stories
-      get("comics/#{id}/stories#{auth}")
+      get("comics/#{id}/stories", options)
     end
 
     # Creators:
 
     # fetches lists of creators
-    def get_creators
+    def creators(options = {})
       # v1/public/creators
+      get('creators', options)
     end
 
     # fetches a single creator by id
-    def get_creator(id)
+    def creator(id, options = {})
       # v1/public/creators/{creatorId}
-      get("creators/#{id}#{auth}")
+      get("creators/#{id}", options)
     end
 
     # fetches lists of comics filtered by a creator id
-    def get_comics_by_creator_id(id)
+    def creator_comics(id, options = {})
       # v1/public/creators/{creatorId}/comics
-      get("creators/#{id}/comics#{auth}")
+      get("creators/#{id}/comics", options)
     end
 
     # fetches lists of events filtered by a creator id
-    def get_events_by_creator_id(id)
+    def creator_events(id, options = {})
       # v1/public/creators/{creatorId}/events
-      get("creators/#{id}/events#{auth}")
+      get("creators/#{id}/events", options)
+    end
+
+     # fetches lists of series filtered by a creator id
+    def creator_series(id, options = {})
+      # v1/public/creators/{creatorId}/series
+      get("creators/#{id}/series", options)
     end
 
     # fetches lists of stories filtered by a creator id
-    def get_stories_by_creator_id(id)
+    def creator_stories(id, options = {})
       # v1/public/creators/{creatorId}/stories
-      get("creators/#{id}/stories#{auth}")
+      get("creators/#{id}/stories", options)
     end
 
     # Events:
 
     # fetches lists of events
-    def get_events
+    def events(options = {})
       # v1/public/events
+      get('events', options)
     end
 
     # fetches a single event by id
-    def get_event(id)
+    def event(id, options = {})
       # v1/public/events/{eventId}
-      get("events/#{id}#{auth}")
+      get("events/#{id}", options)
     end
 
      # fetches lists of characters filtered by an event id
-    def get_characters_by_event_id(id)
+    def event_characters(id, options = {})
       # v1/public/events/{eventId}/characters
-      get("events/#{id}/characters#{auth}")
+      get("events/#{id}/characters", options)
     end
 
     # fetches lists of comics filtered by an event id
-    def get_comics_by_event_id(id)
+    def event_comics(id, options = {})
       # v1/public/events/{eventId}/comics
-      get("events/#{id}/comics#{auth}")
+      get("events/#{id}/comics", options)
     end
 
     # fetches lists of creators filtered by an event id
-    def get_creators_by_event_id(id)
+    def event_creators(id, options = {})
       # v1/public/events/{eventId}/creators
-      get("events/#{id}/creators#{auth}")
+      get("events/#{id}/creators", options)
+    end
+
+    # fetches lists of series filtered by an event id
+    def event_series(id, options = {})
+      # vi/public/events/{eventId}/series
+      get("events/#{id}/series", options)
     end
 
     # fetches lists of stories filtered by an event id
-    def get_stories_by_event_id(id)
+    def event_stories(id, options = {})
       # v1/public/events/{eventId}/stories
-      get("events/#{id}/stories#{auth}")
+      get("events/#{id}/stories", options)
     end
 
 
     # Series:
 
     # fetches lists of series
-    def get_series
+    def series(options = {})
       # v1/public/series
+      get('series', options)
     end
 
     # fetches a single comic series by id
-    def get_series_by_id(id)
+    def serie(id, options = {})
       # v1/public/series/{seriesId}
-      get("series/#{id}#{auth}")
+      get("series/#{id}", options)
     end
 
      # fetches lists of characters filtered by a series id
-    def get_characters_by_series_id(id)
+    def series_characters(id, options = {})
       # v1/public/series/{seriesId}/characters
-      get("series/#{id}/characters#{auth}")
+      get("series/#{id}/characters", options)
     end
 
     # fetches lists of comics filtered by a series id
-    def get_comics_by_series_id(id)
+    def series_comics(id, options = {})
       # v1/public/series/{seriesId}/comics
-      get("series/#{id}/comics#{auth}")
+      get("series/#{id}/comics", options)
     end
 
     # fetches lists of creators filtered by a series id
-    def get_creators_by_series_id(id)
+    def series_creators(id, options = {})
       # v1/public/series/{seriesId}/creators
-      get("series/#{id}/creators#{auth}")
+      get("series/#{id}/creators", options)
     end
 
     # fetches lists of events filtered by a series id
-    def get_events_by_series_id(id)
+    def series_events(id, options = {})
       # v1/public/series/{seriesId}/events
-      get("series/#{id}/events#{auth}")
+      get("series/#{id}/events", options)
     end
 
     # fetches lists of stories filtered by a series id
-    def get_stories_by_series_id(id)
+    def series_stories(id, options = {})
       # v1/public/series/{seriesId}/stories
-      get("series/#{id}/stories#{auth}")
+      get("series/#{id}/stories", options)
     end
 
     # Stories:
 
     # fetches lists of stories
-    def get_stories
+    def stories(options = {})
       # v1/public/stories
+      get('stories', options)
     end
 
     # fetches a single comic story by id
-    def get_story(id)
+    def story(id, options = {})
       # v1/public/stories/{storyId}
-      get("stories/#{id}#{auth}")
+      get("stories/#{id}", options)
     end
 
      # fetches lists of characters filtered by a story id
-    def get_characters_by_story_id(id)
+    def story_characters(id, options = {})
       # v1/public/stories/{storyId}/characters
-      get("stories/#{id}/characters#{auth}")
+      get("stories/#{id}/characters", options)
     end
 
     # fetches lists of comics filtered by a story id
-    def get_comics_by_story_id(id)
+    def story_comics(id, options = {})
       # v1/public/stories/{storyId}/comics
-      get("stories/#{id}/comics#{auth}")
+      get("stories/#{id}/comics", options)
     end
 
     # fetches lists of creators filtered by a story id
-    def get_creators_by_story_id(id)
+    def story_creators(id, options = {})
       # v1/public/stories/{storyId}/creators
-      get("stories/#{id}/creators#{auth}")
+      get("stories/#{id}/creators", options)
     end
 
     # fetches lists of events filtered by a story id
-    def get_events_by_story_id(id)
+    def story_events(id, options = {})
       # v1/public/stories/{storyId}/events
-      get("stories/#{id}/events#{auth}")
-    end
-
-    private
-
-    def auth
-      ts = timestamp
-      hsh = hash(ts)
-      "?ts=#{ts}&apikey=#{api_key}&hash=#{hsh}"
-    end
-
-    def hash(ts)
-      Digest::MD5.hexdigest(ts + private_key + api_key)
+      get("stories/#{id}/events", options)
     end
 
-    def timestamp
-      Time.now.to_s
+    # fetches lists of series filtered by a story id
+    def story_series(id, options = {})
+      # v1/public/stories/{storyId}/series
+      get("stories/#{id}/series", options)
     end
   end
 end

data/lib/marvel/request.rb

@@ -6,11 +6,25 @@ module Marvel
 
     private
 
-    def request(method, path, options)
+    def request(method, path, options = {})
       response = connection.send(method) do |request|
-        request.url(path, options)
+        request.url(path, options.merge(auth))
       end
       response.body
     end
+
+    def auth
+      ts = timestamp
+      hsh = hash(ts)
+      { ts: ts, apikey: api_key, hash: hsh }
+    end
+
+    def hash(ts)
+      Digest::MD5.hexdigest(ts + private_key + api_key)
+    end
+
+    def timestamp
+      Time.now.to_s
+    end    
   end
 end

data/marvel_api.gemspec

@@ -2,15 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: marvel_api 0.1.3 ruby lib
+# stub: marvel_api 0.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "marvel_api"
-  s.version = "0.1.3"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Rahul Hor\u{e9}"]
-  s.date = "2014-02-14"
+  s.date = "2014-05-20"
   s.description = "Marvel_API is a Ruby gem that lets you explore the Marvel Universe like never before."
   s.email = "hore.rahul@gmail.com"
   s.extra_rdoc_files = [
@@ -31,20 +32,21 @@ Gem::Specification.new do |s|
     "lib/marvel/request.rb",
     "lib/marvel_api.rb",
     "marvel_api.gemspec",
-    "spec/marvel_spec.rb",
+    "spec/marvel_api/client_spec.rb",
+    "spec/marvel_api_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/O-I/marvel"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.1.9"
+  s.rubygems_version = "2.2.2"
   s.summary = "Ruby bindings for the Marvel API"
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<faraday>, ["~> 0.8.9"])
+      s.add_runtime_dependency(%q<faraday>, [">= 0"])
+      s.add_runtime_dependency(%q<faraday_middleware>, [">= 0"])
       s.add_runtime_dependency(%q<hashie>, [">= 0"])
       s.add_development_dependency(%q<pry>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
@@ -54,7 +56,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.7"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
-      s.add_dependency(%q<faraday>, ["~> 0.8.9"])
+      s.add_dependency(%q<faraday>, [">= 0"])
+      s.add_dependency(%q<faraday_middleware>, [">= 0"])
       s.add_dependency(%q<hashie>, [">= 0"])
       s.add_dependency(%q<pry>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
@@ -65,7 +68,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<faraday>, ["~> 0.8.9"])
+    s.add_dependency(%q<faraday>, [">= 0"])
+    s.add_dependency(%q<faraday_middleware>, [">= 0"])
     s.add_dependency(%q<hashie>, [">= 0"])
     s.add_dependency(%q<pry>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])

data/spec/marvel_api/client_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe Marvel::Client do
+  before do
+    @client = Marvel::Client.new
+  end
+end

data/spec/marvel_api_spec.rb

@@ -0,0 +1,9 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe 'Marvel' do
+  describe '.new' do
+    it 'should return a Marvel::Client' do
+      Marvel.new.should be_a Marvel::Client
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
-require 'marvel'
+require 'marvel_api'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.

metadata

@@ -1,139 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: marvel_api
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Rahul Horé
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-14 00:00:00.000000000 Z
+date: 2014-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.9
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.9
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.7
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Marvel_API is a Ruby gem that lets you explore the Marvel Universe like
@@ -145,8 +159,8 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- .document
-- .rspec
+- ".document"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -158,7 +172,8 @@ files:
 - lib/marvel/request.rb
 - lib/marvel_api.rb
 - marvel_api.gemspec
-- spec/marvel_spec.rb
+- spec/marvel_api/client_spec.rb
+- spec/marvel_api_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/O-I/marvel
 licenses:
@@ -170,17 +185,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for the Marvel API

data/spec/marvel_spec.rb

@@ -1,9 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe 'Marvel' do
-
-  it "should" do
-    # some awesome testing
-  end
-
-end