omniauth-osm 0.1.1 → 0.1.2

data/.rspec

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

data/.rvmrc

@@ -1 +1,2 @@
+rvm_gemset_create_on_use_flag=1
 rvm use 1.8.7@omniauth-osm

data/.travis.yml

@@ -0,0 +1,6 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - ruby-head
+  - ree

data/README.md

@@ -1,5 +1,11 @@
 # OmniAuth OpenStreetMap
 
+[![alt text][2]][1]
+
+  [1]: http://travis-ci.org/#!/sozialhelden/omniauth-osm
+  [2]: https://secure.travis-ci.org/sozialhelden/omniauth-osm.png
+
+
 This gem contains the OpenStreetMap strategy for OmniAuth.
 
 OpenStreetMap uses the OAuth 1.0a flow, you can read about it here: http://wiki.openstreetmap.org/wiki/OAuth

data/Rakefile

@@ -1,18 +1,11 @@
-#!/usr/bin/env rake
-
-require 'bundler'
-Bundler::GemHelper.install_tasks
-
+require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec)
 
+desc 'Default: run specs.'
 task :default => :spec
-task :test => :spec
 
-require 'yard'
-namespace :doc do
-  YARD::Rake::YardocTask.new do |task|
-    task.files   = ['LICENSE.md', 'lib/**/*.rb']
-    task.options = ['--markup', 'markdown']
-  end
-end
+desc "Run specs"
+RSpec::Core::RakeTask.new
+
+desc 'Run specs'
+task :default => :spec

data/lib/omniauth-osm.rb

@@ -1 +1,2 @@
-require 'omniauth/osm'
+require "omniauth-osm/version"
+require 'omniauth/strategies/osm'

data/lib/{omniauth/osm → omniauth-osm}/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Osm
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
-end
+end

data/lib/omniauth/strategies/osm.rb

@@ -1,4 +1,5 @@
 require 'omniauth-oauth'
+require 'multi_json'
 
 module OmniAuth
   module Strategies
@@ -7,9 +8,9 @@ module OmniAuth
 
       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'
+        :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'
       }
 
       uid{ raw_info['user']['id'] }
@@ -45,7 +46,7 @@ module OmniAuth
       end
 
       def raw_info
-        @raw_info ||= Hash.from_xml(access_token.get('/api/0.6/user/details.json').body)['osm']
+        @raw_info ||= MultiJson.decode(access_token.get('/api/0.6/user/details.json').body)['osm']
         rescue ::Errno::ETIMEDOUT
         raise ::Timeout::Error
       end

data/omniauth-osm.gemspec

@@ -1,28 +1,29 @@
-# encoding: utf-8
-require File.expand_path('../lib/omniauth/osm/version', __FILE__)
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+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.email       = 'christoph@sozialhelden.de'
   gem.homepage    = 'https://github.com/sozialhelden/omniauth-osm'
+  gem.description = %q{OpenStreetMap strategy for OmniAuth 1.0a}
+  gem.summary     = %q{OpenStreetMap strategy for OmniAuth 1.0a}
 
-  gem.author      = "Christoph Bünte"
-  gem.email       = 'christoph@sozialhelden.de'
-  gem.description = 'OpenStreetMap strategy for OmniAuth 1.0'
-  gem.summary     = gem.description
+  gem.rubyforge_project = "omniauth-osm"
 
-  gem.add_dependency "omniauth-oauth", "~> 1.0"
+  gem.files       = `git ls-files`.split("\n")
+  gem.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.executables = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f)}
+  gem.require_paths = ['lib']
+
+  gem.add_runtime_dependency "omniauth-oauth", "~> 1.0"
 
   gem.add_development_dependency 'rake', '~> 0.9'
-  gem.add_development_dependency 'rdiscount', '~> 1.6'
   gem.add_development_dependency 'rspec', '~> 2.7'
   gem.add_development_dependency 'simplecov', '~> 0.5'
-  gem.add_development_dependency 'yard', '~> 0.7'
   gem.add_development_dependency 'webmock', '~> 1.7'
 
-  gem.executables = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f)}
-  gem.files       = `git ls-files`.split("\n")
-  gem.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
 
-  gem.require_paths = ['lib']
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: omniauth-osm
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - "Christoph B\xC3\xBCnte"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-29 00:00:00 Z
+date: 2012-01-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: omniauth-oauth
@@ -47,25 +47,10 @@ dependencies:
         version: "0.9"
   type: :development
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rdiscount
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 6
-        version: "1.6"
-  type: :development
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -76,11 +61,11 @@ dependencies:
         - 7
         version: "2.7"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: simplecov
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -91,26 +76,11 @@ dependencies:
         - 5
         version: "0.5"
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: yard
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 7
-        version: "0.7"
-  type: :development
-  version_requirements: *id006
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: webmock
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -121,8 +91,8 @@ dependencies:
         - 7
         version: "1.7"
   type: :development
-  version_requirements: *id007
-description: OpenStreetMap strategy for OmniAuth 1.0
+  version_requirements: *id005
+description: OpenStreetMap strategy for OmniAuth 1.0a
 email: christoph@sozialhelden.de
 executables: []
 
@@ -132,14 +102,15 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .rspec
 - .rvmrc
+- .travis.yml
 - Gemfile
 - LICENSE.md
 - README.md
 - Rakefile
 - lib/omniauth-osm.rb
-- lib/omniauth/osm.rb
-- lib/omniauth/osm/version.rb
+- lib/omniauth-osm/version.rb
 - lib/omniauth/strategies/osm.rb
 - omniauth-osm.gemspec
 - spec/integration.spec
@@ -173,11 +144,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.8.11
+rubyforge_project: omniauth-osm
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: OpenStreetMap strategy for OmniAuth 1.0
+summary: OpenStreetMap strategy for OmniAuth 1.0a
 test_files: 
 - spec/integration.spec
 - spec/omniauth/strategies/osm_spec.rb

data/lib/omniauth/osm.rb

@@ -1 +0,0 @@
-require 'omniauth/strategies/osm'