fotolia_rest 0.0.1 → 0.0.2

data/Gemfile

@@ -7,7 +7,7 @@ source "http://rubygems.org"
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "rspec", "~> 2.7.0"
-  gem "bundler", "~> 1.0.0"
+  gem "bundler", ">= 1.0.0"
   gem "jeweler", "~> 1.6.4"
   gem "rcov", ">= 0"
 end

data/Gemfile.lock

@@ -23,7 +23,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
+  bundler (>= 1.0.0)
   jeweler (~> 1.6.4)
   json
   rcov

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/fotolia_rest.gemspec

@@ -0,0 +1,66 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "fotolia_rest"
+  s.version = "0.0.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Tony La"]
+  s.date = "2012-02-10"
+  s.description = "Wrapper library for the Fotolia API"
+  s.email = "tonyla@pingg.com"
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "fotolia_rest.gemspec",
+    "lib/fotolia_rest.rb",
+    "lib/fotolia_rest/client.rb",
+    "lib/fotolia_rest/exceptions.rb",
+    "lib/fotolia_rest/result.rb",
+    "spec/fotolia_rest_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = "http://github.com/tonyla/fotolia_rest"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.11"
+  s.summary = "Fotolia REST client"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<json>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.7.0"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+    else
+      s.add_dependency(%q<json>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 2.7.0"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<json>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 2.7.0"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+  end
+end
+

data/lib/fotolia_rest/client.rb

@@ -4,9 +4,9 @@ require 'cgi'
 require 'json'
 module FotoliaRest
   class Client
-
     BASE_URL = 'api.fotolia.com'
     attr_reader :api_key, :username, :password, :session_id
+
     def initialize(api_key, username, password)
       @api_key = api_key
       @username = username
@@ -35,6 +35,7 @@ module FotoliaRest
       begin
         uri = URI.parse(compose_uri(method, function))
         http = Net::HTTP.new(uri.host, uri.port)
+        http.open_timeout = http.read_timeout = 5 # seconds
         if http_method == :get
           uri.query = URI.encode_www_form(fotolia_parameters(args))
           request = Net::HTTP::Get.new(uri.request_uri)
@@ -59,6 +60,10 @@ module FotoliaRest
       end
     end
 
+    def download_media(url)
+      open(url, 'rb', :http_basic_authentication => [ @api_key, @session_id ])
+    end
+
     protected
 
     def fotolia_parameters(args)

data/spec/fotolia_rest_spec.rb

@@ -34,6 +34,13 @@ describe "FotoliaRest" do
         result.response.should_not be_nil
         puts result.response
       end
+
+      it "should error on invalid calls" do
+        result = @client.execute( 'asdf', '1234' )
+        result.success?.should be_false
+        result.response.should_not be_nil
+        result.error.should be_kind_of(FotoliaRest::FotoliaApiError)
+      end
     end
 
     describe "invalid credentials" do
@@ -49,5 +56,19 @@ describe "FotoliaRest" do
         result.error.message.should_not be_nil
       end
     end
+
+    describe "timeout" do
+      before( :each ) do
+        @client = FotoliaRest::Client.new('','','')
+      end
+
+      it "should result in a timeout exception" do
+        using_constants( FotoliaRest::Client, :BASE_URL => 'nowhere.nowhere.nowhere' ) do
+          expect {
+            @client.execute('anything', 'at', :all => true)
+          }.to raise_error(FotoliaRest::FotoliaError)
+        end
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -7,6 +7,22 @@ require 'fotolia_rest'
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
+def using_constants(klass, new_constants)
+  old_constants = {}
+  begin
+    new_constants.each_pair do |name, value|
+      old_constants[name] = klass.__send__(:remove_const, name)
+      klass.const_set(name, value)
+    end
+
+    yield
+  ensure
+    old_constants.each_pair do |name, value|
+      klass.__send__(:remove_const, name)
+      klass.const_set(name, value)
+    end
+  end
+end
+
 RSpec.configure do |config|
-  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fotolia_rest
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-09 00:00:00.000000000 Z
+date: 2012-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70285131528760 !ruby/object:Gem::Requirement
+  requirement: &70111545790880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70285131528760
+  version_requirements: *70111545790880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70285131527920 !ruby/object:Gem::Requirement
+  requirement: &70111545790260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,21 +32,21 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70285131527920
+  version_requirements: *70111545790260
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70285131545940 !ruby/object:Gem::Requirement
+  requirement: &70111545789680 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70285131545940
+  version_requirements: *70111545789680
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70285131543620 !ruby/object:Gem::Requirement
+  requirement: &70111545789120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70285131543620
+  version_requirements: *70111545789120
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70285131540980 !ruby/object:Gem::Requirement
+  requirement: &70111545788540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70285131540980
+  version_requirements: *70111545788540
 description: Wrapper library for the Fotolia API
 email: tonyla@pingg.com
 executables: []
@@ -82,6 +82,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- fotolia_rest.gemspec
 - lib/fotolia_rest.rb
 - lib/fotolia_rest/client.rb
 - lib/fotolia_rest/exceptions.rb
@@ -103,7 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1765157675272554145
+      hash: -2249850876015974525
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: