omniauth-yandex 0.0.1 → 0.0.2

data/README.md

@@ -1,6 +1,12 @@
-# OmniAuth Yandex.ru
+# Yandex OAuth strategy for OmniAuth
 
-This gem contains the unofficial Yandex.ru OAuth2 strategy for [OmniAuth](http://github.com/intridea/omniauth).
+This gem contains the unofficial Yandex OAuth2 strategy for [OmniAuth](http://github.com/intridea/omniauth).
+
+## Installation
+
+    gem "omniauth-yandex"
+    
+Also, you have to obtain API key for your app at Yandex [OAuth app registration page](https://oauth.yandex.ru/client/new)
 
 ## Basic Usage
 
@@ -15,4 +21,4 @@ This gem contains the unofficial Yandex.ru OAuth2 strategy for [OmniAuth](http:/
 
 ## License
 
-Copyright (c) 2011 by Kirill Shatrov
+Copyright (c) 2011 by Kirill Shatrov, [Evrone.com](http://evrone.com/)

data/lib/omniauth-yandex/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Yandex
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/omniauth/strategies/yandex.rb

@@ -1,5 +1,5 @@
 require 'omniauth/strategies/oauth2'
-require 'xmlsimple'
+require 'json'
 
 module OmniAuth
   module Strategies
@@ -16,25 +16,18 @@ module OmniAuth
         :authorize_url => '/authorize'
       }
 
-      uid do
-        raw_info[:uid]
-      end
+      uid { raw_info['id'] }
 
-      info do
-        {
-          :nickname => raw_info[:name],
-          :email => raw_info[:email],
-          :name => raw_info[:name],
-          :image => raw_info[:photo],
-          :location => raw_info[:country],
-          :urls => {
-            'Yandex' => raw_info[:yaru_profile]
-          }
-        }
+      extra do
+        prune!({:raw_info => raw_info})
       end
 
-      extra do
-        {:raw_info => raw_info}
+      info do
+        prune!({
+          'nickname' => raw_info['display_name'],
+          'email'  => raw_info['default_email'],
+          'name' => raw_info['real_name']
+        })
       end
 
       def callback_url
@@ -47,26 +40,19 @@ module OmniAuth
 
       private
 
+      def prune!(hash)
+        hash.delete_if do |_, value|
+          prune!(value) if value.is_a?(Hash)
+          value.nil? || (value.respond_to?(:empty?) && value.empty?)
+        end
+      end
+
       def raw_info
         @raw_info ||= begin
-          # Get user info from Ya.ru API
-          # http://api.yandex.ru/yaru/doc/ref/concepts/discovery.xml
-          xml_data = access_token.get("https://api-yaru.yandex.ru/me/").body
-          data = XmlSimple.xml_in(xml_data)
-          {
-            :uid => data["id"][0],
-            :yaru_profile => data["link"][0]["href"],
-            :photo => data["link"][2]["href"],
-            :name => data["name"][0],
-            :email => data["email"][0],
-            :country => data["country"][0],
-            :city => data["city"][0],
-            :sex => data["sex"][0],
-            :skype => data["skype"][0]
-          }
+          # Get user info from Yandex.login API
+          JSON.parse access_token.get("https://login.yandex.ru/info?format=json").body
         end
       end
-
     end
   end
 end

data/omniauth-yandex.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.version     = Omniauth::Yandex::VERSION
   s.authors     = ["Kir Shatrov"]
   s.email       = ["shatrov@me.com"]
-  s.homepage    = "https://github.com/kirs/omniauth-yandex"
+  s.homepage    = "https://github.com/evrone/omniauth-yandex"
   s.summary     = %q{OmniAuth strategy for Yandex.ru}
   s.description = %q{OmniAuth strategy for Yandex.ru}
 
@@ -19,5 +19,4 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'omniauth', '~> 1.0'
   s.add_dependency 'omniauth-oauth2', '~> 1.0'
-  s.add_dependency 'xml-simple'
 end

metadata

@@ -1,59 +1,59 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: omniauth-yandex
-version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 2
+  version: 0.0.2
 platform: ruby
-authors:
+authors: 
 - Kir Shatrov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-26 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-10-21 00:00:00 +03:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: omniauth
-  requirement: &70210863807100 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
   prerelease: false
-  version_requirements: *70210863807100
-- !ruby/object:Gem::Dependency
-  name: omniauth-oauth2
-  requirement: &70210863805020 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: omniauth-oauth2
   prerelease: false
-  version_requirements: *70210863805020
-- !ruby/object:Gem::Dependency
-  name: xml-simple
-  requirement: &70210863803400 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70210863803400
+  version_requirements: *id002
 description: OmniAuth strategy for Yandex.ru
-email:
+email: 
 - shatrov@me.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
-- .rspec
-- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -61,28 +61,35 @@ files:
 - lib/omniauth-yandex/version.rb
 - lib/omniauth/strategies/yandex.rb
 - omniauth-yandex.gemspec
-homepage: https://github.com/kirs/omniauth-yandex
+has_rdoc: true
+homepage: https://github.com/evrone/omniauth-yandex
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+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: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: omniauth-yandex
-rubygems_version: 1.8.10
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: OmniAuth strategy for Yandex.ru
 test_files: []
+

data/.rspec

@@ -1 +0,0 @@
---colour

data/.travis.yml

@@ -1,5 +0,0 @@
-rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  - ree