omniauth-eventful 0.0.1.pre → 0.0.2.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f4b320d53a37dc6113b4a9a9697a05e4eec48f6
-  data.tar.gz: a637e3c696fe5cb8e343c1de6f1b26c039e3c6b5
+  metadata.gz: a6cbbb2ad1272ca6992eb8c5dcbd0a9ed53032e8
+  data.tar.gz: 61074495ce7a1caec94dc2d82400c301cf632055
 SHA512:
-  metadata.gz: 43a7e260f016eda736b7013f1a5de6e1201fdb6d683b7275db268106f4a86355c9a37b31253f7fb279db762818faad1eab1acfe49d563c6eccd6c9b7ad691455
-  data.tar.gz: 1d155516b5023502c140d7fcbf1faab0e5e59e7580693bb275d34b8577e18980093f6f5832323074510e5631d88aa206cca3f5696fd65339dff43b1ff150e801
+  metadata.gz: 86c832c2f3cf9b8e784528050e1a39006614c66ecf3ac69b9e6d3f1f55365cc94bfbf4cca3910eb69489ddf842773a440872c4f2322d7a9efccaaa793ae700a4
+  data.tar.gz: 601826aaf51ded70aa0a179f8259f700edf5d45b79f3c87068bad9f394b72657f3a0b8c26619ec971e5abfd5934064cd8ace936dce6fd915661e3268e6a4deaf

data/.travis.yml

@@ -1,10 +1,8 @@
 language: ruby
 rvm:
-  - "1.8.7"
   - "1.9.2"
   - "1.9.3"
   - "2.0.0"
   - "2.1.1"
-  - jruby-18mode # JRuby in 1.8 mode
   - jruby-19mode # JRuby in 1.9 mode
   - rbx

data/README.md

@@ -1,3 +1,9 @@
+[![Build Status](https://travis-ci.org/kelleystephens/omniauth-eventful.svg?branch=master)](https://travis-ci.org/kelleystephens/omniauth-eventful)
+[![Gem Version](http://img.shields.io/badge/version-v0.0.1.pre-FF0DE3.svg)](https://rubygems.org/gems/omniauth-eventful)
+[![Downloads](http://ruby-gem-downloads-badge.herokuapp.com/omniauth-eventful?type=total)](https://rubygems.org/gems/omniauth-eventful)
+[![License](http://img.shields.io/badge/license-MIT-C707F7.svg)](http://opensource.org/licenses/MIT)
+
+
 # Omniauth::Eventful
 
 This gem is an OmniAuth Strategy for the Eventful API. Eventful uses OAuth 1.0,

data/lib/omniauth-eventful/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Eventful
-    VERSION = "0.0.1.pre"
+    VERSION = "0.0.2.pre"
   end
 end

data/lib/omniauth/strategies/eventful.rb

@@ -22,24 +22,21 @@ module OmniAuth
       uid{ info[:username] }
 
       info do
-        # If eventful returns a nil response, re-call the omniauth callback
-        if raw_info["user"].nil?
-          callback_phase
-        else
-          {
-            name: [@raw_info["user"]["first_name"], @raw_info["user"]["last_name"]].compact.join(' ').strip,
-            username: @raw_info["user"]["username"],
-            bio: @raw_info["user"]["bio"],
-            hometown: @raw_info["user"]["hometown"],
-            first_name: @raw_info["user"]["first_name"],
-            last_name: @raw_info["user"]["last_name"],
-            interests: @raw_info["user"]["interests"],
-            images: @raw_info["user"]["images"],
-            links: @raw_info["user"]["links"],
-            locales: @raw_info["user"]["locales"],
-            going: @raw_info["user"]["going"]
-          }
-        end
+        user = raw_info["user"]
+        {
+          name: [user["first_name"], user["last_name"]].compact.join(' ').strip,
+          username: user["username"],
+          bio: user["bio"],
+          hometown: user["hometown"],
+          default_location: user["default_location"],
+          first_name: user["first_name"],
+          last_name: user["last_name"],
+          interests: user["interests"],
+          images: user["images"],
+          links: user["links"],
+          locales: user["locales"],
+          going: user["going"]
+        }
       end
 
       extra do
@@ -47,7 +44,12 @@ module OmniAuth
       end
 
       def raw_info
-        @raw_info ||= MultiXml.parse(access_token.get("http://api.eventful.com/rest/users/get?app_key=#{options.app_key}&oath_consumer_key=#{options.consumer_key}").body)
+        @raw_info ||= MultiXml.parse(access_token.get("http://api.eventful.com/rest/users/get?app_key=#{options.app_key}").body)
+        if @raw_info.nil? || @raw_info["user"].nil?
+          @raw_info = nil
+          @raw_info = MultiXml.parse(access_token.get("http://api.eventful.com/rest/users/get?app_key=#{options.app_key}").body)
+        end
+        @raw_info
       end
     end
   end

data/omniauth-eventful.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Omniauth::Eventful::VERSION
   spec.authors       = ["Kelley Stephens"]
   spec.email         = ["kelley@kelleystephens.com"]
-  spec.summary       = %q{An Eventful strategy for OmniAuth}
-  spec.description   = %q{An Eventful strategy for OmniAuth}
+  spec.summary       = %q{An Eventful OAuth 1.0 strategy for OmniAuth}
+  spec.description   = %q{An Eventful OAuth 1.0 strategy for OmniAuth}
   spec.homepage      = "https://github.com/kelleystephens/omniauth-eventful"
   spec.license       = "MIT"
 
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'omniauth', '~> 1.0'
   spec.add_dependency 'omniauth-oauth', '~> 1.0'
   spec.add_dependency "multi_xml", "~> 0.5"
-  spec.add_dependency 'multi_json', '~> 1.0'
+  spec.add_dependency 'multi_json', '~> 1.5.0'
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
   spec.add_development_dependency 'rspec', '~> 2.7'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-eventful
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre
+  version: 0.0.2.pre
 platform: ruby
 authors:
 - Kelley Stephens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-22 00:00:00.000000000 Z
+date: 2014-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -150,7 +150,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: An Eventful strategy for OmniAuth
+description: An Eventful OAuth 1.0 strategy for OmniAuth
 email:
 - kelley@kelleystephens.com
 executables: []
@@ -192,7 +192,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: An Eventful strategy for OmniAuth
+summary: An Eventful OAuth 1.0 strategy for OmniAuth
 test_files:
 - spec/omniauth/strategies/eventful_spec.rb
 - spec/spec_helper.rb