ruby-tmdb 0.0.20 → 0.0.21

data/VERSION

@@ -1 +1 @@
-0.0.20
+0.0.21

data/lib/ruby-tmdb/tmdb.rb

@@ -3,6 +3,7 @@ class Tmdb
   require 'net/http'
   require 'uri'
   require 'cgi'
+  require 'yaml'
   
   @@api_key = ""
   @@api_response = {}
@@ -20,6 +21,7 @@ class Tmdb
   end
   
   def self.api_call(method, data, language = "en")
+    raise ArgumentError, "Tmdb.api_key must be set before using the API" if(Tmdb.api_key.nil? || Tmdb.api_key.empty?)
     url = Tmdb.base_api_url + method + '/' + language + '/yaml/' + Tmdb.api_key + '/' + CGI::escape(data.to_s)
     response = @@api_response[url] ||= begin
       Tmdb.get_url(url)

data/ruby-tmdb.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby-tmdb}
-  s.version = "0.0.20"
+  s.version = "0.0.21"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Gough"]
@@ -36,9 +36,11 @@ Gem::Specification.new do |s|
      "test/fixtures/person_get_info.txt",
      "test/fixtures/person_search.txt",
      "test/setup/.gitignore",
+     "test/setup/setup_api_key.rb",
      "test/setup/test_unit_extensions.rb",
      "test/setup/url_mocks.rb",
      "test/test_helper.rb",
+     "test/unit/test_direct_require.rb",
      "test/unit/tmdb_cast_test.rb",
      "test/unit/tmdb_movie_test.rb",
      "test/unit/tmdb_test.rb"
@@ -49,9 +51,11 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{An ActiveRecord-style API wrapper for TheMovieDB.org}
   s.test_files = [
-    "test/setup/test_unit_extensions.rb",
+    "test/setup/setup_api_key.rb",
+     "test/setup/test_unit_extensions.rb",
      "test/setup/url_mocks.rb",
      "test/test_helper.rb",
+     "test/unit/test_direct_require.rb",
      "test/unit/tmdb_cast_test.rb",
      "test/unit/tmdb_movie_test.rb",
      "test/unit/tmdb_test.rb"

data/test/setup/setup_api_key.rb

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

data/test/test_helper.rb

@@ -2,8 +2,6 @@ TEST_LIVE_API = false
 
 require 'rubygems'
 require 'test/unit'
-require 'yaml'
-require 'net/http'
 
 unless(TEST_LIVE_API)
   require 'webmock/test_unit'
@@ -18,6 +16,5 @@ require_files.each do |file|
   require File.expand_path(file)
 end
 
-File.open(File.join(File.dirname(__FILE__), 'setup', 'tmdb_api_key.txt')) do |file|
-  Tmdb.api_key = file.read
-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

@@ -0,0 +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
+  
+end

data/test/unit/tmdb_test.rb

@@ -28,6 +28,15 @@ class TmdbTest < Test::Unit::TestCase
     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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-tmdb
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: false
   segments: 
   - 0
   - 0
-  - 20
-  version: 0.0.20
+  - 21
+  version: 0.0.21
 platform: ruby
 authors: 
 - Aaron Gough
@@ -61,9 +61,11 @@ files:
 - test/fixtures/person_get_info.txt
 - test/fixtures/person_search.txt
 - test/setup/.gitignore
+- test/setup/setup_api_key.rb
 - test/setup/test_unit_extensions.rb
 - test/setup/url_mocks.rb
 - test/test_helper.rb
+- test/unit/test_direct_require.rb
 - test/unit/tmdb_cast_test.rb
 - test/unit/tmdb_movie_test.rb
 - test/unit/tmdb_test.rb
@@ -104,9 +106,11 @@ signing_key:
 specification_version: 3
 summary: An ActiveRecord-style API wrapper for TheMovieDB.org
 test_files: 
+- test/setup/setup_api_key.rb
 - test/setup/test_unit_extensions.rb
 - test/setup/url_mocks.rb
 - test/test_helper.rb
+- test/unit/test_direct_require.rb
 - test/unit/tmdb_cast_test.rb
 - test/unit/tmdb_movie_test.rb
 - test/unit/tmdb_test.rb