digitalpardoe-rflickr 1.1.4 → 2.0.0.pre.1

data/spec/api/activity_spec.rb

@@ -0,0 +1,16 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "Activity" do
+	before(:each) do
+		@flickr = Flickr.new(Flickr.class_variable_get(:@@api_data)['api_key'], Flickr.class_variable_get(:@@api_data)['shared_secret'], Flickr.class_variable_get(:@@api_data)['auth_token'])
+	end
+
+	it "should sucessfully get the user comments" do
+		@flickr.flickr_activity_userComments(auth: true)['stat'].should == 'ok'
+	end
+	
+	it "should sucessfully get the users photos" do
+		@flickr.flickr_activity_userPhotos(auth: true)['stat'].should == 'ok'
+	end
+end
+

data/spec/api/api_spec.rb

@@ -0,0 +1,16 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "Api" do
+	before(:each) do
+		@flickr = Flickr.new(Flickr.class_variable_get(:@@api_data)['api_key'], Flickr.class_variable_get(:@@api_data)['shared_secret'], Flickr.class_variable_get(:@@api_data)['auth_token'])
+	end
+
+  it "should (probably) fail but not error" do
+	  @flickr.api.login_link
+	  @flickr.api.get_token['stat'].should == 'fail'
+  end
+
+  it "should raise an error when getting token without login_link" do
+	  lambda { @flickr.api.get_token }.should raise_error(ArgumentError)
+  end
+end

data/spec/api/auth_spec.rb

@@ -0,0 +1,16 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "Auth" do
+	before(:each) do
+		@flickr = Flickr.new(Flickr.class_variable_get(:@@api_data)['api_key'], Flickr.class_variable_get(:@@api_data)['shared_secret'], Flickr.class_variable_get(:@@api_data)['auth_token'])
+	end
+
+	it "should sucessfully check the auth token" do
+		@flickr.flickr_auth_checkToken(auth: true)['stat'].should == 'ok'
+	end
+
+	it "should sucessfully get the frob" do
+		@flickr.flickr_auth_getFrob['stat'].should == 'ok'
+	end
+end
+

data/spec/api/blogs_spec.rb

@@ -0,0 +1,12 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "Blogs" do
+	before(:each) do
+		@flickr = Flickr.new(Flickr.class_variable_get(:@@api_data)['api_key'], Flickr.class_variable_get(:@@api_data)['shared_secret'], Flickr.class_variable_get(:@@api_data)['auth_token'])
+	end
+
+	it "should be able to get the blog list" do
+		@flickr.flickr_blogs_getList(auth: true)['stat'].should == 'ok'
+	end
+end
+

data/spec/api/collections_spec.rb

@@ -0,0 +1,17 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "Collections" do
+	before(:each) do
+		@flickr = Flickr.new(Flickr.class_variable_get(:@@api_data)['api_key'], Flickr.class_variable_get(:@@api_data)['shared_secret'], Flickr.class_variable_get(:@@api_data)['auth_token'])
+	end
+
+	it "should successfully retrieve the collection tree" do
+		@flickr.flickr_collections_getTree(auth: true)['stat'].should == 'ok'
+	end
+	
+	it "should successfully retrieve the collection information" do
+    set_id = @flickr.flickr_collections_getTree(auth: true)['collections']['collection'][0]['id']
+    @flickr.flickr_collections_getInfo(args: { collection_id: set_id }, auth: true)['stat'].should == 'ok'
+  end
+end
+

data/spec/api/commons_spec.rb

@@ -0,0 +1,12 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "Commons" do
+	before(:each) do
+		@flickr = Flickr.new(Flickr.class_variable_get(:@@api_data)['api_key'], Flickr.class_variable_get(:@@api_data)['shared_secret'], Flickr.class_variable_get(:@@api_data)['auth_token'])
+	end
+
+	it "should sucessfully get institutions" do
+		@flickr.flickr_commons_getInstitutions['stat'].should == 'ok'
+	end
+end
+

data/spec/api/contacts_spec.rb

@@ -0,0 +1,16 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "Contacts" do
+	before(:each) do
+		@flickr = Flickr.new(Flickr.class_variable_get(:@@api_data)['api_key'], Flickr.class_variable_get(:@@api_data)['shared_secret'], Flickr.class_variable_get(:@@api_data)['auth_token'])
+	end
+
+	it "should sucessfully get the list of contacts" do
+		@flickr.flickr_contacts_getList(auth: true)['stat'].should == 'ok'
+	end
+
+	it "should sucessfully get the recently uploaded list" do
+		@flickr.flickr_contacts_getListRecentlyUploaded(auth: true)['stat'].should == 'ok'
+	end
+end
+

data/spec/api/favorites_spec.rb

@@ -0,0 +1,11 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "Favorites" do
+	before(:each) do
+		@flickr = Flickr.new(Flickr.class_variable_get(:@@api_data)['api_key'], Flickr.class_variable_get(:@@api_data)['shared_secret'], Flickr.class_variable_get(:@@api_data)['auth_token'])
+	end
+
+	it "should be able to get the list" do
+		@flickr.flickr_favorites_getList(auth: true)['stat'].should == 'ok'
+	end
+end

data/spec/api/groups/members_spec.rb

@@ -0,0 +1,20 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe "Groups/Member" do
+	before(:each) do
+		@flickr = Flickr.new(Flickr.class_variable_get(:@@api_data)['api_key'], Flickr.class_variable_get(:@@api_data)['shared_secret'], Flickr.class_variable_get(:@@api_data)['auth_token'])
+	  @group_id = @flickr.flickr_groups_search(args: { text: "Nikon" })['groups']['group'][0]['nsid']
+	end
+
+	it "should be able to get the members list" do
+		@flickr.flickr_groups_members_getList(args: { group_id: @group_id, membertypes: [2] }, auth: true)['stat'].should == 'ok'
+	end
+	
+	it "should be able to handle an array of member types" do
+		@flickr.flickr_groups_members_getList(args: { group_id: @group_id, membertypes: [2, 3] }, auth: true)['stat'].should == 'ok'
+	end
+	
+	it "should be able to get the members list without member types" do
+		@flickr.flickr_groups_members_getList(args: { group_id: @group_id }, auth: true)['stat'].should == 'ok'
+  end
+end

data/spec/config/api.example.yml

@@ -0,0 +1,3 @@
+api_key: api_key
+shared_secret: shared_secret
+auth_token: auth_token

data/spec/flickr_spec.rb

@@ -0,0 +1,33 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Flickr do
+	before(:each) do
+		@flickr_auth = Flickr.new(Flickr.class_variable_get(:@@api_data)['api_key'], Flickr.class_variable_get(:@@api_data)['shared_secret'], Flickr.class_variable_get(:@@api_data)['auth_token'])
+		@flickr_norm = Flickr.new(Flickr.class_variable_get(:@@api_data)['api_key'], Flickr.class_variable_get(:@@api_data)['shared_secret'])
+	end
+
+	it "should connect and make api request" do
+		(@flickr_auth.flickr_test_echo['stat'] == 'fail' ? true : (@flickr_auth.flickr_test_echo['stat'].should == 'ok' ? true : false)).should == true
+	end
+
+	it "should make authorized request" do
+		@flickr_auth.flickr_test_login(auth: true)['stat'].should == 'ok'
+	end
+
+	it "should not make authorized request" do
+		@flickr_auth.auth_token('some_token').flickr_test_login(auth: true)['stat'].should == 'fail'
+	end
+
+	it "should not raise an error on authorized method with nil token" do
+		@flickr_auth.auth_token(nil).flickr_test_login(auth: true)['stat'].should == 'fail'
+	end
+
+	it "should not make an authorized request" do
+		@flickr_norm.flickr_test_login['stat'].should == 'fail'
+	end
+
+	it "should make a normal request" do
+		@flickr_norm.flickr_test_echo['stat'].should == 'ok'
+	end
+end
+

data/spec/spec_helper.rb

@@ -0,0 +1,19 @@
+require 'rspec'
+require 'yaml'
+
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'flickr'
+
+file_path = File.dirname(__FILE__) + '/config/api.yml'
+
+if (File.exists?(file_path))
+  Flickr.class_variable_set(:@@api_data, File.open(file_path) { |yf| YAML::load( yf ) })['api_key']
+else
+	raise IOError, 'You need to create the config/api.yml file containing your details first'
+end
+
+RSpec.configure do |config|
+  config.color_enabled = true
+  config.formatter = :documentation
+end

metadata

@@ -1,146 +1,125 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: digitalpardoe-rflickr
-version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 4
-  version: 1.1.4
+version: !ruby/object:Gem::Version
+  version: 2.0.0.pre.1
 platform: ruby
-authors: 
-- digital:pardoe
+authors:
+- Alex Pardoe
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-08-09 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-08-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.0
   type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id001
   prerelease: false
-  name: mime-types
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id002
   prerelease: false
-  name: rdoc
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.4
   type: :development
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id003
   prerelease: false
-  name: bundler
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.4
+- !ruby/object:Gem::Dependency
+  name: ZenTest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id004
   prerelease: false
-  name: jeweler
-description: rFlickr is a clone of the original RubyForge based rflickr, a Ruby implementation of the Flickr API. It includes a faithful albeit old reproduction of the published API.
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: rFlickr is a clone of the original RubyForge based rflickr, a Ruby implementation
+  of the Flickr API. It includes a faithful albeit old reproduction of the published
+  API.
 email: contact@digitalpardoe.co.uk
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE
-- README.markdown
-files: 
+extra_rdoc_files:
+- README.md
+files:
+- .autotest
+- .document
+- .rspec
 - Gemfile
-- LICENSE
-- README.markdown
+- README.md
 - Rakefile
-- VERSION.yml
+- VERSION
 - digitalpardoe-rflickr.gemspec
 - lib/flickr.rb
-- lib/flickr/auth.rb
-- lib/flickr/base.rb
-- lib/flickr/blogs.rb
-- lib/flickr/contacts.rb
-- lib/flickr/favorites.rb
-- lib/flickr/groups.rb
-- lib/flickr/interestingness.rb
-- lib/flickr/licenses.rb
-- lib/flickr/notes.rb
-- lib/flickr/people.rb
-- lib/flickr/photos.rb
-- lib/flickr/photosets.rb
-- lib/flickr/pools.rb
-- lib/flickr/reflection.rb
-- lib/flickr/tags.rb
-- lib/flickr/transform.rb
-- lib/flickr/upload.rb
-- lib/flickr/urls.rb
-- test/test_suite.rb
+- lib/flickr/api.rb
+- lib/flickr/interaction/flickr_api_request.rb
+- lib/flickr/interaction/request.rb
+- spec/api/activity_spec.rb
+- spec/api/api_spec.rb
+- spec/api/auth_spec.rb
+- spec/api/blogs_spec.rb
+- spec/api/collections_spec.rb
+- spec/api/commons_spec.rb
+- spec/api/contacts_spec.rb
+- spec/api/favorites_spec.rb
+- spec/api/groups/members_spec.rb
+- spec/config/api.example.yml
+- spec/flickr_spec.rb
+- spec/spec_helper.rb
 homepage: http://github.com/digitalpardoe/rflickr
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+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: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: rFlickr is a Ruby interface to the Flickr API
 test_files: []
-