flickr_oauth 0.0.1 → 0.0.2

data/spec/flickr/reflection/getMethodInfo_spec.rb

@@ -0,0 +1,73 @@
+require 'spec_helper'
+
+describe flickr.reflection.getMethodInfo do
+  let(:method_name) { 'flickr.photos.search' }
+  
+  context ':format => :json' do
+    use_vcr_cassette
+    
+    context ':normalize => false' do
+      let(:result) { flickr.reflection.getMethodInfo({:method_name => method_name, :format => 'json'}.merge(oauth_options)) }
+      
+      it 'returns raw method information' do
+        result['method']['name'].should be_a(String)
+        result['method']['description']['_content'].should be_a(String)
+      end
+      
+      it 'returns raw method arguments information' do
+        result['arguments']['argument'].should be_an(Array)
+        result['arguments']['argument'].each do |argument|
+          argument['name'].should be_a(String)
+          argument['_content'].should be_a(String)
+        end
+      end
+      
+      it 'returns raw method errors information' do
+        result['errors']['error'].should be_an(Array)
+        result['errors']['error'].each do |error|
+          error['message'].should be_a(String)
+          error['_content'].should be_a(String)
+        end
+      end      
+    end
+    
+    context ':normalize => true' do
+      let(:result) { flickr.reflection.getMethodInfo({:method_name => method_name, :format => 'json', :normalize => true}.merge(oauth_options)) }
+      
+      it 'returns normalized method information' do
+        result['method']['name'].should be_a(String)
+        result['method']['description'].should be_a(String)
+      end
+    end
+  end
+  
+  context ':format => :rest' do
+    use_vcr_cassette
+    
+    context ':normalize => false' do
+      let(:result) { flickr.reflection.getMethodInfo({:method_name => method_name, :format => 'rest'}.merge(oauth_options)) }
+      
+      it 'returns raw method information' do
+        result['rsp']['method']['name'].should be_a(String)
+        result['rsp']['method']['description'].should be_a(String)
+      end    
+      
+      it 'returns raw method arguments information' do
+        result['rsp']['arguments']['argument'].should be_an(Array)
+      end
+      
+      it 'returns raw method errors information' do
+        result['rsp']['errors']['error'].should be_an(Array)
+      end      
+    end
+    
+    context ':normalize => true' do
+      let(:result) { flickr.reflection.getMethodInfo({:method_name => method_name, :format => 'rest', :normalize => true}.merge(oauth_options)) }
+      
+      it 'returns normalized method information' do
+        result['method']['name'].should be_a(String)
+        result['method']['description'].should be_a(String)
+      end      
+    end    
+  end  
+end

data/spec/flickr/reflection/getMethods_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+require 'json'
+
+describe flickr.reflection.getMethods do
+  context ':format => :json' do
+    use_vcr_cassette
+    
+    context ':normalize => false' do
+      let(:result) { flickr.reflection.getMethods({:format => 'json'}.merge(oauth_options)) }
+    
+      it 'returns all Flickr API methods in raw Flickr JSON format' do
+        result['methods']['method'].each do |method|
+          Flickr::METHODS.should include(method['_content'])
+        end
+      end
+    end
+    
+    context ':normalize => true' do
+      let(:result) { flickr.reflection.getMethods({:format => 'json', :normalize => true}.merge(oauth_options)) }
+      
+      it 'returns all Flickr API methods in normalized JSON format' do
+        result['methods']['method'].each do |method|
+          Flickr::METHODS.should include(method)
+        end
+      end      
+    end
+  end
+  
+  context ':format => :rest' do
+    use_vcr_cassette
+    
+    context ':normalize => false' do
+      let(:result) { flickr.reflection.getMethods({:format => 'rest'}.merge(oauth_options)) }
+    
+      it 'returns all Flickr API methods in raw Flickr REST format' do
+        result['rsp']['methods']['method'].each do |method|
+          Flickr::METHODS.should include(method)
+        end
+      end
+    end
+    
+    context ':normalize => true' do
+      let(:result) { flickr.reflection.getMethods({:format => 'rest', :normalize => true}.merge(oauth_options)) }
+      
+      it 'returns all Flickr API methods in normalized REST format' do
+        result['methods']['method'].each do |method|
+          Flickr::METHODS.should include(method)
+        end
+      end      
+    end    
+  end
+  
+end

data/spec/flickr/test/echo_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+describe flickr.test.echo do
+  context ':format => :json' do
+    use_vcr_cassette
+    
+    context ':normalize => false' do
+      let(:result) { flickr.test.echo({:foo => 'bar', :format => 'json'}.merge(oauth_options)) }
+      
+      it 'responds with the original request parameters' do
+        result['method']['_content'].should == 'flickr.test.echo'
+        result['foo']['_content'].should == 'bar'
+        result['format']['_content'].should == 'json'
+      end
+    end
+    
+    context ':normalize => true' do
+      let(:result) { flickr.test.echo({:foo => 'bar', :format => 'json', :normalize => true}.merge(oauth_options)) }
+      
+      it 'responds with the original request parameters' do
+        result['method'].should == 'flickr.test.echo'
+        result['foo'].should == 'bar'
+        result['format'].should == 'json'        
+      end      
+    end
+  end
+  
+  context ':format => :rest' do
+    use_vcr_cassette
+    
+    context ':normalize => false' do
+      let(:result) { flickr.test.echo({:foo => 'bar', :format => 'rest'}.merge(oauth_options)) }
+      
+      it 'responds with the original request parameters' do
+        result['rsp']['method'].should == 'flickr.test.echo'
+        result['rsp']['foo'].should == 'bar'
+        result['rsp']['format'].should == 'rest'
+      end      
+    end
+    
+    context ':normalize => true' do
+      let(:result) { flickr.test.echo({:foo => 'bar', :format => 'rest', :normalize => true}.merge(oauth_options)) }
+      
+      it 'responds with the original request parameters' do
+        result['method'].should == 'flickr.test.echo'
+        result['foo'].should == 'bar'
+        result['format'].should == 'rest'        
+      end
+    end
+  end
+end

data/spec/flickr/upload_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe 'flickr.upload' do
+  let(:image_path) { File.expand_path('../../fixtures/test.jpg', __FILE__) }
+  let(:image_info) { { :title => 'test upload', :description => 'this is an image for testing flickr uploads', :tags => 'test upload' } }
+  
+  use_vcr_cassette
+  
+  context ':normalize => true' do
+    let(:result) { flickr.upload(image_path, {:normalize => true}.merge(image_info).merge(oauth_options)) }
+    
+    it 'returns the uploaded image\'s Flickr photo ID' do
+      result['photoid'].should =~ %r(\d)
+    end
+    
+    describe 'photo' do
+      let(:photo) { flickr.photos.getInfo({ :photo_id => result['photoid'], :normalize => true }.merge(oauth_options)) }
+      
+      it 'has a title' do
+        photo['photo']['title'].should == image_info[:title]
+      end
+      
+      it 'has a description' do
+        photo['photo']['description'].should == image_info[:description]
+      end
+      
+      it 'has tags' do
+        photo['photo']['tags']['tag'].join(" ").should == image_info[:tags]
+      end
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -20,15 +20,14 @@ RSpec.configure do |config|
   config.mock_with :rspec
 end
 
-require 'shared_examples'
-
 def oauth_options
  {
-   :consumer_key => '',
+   :consumer_key => '', 
    :consumer_secret => '',
-   :token => '',
-   :token_secret => '',
+   :token => '', 
+   :token_secret => ''
  }
 end
 
+# require 'oauth_keys'
 # flickr.enable_logging = true # watch the magic come alive!

metadata

@@ -2,7 +2,7 @@
 name: flickr_oauth
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Evan Sagge
@@ -10,7 +10,7 @@ autorequire: flickr
 bindir: bin
 cert_chain: []
 
-date: 2011-06-30 00:00:00 Z
+date: 2011-07-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: faraday
@@ -35,7 +35,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: multi_xml
+  name: mime-types
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -46,7 +46,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: multi_json
+  name: multipart-post
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -57,7 +57,7 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: simple_oauth
+  name: multi_json
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -68,38 +68,60 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: multi_xml
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: simple_oauth
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "2.6"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: webmock
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "1.6"
   type: :development
-  version_requirements: *id007
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: vcr
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "1.7"
   type: :development
-  version_requirements: *id008
+  version_requirements: *id010
 description: ""
 email: 
 - evansagge@gmail.com
@@ -119,17 +141,31 @@ files:
 - lib/faraday/response/raise_flickr_error.rb
 - lib/flickr.rb
 - lib/flickr/client.rb
+- lib/flickr/client/authentication.rb
+- lib/flickr/client/connection.rb
+- lib/flickr/client/requests.rb
+- lib/flickr/client/upload.rb
 - lib/flickr/error.rb
 - lib/flickr/node.rb
 - lib/flickr_oauth.rb
 - lib/flickr_oauth/version.rb
-- spec/fixtures/cassettes/JSON_format/it_should_behave_like_Flickr_with_specified_format/Flickr/flickr_test_echo/no_oauth_token.yml
-- spec/fixtures/cassettes/JSON_format/it_should_behave_like_Flickr_with_specified_format/Flickr/flickr_test_echo/with_oauth_token.yml
-- spec/fixtures/cassettes/REST_format/it_should_behave_like_Flickr_with_specified_format/Flickr/flickr_test_echo/no_oauth_token.yml
-- spec/fixtures/cassettes/REST_format/it_should_behave_like_Flickr_with_specified_format/Flickr/flickr_test_echo/with_oauth_token.yml
-- spec/json/flickr_spec.rb
-- spec/rest/flickr_spec.rb
-- spec/shared_examples.rb
+- spec/.DS_Store
+- spec/fixtures/.DS_Store
+- spec/fixtures/cassettes/.DS_Store
+- spec/fixtures/cassettes/flickr_reflection_getMethodInfo/_format_json.yml
+- spec/fixtures/cassettes/flickr_reflection_getMethodInfo/_format_rest.yml
+- spec/fixtures/cassettes/flickr_reflection_getMethods/.yml
+- spec/fixtures/cassettes/flickr_reflection_getMethods/_format_json.yml
+- spec/fixtures/cassettes/flickr_reflection_getMethods/_format_rest.yml
+- spec/fixtures/cassettes/flickr_test_echo/_format_json.yml
+- spec/fixtures/cassettes/flickr_test_echo/_format_rest.yml
+- spec/fixtures/cassettes/flickr_upload.yml
+- spec/fixtures/test.jpg
+- spec/fixtures/test_2.jpg
+- spec/flickr/reflection/getMethodInfo_spec.rb
+- spec/flickr/reflection/getMethods_spec.rb
+- spec/flickr/test/echo_spec.rb
+- spec/flickr/upload_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/evansagge/flickr_oauth
 licenses: []
@@ -159,11 +195,20 @@ signing_key:
 specification_version: 3
 summary: Flickr API adapter using OAuth
 test_files: 
-- spec/fixtures/cassettes/JSON_format/it_should_behave_like_Flickr_with_specified_format/Flickr/flickr_test_echo/no_oauth_token.yml
-- spec/fixtures/cassettes/JSON_format/it_should_behave_like_Flickr_with_specified_format/Flickr/flickr_test_echo/with_oauth_token.yml
-- spec/fixtures/cassettes/REST_format/it_should_behave_like_Flickr_with_specified_format/Flickr/flickr_test_echo/no_oauth_token.yml
-- spec/fixtures/cassettes/REST_format/it_should_behave_like_Flickr_with_specified_format/Flickr/flickr_test_echo/with_oauth_token.yml
-- spec/json/flickr_spec.rb
-- spec/rest/flickr_spec.rb
-- spec/shared_examples.rb
+- spec/fixtures/.DS_Store
+- spec/fixtures/cassettes/.DS_Store
+- spec/fixtures/cassettes/flickr_reflection_getMethodInfo/_format_json.yml
+- spec/fixtures/cassettes/flickr_reflection_getMethodInfo/_format_rest.yml
+- spec/fixtures/cassettes/flickr_reflection_getMethods/.yml
+- spec/fixtures/cassettes/flickr_reflection_getMethods/_format_json.yml
+- spec/fixtures/cassettes/flickr_reflection_getMethods/_format_rest.yml
+- spec/fixtures/cassettes/flickr_test_echo/_format_json.yml
+- spec/fixtures/cassettes/flickr_test_echo/_format_rest.yml
+- spec/fixtures/cassettes/flickr_upload.yml
+- spec/fixtures/test.jpg
+- spec/fixtures/test_2.jpg
+- spec/flickr/reflection/getMethodInfo_spec.rb
+- spec/flickr/reflection/getMethods_spec.rb
+- spec/flickr/test/echo_spec.rb
+- spec/flickr/upload_spec.rb
 - spec/spec_helper.rb

data/spec/fixtures/cassettes/JSON_format/it_should_behave_like_Flickr_with_specified_format/Flickr/flickr_test_echo/no_oauth_token.yml

@@ -1,40 +0,0 @@
---- 
-- !ruby/struct:VCR::HTTPInteraction 
-  request: !ruby/struct:VCR::Request 
-    method: :get
-    uri: http://api.flickr.com:80/services/rest?foo=bar&format=json&method=flickr.test.echo&nojsoncallback=1
-    body: 
-    headers: 
-      authorization: 
-      - OAuth oauth_consumer_key="", oauth_nonce="beff09eaac9ae76f7e8494a19602b8cc", oauth_signature="9CcsMhPiC0Qz7TqOb3m11yYUJ%2Fs%3D", oauth_signature_method="HMAC-SHA1", oauth_timestamp="1309463375", oauth_token="", oauth_version="1.0"
-      accept-encoding: 
-      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-  response: !ruby/struct:VCR::Response 
-    status: !ruby/struct:VCR::ResponseStatus 
-      code: 200
-      message: OK
-    headers: 
-      date: 
-      - Thu, 30 Jun 2011 19:49:36 GMT
-      p3p: 
-      - policyref="http://p3p.yahoo.com/w3c/p3p.xml", CP="CAO DSP COR CUR ADM DEV TAI PSA PSD IVAi IVDi CONi TELo OTPi OUR DELi SAMi OTRi UNRi PUBi IND PHY ONL UNI PUR FIN COM NAV INT DEM CNT STA POL HEA PRE GOV"
-      access-control-allow-origin: 
-      - "*"
-      x-served-by: 
-      - www136.flickr.mud.yahoo.com
-      cache-control: 
-      - private
-      vary: 
-      - Accept-Encoding
-      content-encoding: 
-      - gzip
-      content-length: 
-      - "91"
-      content-type: 
-      - text/plain; charset=utf-8
-    body: !binary |
-      H4sIAAAAAAAAA6tWKi5JLFGyUkpLzMxR0lFQSs5PSVWyMjQwALJzU4uLE9OB
-      XCXPvLLEnMwUBccATwXv1EoFDRCRkViskAmVSMsvyk0s0VSqBQC/jELiUQAA
-      AA==
-
-    http_version: "1.1"