vidibus-user 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -42,14 +42,14 @@ GEM
       rack (>= 1.0.1)
     gemcutter (0.6.1)
     git (1.2.5)
-    httparty (0.6.1)
-      crack (= 0.1.8)
     i18n (0.4.1)
     jeweler (1.4.0)
       gemcutter (>= 0.1.0)
       git (>= 1.2.5)
       rubyforge (>= 2.0.0)
+    json (1.5.1)
     json_pure (1.4.6)
+    macaddr (1.0.0)
     mail (2.2.6.1)
       activesupport (>= 2.3.6)
       mime-types
@@ -104,6 +104,22 @@ GEM
     treetop (1.4.8)
       polyglot (>= 0.3.1)
     tzinfo (0.3.23)
+    uuid (2.3.1)
+      macaddr (~> 1.0)
+    vidibus-core_extensions (0.3.16)
+    vidibus-secure (0.0.4)
+      activesupport (~> 3.0.0)
+      activesupport (~> 3.0.0)
+      mongoid (~> 2.0.0.beta.20)
+      mongoid (~> 2.0.0.beta.20)
+      rack
+      vidibus-core_extensions
+      vidibus-core_extensions
+    vidibus-uuid (0.3.10)
+      mongoid (~> 2.0.0.beta.17)
+      mongoid (~> 2.0.0.beta.20)
+      uuid (~> 2.3.1)
+      uuid (~> 2.3.1)
     warden (0.10.7)
       rack (>= 1.0.0)
     webmock (1.3.5)
@@ -115,8 +131,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  httparty
   jeweler
+  json
   mongoid (~> 2.0.0.beta.20)
   oauth2
   rails (~> 3.0.0)
@@ -124,5 +140,7 @@ DEPENDENCIES
   relevance-rcov
   rr
   rspec (~> 2.0.0.beta.20)
+  vidibus-secure
+  vidibus-uuid
   warden
   webmock

data/README.rdoc

@@ -1,8 +1,8 @@
-= vidibus-user
+= Vidibus::User
 
 Provides single sign-on through OAuth2 authentication. It adds a simple user model to your application which can be extended easily.
 
-This gem is part of the open source SOA framework Vidibus: vidibus.org.
+This gem is part of the open source SOA framework {Vidibus}[http://vidibus.org].
 
 It is far from being complete, but this will change soon.
 
@@ -18,18 +18,18 @@ Then call bundle install on your console.
 
 == Obtaining user data
 
-After authorization via OAuth this gem requests user data from providing service. It will call the following route:
+After authorization via OAuth2 this gem requests user data from the providing service. It will call the following route:
 
   /oauth/user
 
-It expects JSON data to be returned. The dataset must at least include the user's uuid.
+It expects JSON data to be returned. The dataset must at least include the user's UUID.
 
-The vidibus-oauth2_server gem will provide a controller for this task.
+The {Vidibus::Oauth2Server}[https://github.com/vidibus/vidibus-oauth2_server] gem will provide a controller for this task.
 
 
 == Dependencies
 
-In order to perform authentication, this gem depends on services provided by the vidibus-service gem.
+In order to perform authentication, this gem depends on services provided by the {Vidibus::Service}[https://github.com/vidibus/vidibus-service] gem.
 
 
 == TODO

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/vidibus/user/mongoid.rb

@@ -4,9 +4,6 @@ module Vidibus
       extend ActiveSupport::Concern
       included do
         field :uuid
-        field :email
-        field :name
-        validates :email, :name, :presence => true
         validates :uuid, :uuid => true
       end
     end

data/lib/vidibus/user/warden_strategy.rb

@@ -53,14 +53,14 @@ Warden::Strategies.add(:connector) do
     begin
       response = access_token.get("/oauth/user")
       user_data = JSON.parse(response)
-      unless user = User.where(:uuid => user_data["uuid"]).first
-        unless user = User.create(user_data)
-          raise "user.errors = #{user.errors.inspect}"
-        end
-      end
+      selector = {:uuid => user_data["uuid"]}
+      user = User.where(selector).first || User.new(selector)
+      user.save!
     rescue OAuth2::HTTPError
       Rails.logger.error "Failed to fetch user data from #{credentials[:service_url]}/oauth/user"
       user = true
+    rescue => e
+      Rails.logger.error "Error: #{e.message}"
     end
 
     success!(user)

data/vidibus-user.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vidibus-user}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andre Pankratz"]
-  s.date = %q{2011-01-14}
+  s.date = %q{2011-02-04}
   s.description = %q{Provides single sign-on and a local user model.}
   s.email = %q{andre@vidibus.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vidibus-user
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Andre Pankratz
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-14 00:00:00 +01:00
+date: 2011-02-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency