marvel_api 0.2.0 → 0.2.1

data/spec/marvel_api_spec.rb

@@ -1,9 +1,21 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe 'Marvel' do
+describe Marvel do
   describe '.new' do
-    it 'should return a Marvel::Client' do
-      Marvel.new.should be_a Marvel::Client
+    it 'returns a Marvel::Client' do
+      expect(Marvel.new).to be_a Marvel::Client
+    end
+  end
+
+  describe '.configure' do
+    it 'sets the api_key and private_key' do
+      Marvel.configure do |config|
+        config.api_key = '1234'
+        config.private_key = 'abcd'
+      end
+
+      expect(Marvel.api_key).to eq '1234'
+      expect(Marvel.private_key).to eq 'abcd'
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,16 +1,67 @@
+require 'simplecov'
+require 'coveralls'
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+
+SimpleCov.start
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
+
 require 'rspec'
+require 'webmock/rspec'
 require 'marvel_api'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
-  
+  config.expect_with(:rspec) { |c| c.syntax = :expect }
+end
+
+WebMock.disable_net_connect!(allow: 'coveralls.io')
+
+def marvel_test_client
+  Marvel::Client.new.tap do |client|
+    client.configure do |config|
+      config.api_key = '1234'
+      config.private_key = 'abcd'
+    end
+  end
+end
+
+AUTH = '?ts=1&apikey=1234&hash=ffd275c5130566a2916217b101f26150'
+
+def stub_get(path, options = {})
+  file = options.delete(:returns)
+  code = options.delete(:response_code) || 200
+  etag = options.delete(:etag)
+  headers = Marvel::Connection::HEADERS
+  headers.merge!('If-None-Match' => etag) if etag
+  params = '&' + options.map { |k, v| "#{k}=#{v}" } * '&'
+  endpoint = Marvel::Connection::BASE_API_URL + path + AUTH + params
+  stub_request(:get, endpoint)
+    .with(headers: headers)
+    .to_return(body: fixture(file), status: code)
+end
+
+def fixture_path
+  File.expand_path('../fixtures', __FILE__)
+end
+
+def fixture(file)
+  File.new(fixture_path + '/' + file) rescue nil
 end
 
-Marvel.configure do |config|
-  
+module Marvel
+  module Request
+    private
+    def timestamp
+      '1'
+    end
+  end
 end

metadata

@@ -1,57 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: marvel_api
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Rahul Horé
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-20 00:00:00.000000000 Z
+date: 2014-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -136,22 +148,7 @@ dependencies:
     - - "~>"
       - !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
-  never before.
+description: Explore the Marvel Universe like never before.
 email: hore.rahul@gmail.com
 executables: []
 extensions: []
@@ -161,18 +158,77 @@ extra_rdoc_files:
 files:
 - ".document"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- VERSION
 - lib/marvel/client.rb
 - lib/marvel/configuration.rb
 - lib/marvel/connection.rb
+- lib/marvel/error.rb
 - lib/marvel/request.rb
+- lib/marvel/response.rb
+- lib/marvel/version.rb
 - lib/marvel_api.rb
 - marvel_api.gemspec
-- spec/marvel_api/client_spec.rb
+- spec/fixtures/characters/character.json
+- spec/fixtures/characters/character_comics.json
+- spec/fixtures/characters/character_events.json
+- spec/fixtures/characters/character_series.json
+- spec/fixtures/characters/character_stories.json
+- spec/fixtures/characters/characters.json
+- spec/fixtures/comics/comic.json
+- spec/fixtures/comics/comic_characters.json
+- spec/fixtures/comics/comic_creators.json
+- spec/fixtures/comics/comic_events.json
+- spec/fixtures/comics/comic_stories.json
+- spec/fixtures/comics/comics.json
+- spec/fixtures/creators/creator.json
+- spec/fixtures/creators/creator_comics.json
+- spec/fixtures/creators/creator_events.json
+- spec/fixtures/creators/creator_series.json
+- spec/fixtures/creators/creator_stories.json
+- spec/fixtures/creators/creators.json
+- spec/fixtures/errors/empty_parameter.json
+- spec/fixtures/errors/excessive_filter_values.json
+- spec/fixtures/errors/invalid_credentials.json
+- spec/fixtures/errors/invalid_filter_value.json
+- spec/fixtures/errors/invalid_hash_ts_key_combo.json
+- spec/fixtures/errors/invalid_ordering.json
+- spec/fixtures/errors/invalid_parameter.json
+- spec/fixtures/errors/limit_invalid.json
+- spec/fixtures/errors/limit_over_100.json
+- spec/fixtures/errors/resource_not_found.json
+- spec/fixtures/events/event.json
+- spec/fixtures/events/event_characters.json
+- spec/fixtures/events/event_comics.json
+- spec/fixtures/events/event_creators.json
+- spec/fixtures/events/event_series.json
+- spec/fixtures/events/event_stories.json
+- spec/fixtures/events/events.json
+- spec/fixtures/series/serie.json
+- spec/fixtures/series/series.json
+- spec/fixtures/series/series_characters.json
+- spec/fixtures/series/series_comics.json
+- spec/fixtures/series/series_creators.json
+- spec/fixtures/series/series_events.json
+- spec/fixtures/series/series_stories.json
+- spec/fixtures/stories/stories.json
+- spec/fixtures/stories/story.json
+- spec/fixtures/stories/story_characters.json
+- spec/fixtures/stories/story_comics.json
+- spec/fixtures/stories/story_creators.json
+- spec/fixtures/stories/story_events.json
+- spec/fixtures/stories/story_series.json
+- spec/marvel_api/client/client_character_spec.rb
+- spec/marvel_api/client/client_comic_spec.rb
+- spec/marvel_api/client/client_creator_spec.rb
+- spec/marvel_api/client/client_event_spec.rb
+- spec/marvel_api/client/client_series_spec.rb
+- spec/marvel_api/client/client_story_spec.rb
+- spec/marvel_api/error_spec.rb
 - spec/marvel_api_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/O-I/marvel
@@ -187,7 +243,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/VERSION

@@ -1 +0,0 @@
-0.2.0

data/spec/marvel_api/client_spec.rb

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