omniauth-flickr 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 221681304d9f61f755b9444a982d5cabede6fade
-  data.tar.gz: 9d3b57376604ef2d1c889971dcb910c366c7c1fa
+  metadata.gz: 6d043334971baaece4af66c2781a7dc2b6087d9f
+  data.tar.gz: 266c7eb02f5ebfd48f9fcd51cb29806d1df6f2f0
 SHA512:
-  metadata.gz: e1963e3ccdbf635df694d673b623d7b7735628231c362031b5c3c28c15ff366c1fbd996681d7760ab014cf44471abd787864401f4e21e30d75bf86bd96f9d489
-  data.tar.gz: 81bcfdd66bf67609c28dcdae3dae202dc1ce790894672fbc3162a47f66d900b4574151aa890115db933b46d3e510d6153037c4117f61b75cbd14bc97a0a459cc
+  metadata.gz: d5fac7139b4ecfa7bc47e612b976270ce89912562fea3e5aabac600bc6110c3dc220fd72649eba28929b28db32f9b7ed550e3adec633ce41afd714c474c38147
+  data.tar.gz: e3d4a91ebd6b47a887f794f15df6f2b058b6a0537b73a202c53455ee61a8fbf4662aed517d15cbd724a7845e3ba8eaf3350a11a1989809fcebb979e8f5a7baa9

data/.gitignore

@@ -3,3 +3,4 @@
 Gemfile.lock
 pkg/*
 coverage
+logs/*.log

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--require spec_helper
+--format documentation

data/README.md

@@ -47,6 +47,10 @@ credentials: !ruby/hash:OmniAuth::AuthHash
  
 ## Release notes:
 
+ * Version 0.0.18
+
+  - add test cases from Maxcal
+
  * Version 0.0.17
 
   - better examples and documentation, fix reversed name and nickname (thanks @maxcal)
@@ -83,18 +87,3 @@ credentials: !ruby/hash:OmniAuth::AuthHash
  * Version 0.0.6
 
   - Comply more closely to published Auth Hash Schema (https://github.com/intridea/omniauth/wiki/Auth-Hash-Schema)
-
- * Version 0.0.5
-
-  - Most available user information should now be available in the info hash - Still needs some testing and
-  documentation--to come - Fixed a rescue so it is more contained
-
- * Version 0.0.4
-
-  - Added more user info explicitly into the info hash
-
- * Version 0.0.1
-
-  - First cut
-
-

data/lib/omniauth/strategies/flickr.rb

@@ -22,23 +22,27 @@ module OmniAuth
       }
 
       info do
+
+        user_info_unwrapped = unwrap_hash_content(user_info.clone)
         {
           :name => access_token.params['fullname'],
           :nickname => access_token.params['username'],
-          :ispro => user_info["ispro"],
-          :iconserver => user_info["iconserver"],
-          :iconfarm => user_info["iconfarm"],
-          :path_alias => user_info["path_alias"],
+          :ispro => user_info_unwrapped["ispro"],
+          :iconserver => user_info_unwrapped["iconserver"],
+          :iconfarm => user_info_unwrapped["iconfarm"],
+          :path_alias => user_info_unwrapped["path_alias"],
           :urls => {
-            "Photos" => user_info["photosurl"],
-            "Profile" => user_info["profileurl"],
+            "Photos" => user_info_unwrapped["photosurl"],
+            "Profile" => user_info_unwrapped["profileurl"],
           },
-          :mbox_sha1sum => user_info["mbox_sha1sum"],
-          :location => user_info["location"],
+          :mbox_sha1sum => user_info_unwrapped["mbox_sha1sum"],
+          :location => user_info_unwrapped["location"],
           :image => image_info
         }
       end
 
+
+
       extra do
         {
           :raw_info => raw_info
@@ -73,6 +77,17 @@ module OmniAuth
         options[:authorize_params] = {:perms => options[:scope]} if options[:scope]
         super
       end
+
+      private
+      # Flickr has a really annoying habit of wrapping values in { "_content" : "something" }
+      # This loops through an auth hash and converts these values into simple key / val
+      def unwrap_hash_content(hash)
+        hash.each do  |key, val|
+          if val.respond_to? :has_key?
+            hash[key] = val['_content'] if val.has_key?('_content')
+          end
+        end
+      end
     end
   end
 end

data/lib/omniauth-flickr/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Flickr
-    VERSION = "0.0.17"
+    VERSION = "0.0.18"
   end
 end

data/omniauth-flickr.gemspec

@@ -19,4 +19,9 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency 'omniauth-oauth', '~> 1.0'
-end
+  s.add_runtime_dependency 'multi_json', '~> 1.11.0'
+  s.add_development_dependency 'rspec', '~> 3.2.0'
+  s.add_development_dependency 'webmock', '~> 1.21.0'
+  s.add_development_dependency 'rack-test', '~> 0.6.3'
+  s.add_development_dependency 'rspec-its', '~> 1.2.0'
+end

data/spec/omniauth/strategies/flickr.people.getInfo.json

@@ -0,0 +1,28 @@
+{
+    "person": {
+        "id": "ABC123",
+        "nsid": "ABC123",
+        "ispro": 0,
+        "can_buy_pro": 0,
+        "iconserver": "8061",
+        "iconfarm": 9,
+        "path_alias": "test string",
+        "has_stats": 0,
+        "username":  "j.bloggs",
+        "realname": { "_content": "John Bloggs" },
+        "mbox_sha1sum": { "_content": "f9aa1a7919dea99ba86c773f58381aebc91e333d" },
+        "location": { "_content": "Gotham, USA" },
+        "timezone": { "label": "Pacific Time (US & Canada); Tijuana", "offset": "-08:00" },
+        "description": { "_content": "Amateur photographer from sweden.\n\nMost of my images are available with a creative commons licence for non-commercial usage. But i do appreciate if you contact me prior to publishing." },
+        "photosurl": { "_content": "https:\/\/www.flickr.com\/photos\/ABC123\/" },
+        "profileurl": { "_content": "https:\/\/www.flickr.com\/people\/ABC123\/" },
+        "mobileurl": { "_content": "https:\/\/m.flickr.com\/photostream.gne?id=ABC123" },
+        "photos": {
+            "firstdatetaken": { "_content": "2011-04-25 14:20:23" },
+            "firstdate": { "_content": "1305397528" },
+            "count": { "_content": "191" },
+            "views": { "_content": "156" }
+        }
+    },
+    "stat": "ok"
+}

data/spec/omniauth/strategies/flickr_spec.rb

@@ -0,0 +1,102 @@
+require 'spec_helper'
+require 'omniauth/strategies/flickr'
+require "addressable/uri"
+
+RSpec.describe OmniAuth::Strategies::Flickr, type: :strategy do
+
+  let(:app) do
+    Rack::Builder.new {
+      use OmniAuth::Test::PhonySession
+      use OmniAuth::Builder do
+        provider :flickr, ENV['FLICKR_KEY'], ENV['FLICKR_SECRET'], scope: 'read'
+      end
+      run lambda { |env| [404, {'Content-Type' => 'text/plain'}, [env.key?('omniauth.auth').to_s]] }
+    }.to_app
+  end
+
+  let(:session) { last_request.env['rack.session'] }
+
+  before do
+    stub_request(:post, "https://www.flickr.com/services/oauth/request_token").
+        to_return(:body => "oauth_token=yourtoken&oauth_token_secret=yoursecret&oauth_callback_confirmed=true")
+  end
+
+  describe '/auth/flickr' do
+
+    before { get '/auth/flickr' }
+
+    it 'should redirect to authorize_url' do
+      expect(last_response.headers['Location']).to \
+        eq "https://www.flickr.com/services/oauth/authorize?perms=read&oauth_token=yourtoken"
+    end
+
+    it 'should set appropriate session variables' do
+      expect(session['oauth']['flickr']).to eq({
+                                                   'callback_confirmed' => true,
+                                                   'request_token' => 'yourtoken',
+                                                   'request_secret' => 'yoursecret'
+                                               })
+    end
+  end
+
+  describe '/auth/flickr/callback' do
+    let(:session) {
+      {
+          'rack.session' => {
+              'oauth' => {
+                  "flickr" => {
+                      'callback_confirmed' => true,
+                      'request_token' => 'yourtoken',
+                      'request_secret' => 'yoursecret'
+                  }
+              }
+          }
+      }
+    }
+    let(:auth_response) { last_request.env['omniauth.auth'] }
+    let(:get_info) {
+      IO.binread(File.dirname(__FILE__) + "/flickr.people.getInfo.json")
+    }
+
+    before do
+      stub_request(:post, 'https://www.flickr.com/services/oauth/access_token').
+          to_return(:body => "oauth_token=yourtoken&oauth_token_secret=yoursecret&username=j.bloggs&fullname=John Bloggs&user_nsid=ABC123")
+
+      stub_request(:get, 'https://www.flickr.com/services/rest/?format=json&method=flickr.people.getInfo&nojsoncallback=1&user_id=ABC123')
+        .to_return(:body => get_info)
+
+      get '/auth/flickr/callback', {:oauth_verifier => 'dudeman'}, session
+    end
+
+    it 'calls through to the master app' do
+      expect(last_response.body).to eq 'true'
+    end
+
+    it 'exchanges the request token for an access token' do
+      expect(auth_response['provider']).to eq 'flickr'
+      expect(auth_response['extra']['access_token']).to be_kind_of(OAuth::AccessToken)
+    end
+
+    it "has the correct UID" do
+      expect(auth_response.uid).to eq "ABC123"
+    end
+
+    describe "auth_response.info" do
+      subject { auth_response['info'] }
+
+      its(:nickname) { should eq "j.bloggs" }
+      its(:name) { should eq "John Bloggs" }
+      its(:image) { should eq 'http://farm9.static.flickr.com/8061/buddyicons/ABC123.jpg' }
+      its(:ispro) { should eq 0 }
+      its(:iconserver) { should eq "8061" }
+      its(:iconfarm) { should eq 9 }
+      its(:path_alias) { should eq "test string" }
+      its(:urls) { should eq({
+           "Photos" => "https://www.flickr.com/photos/ABC123/",
+           "Profile" => "https://www.flickr.com/people/ABC123/",
+      })}
+      its(:mbox_sha1sum) { should eq "f9aa1a7919dea99ba86c773f58381aebc91e333d"}
+      its(:location) { should eq "Gotham, USA" }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,70 @@
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause
+# this file to always be loaded, without a need to explicitly require it in any
+# files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need
+# it.
+#
+# The `.rspec` file also contains a few flags that are not defaults but that
+# users commonly want.
+
+#
+
+
+require 'rack/test'
+require 'webmock/rspec'
+require 'omniauth'
+require 'logger'
+require 'rspec/its'
+
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+
+
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+
+  OmniAuth.config.logger = Logger.new(File.dirname(__FILE__) + '/../logs/test.log')
+
+  config.include WebMock::API
+  config.include Rack::Test::Methods
+  config.extend  OmniAuth::Test::StrategyMacros, :type => :strategy
+
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #     # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+end

metadata

@@ -1,29 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-flickr
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Tim Breitkreutz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.11.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.11.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.21.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.21.0
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.3
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 description: OmniAuth strategy for Flickr
 email:
 - tim@sbrew.com
@@ -31,7 +101,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
+- .rspec
 - Gemfile
 - LICENSE
 - README.md
@@ -40,7 +111,11 @@ files:
 - lib/omniauth-flickr.rb
 - lib/omniauth-flickr/version.rb
 - lib/omniauth/strategies/flickr.rb
+- logs/.gitkeep
 - omniauth-flickr.gemspec
+- spec/omniauth/strategies/flickr.people.getInfo.json
+- spec/omniauth/strategies/flickr_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/timbreitkreutz/omniauth-flickr
 licenses: []
 metadata: {}
@@ -50,19 +125,21 @@ require_paths:
 - lib
 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: '0'
 requirements: []
 rubyforge_project: omniauth-flickr
-rubygems_version: 2.2.2
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: OmniAuth strategy for Flickr
-test_files: []
-has_rdoc: 
+test_files:
+- spec/omniauth/strategies/flickr.people.getInfo.json
+- spec/omniauth/strategies/flickr_spec.rb
+- spec/spec_helper.rb