marver 0.0.2 → 0.0.4

data/spec/marver/client_spec.rb

@@ -1,12 +1,17 @@
 require 'spec_helper'
-require './lib/marver/rest/client.rb'
-require './lib/marver.rb'
 
 describe Marver::Client do
-  let(:client) { Marver::Client.new("private_key", "public_key") }
+  before :each do
+    Marver.configure do |config|
+      config.public_key = 'pub-key'
+      config.private_key = 'priv-key'
+    end
+
+    @client = Marver::Client.new
+  end
 
   it 'has a character finder' do
-    expect(client.characters.class).to eq Marver::CharacterFinder
+    expect(@client.characters.class).to eq Marver::CharacterFinder
   end
 
 end

data/spec/marver/configuration_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe Marver::Configuration do
+  before :each do
+    Marver.configure do |config|
+      config.private_key = 'priv123'
+      config.public_key  = 'pub123'
+    end
+  end
+
+  it 'has a private key' do
+    expect(Marver.configuration.private_key).to eq 'priv123'
+  end
+
+  it 'has a public key' do
+    expect(Marver.configuration.public_key).to eq 'pub123'
+  end
+end

data/spec/marver/data_container_spec.rb

@@ -1,7 +1,7 @@
 require './lib/marver.rb'
 
 describe Marver::DataContainer do
-  let(:response) { Marver::REST::Response.new("{ \"code\": 200, \"status\": \"Ok\", \"etag\": \"ec5ab621cf3760eb6f2df2e6270ccb56c6debfb7\", \"data\": { \"offset\": 0, \"limit\": 20, \"total\": 1, \"count\": 1, \"results\": [1]}}") }
+  let(:response) { Marver::API::Response.new("{ \"code\": 200, \"status\": \"Ok\", \"etag\": \"ec5ab621cf3760eb6f2df2e6270ccb56c6debfb7\", \"data\": { \"offset\": 0, \"limit\": 20, \"total\": 1, \"count\": 1, \"results\": [1]}}") }
 
   let(:data_container) { Marver::DataContainer.new(response) }
 

data/spec/marver/entities/{core/character_spec.rb → character_spec.rb}

@@ -4,10 +4,9 @@ describe Marver::Character do
 
   describe 'Attributes' do
     let(:json) { fixture('character.json').read }
-    let(:response) { Marver::REST::Response.new(json) }
-    let(:credentials) { Marver::Credentials.new('pub_key', 'priv_key') }
+    let(:response) { Marver::API::Response.new(json) }
     let(:data_container) { Marver::DataContainer.new(response) }
-    let(:character) { Marver::Character.new(data_container.results, credentials) }
+    let(:character) { Marver::Character.new(data_container.results) }
 
     it '#id - The unique ID of the character resource' do
       expect(character.id).to eq 1009220
@@ -23,7 +22,7 @@ describe Marver::Character do
 
     it '#resourceURI - The canonical URL identifier for this resource.' do
       Time.stub_chain(:now, :to_i, :to_s).and_return "1"
-      expect(character.resource_uri).to eq "http://gateway.marvel.com/v1/public/characters/1009220?ts=1&apikey=priv_key&hash=668dea517c974c12d8d0193cf2d8f7f7"
+      expect(character.resource_uri).to eq "http://gateway.marvel.com/v1/public/characters/1009220"
     end
 
     it '#urls - A set of public web site URLs for the resource.' do
@@ -38,37 +37,33 @@ describe Marver::Character do
     end
 
     context 'summary objects' do
-      before :each do
-        Time.stub_chain(:now, :to_i, :to_s).and_return "1"
-      end
-
       it '#comics - A resource list containing comics which feature this character.' do
         expect(character.comics.class).to eq Array
-        expect(character.comics.first.class).to eq Marver::ComicSummary
+        expect(character.comics.first.class).to eq Marver::Summary::Comic
         expect(character.comics.first.name).to eq "Age of Apocalypse (2011) #2 (Avengers Art Appreciation Variant)"
-        expect(character.comics.first.resource_uri).to eq          "http://gateway.marvel.com/v1/public/comics/42539?ts=1&apikey=priv_key&hash=668dea517c974c12d8d0193cf2d8f7f7"
+        expect(character.comics.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/comics/42539"
       end
 
       it '#stories - A resource list of stories in which this character appears.' do
         expect(character.stories.class).to eq Array
-        expect(character.stories.first.class).to eq Marver::StorySummary
+        expect(character.stories.first.class).to eq Marver::Summary::Story
         expect(character.stories.first.name).to eq "Cover #892"
-        expect(character.stories.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/stories/892?ts=1&apikey=priv_key&hash=668dea517c974c12d8d0193cf2d8f7f7"
+        expect(character.stories.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/stories/892"
         expect(character.stories.first.type).to eq "cover"
       end
 
       it '#events - A resource list of events in which this character appears.' do
         expect(character.events.class).to eq Array
-        expect(character.events.first.class).to eq Marver::EventSummary
+        expect(character.events.first.class).to eq Marver::Summary::Event
         expect(character.events.first.name).to eq "Acts of Vengeance!"
-        expect(character.events.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/events/116?ts=1&apikey=priv_key&hash=668dea517c974c12d8d0193cf2d8f7f7"
+        expect(character.events.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/events/116"
       end
 
       it '#series - A resource list of series in which this character appears.' do
         expect(character.series.class).to eq Array
-        expect(character.series.first.class).to eq Marver::SerieSummary
+        expect(character.series.first.class).to eq Marver::Summary::Serie
         expect(character.series.first.name).to eq "Age of Apocalypse (2011 - Present)"
-        expect(character.series.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/series/15331?ts=1&apikey=priv_key&hash=668dea517c974c12d8d0193cf2d8f7f7"
+        expect(character.series.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/series/15331"
       end
     end
 

data/spec/marver/entities/{core/comic_spec.rb → comic_spec.rb}

@@ -2,8 +2,7 @@ require 'spec_helper'
 
 describe Marver::Comic do
   let(:json) { JSON.parse(fixture('comic.json').read)['data']['results'].first }
-  let(:credentials) { Marver::Credentials.new("pub_key", "priv_key") }
-  let(:comic) { Marver::Comic.new(json, credentials) }
+  let(:comic) { Marver::Comic.new(json) }
 
   it '#id - The unique ID of the comic resource' do
     expect(comic.id).to eq 38524
@@ -15,7 +14,7 @@ describe Marver::Comic do
 
   it '#resource_uri - The canonical URL identifier for this resource.' do
     Time.stub_chain(:now, :to_i, :to_s).and_return "1"
-    expect(comic.resource_uri).to eq "http://gateway.marvel.com/v1/public/comics/38524?ts=1&apikey=priv_key&hash=668dea517c974c12d8d0193cf2d8f7f7"
+    expect(comic.resource_uri).to eq "http://gateway.marvel.com/v1/public/comics/38524"
   end
 
   it '#digital_id - The ID of the digital comic representation of this comic. Will be 0 if the comic is not available digitally.' do
@@ -91,8 +90,8 @@ describe Marver::Comic do
   it '#series - A summary representation of the series to which this comic belongs.' do
     Time.stub_chain(:now, :to_i, :to_s).and_return "1"
     expect(comic.series.class).to eq Array
-    expect(comic.series.first.class).to eq Marver::SerieSummary
-    expect(comic.series.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/series/13896?ts=1&apikey=priv_key&hash=668dea517c974c12d8d0193cf2d8f7f7"
+    expect(comic.series.first.class).to eq Marver::Summary::Serie
+    expect(comic.series.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/series/13896"
     expect(comic.series.first.name).to eq "Age of X: Universe (2011)"
   end
 
@@ -112,9 +111,9 @@ describe Marver::Comic do
   it '#characters - A resource list containing the characters which appear in this comic.' do
     Time.stub_chain(:now, :to_i, :to_s).and_return "1"
     expect(comic.characters.class).to eq Array
-    expect(comic.characters.first.class).to eq Marver::CharacterSummary
+    expect(comic.characters.first.class).to eq Marver::Summary::Character
     expect(comic.characters.first.name).to eq "Captain America"
-    expect(comic.characters.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/characters/1009220?ts=1&apikey=priv_key&hash=668dea517c974c12d8d0193cf2d8f7f7"
+    expect(comic.characters.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/characters/1009220"
   end
 
   it '#variants - A list of variant issues for this comic (includes the "original" issue if the current issue is a variant).'
@@ -124,27 +123,27 @@ describe Marver::Comic do
   it '#creators - A resource list containing the creators associated with this comic.' do
     Time.stub_chain(:now, :to_i, :to_s).and_return "1"
     expect(comic.creators.class).to eq Array
-    expect(comic.creators.first.class).to eq Marver::CreatorSummary
+    expect(comic.creators.first.class).to eq Marver::Summary::Creator
     expect(comic.creators.first.name).to eq "Simone Bianchi"
     expect(comic.creators.first.role).to eq "penciller (cover)"
-    expect(comic.creators.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/creators/648?ts=1&apikey=priv_key&hash=668dea517c974c12d8d0193cf2d8f7f7"
+    expect(comic.creators.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/creators/648"
   end
 
   it '#stories - A resource list containing the stories which appear in this comic.' do
     Time.stub_chain(:now, :to_i, :to_s).and_return "1"
     expect(comic.stories.class).to eq Array
-    expect(comic.stories.first.class).to eq Marver::StorySummary
+    expect(comic.stories.first.class).to eq Marver::Summary::Story
     expect(comic.stories.first.name).to eq "Age of X: Avengers (2011) #1"
     expect(comic.stories.first.type).to eq "cover"
-    expect(comic.stories.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/stories/90010?ts=1&apikey=priv_key&hash=668dea517c974c12d8d0193cf2d8f7f7"
+    expect(comic.stories.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/stories/90010"
   end
 
   it '#events - A resource list containing the events in which this comic appears.' do
     Time.stub_chain(:now, :to_i, :to_s).and_return "1"
     expect(comic.events.class).to eq Array
-    expect(comic.events.first.class).to eq Marver::EventSummary
+    expect(comic.events.first.class).to eq Marver::Summary::Event
     expect(comic.events.first.name).to eq "Age of X"
     expect(comic.events.first.type).to eq nil
-    expect(comic.events.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/events/303?ts=1&apikey=priv_key&hash=668dea517c974c12d8d0193cf2d8f7f7"
+    expect(comic.events.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/events/303"
   end
 end

data/spec/marver/entities/{core/creator_spec.rb → creator_spec.rb}

@@ -1,14 +1,12 @@
 require 'spec_helper'
 require 'json'
-require './lib/marver.rb'
 
 describe Marver::Creator do
 
   let(:json) { fixture('creator.json').read }
-  let(:response) { Marver::REST::Response.new(json) }
-  let(:credentials) { Marver::Credentials.new('pub_key', 'priv_key') }
+  let(:response) { Marver::API::Response.new(json) }
   let(:data_container) { Marver::DataContainer.new(response) }
-  let(:creator) { Marver::Creator.new(data_container.results, credentials) }
+  let(:creator) { Marver::Creator.new(data_container.results) }
 
   it '#id - The unique ID of the creator resource.' do
     expect(creator.id).to eq 648
@@ -52,32 +50,32 @@ describe Marver::Creator do
   it '#series - A resource list containing the series which feature work by this creator.' do
     Time.stub_chain(:now, :to_i, :to_s).and_return '1'
     expect(creator.series.class).to eq Array
-    expect(creator.series.first.class).to eq Marver::SerieSummary
+    expect(creator.series.first.class).to eq Marver::Summary::Serie
     expect(creator.series.first.name).to eq "Age of X: Universe (2011)"
-    expect(creator.series.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/series/13896?ts=1&apikey=priv_key&hash=668dea517c974c12d8d0193cf2d8f7f7"
+    expect(creator.series.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/series/13896"
   end
 
   it '#comics - A resource list containing the stories which feature work by this creator' do
     Time.stub_chain(:now, :to_i, :to_s).and_return '1'
     expect(creator.comics.class).to eq Array
-    expect(creator.comics.first.class).to eq Marver::ComicSummary
+    expect(creator.comics.first.class).to eq Marver::Summary::Comic
     expect(creator.comics.first.name).to eq "Age of X: Universe (2011) #1"
-    expect(creator.comics.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/comics/38524?ts=1&apikey=priv_key&hash=668dea517c974c12d8d0193cf2d8f7f7"
+    expect(creator.comics.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/comics/38524"
   end
 
   it '#stories - A resource list containing the comics which feature work by this creator.' do
     Time.stub_chain(:now, :to_i, :to_s).and_return '1'
     expect(creator.stories.class).to eq Array
-    expect(creator.stories.first.class).to eq Marver::StorySummary
+    expect(creator.stories.first.class).to eq Marver::Summary::Story
     expect(creator.stories.first.name).to eq "1 of 6 - Evolution"
-    expect(creator.stories.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/stories/2243?ts=1&apikey=priv_key&hash=668dea517c974c12d8d0193cf2d8f7f7"
+    expect(creator.stories.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/stories/2243"
   end
 
   it '#events - A resource list containing the events which feature work by this creator.' do
     Time.stub_chain(:now, :to_i, :to_s).and_return '1'
     expect(creator.events.class).to eq Array
-    expect(creator.events.first.class).to eq Marver::EventSummary
+    expect(creator.events.first.class).to eq Marver::Summary::Event
     expect(creator.events.first.name).to eq "Age of X"
-    expect(creator.events.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/events/303?ts=1&apikey=priv_key&hash=668dea517c974c12d8d0193cf2d8f7f7"
+    expect(creator.events.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/events/303"
   end
 end

data/spec/marver/entities/{core/event_spec.rb → event_spec.rb}

@@ -1,13 +1,11 @@
 require 'spec_helper'
 require 'json'
-require './lib/marver.rb'
 
 describe Marver::Event do
   let(:json) { fixture('event.json').read }
-  let(:response) { Marver::REST::Response.new(json) }
-  let(:credentials) { Marver::Credentials.new('pub_key', 'priv_key') }
+  let(:response) { Marver::API::Response.new(json) }
   let(:data_container) { Marver::DataContainer.new(response) }
-  let(:event) { Marver::Event.new(data_container.results, credentials) }
+  let(:event) { Marver::Event.new(data_container.results) }
 
   it "#title - The title of the event." do
     expect(event.title).to eq "Fall of the Mutants"
@@ -15,7 +13,7 @@ describe Marver::Event do
 
   it "#resourceURI - The canonical URL identifier for this resource." do
     Time.stub_chain(:now, :to_i, :to_s).and_return "1"
-    expect(event.resource_uri).to eq "http://gateway.marvel.com/v1/public/events/248?ts=1&apikey=priv_key&hash=668dea517c974c12d8d0193cf2d8f7f7"
+    expect(event.resource_uri).to eq "http://gateway.marvel.com/v1/public/events/248"
   end
 
   it '#description - A description of the event.' do
@@ -51,56 +49,56 @@ describe Marver::Event do
   it '#comics - A resource list containing the comics in this event.' do
     Time.stub_chain(:now, :to_i, :to_s).and_return "1"
     expect(event.comics.class).to eq Array
-    expect(event.comics.first.class).to eq Marver::ComicSummary
+    expect(event.comics.first.class).to eq Marver::Summary::Comic
     expect(event.comics.first.name).to eq "Captain America (1968) #339"
-    expect(event.comics.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/comics/7720?ts=1&apikey=priv_key&hash=668dea517c974c12d8d0193cf2d8f7f7"
+    expect(event.comics.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/comics/7720"
   end
 
   it '#stories - A resource list containing the stories in this event.' do
     Time.stub_chain(:now, :to_i, :to_s).and_return "1"
     expect(event.stories.class).to eq Array
-    expect(event.stories.first.class).to eq Marver::StorySummary
+    expect(event.stories.first.class).to eq Marver::Summary::Story
     expect(event.stories.first.name).to eq "Fall of the Mutants"
-    expect(event.stories.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/stories/22222?ts=1&apikey=priv_key&hash=668dea517c974c12d8d0193cf2d8f7f7"
+    expect(event.stories.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/stories/22222"
     expect(event.stories.first.type).to eq 'cover'
   end
 
   it '#series - A resource list containing the series in this event.' do
     Time.stub_chain(:now, :to_i, :to_s).and_return "1"
     expect(event.series.class).to eq Array
-    expect(event.series.first.class).to eq Marver::SerieSummary
+    expect(event.series.first.class).to eq Marver::Summary::Serie
     expect(event.series.first.name).to eq "Daredevil (1963 - 1998)"
-    expect(event.series.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/series/2002?ts=1&apikey=priv_key&hash=668dea517c974c12d8d0193cf2d8f7f7"
+    expect(event.series.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/series/2002"
   end
 
   it '#characters - A resource list containing the characters which appear in this event.' do
     Time.stub_chain(:now, :to_i, :to_s).and_return "1"
     expect(event.characters.class).to eq Array
-    expect(event.characters.first.class).to eq Marver::CharacterSummary
+    expect(event.characters.first.class).to eq Marver::Summary::Character
     expect(event.characters.first.name).to eq "Havok"
-    expect(event.characters.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/characters/1009337?ts=1&apikey=priv_key&hash=668dea517c974c12d8d0193cf2d8f7f7"
+    expect(event.characters.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/characters/1009337"
   end
 
   it '#creators - A resource list containing creators whose work appears in this event.' do
     Time.stub_chain(:now, :to_i, :to_s).and_return "1"
     expect(event.creators.class).to eq Array
-    expect(event.creators.first.class).to eq Marver::CreatorSummary
+    expect(event.creators.first.class).to eq Marver::Summary::Creator
     expect(event.creators.first.name).to eq "Mark Gruenwald"
     expect(event.creators.first.role).to eq "writer"
-    expect(event.creators.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/creators/259?ts=1&apikey=priv_key&hash=668dea517c974c12d8d0193cf2d8f7f7"
+    expect(event.creators.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/creators/259"
   end
 
   it '#next - A summary representation of the event which follows this event.' do
     Time.stub_chain(:now, :to_i, :to_s).and_return "1"
-    expect(event.next.class).to eq Marver::EventSummary
-    expect(event.next.resource_uri).to eq "http://gateway.marvel.com/v1/public/events/252?ts=1&apikey=priv_key&hash=668dea517c974c12d8d0193cf2d8f7f7"
+    expect(event.next.class).to eq Marver::Summary::Event
+    expect(event.next.resource_uri).to eq "http://gateway.marvel.com/v1/public/events/252"
     expect(event.next.type).to eq nil
   end
 
   it '#previous - A summary representation of the event which preceded this event.' do
     Time.stub_chain(:now, :to_i, :to_s).and_return "1"
-    expect(event.previous.class).to eq Marver::EventSummary
-    expect(event.previous.resource_uri).to eq "http://gateway.marvel.com/v1/public/events/246?ts=1&apikey=priv_key&hash=668dea517c974c12d8d0193cf2d8f7f7"
+    expect(event.previous.class).to eq Marver::Summary::Event
+    expect(event.previous.resource_uri).to eq "http://gateway.marvel.com/v1/public/events/246"
     expect(event.previous.type).to eq nil
   end
 end

data/spec/marver/entities/{core/serie_spec.rb → serie_spec.rb}

@@ -1,14 +1,12 @@
 require 'spec_helper'
 require 'json'
-require './lib/marver.rb'
 
 describe Marver::Serie do
 
   let(:json) { fixture('serie.json').read }
-  let(:response) { Marver::REST::Response.new(json) }
-  let(:credentials) { Marver::Credentials.new('pub_key', 'priv_key') }
+  let(:response) { Marver::API::Response.new(json) }
   let(:data_container) { Marver::DataContainer.new(response) }
-  let(:serie) { Marver::Serie.new(data_container.results, credentials) }
+  let(:serie) { Marver::Serie.new(data_container.results) }
 
   it '#id - The unique ID of the series resource.' do
     expect(serie.id).to eq 2002
@@ -43,57 +41,50 @@ describe Marver::Serie do
   end
 
   it '#comics - A resource list containing comics in this series.' do
-    Time.stub_chain(:now, :to_i, :to_s).and_return "1"
     expect(serie.comics.class).to eq Array
-    expect(serie.comics.first.class).to eq Marver::ComicSummary
+    expect(serie.comics.first.class).to eq Marver::Summary::Comic
     expect(serie.comics.first.name).to eq "Daredevil (1963)"
-    expect(serie.comics.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/comics/8072?ts=1&apikey=priv_key&hash=668dea517c974c12d8d0193cf2d8f7f7"
+    expect(serie.comics.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/comics/8072"
   end
 
   it '#stories - A resource list containing stories which occur in comics in this series.' do
-    Time.stub_chain(:now, :to_i, :to_s).and_return "1"
     expect(serie.stories.class).to eq Array
-    expect(serie.stories.first.class).to eq Marver::StorySummary
+    expect(serie.stories.first.class).to eq Marver::Summary::Story
     expect(serie.stories.first.name).to eq "Life Be Not Proud!"
-    expect(serie.stories.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/stories/15722?ts=1&apikey=priv_key&hash=668dea517c974c12d8d0193cf2d8f7f7"
+    expect(serie.stories.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/stories/15722"
     expect(serie.stories.first.type).to eq "interiorStory"
   end
 
   it '#events - A resource list containing events which take place in comics in this series.' do
-    Time.stub_chain(:now, :to_i, :to_s).and_return "1"
     expect(serie.events.class).to eq Array
-    expect(serie.events.first.class).to eq Marver::EventSummary
+    expect(serie.events.first.class).to eq Marver::Summary::Event
     expect(serie.events.first.name).to eq "Acts of Vengeance!"
-    expect(serie.events.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/events/116?ts=1&apikey=priv_key&hash=668dea517c974c12d8d0193cf2d8f7f7"
+    expect(serie.events.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/events/116"
   end
 
   it '#characters - A resource list containing characters which appear in comics in this series.' do
-    Time.stub_chain(:now, :to_i, :to_s).and_return "1"
     expect(serie.characters.class).to eq Array
-    expect(serie.characters.first.class).to eq Marver::CharacterSummary
+    expect(serie.characters.first.class).to eq Marver::Summary::Character
     expect(serie.characters.first.name).to eq "Beast"
-    expect(serie.characters.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/characters/1009175?ts=1&apikey=priv_key&hash=668dea517c974c12d8d0193cf2d8f7f7"
+    expect(serie.characters.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/characters/1009175"
   end
 
   it '#creators - A resource list of creators whose work appears in comics in this series.' do
-    Time.stub_chain(:now, :to_i, :to_s).and_return "1"
     expect(serie.creators.class).to eq Array
-    expect(serie.creators.first.class).to eq Marver::CreatorSummary
+    expect(serie.creators.first.class).to eq Marver::Summary::Creator
     expect(serie.creators.first.name).to eq "Mark Bagley"
-    expect(serie.creators.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/creators/87?ts=1&apikey=priv_key&hash=668dea517c974c12d8d0193cf2d8f7f7"
+    expect(serie.creators.first.resource_uri).to eq "http://gateway.marvel.com/v1/public/creators/87"
     expect(serie.creators.first.role).to eq "penciller (cover)"
   end
 
   it '#next - A summary representation of the series which follows this series.' do
-    Time.stub_chain(:now, :to_i, :to_s).and_return "1"
-    expect(serie.next.class).to eq Marver::SerieSummary
-    expect(serie.next.resource_uri).to eq "http://gateway.marvel.com/v1/public/series/449?ts=1&apikey=priv_key&hash=668dea517c974c12d8d0193cf2d8f7f7"
+    expect(serie.next.class).to eq Marver::Summary::Serie
+    expect(serie.next.resource_uri).to eq "http://gateway.marvel.com/v1/public/series/449"
   end
 
   it '#previous - A summary representation of the series which preceded this series.' do
-    Time.stub_chain(:now, :to_i, :to_s).and_return "1"
-    expect(serie.previous.class).to eq Marver::SerieSummary
-    expect(serie.previous.resource_uri).to eq "http://gateway.marvel.com/v1/public/series/449?ts=1&apikey=priv_key&hash=668dea517c974c12d8d0193cf2d8f7f7"
+    expect(serie.previous.class).to eq Marver::Summary::Serie
+    expect(serie.previous.resource_uri).to eq "http://gateway.marvel.com/v1/public/series/449"
   end
 
   it "#title - Serie's title" do
@@ -103,4 +94,5 @@ describe Marver::Serie do
   it "#resource_uri - Full cannonical URL of the entity" do
     expect(serie.resource_uri).to eq "http://gateway.marvel.com/v1/public/series/2002"
   end
+
 end

data/spec/marver/entities/{core/story_spec.rb → story_spec.rb}

@@ -3,10 +3,9 @@ require 'spec_helper'
 describe Marver::Story do
   describe "Attributes" do
     let(:json) { fixture('story.json').read }
-    let(:response) { Marver::REST::Response.new(json) }
-    let(:credentials) { Marver::Credentials.new('pub_key', 'priv_key') }
+    let(:response) { Marver::API::Response.new(json) }
     let(:data_container) { Marver::DataContainer.new(response) }
-    let(:story) { Marver::Story.new(data_container.results, credentials) }
+    let(:story) { Marver::Story.new(data_container.results) }
 
     it "#title - The story title." do
       expect(story.title).to eq "Cover #892"
@@ -18,7 +17,7 @@ describe Marver::Story do
 
     it "#resource_uri - The canonical URL identifier for this resource." do
       Time.stub_chain(:now, :to_i, :to_s).and_return "1"
-      expect(story.resource_uri).to eq "http://gateway.marvel.com/v1/public/stories/892?ts=1&apikey=priv_key&hash=668dea517c974c12d8d0193cf2d8f7f7"
+      expect(story.resource_uri).to eq "http://gateway.marvel.com/v1/public/stories/892"
     end
 
     it '#description - A short description of the story.' do
@@ -31,39 +30,39 @@ describe Marver::Story do
 
     it '#comics - A resource list containing comics in which this story takes place.' do
       expect(story.comics.class).to eq Array
-      expect(story.comics.first.class).to eq Marver::ComicSummary
+      expect(story.comics.first.class).to eq Marver::Summary::Comic
       expect(story.comics.first.name).to eq "Thor (1998) #81"
     end
 
     it '#series - A resource list containing series in which this story appears.' do
       expect(story.series.class).to eq Array
-      expect(story.series.first.class).to eq Marver::SerieSummary
+      expect(story.series.first.class).to eq Marver::Summary::Serie
       expect(story.series.first.name).to eq "Thor (1998 - 2004)"
     end
 
     it '#events - A resource list of the events in which this story appears.' do
       expect(story.events.class).to eq Array
-      expect(story.events.first.class).to eq Marver::EventSummary
+      expect(story.events.first.class).to eq Marver::Summary::Event
       expect(story.events.first.name).to eq "Avengers Disassembled"
     end
 
     it '#characters - A resource list of characters which appear in this story.' do
       expect(story.characters.class).to eq Array
-      expect(story.characters.first.class).to eq Marver::CharacterSummary
+      expect(story.characters.first.class).to eq Marver::Summary::Character
       expect(story.characters.first.name).to eq "Avengers"
     end
 
     it '#creators - A resource list of creators who worked on this story.' do
       expect(story.creators.class).to eq Array
-      expect(story.creators.first.class).to eq Marver::CreatorSummary
+      expect(story.creators.first.class).to eq Marver::Summary::Creator
       expect(story.creators.first.name).to eq "Steve Epting"
     end
 
     it '#original_issue - A summary representation of the issue in which this story was originally published.' do
       Time.stub_chain(:now, :to_i, :to_s).and_return "1"
-      expect(story.original_issue.class).to eq Marver::ComicSummary
+      expect(story.original_issue.class).to eq Marver::Summary::Comic
       expect(story.original_issue.name).to eq "Thor (1998) #81"
-      expect(story.original_issue.resource_uri).to eq "http://gateway.marvel.com/v1/public/comics/715?ts=1&apikey=priv_key&hash=668dea517c974c12d8d0193cf2d8f7f7"
+      expect(story.original_issue.resource_uri).to eq "http://gateway.marvel.com/v1/public/comics/715"
     end
 
   end