marvel_api 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c686aa94a9096cc47687af1ddddda036359671d
-  data.tar.gz: ee460b33b47415ac7549013e123adc3ce66260b0
+  metadata.gz: f9d7479fcdd1929f6bfcb85144acf86da8e50be4
+  data.tar.gz: 822114459097dfb00cfea66892df24aac463c6a3
 SHA512:
-  metadata.gz: 3f3f881da1f54e4c48f2244161a58d3edc16c254abe2879f02e61136fe70c8f82fce7949ac25925478aefb15dace0d88982c16a4bb448148f208e0b73c8fa4b8
-  data.tar.gz: d06f17a73a61c6aca9b68949fad8403428b757c523af6e3d98a8d85f6c31d666a9160c21a16b3971323e2a5d3bc577fa072a61b4684827daf9fd586e91d1aa7e
+  metadata.gz: 1f2ec4602b49b535665b5fb094e15c6a420c6aa34d5042e547308295fafccaa32451c485fd3bf6d552882a0483df3cb4a3f7e6100344328657949af8f7edcd48
+  data.tar.gz: 42404bc7490247d9afc2b9ef7ed54edce56efb7f4537158964681b42380e0a67ead434a61b0498fdb1fa91c35978c542475ff89b90592bd80048233aee746912

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
-# To make HTTP requests
-gem 'faraday'
+gem 'faraday', '~> 0.8.9'
+gem 'hashie' 
 
 group :development do
   gem 'pry'

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/marvel/client.rb

@@ -12,8 +12,6 @@ module Marvel
     include Marvel::Connection
     include Marvel::Configuration
 
-    # BASE_URL = 'https://gateway.marvel.com/v1/public/'
-
     def initialize
       reset
     end
@@ -25,9 +23,17 @@ module Marvel
     # where hash is the MD5 hash of the concatenation of 
     # ts, your private API key, and your public API key
 
+    # So basic request form for all methods looks like
+    # Faraday.get("#{BASE_URL}#{path}#{id}#{stub}#{auth}").body
+    # e.g., get_comics_by_character_id
+    # Faraday.get("#{BASE_URL}characters/#{id}/comics#{auth}").body
+
     # TODO; MODULARIZE THIS!!!
     # TODO; Refactor — tons of duplication
 
+    # All methods return a Hashie::Mash object
+    # representation of the original JSON response
+
     # Characters: 
 
     # fetches lists of characters
@@ -38,26 +44,25 @@ module Marvel
     # fetches a single character by id
     def get_character(id)
       # v1/public/characters/{characterId}
-      Faraday.get("#{BASE_URL}characters/#{id}#{auth}").body
-      # get("characters/#{id}#{auth}")
+      get("characters/#{id}#{auth}")
     end
 
     # fetches lists of comics filtered by a character id
     def get_comics_by_character_id(id)
       # v1/public/characters/{characterId}/comics
-      Faraday.get("#{BASE_URL}characters/#{id}/comics#{auth}").body
+      get("characters/#{id}/comics#{auth}")
     end
 
     # fetches lists of events filtered by a character id
     def get_events_by_character_id(id)
       # v1/public/characters/{characterId}/events
-      Faraday.get("#{BASE_URL}characters/#{id}/events#{auth}").body
+      get("characters/#{id}/events#{auth}")
     end
 
     # fetches lists of stories filtered by a character id
     def get_stories_by_character_id(id)
       # v1/public/characters/{characterId}/stories
-      Faraday.get("#{BASE_URL}characters/#{id}/stories#{auth}").body
+      get("characters/#{id}/stories#{auth}")
     end
 
     # Comics:
@@ -70,31 +75,31 @@ module Marvel
     # fetches a single comic by id
     def get_comic(id)
       # v1/public/comics/{comicId}
-      Faraday.get("#{BASE_URL}comics/#{id}#{auth}").body
+      get("comics/#{id}#{auth}")
     end
 
     # fetches lists of characters filtered by a comic id
     def get_characters_by_comic_id(id)
       # v1/public/comics/{comicId}/characters
-      Faraday.get("#{BASE_URL}comics/#{id}/characters#{auth}").body
+      get("comics/#{id}/characters#{auth}")
     end
 
     # fetches lists of creators filtered by a comic id
     def get_creators_by_comic_id(id)
       # v1/public/comics/{comicId}/creators
-      Faraday.get("#{BASE_URL}comics/#{id}/creators#{auth}").body
+      get("comics/#{id}/creators#{auth}")
     end
 
     # fetches lists of events filtered by a comic id
     def get_events_by_comic_id(id)
       # v1/public/comics/{comicId}/events
-      Faraday.get("#{BASE_URL}comics/#{id}/events#{auth}").body
+      get("comics/#{id}/events#{auth}")
     end
 
     # fetches lists of stories filtered by a comic id
     def get_stories_by_comic_id(id)
       # v1/public/comics/{comicId}/stories
-      Faraday.get("#{BASE_URL}comics/#{id}/stories#{auth}").body
+      get("comics/#{id}/stories#{auth}")
     end
 
     # Creators:
@@ -107,25 +112,25 @@ module Marvel
     # fetches a single creator by id
     def get_creator(id)
       # v1/public/creators/{creatorId}
-      Faraday.get("#{BASE_URL}creators/#{id}#{auth}").body
+      get("creators/#{id}#{auth}")
     end
 
     # fetches lists of comics filtered by a creator id
     def get_comics_by_creator_id(id)
       # v1/public/creators/{creatorId}/comics
-      Faraday.get("#{BASE_URL}creators/#{id}/comics#{auth}").body
+      get("creators/#{id}/comics#{auth}")
     end
 
     # fetches lists of events filtered by a creator id
     def get_events_by_creator_id(id)
       # v1/public/creators/{creatorId}/events
-      Faraday.get("#{BASE_URL}creators/#{id}/events#{auth}").body
+      get("creators/#{id}/events#{auth}")
     end
 
     # fetches lists of stories filtered by a creator id
     def get_stories_by_creator_id(id)
       # v1/public/creators/{creatorId}/stories
-      Faraday.get("#{BASE_URL}creators/#{id}/stories#{auth}").body
+      get("creators/#{id}/stories#{auth}")
     end
 
     # Events:
@@ -138,31 +143,31 @@ module Marvel
     # fetches a single event by id
     def get_event(id)
       # v1/public/events/{eventId}
-      Faraday.get("#{BASE_URL}events/#{id}#{auth}").body
+      get("events/#{id}#{auth}")
     end
 
      # fetches lists of characters filtered by an event id
     def get_characters_by_event_id(id)
       # v1/public/events/{eventId}/characters
-      Faraday.get("#{BASE_URL}events/#{id}/characters#{auth}").body
+      get("events/#{id}/characters#{auth}")
     end
 
     # fetches lists of comics filtered by an event id
     def get_comics_by_event_id(id)
       # v1/public/events/{eventId}/comics
-      Faraday.get("#{BASE_URL}events/#{id}/comics#{auth}").body
+      get("events/#{id}/comics#{auth}")
     end
 
     # fetches lists of creators filtered by an event id
     def get_creators_by_event_id(id)
       # v1/public/events/{eventId}/creators
-      Faraday.get("#{BASE_URL}events/#{id}/creators#{auth}").body
+      get("events/#{id}/creators#{auth}")
     end
 
     # fetches lists of stories filtered by an event id
     def get_stories_by_event_id(id)
       # v1/public/events/{eventId}/stories
-      Faraday.get("#{BASE_URL}events/#{id}/stories#{auth}").body
+      get("events/#{id}/stories#{auth}")
     end
 
 
@@ -176,37 +181,37 @@ module Marvel
     # fetches a single comic series by id
     def get_series_by_id(id)
       # v1/public/series/{seriesId}
-      Faraday.get("#{BASE_URL}series/#{id}#{auth}").body
+      get("series/#{id}#{auth}")
     end
 
      # fetches lists of characters filtered by a series id
     def get_characters_by_series_id(id)
       # v1/public/series/{seriesId}/characters
-      Faraday.get("#{BASE_URL}series/#{id}/characters#{auth}").body
+      get("series/#{id}/characters#{auth}")
     end
 
     # fetches lists of comics filtered by a series id
     def get_comics_by_series_id(id)
       # v1/public/series/{seriesId}/comics
-      Faraday.get("#{BASE_URL}series/#{id}/comics#{auth}").body
+      get("series/#{id}/comics#{auth}")
     end
 
     # fetches lists of creators filtered by a series id
     def get_creators_by_series_id(id)
       # v1/public/series/{seriesId}/creators
-      Faraday.get("#{BASE_URL}series/#{id}/creators#{auth}").body
+      get("series/#{id}/creators#{auth}")
     end
 
     # fetches lists of events filtered by a series id
     def get_events_by_series_id(id)
       # v1/public/series/{seriesId}/events
-      Faraday.get("#{BASE_URL}series/#{id}/events#{auth}").body
+      get("series/#{id}/events#{auth}")
     end
 
     # fetches lists of stories filtered by a series id
     def get_stories_by_series_id(id)
       # v1/public/series/{seriesId}/stories
-      Faraday.get("#{BASE_URL}series/#{id}/stories#{auth}").body
+      get("series/#{id}/stories#{auth}")
     end
 
     # Stories:
@@ -219,31 +224,31 @@ module Marvel
     # fetches a single comic story by id
     def get_story(id)
       # v1/public/stories/{storyId}
-      Faraday.get("#{BASE_URL}stories/#{id}#{auth}").body
+      get("stories/#{id}#{auth}")
     end
 
      # fetches lists of characters filtered by a story id
     def get_characters_by_story_id(id)
       # v1/public/stories/{storyId}/characters
-      Faraday.get("#{BASE_URL}stories/#{id}/characters#{auth}").body
+      get("stories/#{id}/characters#{auth}")
     end
 
     # fetches lists of comics filtered by a story id
     def get_comics_by_story_id(id)
       # v1/public/stories/{storyId}/comics
-      Faraday.get("#{BASE_URL}stories/#{id}/comics#{auth}").body
+      get("stories/#{id}/comics#{auth}")
     end
 
     # fetches lists of creators filtered by a story id
     def get_creators_by_story_id(id)
       # v1/public/stories/{storyId}/creators
-      Faraday.get("#{BASE_URL}stories/#{id}/creators#{auth}").body
+      get("stories/#{id}/creators#{auth}")
     end
 
     # fetches lists of events filtered by a story id
     def get_events_by_story_id(id)
       # v1/public/stories/{storyId}/events
-      Faraday.get("#{BASE_URL}stories/#{id}/events#{auth}").body
+      get("stories/#{id}/events#{auth}")
     end
 
     private

data/lib/marvel/connection.rb

@@ -1,4 +1,4 @@
-require 'faraday/middleware'
+require 'faraday_middleware'
 
 module Marvel
   module Connection
@@ -13,7 +13,7 @@ module Marvel
       Faraday.new(options) do |connection|
         connection.use Faraday::Request::UrlEncoded
         connection.use Faraday::Response::RaiseError
-        connection.use Faraday::Response::Rashify
+        connection.use Faraday::Response::Mashify
         connection.use Faraday::Response::ParseJson
         connection.adapter(Faraday.default_adapter)
       end

data/marvel_api.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: marvel_api 0.1.2 ruby lib
+# stub: marvel_api 0.1.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "marvel_api"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rahul Hor\u{e9}"]
@@ -44,7 +44,8 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<faraday>, [">= 0"])
+      s.add_runtime_dependency(%q<faraday>, ["~> 0.8.9"])
+      s.add_runtime_dependency(%q<hashie>, [">= 0"])
       s.add_development_dependency(%q<pry>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
@@ -53,7 +54,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"])
+      s.add_dependency(%q<faraday>, ["~> 0.8.9"])
+      s.add_dependency(%q<hashie>, [">= 0"])
       s.add_dependency(%q<pry>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
@@ -63,7 +65,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<faraday>, [">= 0"])
+    s.add_dependency(%q<faraday>, ["~> 0.8.9"])
+    s.add_dependency(%q<hashie>, [">= 0"])
     s.add_dependency(%q<pry>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marvel_api
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Rahul Horé
@@ -12,6 +12,20 @@ date: 2014-02-14 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
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.9
+- !ruby/object:Gem::Dependency
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='