omniauth-osm 0.3.0 → 0.3.1

data/.ruby-version

@@ -0,0 +1 @@
+1.8.7-p371

data/README.md

@@ -36,6 +36,12 @@ You will obviously have to put in your key and secret, which you get when you re
 
 Now just follow the README at: https://github.com/intridea/omniauth
 
+## Other Servers
+
+If you would like to use this plugin against another OSM server, such as the test development server you can use the environment variable OSM_AUTH_SITE to set the server to connect to.
+
+You could for example use the gem figaro to configure the environment variable, or roll your own preinitialiser similar to the OpenStreetMap website.
+
 ## Note on Patches/Pull Requests
 
 - Fork the project.

data/lib/omniauth-osm/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Osm
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/lib/omniauth/strategies/osm.rb

@@ -6,7 +6,15 @@ module OmniAuth
     class Osm < OmniAuth::Strategies::OAuth
       option :name, "osm"
 
-      option :client_options, :site => 'http://www.openstreetmap.org'
+      def self.site
+        if ENV['OSM_AUTH_SITE']
+          ENV['OSM_AUTH_SITE']
+        else
+          "http://www.openstreetmap.org"
+        end
+      end
+
+      option :client_options, :site => site
       option :fetch_permissions, false
 
       uid { raw_info['id'] }

data/spec/omniauth/strategies/osm_spec.rb

@@ -13,8 +13,15 @@ describe OmniAuth::Strategies::Osm do
   end
 
   describe '#client_options' do
-    it 'has correct Osm site' do
-      subject.options.client_options.site.should eq('http://www.openstreetmap.org')
+    it 'has correct default production site' do
+      OmniAuth::Strategies::Osm.site.should eq('http://www.openstreetmap.org')
+    end
+
+    it 'should use the correct environment site override' do
+      stub_const("ENV", {'OSM_AUTH_SITE' => 'http://api06.dev.openstreetmap.org'})
+      # Can't test the subject directly here as the site was set on class load,
+      # but could still override it via an options hash if you wanted to
+      OmniAuth::Strategies::Osm.site.should eq('http://api06.dev.openstreetmap.org')
     end
   end
 
@@ -106,7 +113,7 @@ EOX
 
     it "initializes raw_info properly if no xml is returned" do
       response_body = "foo bar"
-      access_token = mock(:get => mock(:body => response_body))
+      access_token = double(:get => double(:body => response_body))
       subject.should_receive(:access_token).and_return(access_token)
 
       subject.raw_info.should eq({"languages" => []})

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: omniauth-osm
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - "Christoph B\xC3\xBCnte"
@@ -15,10 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-09 00:00:00 Z
+date: 2013-10-25 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -28,12 +29,12 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  prerelease: false
-  requirement: *id001
   type: :runtime
   name: omniauth-oauth
+  version_requirements: *id001
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -43,12 +44,12 @@ dependencies:
         - 0
         - 9
         version: "0.9"
-  prerelease: false
-  requirement: *id002
   type: :development
   name: rake
+  version_requirements: *id002
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -58,12 +59,12 @@ dependencies:
         - 2
         - 7
         version: "2.7"
-  prerelease: false
-  requirement: *id003
   type: :development
   name: rspec
+  version_requirements: *id003
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -73,12 +74,12 @@ dependencies:
         - 0
         - 5
         version: "0.5"
-  prerelease: false
-  requirement: *id004
   type: :development
   name: simplecov
+  version_requirements: *id004
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -88,10 +89,10 @@ dependencies:
         - 1
         - 7
         version: "1.7"
-  prerelease: false
-  requirement: *id005
   type: :development
   name: webmock
+  version_requirements: *id005
+  prerelease: false
 description: OpenStreetMap strategy for OmniAuth 1.0a
 email: christoph@sozialhelden.de
 executables: []
@@ -102,8 +103,8 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
-- .rbenv-version
 - .rspec
+- .ruby-version
 - .rvmrc
 - .travis.yml
 - Gemfile
@@ -117,6 +118,7 @@ files:
 - spec/integration.spec
 - spec/omniauth/strategies/osm_spec.rb
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: https://github.com/sozialhelden/omniauth-osm
 licenses: []
 
@@ -146,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: omniauth-osm
-rubygems_version: 1.8.15
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: OpenStreetMap strategy for OmniAuth 1.0a

data/.rbenv-version

@@ -1 +0,0 @@
-1.8.7-p352