omniauth-tumblr 1.1 → 1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 52c721879f95a16d3210f8a409e7b206afdf09e5
+  data.tar.gz: 51c8156fa24b5fdec962192c69b9b90e2b8eeed7
+SHA512:
+  metadata.gz: 3dbd006c97129a740d81399525c4aff5f77cf99cc617e21740c0ff79818bd7c6d34ab44c51dad2273d5584ef888bc8f58a1aaa4725073b62d9342aea131f6870
+  data.tar.gz: 4f8e7b1c0883fb518aeef9dca16805419b131af201994fe90ead9c9d1ff915b991ff598f5ee9c2c59c7645e53f520f0ae8773cce5581c8dd081374f412811b27

data/.gitignore

@@ -1,2 +1,4 @@
+.bundle
 .DS_Store
+.gems
 *.gem

data/.rspec

@@ -0,0 +1 @@
+--color

data/.ruby-version

@@ -0,0 +1 @@
+2.2.3

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,41 @@
+PATH
+  remote: .
+  specs:
+    omniauth-tumblr (1.2)
+      multi_json
+      omniauth-oauth (~> 1.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.1.3)
+    hashie (3.4.3)
+    multi_json (1.11.2)
+    oauth (0.4.7)
+    omniauth (1.2.2)
+      hashie (>= 1.2, < 4)
+      rack (~> 1.0)
+    omniauth-oauth (1.1.0)
+      oauth
+      omniauth (~> 1.0)
+    rack (1.6.4)
+    rake (0.9.2.2)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.2)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  omniauth-tumblr!
+  rake
+  rspec
+
+BUNDLED WITH
+   1.10.6

data/README.md

@@ -7,11 +7,21 @@ An example Rails application is available:
 <https://github.com/jamiew/omniauth-rails-app>
 
 
-Usage
+Setup
 -----
 
-Register your application with Tumblr. *Important*: you must specify a default callback URL,
-or Tumblr will throw 400 Bad Request errors despite the `?oauth_callback` param. Any URL is fine.
+Register your application with [Tumblr](http://www.tumblr.com/oauth/apps).
+
+*Important*: your callback URL needs to be specified as `http://[hostname]/auth/tumblr/callback`.
+The Tumblr API does not respect the dynamic ?oauth_callback URL passed by Omniauth. ([related thread](https://groups.google.com/forum/?fromgroups#!searchin/tumblr-api/callback$20url/tumblr-api/5k_afNDUB5s/gfaNMnRtINoJ))
+
+In order to authenticate with Tumblr in both development and production we recommend
+registering a "-dev" app with Tumblr which points at localhost:3000 or yourapp.dev (not ideal)
+
+Using services like https://ngrok.com works like a charm.
+
+Usage
+-----
 
 Get started by adding the Tumblr strategy to your `Gemfile`:
 
@@ -19,27 +29,27 @@ Get started by adding the Tumblr strategy to your `Gemfile`:
 gem 'omniauth-tumblr'
 ```
 
-Then add the Tumblr strategy to your Rack middleware:
+In a Rails app, add the Tumblr provider to your Omniauth middleware, e.g.
+in a file like @config/initializers/omniauth.rb@:
 
 ```ruby
-use OmniAuth::Builder do
+Rails.application.config.middleware.use OmniAuth::Builder do
   provider :tumblr, ENV['TUMBLR_KEY'], ENV['TUMBLR_SECRET']
 end
 ```
 
-In Rails, create a file like @config/initializers/omniauth.com@:
+In any Rack app you can add the Tumblr strategy like so:
 
 ```ruby
-Rails.application.config.middleware.use OmniAuth::Builder do
+use OmniAuth::Builder do
   provider :tumblr, ENV['TUMBLR_KEY'], ENV['TUMBLR_SECRET']
 end
 ```
 
-
 License
 -------
 
-Copyright (c) 2011 Jamie Wilkinson
+Copyright (c) 2011-2012 [Jamie Wilkinson](http://jamiedubs.com)
 
 This source code released under an MIT license.
 

data/Rakefile

@@ -0,0 +1,9 @@
+#!/usr/bin/env rake
+
+require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+desc "Run specs"
+RSpec::Core::RakeTask.new
+
+task :default => :spec

data/lib/omniauth-tumblr/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Tumblr
-    VERSION = "1.1"
+    VERSION = "1.2"
   end
 end

data/lib/omniauth/strategies/tumblr.rb

@@ -6,7 +6,10 @@ module OmniAuth
     class Tumblr < OmniAuth::Strategies::OAuth
 
       option :name, 'tumblr'
-      option :client_options, {:site => 'http://www.tumblr.com'}
+      option :client_options, {:site => 'https://www.tumblr.com',
+                               :request_token_path => "/oauth/request_token",
+                               :access_token_path  => "/oauth/access_token",
+                               :authorize_path     => "/oauth/authorize"}
 
       uid { raw_info['name'] }
 

data/omniauth-tumblr.gemspec

@@ -17,6 +17,10 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_runtime_dependency 'omniauth-oauth', '~> 1.0'
+  gem.add_runtime_dependency 'multi_json'
+
+  gem.add_development_dependency 'rspec' #, "~> 2.9"
+  gem.add_development_dependency 'rake' #, '~> 0.9'
 
   gem.required_rubygems_version = Gem::Requirement.new('>= 1.3.6') if gem.respond_to? :required_rubygems_version=
-end
+end

data/spec/omniauth/strategies/tumblr_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe OmniAuth::Strategies::Tumblr do
+
+  subject do
+    OmniAuth::Strategies::Tumblr.new({})
+  end
+
+  context "client options" do
+    it 'should have correct name' do
+      subject.options.name.should eq("tumblr")
+    end
+
+    it 'should have correct site' do
+      subject.options.client_options.site.should eq("https://www.tumblr.com")
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,53 @@
+$:.unshift File.expand_path('..', __FILE__)
+$:.unshift File.expand_path('../../lib', __FILE__)
+
+require 'rspec'
+require 'omniauth'
+require 'omniauth-tumblr'
+
+RSpec.configure do |config|
+  config.extend  OmniAuth::Test::StrategyMacros, :type => :strategy
+end
+
+
+
+
+# Copied/inlined from omniauth-google2
+# TODO this should also be part of omniauth-oauth
+# NOTE it would be useful if this lived in omniauth-oauth2 eventually
+shared_examples 'an oauth2 strategy' do
+  describe '#client' do
+    it 'should be initialized with symbolized client_options' do
+      @options = { :client_options => { 'authorize_url' => 'https://example.com' } }
+      subject.client.options[:authorize_url].should == 'https://example.com'
+    end
+  end
+
+  describe '#authorize_params' do
+    it 'should include any authorize params passed in the :authorize_params option' do
+      @options = { :authorize_params => { :foo => 'bar', :baz => 'zip' } }
+      subject.authorize_params['foo'].should eq('bar')
+      subject.authorize_params['baz'].should eq('zip')
+    end
+
+    it 'should include top-level options that are marked as :authorize_options' do
+      @options = { :authorize_options => [:scope, :foo], :scope => 'http://bar', :foo => 'baz' }
+      subject.authorize_params['scope'].should eq('http://bar')
+      subject.authorize_params['foo'].should eq('baz')
+    end
+  end
+
+  describe '#token_params' do
+    it 'should include any token params passed in the :token_params option' do
+      @options = { :token_params => { :foo => 'bar', :baz => 'zip' } }
+      subject.token_params['foo'].should eq('bar')
+      subject.token_params['baz'].should eq('zip')
+    end
+
+    it 'should include top-level options that are marked as :token_options' do
+      @options = { :token_options => [:scope, :foo], :scope => 'bar', :foo => 'baz' }
+      subject.token_params['scope'].should eq('bar')
+      subject.token_params['foo'].should eq('baz')
+    end
+  end
+end

metadata

@@ -1,32 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-tumblr
 version: !ruby/object:Gem::Version
-  version: '1.1'
-  prerelease: 
+  version: '1.2'
 platform: ruby
 authors:
 - Jamie Wilkinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-04 00:00:00.000000000 Z
+date: 2015-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     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: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: OmniAuth strategy for Tumblr
 email:
 - jamie@jamiedubs.com
@@ -34,35 +73,42 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".rspec"
+- ".ruby-version"
+- Gemfile
+- Gemfile.lock
 - README.md
+- Rakefile
 - lib/omniauth-tumblr.rb
 - lib/omniauth-tumblr/version.rb
 - lib/omniauth/strategies/tumblr.rb
 - omniauth-tumblr.gemspec
+- spec/omniauth/strategies/tumblr_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/jamiew/omniauth-tumblr
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.4.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: OmniAuth strategy for Tumblr
-test_files: []
-has_rdoc: 
+test_files:
+- spec/omniauth/strategies/tumblr_spec.rb
+- spec/spec_helper.rb