omdbapi 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 272ba0afa85cd815166b6a0b2d077f447d3b652e
-  data.tar.gz: 112b7114fc02de8a93b491c5e6cbef4f65308419
+  metadata.gz: f96546e47313f62cae59711b67ad3c44e97a627e
+  data.tar.gz: a6d69f0a189d0a57c8c9e46334bbb23fdaa973bd
 SHA512:
-  metadata.gz: eb65226a4f6ce075f9ff299af4577393e20be45a363ab2cdaba50fd4ca03a05c17a0152c5e84b69212d91b9fc544f05875ef65756a98f97ba5c57d99792ca66f
-  data.tar.gz: fbbaad3014a8944a6ddd743e12872f1c3299563c1e004416ce16a166bbee40e37c821784321381b14c2f5a0970ed42ce97f0ae19053cc3bf361d3d37ef8aa1d4
+  metadata.gz: c9d2645b01291cf785e4e9e810abaa60a09c48c68ec932edbe613564dc49fe4e77bbe66dd9e04cf59f7113288298ca5e7d8d6eca0ac3da35a299783f151cc2ab
+  data.tar.gz: 599596e06bfe191982051c8a423bb242ef9f72934a225deaf834d4ba0d5bbfe475c8c0a16dcf5e0adf8d8cf3b6bf048b18f6a4aee2b8e8d12366fcc5dc70039e

data/README.md

@@ -59,7 +59,7 @@ This function will return a Hash with the following information about the title:
 :actors, :plot, :poster, :imdb_rating, :imdb_votes, :imdb_id, :type
 ```
 
-You can also pass in the optional parameters for year or plot. Plot defaults to 'short', so the only other option is 'full'.
+You can also pass in the optional parameters for year, plot, or season and episode. Plot defaults to 'short', so the only other option is 'full'.
 
 ```ruby
 OMDB.title('True Grit')
@@ -72,6 +72,10 @@ OMDB.title('Breaking Bad', plot: 'full')
 
 # Get the original Italian Job with the full plot
 OMDB.title('The Italian Job', year: '1969', plot: 'full')
+
+# Get a specific episode (season and episode must be included together)
+OMDB.title('True Detective', { :season => '1', :episode => '1' })
+# => {:title=>"The Long Bright Dark", :year=>"2014", :rated=>"TV-MA", :released=>"12 Jan 2014", :season=>"1", :episode=>"1", :runtime=>"58 min", :genre=>"Crime, Drama, Mystery", :director=>"Cary Fukunaga", :writer=>"Nic Pizzolatto (created by), Nic Pizzolatto", :actors=>"Matthew McConaughey, Woody Harrelson, Michelle Monaghan, Michael Potts", :plot=>"In 2012, former detective partners, Rust Cohle and Martin Hart recap one of their very first cases together involving a serial killer, back in 1995.", :language=>"English", :country=>"USA", :awards=>"N/A", :poster=>"http://ia.media-imdb.com/images/M/MV5BMTY5NjA2MjEyN15BMl5BanBnXkFtZTgwNzU2MjQ4MDE@._V1_SX300.jpg", :metascore=>"N/A", :imdb_rating=>"8.9", :imdb_votes=>"8282", :imdb_id=>"tt2657398", :series_id=>"tt2356777", :type=>"episode", :response=>"True"}
 ```
 
 ### IMDb ID

data/lib/omdbapi.rb

@@ -1,5 +1,4 @@
 require 'httparty'
-require 'json'
 require 'omdbapi/version'
 require 'omdbapi/default'
 require 'omdbapi/client'

data/lib/omdbapi/client.rb

@@ -12,11 +12,19 @@ module OMDB
     #
     # @param title [String] The title of the movie or show.
     # @param options [Hash] Options for the title, plot or year.
+    # @option options [Integer] :year The year of the movie.
+    # @option options [String] :plot 'short' (default), 'full'
+    # @option options [Integer] :season The season to retrieve.
+    # @option options [Integer] :episode The episode to retrieve. Requires the season parameter.
     # @return [Hash]
     # @example
     #   OMDB.title('Game of Thrones')
     def title(title, options={})
-      params = build_params(title, options)
+      params = { t: title }
+      params[:y] = options[:year] if options[:year]
+      params[:plot] = options[:plot] if options[:plot]
+      params[:season] = options[:season] if options[:season]
+      params[:episode] = options[:episode] if options[:episode]
       get '/', params
     end
 
@@ -28,7 +36,7 @@ module OMDB
     # @example
     #   OMDB.id('tt0944947')
     def id(imdb_id) 
-      return get '/', { i: imdb_id }
+      get '/', { i: imdb_id }
     end
 
     # Search for a movie by its title.
@@ -74,7 +82,7 @@ module OMDB
       # @return [Hash]
       def build_params(title, options)
         params = { t: title }
-        params[:plot] = options[:plot] if options[:plot]
+        
         params[:y] = options[:year] if options[:year]
         params
       end
@@ -88,7 +96,7 @@ module OMDB
       #   get '/users', { username: 'caseyscarborough' }
       def get(url, params={})
         request = self.class.get '/', query: params
-        convert_hash_keys(JSON.parse(request.parsed_response))
+        convert_hash_keys(request.parsed_response)
       end
   end
 end

data/lib/omdbapi/version.rb

@@ -2,5 +2,5 @@ module OMDB
   # OMDB current version
   #
   # @return [String]
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/omdbapi.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_dependency 'httparty', '0.11.0'
+  spec.add_dependency 'httparty', '>= 0.13'
 end

data/spec/omdbapi/client_spec.rb

@@ -43,6 +43,33 @@ describe OMDB::Client do
         end
       end
 
+      describe 'with the season and episode parameters' do
+        let(:title) { OMDB.title('True Detective', episode: 1, season: 1) }
+
+        it 'should include season and episode in the response' do
+          title.season.should eq("1")
+          title.episode.should eq("1")
+        end
+      end
+
+      describe 'with only the season parameter, missing the episode parameter' do
+        let(:title) { OMDB.title('True Detective', season: 1) }
+
+        it 'should not include season and episode in the response' do
+          expect { title.season }.to raise_error(NoMethodError)
+          expect { title.episode }.to raise_error(NoMethodError)
+        end
+      end
+
+      describe 'with only the episode parameter, missing the season parameter' do
+        let(:title) { OMDB.title('True Detective', episode: 1) }
+
+        it 'should not include season and episode in the response' do
+          expect { title.season }.to raise_error(NoMethodError)
+          expect { title.episode }.to raise_error(NoMethodError)
+        end
+      end
+
       describe 'with a movie that doesn''t exist' do
         let(:title) { OMDB.title('lsdfoweirjrpwef323423dsfkip') }
         
@@ -106,14 +133,14 @@ describe OMDB::Client do
       end
 
       describe 'with a single search result' do
-        let(:result) { OMDB.search('The Star Wars Holiday Special') }
+        let(:result) { OMDB.search('Star Wars: Episode IV - A New Hope') }
 
         it 'should return a hash of the title' do
           result.should be_instance_of Hash
         end
 
         it 'should have a title' do
-          result.title.should eq('The Star Wars Holiday Special')
+          result.title.should eq('Star Wars: Episode IV - A New Hope')
         end
       end
 

metadata

@@ -1,80 +1,80 @@
 --- !ruby/object:Gem::Specification
 name: omdbapi
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Casey Scarborough
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2015-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
-description: '[In Progress] A wrapper for the omdbapi.com movie API.'
+        version: '0.13'
+description: "[In Progress] A wrapper for the omdbapi.com movie API."
 email:
 - caseyscarborough@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -97,17 +97,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.0.5
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: This gem provides easy access for information retrieval from omdbapi.com.