ruby-tmdb 0.1.3 → 0.1.4

data/MIT-LICENSE

@@ -1,20 +1,20 @@
-Copyright (c) 2010 Aaron Gough (http://thingsaaronmade.com/)
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+Copyright (c) 2010 Aaron Gough (http://thingsaaronmade.com/)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -17,6 +17,7 @@ begin
     gemspec.rdoc_options << '--line-numbers' << '--inline-source'
     gemspec.extra_rdoc_files = ['README.rdoc', 'MIT-LICENSE']
     gemspec.add_dependency( "deepopenstruct", ">= 0.1.2")
+    gemspec.add_dependency( "json")
     gemspec.add_development_dependency "webmock"
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/ruby-tmdb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby-tmdb}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Gough"]
-  s.date = %q{2010-08-23}
+  s.date = %q{2010-10-06}
   s.description = %q{An ActiveRecord-style API wrapper for TheMovieDB.org}
   s.email = %q{aaron@aarongough.com}
   s.extra_rdoc_files = [
@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{https://github.com/aarongough/ruby-tmdb}
   s.rdoc_options = ["--charset=UTF-8", "--line-numbers", "--inline-source"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{An ActiveRecord-style API wrapper for TheMovieDB.org}
   s.test_files = [
     "test/setup/setup_api_key.rb",
@@ -66,15 +66,18 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<deepopenstruct>, [">= 0.1.2"])
+      s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_development_dependency(%q<webmock>, [">= 0"])
     else
       s.add_dependency(%q<deepopenstruct>, [">= 0.1.2"])
+      s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<webmock>, [">= 0"])
     end
   else
     s.add_dependency(%q<deepopenstruct>, [">= 0.1.2"])
+    s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<webmock>, [">= 0"])
   end
 end

data/test/setup/setup_api_key.rb

@@ -1,3 +1,3 @@
-File.open(File.join(File.dirname(__FILE__), 'tmdb_api_key.txt')) do |file|
-  Tmdb.api_key = file.read
+File.open(File.join(File.dirname(__FILE__), 'tmdb_api_key.txt')) do |file|
+  Tmdb.api_key = file.read
 end

data/test/setup/test_unit_extensions.rb

@@ -1,21 +1,21 @@
-module Test::Unit
-  # Used to fix a minor minitest/unit incompatibility in flexmock
-  AssertionFailedError = Class.new(StandardError)
-  
-  class TestCase
-   
-    def self.test(name, &block)
-      test_name = "test_#{name.gsub(/\s+/,'_')}".to_sym
-      defined = instance_method(test_name) rescue false
-      raise "#{test_name} is already defined in #{self}" if defined
-      if block_given?
-        define_method(test_name, &block)
-      else
-        define_method(test_name) do
-          flunk "No implementation provided for #{name}"
-        end
-      end
-    end
-
-  end
+module Test::Unit
+  # Used to fix a minor minitest/unit incompatibility in flexmock
+  AssertionFailedError = Class.new(StandardError)
+  
+  class TestCase
+   
+    def self.test(name, &block)
+      test_name = "test_#{name.gsub(/\s+/,'_')}".to_sym
+      defined = instance_method(test_name) rescue false
+      raise "#{test_name} is already defined in #{self}" if defined
+      if block_given?
+        define_method(test_name, &block)
+      else
+        define_method(test_name) do
+          flunk "No implementation provided for #{name}"
+        end
+      end
+    end
+
+  end
 end

data/test/test_helper.rb

@@ -1,20 +1,20 @@
-TEST_LIVE_API = false
-
-require 'rubygems'
-require 'test/unit'
-
-unless(TEST_LIVE_API)
-  require 'webmock/test_unit'
-  include WebMock
-end
-
-require_files = []
-require_files << File.join(File.dirname(__FILE__), '..', 'lib', 'ruby-tmdb.rb')
-require_files.concat Dir[File.join(File.dirname(__FILE__), 'setup', '*.rb')]
-
-require_files.each do |file|
-  require File.expand_path(file)
-end
-
-#load(File.join('unit', 'test_direct_require.rb'), true)
+TEST_LIVE_API = false
+
+require 'rubygems'
+require 'test/unit'
+
+unless(TEST_LIVE_API)
+  require 'webmock/test_unit'
+  include WebMock
+end
+
+require_files = []
+require_files << File.join(File.dirname(__FILE__), '..', 'lib', 'ruby-tmdb.rb')
+require_files.concat Dir[File.join(File.dirname(__FILE__), 'setup', '*.rb')]
+
+require_files.each do |file|
+  require File.expand_path(file)
+end
+
+#load(File.join('unit', 'test_direct_require.rb'), true)
 system('ruby ' + File.expand_path(File.join(File.dirname(__FILE__), 'unit', 'test_direct_require.rb')))

data/test/unit/test_direct_require.rb

@@ -1,25 +1,25 @@
-require "test/unit"
-
-require_files = []
-require_files << File.join(File.dirname(__FILE__), "..", "..", "lib", "ruby-tmdb.rb")
-require_files.concat Dir[File.join(File.dirname(__FILE__), '..', 'setup', '*.rb')]
-
-require_files.each do |file|
-  require File.expand_path(file)
-end
-
-class DirectRequireTest < Test::Unit::TestCase
-  
-  test "TmdbMovie should not raise exception when directly required without using rubygems" do
-    assert_nothing_raised do
-      TmdbMovie.find(:id => 187)
-    end
-  end
-  
-  test "TmdbCast should not raise exception when directly required without using rubygems" do
-    assert_nothing_raised do
-      TmdbCast.find(:id => 287)
-    end
-  end
-  
+require "test/unit"
+
+require_files = []
+require_files << File.join(File.dirname(__FILE__), "..", "..", "lib", "ruby-tmdb.rb")
+require_files.concat Dir[File.join(File.dirname(__FILE__), '..', 'setup', '*.rb')]
+
+require_files.each do |file|
+  require File.expand_path(file)
+end
+
+class DirectRequireTest < Test::Unit::TestCase
+  
+  test "TmdbMovie should not raise exception when directly required without using rubygems" do
+    assert_nothing_raised do
+      TmdbMovie.find(:id => 187)
+    end
+  end
+  
+  test "TmdbCast should not raise exception when directly required without using rubygems" do
+    assert_nothing_raised do
+      TmdbCast.find(:id => 287)
+    end
+  end
+  
 end

data/test/unit/tmdb_test.rb

@@ -1,158 +1,158 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'test_helper.rb'))
-
-class TmdbTest < Test::Unit::TestCase
-
-  def setup
-    register_api_url_stubs
-  end
-
-  test "allows setting of api_key" do
-    old_api_key = Tmdb.api_key
-    api_key = "test1234567890"
-    Tmdb.api_key = api_key
-    assert_equal Tmdb.api_key, api_key
-    Tmdb.api_key = old_api_key
-  end
-  
-  test "should return base API url" do
-    assert_equal "http://api.themoviedb.org/2.1/", Tmdb.base_api_url
-  end
-
-  test "get url returns a response object" do
-    test_response = Tmdb.get_url("http://example.com/")
-    assert_equal 200, test_response.code.to_i
-  end
-  
-  test "getting nonexistent URL returns response object" do
-    test_response = Tmdb.get_url('http://thisisaurlthatdoesntexist.co.nz')
-    assert_equal 404, test_response.code.to_i
-  end
-  
-  test "api_call should raise exception if api_key is not set" do
-    old_api_key = Tmdb.api_key
-    Tmdb.api_key = ""
-    assert_raises ArgumentError do
-      Tmdb.api_call('Movie.search', 'Transformers')
-    end
-    Tmdb.api_key = old_api_key
-  end
-  
-  test "should perform Movie.search API call and return array of results" do
-    movies = Tmdb.api_call('Movie.search', 'Transformers')
-    assert_kind_of Array, movies
-    assert movies.length > 1
-    movies.each do |movie|
-      assert_kind_of Hash, movie
-      ["url", "id", "name"].each do |item|
-        assert movie[item]
-      end
-    end
-  end
-  
-  test "should perform Movie.getInfo API call and return array of results" do
-    movies = Tmdb.api_call('Movie.getInfo', 187)
-    assert_kind_of Array, movies
-    assert movies.length == 1
-    movies.each do |movie|
-      assert_kind_of Hash, movie
-      ["url", "id", "name"].each do |item|
-        assert movie[item]
-      end
-    end
-  end
-  
-  test "should perform Movie.imdbLookup API call and return array of results" do
-    movies = Tmdb.api_call('Movie.imdbLookup', "tt0401792")
-    assert_kind_of Array, movies
-    assert movies.length == 1
-    movies.each do |movie|
-      assert_kind_of Hash, movie
-      ["url", "id", "name"].each do |item|
-        assert movie[item]
-      end
-    end
-  end
-  
-  test "should perform Person.getInfo API call and return array of results" do
-    people = Tmdb.api_call('Person.getInfo', 287)
-    assert_kind_of Array, people
-    assert people.length == 1
-    people.each do |person|
-      assert_kind_of Hash, person
-      ["url", "id", "name"].each do |item|
-        assert person[item]
-      end
-    end
-  end
-  
-  test "should perform Person.search API call and return array of results" do
-    people = Tmdb.api_call('Person.search', "vince")
-    assert_kind_of Array, people
-    assert people.length > 1
-    people.each do |person|
-      assert_kind_of Hash, person
-      ["url", "id", "name"].each do |item|
-        assert person[item]
-      end
-    end
-  end
-  
-  test "failed API call should return nil" do
-    movies = Tmdb.api_call('Movie.blarg', 'Transformers')
-    assert_kind_of NilClass, movies
-    assert_nil movies
-  end
-  
-  test "API call that finds no results should return nil" do
-    movies = Tmdb.api_call('Search.empty', 'Transformers')
-    assert_kind_of NilClass, movies
-    assert_nil movies
-  end
-  
-  test "API call cache should not be changed when data altered in the receiving method" do
-    person = Tmdb.api_call('Person.getInfo', 287)[0]
-    assert_not_nil person[person.keys[0]]
-    person[person.keys[0]] = nil
-    person = Tmdb.api_call('Person.getInfo', 287)[0]
-    assert_not_nil person[person.keys[0]]
-  end
-  
-  test "data_to_object should create object from nested data structures" do
-    test_data = {
-      :test1 => [
-        1,2,3,4
-      ],
-      :test2 => 1
-    }
-    test_object = Tmdb.data_to_object(test_data)
-    assert_nothing_raised do
-      assert_equal [1,2,3,4], test_object.test1
-      assert_equal 1, test_object.test2
-    end
-  end
-  
-  test "data_to_object should include raw_data method that returns original data" do
-    test_data = {
-      :test1 => [1,2,3]
-    }
-    test_object = Tmdb.data_to_object(test_data)
-    assert_equal test_object.raw_data, test_data
-  end
-  
-  test "data_to_object should convert arrays containing images to nicer format" do
-    test_data = {
-      "backdrops" => [
-        {
-          "image" => {
-            :test => 1
-          }
-        }
-      ]
-    }
-    test_object = Tmdb.data_to_object(test_data)
-    assert_nothing_raised do
-      assert_equal 1, test_object.backdrops[0].test
-    end
-  end
-
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'test_helper.rb'))
+
+class TmdbTest < Test::Unit::TestCase
+
+  def setup
+    register_api_url_stubs
+  end
+
+  test "allows setting of api_key" do
+    old_api_key = Tmdb.api_key
+    api_key = "test1234567890"
+    Tmdb.api_key = api_key
+    assert_equal Tmdb.api_key, api_key
+    Tmdb.api_key = old_api_key
+  end
+  
+  test "should return base API url" do
+    assert_equal "http://api.themoviedb.org/2.1/", Tmdb.base_api_url
+  end
+
+  test "get url returns a response object" do
+    test_response = Tmdb.get_url("http://example.com/")
+    assert_equal 200, test_response.code.to_i
+  end
+  
+  test "getting nonexistent URL returns response object" do
+    test_response = Tmdb.get_url('http://thisisaurlthatdoesntexist.co.nz')
+    assert_equal 404, test_response.code.to_i
+  end
+  
+  test "api_call should raise exception if api_key is not set" do
+    old_api_key = Tmdb.api_key
+    Tmdb.api_key = ""
+    assert_raises ArgumentError do
+      Tmdb.api_call('Movie.search', 'Transformers')
+    end
+    Tmdb.api_key = old_api_key
+  end
+  
+  test "should perform Movie.search API call and return array of results" do
+    movies = Tmdb.api_call('Movie.search', 'Transformers')
+    assert_kind_of Array, movies
+    assert movies.length > 1
+    movies.each do |movie|
+      assert_kind_of Hash, movie
+      ["url", "id", "name"].each do |item|
+        assert movie[item]
+      end
+    end
+  end
+  
+  test "should perform Movie.getInfo API call and return array of results" do
+    movies = Tmdb.api_call('Movie.getInfo', 187)
+    assert_kind_of Array, movies
+    assert movies.length == 1
+    movies.each do |movie|
+      assert_kind_of Hash, movie
+      ["url", "id", "name"].each do |item|
+        assert movie[item]
+      end
+    end
+  end
+  
+  test "should perform Movie.imdbLookup API call and return array of results" do
+    movies = Tmdb.api_call('Movie.imdbLookup', "tt0401792")
+    assert_kind_of Array, movies
+    assert movies.length == 1
+    movies.each do |movie|
+      assert_kind_of Hash, movie
+      ["url", "id", "name"].each do |item|
+        assert movie[item]
+      end
+    end
+  end
+  
+  test "should perform Person.getInfo API call and return array of results" do
+    people = Tmdb.api_call('Person.getInfo', 287)
+    assert_kind_of Array, people
+    assert people.length == 1
+    people.each do |person|
+      assert_kind_of Hash, person
+      ["url", "id", "name"].each do |item|
+        assert person[item]
+      end
+    end
+  end
+  
+  test "should perform Person.search API call and return array of results" do
+    people = Tmdb.api_call('Person.search', "vince")
+    assert_kind_of Array, people
+    assert people.length > 1
+    people.each do |person|
+      assert_kind_of Hash, person
+      ["url", "id", "name"].each do |item|
+        assert person[item]
+      end
+    end
+  end
+  
+  test "failed API call should return nil" do
+    movies = Tmdb.api_call('Movie.blarg', 'Transformers')
+    assert_kind_of NilClass, movies
+    assert_nil movies
+  end
+  
+  test "API call that finds no results should return nil" do
+    movies = Tmdb.api_call('Search.empty', 'Transformers')
+    assert_kind_of NilClass, movies
+    assert_nil movies
+  end
+  
+  test "API call cache should not be changed when data altered in the receiving method" do
+    person = Tmdb.api_call('Person.getInfo', 287)[0]
+    assert_not_nil person[person.keys[0]]
+    person[person.keys[0]] = nil
+    person = Tmdb.api_call('Person.getInfo', 287)[0]
+    assert_not_nil person[person.keys[0]]
+  end
+  
+  test "data_to_object should create object from nested data structures" do
+    test_data = {
+      :test1 => [
+        1,2,3,4
+      ],
+      :test2 => 1
+    }
+    test_object = Tmdb.data_to_object(test_data)
+    assert_nothing_raised do
+      assert_equal [1,2,3,4], test_object.test1
+      assert_equal 1, test_object.test2
+    end
+  end
+  
+  test "data_to_object should include raw_data method that returns original data" do
+    test_data = {
+      :test1 => [1,2,3]
+    }
+    test_object = Tmdb.data_to_object(test_data)
+    assert_equal test_object.raw_data, test_data
+  end
+  
+  test "data_to_object should convert arrays containing images to nicer format" do
+    test_data = {
+      "backdrops" => [
+        {
+          "image" => {
+            :test => 1
+          }
+        }
+      ]
+    }
+    test_object = Tmdb.data_to_object(test_data)
+    assert_nothing_raised do
+      assert_equal 1, test_object.backdrops[0].test
+    end
+  end
+
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Aaron Gough
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-23 00:00:00 -04:00
+date: 2010-10-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: deepopenstruct
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -32,17 +33,31 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: webmock
+  name: json
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: webmock
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: An ActiveRecord-style API wrapper for TheMovieDB.org
 email: aaron@aarongough.com
 executables: []
@@ -93,6 +108,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -100,6 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -109,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: An ActiveRecord-style API wrapper for TheMovieDB.org