omniauth-osm 0.1.3 → 0.2.0

data/.travis.yml

@@ -4,3 +4,6 @@ rvm:
   - 1.9.3
   - ruby-head
   - ree
+notifications:
+  email:
+    - info@christophbuente.de

data/lib/omniauth/strategies/osm.rb

@@ -1,55 +1,60 @@
 require 'omniauth-oauth'
-require 'multi_json'
+require 'rexml/document'
 
 module OmniAuth
   module Strategies
     class Osm < OmniAuth::Strategies::OAuth
       option :name, "osm"
 
-      option :client_options, {
-        :site               => 'http://www.openstreetmap.org',
-        :request_token_url  => 'http://www.openstreetmap.org/oauth/request_token',
-        :access_token_url   => 'http://www.openstreetmap.org/oauth/access_token',
-        :authorize_url      => 'http://www.openstreetmap.org/oauth/authorize'
-      }
+      option :client_options, :site => 'http://www.openstreetmap.org'
 
-      uid{ raw_info['user']['id'] }
+      uid { raw_info['id'] }
 
       info do
-      {
-        'name'       => raw_info['user']['display_name'],
-        'languages'  => languages,
-        'lat'        => lat,
-        'lon'        => lon,
-        'image_url'  => image_url
-      }
-      end
-
-      def lat
-        raw_info['user']['home']['lat'].to_f rescue nil
-      end
-
-      def lon
-        raw_info['user']['home']['lon'].to_f rescue nil
-      end
-
-      def languages
-        raw_info['user']['languages']['lang'] rescue []
-      end
-
-      def image_url
-        raw_info['user']['img']['href'] rescue nil
-      end
-
-      extra do
-        { 'raw_info' => raw_info }
+        raw_info
       end
 
       def raw_info
-        @raw_info ||= MultiJson.decode(access_token.get('/api/0.6/user/details.json').body)['osm']
+        @raw_info ||= parse_info(access_token.get('/api/0.6/user/details').body)
         rescue ::Errno::ETIMEDOUT
         raise ::Timeout::Error
       end
+
+      # EXAMPLE XML
+      #
+      # <?xml version="1.0" encoding="UTF-8"?>
+      # <osm generator="OpenStreetMap server" version="0.6">
+      #   <user display_name="freundchen" account_created="2011-01-07T14:35:24Z" id="392638">
+      #     <img href='http://foo.bar.net/logo.gif' />
+      #     <description>Test description</description>
+      #     <contributor-terms pd="false" agreed="true"/>
+      #     <home lon="13.411681556178" zoom="3" lat="52.524360979625"/>
+      #     <languages>
+      #       <lang>de-DE</lang>
+      #       <lang>de</lang>
+      #     </languages>
+      #   </user>
+      # </osm>
+
+      private
+      def parse_info(xml_data)
+        # extract event information
+        doc = REXML::Document.new(xml_data)
+        user = doc.elements['//user']
+        home = doc.elements['//home']
+        languages = doc.get_elements('//lang')
+        image = doc.elements['//img']
+        description = doc.elements['//description']
+        basic_attributes = { }
+        basic_attributes['id']           = user.attribute('id').value
+        basic_attributes['display_name'] = user.attribute('display_name').value
+        basic_attributes['languages']    = languages.map(&:text) if languages
+        basic_attributes['image_url']    = image.attribute('href').value if image
+        basic_attributes['lat']          = home.attribute('lat').value.to_f if home
+        basic_attributes['lon']          = home.attribute('lon').value.to_f if home
+        basic_attributes['description']  = description.text if description
+        basic_attributes
+      end
     end
   end
 end

data/lib/omniauth-osm/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Osm
-    VERSION = "0.1.3"
+    VERSION = "0.2.0"
   end
 end

data/omniauth-osm.gemspec

@@ -5,7 +5,7 @@ require "omniauth-osm/version"
 Gem::Specification.new do |gem|
   gem.name        = 'omniauth-osm'
   gem.version     = OmniAuth::Osm::VERSION
-  gem.authors     = ["Christoph B\303\274nte"]
+  gem.authors     = ["Christoph Bünte"]
   gem.email       = 'christoph@sozialhelden.de'
   gem.homepage    = 'https://github.com/sozialhelden/omniauth-osm'
   gem.description = %q{OpenStreetMap strategy for OmniAuth 1.0a}
@@ -19,7 +19,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_runtime_dependency "omniauth-oauth", "~> 1.0"
-  gem.add_runtime_dependency "multi_json", "~> 1.0"
 
   gem.add_development_dependency 'rake', '~> 0.9'
   gem.add_development_dependency 'rspec', '~> 2.7'

data/spec/omniauth/strategies/osm_spec.rb

@@ -16,73 +16,83 @@ describe OmniAuth::Strategies::Osm do
     it 'has correct Osm site' do
       subject.options.client_options.site.should eq('http://www.openstreetmap.org')
     end
-
-    it 'has correct authorize url' do
-      subject.options.client_options.authorize_url.should eq('http://www.openstreetmap.org/oauth/authorize')
-    end
-
-    it 'has correct request token url' do
-      subject.options.client_options.request_token_url.should eq('http://www.openstreetmap.org/oauth/request_token')
-    end
-
-    it 'has correct access token url' do
-      subject.options.client_options.access_token_url.should eq('http://www.openstreetmap.org/oauth/access_token')
-    end
   end
 
   describe '#id' do
     it 'returns the id from raw_info' do
-      subject.stub(:raw_info) {{ 'user' => { 'id' => '123' } } }
+      subject.stub(:raw_info) { { 'id' => '123' } }
       subject.uid.should eq('123')
     end
   end
 
+  FULL_XML = <<-EOX
+<?xml version="1.0" encoding="UTF-8"?>
+<osm generator="OpenStreetMap server" version="0.6">
+  <user display_name="freundchen" account_created="2011-01-07T14:35:24Z" id="392638">
+    <img href="http://somewhere.com/image.jpg" />
+    <description>Test description</description>
+    <contributor-terms pd="false" agreed="true"/>
+    <home lon="13.411681556178" zoom="3" lat="52.524360979625"/>
+    <languages>
+      <lang>de-DE</lang>
+      <lang>de</lang>
+    </languages>
+  </user>
+</osm>
+EOX
+
+  MINI_XML = <<-EOX
+<?xml version="1.0" encoding="UTF-8"?>
+<osm generator="OpenStreetMap server" version="0.6">
+  <user display_name="freundchen" account_created="2011-01-07T14:35:24Z" id="392638">
+    <description/>
+    <contributor-terms pd="false" agreed="true"/>
+  </user>
+</osm>
+EOX
+
   describe '#info' do
     before :each do
-      @raw_info ||= { 'user' => { 'display_name' => 'Fred', 'languages' => {'lang' => ["de-DE", "de"]}, 'home' => {'lat' => '52.0', 'lon' => '13.4', 'zoom' => '3' }, 'img' => {'href' => 'http://somewhere.com/image.jpg'} } }
-      subject.stub(:raw_info) { @raw_info }
+      @parsed = subject.send(:parse_info, FULL_XML)
+      @mini_parsed = subject.send(:parse_info, MINI_XML)
     end
 
     context 'when data is present in raw info' do
       it 'returns the name' do
-        subject.info['name'].should eq('Fred')
+        @parsed['display_name'].should eq('freundchen')
       end
 
       it 'returns the languages' do
-        subject.info['languages'].should eq(['de-DE', 'de'])
+        @parsed['languages'].should eq(['de-DE', 'de'])
       end
 
       it 'returns no languages if missing' do
-        @raw_info['user'].delete('languages')
-        subject.info['languages'].should eq([])
+
+        @mini_parsed['languages'].should eq([])
       end
 
       it 'returns the lat' do
-        subject.info['lat'].should eq(52.0)
+        @parsed['lat'].should eq(52.524360979625)
       end
 
       it 'returns no lat if missing' do
-        @raw_info['user'].delete('home')
-        subject.info['lat'].should eq(nil)
+        @mini_parsed['lat'].should eq(nil)
       end
 
       it 'returns the lon' do
-        subject.info['lon'].should eq(13.4)
+        @parsed['lon'].should eq(13.411681556178)
       end
 
       it 'returns no lon if missing' do
-        @raw_info['user'].delete('home')
-        subject.info['lon'].should eq(nil)
+        @mini_parsed['lon'].should eq(nil)
       end
 
       it 'returns the image' do
-        subject.info['image_url'].should eq('http://somewhere.com/image.jpg')
+        @parsed['image_url'].should eq('http://somewhere.com/image.jpg')
       end
 
       it 'returns no image of missing' do
-        @raw_info['user'].delete('img')
-        subject.info['image_url'].should eq(nil)
-
+        @mini_parsed['image_url'].should eq(nil)
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: omniauth-osm
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - "Christoph B\xC3\xBCnte"
@@ -15,12 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-13 00:00:00 Z
+date: 2012-04-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: omniauth-oauth
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -30,27 +28,12 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: multi_json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+  requirement: *id001
+  name: omniauth-oauth
   type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -60,12 +43,12 @@ dependencies:
         - 0
         - 9
         version: "0.9"
+  prerelease: false
+  requirement: *id002
+  name: rake
   type: :development
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -75,12 +58,12 @@ dependencies:
         - 2
         - 7
         version: "2.7"
+  prerelease: false
+  requirement: *id003
+  name: rspec
   type: :development
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: simplecov
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -90,12 +73,12 @@ dependencies:
         - 0
         - 5
         version: "0.5"
+  prerelease: false
+  requirement: *id004
+  name: simplecov
   type: :development
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: webmock
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -105,8 +88,10 @@ dependencies:
         - 1
         - 7
         version: "1.7"
+  prerelease: false
+  requirement: *id005
+  name: webmock
   type: :development
-  version_requirements: *id006
 description: OpenStreetMap strategy for OmniAuth 1.0a
 email: christoph@sozialhelden.de
 executables: []
@@ -160,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: omniauth-osm
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: OpenStreetMap strategy for OmniAuth 1.0a
@@ -168,4 +153,3 @@ test_files:
 - spec/integration.spec
 - spec/omniauth/strategies/osm_spec.rb
 - spec/spec_helper.rb
-has_rdoc: