marver 0.0.2 → 0.0.4

data/lib/marver/entities/event.rb

@@ -0,0 +1,34 @@
+module Marver
+  class Event
+    include Marver::Summarizable
+    include Marver::Commonable
+
+    attr_reader :json, :title, :resource_uri,
+                :description, :start, :end, :next, :previous
+
+    class << self
+      def build(results)
+        if results.kind_of?(Array)
+          results.collect do |event|
+            Marver::Event.new(event)
+          end
+        else
+          new(results)
+        end
+      end
+    end
+
+    def initialize(json)
+      @json = json
+
+      @title = @json['title']
+      @resource_uri = @json['resourceURI']
+
+      @description = @json['description']
+      @start = Date.parse(@json['start'])
+      @end = Date.parse(@json['end'])
+      @next = Marver::Summary::Event.new(@json['next'])
+      @previous = Marver::Summary::Event.new(@json['previous'])
+    end
+  end
+end

data/lib/marver/entities/queryable.rb

@@ -0,0 +1,12 @@
+require './lib/marver.rb'
+
+module Marver
+  module Queryable
+    def hash_to_querystring(hash)
+      hash.keys.inject('') do |query_string, key|
+        query_string << '&' unless key == hash.keys.first
+        query_string << "#{URI.encode(key.to_s)}=#{URI.encode(hash[key])}"
+      end
+    end
+  end
+end

data/lib/marver/entities/serie.rb

@@ -0,0 +1,37 @@
+module Marver
+  class Serie
+    include Marver::Summarizable
+    include Marver::Commonable
+
+    attr_reader :json, :id, :title, :resource_uri, :description,
+                :start_year, :end_year, :rating, :next, :previous
+
+    class << self
+      def build(results)
+        if results.kind_of?(Array)
+          results.collect do |serie|
+            Marver::Serie.new(serie)
+          end
+        else
+          new(results)
+        end
+      end
+    end
+
+    def initialize(json)
+      @json = json
+
+      @id = @json['id']
+      @title = @json['title']
+      @resource_uri = @json['resourceURI']
+      @description = @json['description']
+      @start_year = @json['startYear']
+      @end_year = @json['endYear']
+      @rating = @json['rating']
+
+      @next = Marver::Summary::Serie.new(@json['next'])
+      @previous = Marver::Summary::Serie.new(@json['previous'])
+    end
+
+  end
+end

data/lib/marver/entities/story.rb

@@ -0,0 +1,33 @@
+require './lib/marver.rb'
+
+module Marver
+  class Story
+    include Marver::Summarizable
+    include Marver::Commonable
+
+    attr_reader :json, :title, :type, :resource_uri, :description, :thumbnail, :original_issue
+
+    class << self
+      def build(results)
+        if results.kind_of?(Array)
+          results.collect do |story|
+            Marver::Story.new(story)
+          end
+        else
+          new(results)
+        end
+      end
+    end
+
+    def initialize(json)
+      @json = json
+
+      @title = @json['title']
+      @type = @json['type']
+      @resource_uri = @json['resourceURI']
+      @description = @json['description']
+
+      @original_issue = Marver::Summary::Comic.new(@json['originalIssue'])
+    end
+  end
+end

data/lib/marver/entities/summarizable.rb

@@ -0,0 +1,54 @@
+module Marver
+  module Summarizable
+
+    def characters
+      @characters ||= entity_items('characters').collect do |character|
+        Marver::Summary::Character.new(character)
+      end
+    end
+
+    def creators
+      @creators ||= entity_items('creators').collect do |creator|
+        Marver::Summary::Creator.new(creator)
+      end
+    end
+
+    def events
+      @events ||= entity_items('events').collect do |event|
+        Marver::Summary::Event.new(event)
+      end
+    end
+
+    def series
+      @series ||= entity_items('series').collect do |serie|
+        Marver::Summary::Serie.new(serie)
+      end
+    end
+
+    def stories
+      @stories ||= entity_items('stories').collect do |story|
+        Marver::Summary::Story.new(story)
+      end
+    end
+
+    def characters
+      @characters ||= entity_items('characters').collect do |character|
+        Marver::Summary::Character.new(character)
+      end
+    end
+
+    def comics
+      @comics ||= entity_items('comics').collect do |comic|
+        Marver::Summary::Comic.new(comic)
+      end
+    end
+
+    def entity_items(entity)
+      if json[entity].kind_of?(Hash) && json[entity].has_key?('items')
+        [json[entity]['items']].compact.flatten(1)
+      else
+        [json[entity]].compact.flatten(1)
+      end
+    end
+  end
+end

data/lib/marver/entities/summary.rb

@@ -0,0 +1,10 @@
+module Marver
+  module Summary
+    autoload :Character,  'marver/entities/summary/character'
+    autoload :Comic,      'marver/entities/summary/comic'
+    autoload :Story,      'marver/entities/summary/story'
+    autoload :Event,      'marver/entities/summary/event'
+    autoload :Serie,      'marver/entities/summary/serie'
+    autoload :Creator,    'marver/entities/summary/creator'
+  end
+end

data/lib/marver/entities/summary/character.rb

@@ -0,0 +1,23 @@
+require './lib/marver.rb'
+
+module Marver
+  module Summary
+    class Character
+      attr_reader :id, :name, :resource_uri, :type
+
+      def initialize(json)
+        @id = json['id'].to_i
+        @name = json['name']
+        @resource_uri = json['resourceURI']
+        @type = json['type'] || nil
+      end
+
+      def full
+        response = Marver::API::Response.new(RestClient.get(@resource_uri))
+        data = Marver::DataContainer.new(response).results
+        Marver::Character.build(data)
+      end
+
+    end
+  end
+end

data/lib/marver/entities/summary/comic.rb

@@ -0,0 +1,21 @@
+require './lib/marver.rb'
+
+module Marver
+  module Summary
+    class Comic
+      attr_reader :id, :name, :resource_uri, :type
+
+      def initialize(json)
+        @name = json['name']
+        @resource_uri = json['resourceURI']
+        @id = json['id'].to_i
+      end
+
+      def full
+        response = Marver::API::Response.new(RestClient.get(@resource_uri))
+        data = Marver::DataContainer.new(response)
+        Marver::Comic.build(data)
+      end
+    end
+  end
+end

data/lib/marver/entities/summary/creator.rb

@@ -0,0 +1,19 @@
+module Marver
+  module Summary
+    class Creator
+      attr_reader :name, :resource_uri, :role
+
+      def initialize(json)
+        @name = json['name']
+        @resource_uri = json['resourceURI']
+        @role = json['role']
+      end
+
+      def full
+        response = Marver::API::Response.new(RestClient.get(@resource_uri))
+        data = Marver::DataContainer.new(response).results
+        Marver::Creator.build(data)
+      end
+    end
+  end
+end

data/lib/marver/entities/summary/event.rb

@@ -0,0 +1,20 @@
+module Marver
+  module Summary
+    class Event
+      attr_reader :id, :name, :resource_uri, :type
+
+      def initialize(json)
+        @id = json['id'].to_i
+        @name = json['name']
+        @resource_uri = json['resourceURI']
+        @type = json['type'] || nil
+      end
+
+      def full
+        response = Marver::API::Response.new(RestClient.get(@resource_uri))
+        data = Marver::DataContainer.new(response).results
+        Marver::Event.build(data)
+      end
+    end
+  end
+end

data/lib/marver/entities/summary/serie.rb

@@ -0,0 +1,19 @@
+module Marver
+  module Summary
+    class Serie
+      attr_reader :id, :name, :resource_uri, :type
+
+      def initialize(json)
+        @name = json['name']
+        @resource_uri = json['resourceURI']
+      end
+
+      def full
+        response = Marver::API::Response.new(RestClient.get(@resource_uri))
+        data = Marver::DataContainer.new(response).results
+        Marver::Serie.build(data)
+      end
+
+    end
+  end
+end

data/lib/marver/entities/summary/story.rb

@@ -0,0 +1,20 @@
+module Marver
+  module Summary
+    class Story
+      attr_reader :id, :name, :resource_uri, :type
+
+      def initialize(json)
+        @name = json['name']
+        @resource_uri = json['resourceURI']
+        @type = json['type'] || nil
+        @id = json['id'].to_i
+      end
+
+      def full
+        response = Marver::API::Response.new(RestClient.get(@resource_uri))
+        data = Marver::DataContainer.new(response).results
+        Marver::Story.build(data)
+      end
+    end
+  end
+end

data/lib/marver/finders/character_finder.rb

@@ -2,23 +2,10 @@ require './lib/marver.rb'
 
 module Marver
   class CharacterFinder
-    attr_reader :credentials, :rest_client
-
-    def initialize(credentials)
-      @credentials = credentials
-      @rest_client = Marver::REST::Client.new
-    end
-
     def find(options = {})
-      response = @rest_client.get_request(url)
+      response = Marver::API::Client.new.get(:characters, options)
       results = Marver::DataContainer.new(response).results
-      Marver::Character.build(results, @credentials)
-    end
-
-    private
-
-    def url
-      "characters?#{@credentials.to_s}"
+      Marver::Character.build(results)
     end
   end
 end

data/lib/marver/helpers/string_helper.rb

@@ -1,7 +1,7 @@
 module Marver
   module StringHelper
     def summary_class(entity)
-      constantize("Marver::#{refined(entity)}Summary")
+      constantize("Marver::Summary::#{refined(entity)}")
     end
 
     def common_class(entity)
@@ -31,6 +31,6 @@ module Marver
       end
       constant
     end
-  end
 
+  end
 end

data/lib/marver/version.rb

@@ -1,3 +1,3 @@
 module Marver
-  VERSION = '0.0.2'
+  VERSION = '0.0.4'
 end

data/marver.gemspec

@@ -20,4 +20,8 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "pry"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "webmock"
+  spec.add_dependency 'rest-client'
 end

data/spec/marver/{rest → api}/client_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper.rb'
-require './lib/marver/rest/client.rb'
 
-describe Marver::REST::Client do
-  let(:client) { Marver::REST::Client.new }
+describe Marver::API::Client do
+  let(:client) { Marver::API::Client.new }
 
   it '#endpoint' do
     expect(client.endpoint).to eq "http://gateway.marvel.com/v1/public/"

data/spec/marver/api/credentials_spec.rb

@@ -0,0 +1,17 @@
+require './lib/marver.rb'
+
+describe Marver::API::Credentials do
+  before :each do
+    Time.stub_chain(:now, :to_i, :to_s).and_return "1"
+
+    Marver.configure do |config|
+      config.public_key  = 'pub_key'
+      config.private_key = 'priv_key'
+    end
+
+  end
+
+  it "returns api credentials as query string" do
+    expect(Marver::API::Credentials.get).to eq "&ts=1&apikey=pub_key&hash=3d4ce88a477c7e4a5accbf6cd2c8b819"
+  end
+end

data/spec/marver/{rest → api}/error_spec.rb

@@ -1,7 +1,7 @@
-require './lib/marver/rest/error.rb'
+require 'spec_helper'
 
-describe Marver::REST::Error do
-  let(:error) { Marver::REST::Error.new({ "code" => "404", "status" => "Not found."}) }
+describe Marver::API::Error do
+  let(:error) { Marver::API::Error.new({ "code" => "404", "status" => "Not found."}) }
 
   it '#code - the http status code of the error' do
     expect(error.code).to eq 404

data/spec/marver/api/response_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Marver::API::Response do
+
+  before :each do
+    stub_get("http://gateway.marvel.com/v1/public/characters?apikey=pub_key&hash=3d4ce88a477c7e4a5accbf6cd2c8b819&ts=1").to_return(:body => fixture('raw_json.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+
+    Time.stub_chain(:now, :to_i, :to_s).and_return "1"
+    Marver.configure do |config|
+      config.public_key  = 'pub_key'
+      config.private_key = 'priv_key'
+    end
+
+    @response = Marver::API::Client.new.get(:characters, {})
+  end
+
+  it 'has a response code ' do
+    expect(@response.code).to eq 200
+  end
+
+  it 'has a status' do
+    expect(@response.status).to eq "Ok"
+  end
+
+end