disiid_user 2.0.1 → 3.0.1

data/.gitignore

@@ -2,7 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
-.rvmrc*
-rvmrc*
-!.rvmrc-template
-
+.rvmrc

data/disiid_user.gemspec

@@ -22,8 +22,7 @@ Gem::Specification.new do |s|
 
   # specify any dependencies here; for example:
   s.add_development_dependency "rspec"
-  s.add_development_dependency "rake", '~> 0.8.7'
   s.add_development_dependency "bundler"
   # runtime dependencies
-  s.add_runtime_dependency "activeresource", '~> 2'
+  s.add_runtime_dependency "activeresource", '~> 3'
 end

data/lib/disiid_user/version.rb

@@ -1,3 +1,3 @@
 module DisiidUser
-  VERSION = "2.0.1"
+  VERSION = "3.0.1"
 end

data/lib/disiid_user.rb

@@ -11,6 +11,7 @@ require 'active_resource'
 #   # if resource name is different from 'user' (default)
 #   DisiidUser::RemoteUser.element_name = 'user'
 #
+#
 # in app/models/user.rb:
 #
 #   class User < ActiveRecord::Base
@@ -22,7 +23,7 @@ module DisiidUser
   
   def self.included(klass)    
     klass.class_eval do
-      named_scope :with_local_role, lambda { |role| where('role & ? > 0', 2**LOCAL_ROLES.index(role.to_s)) }
+      scope :with_local_role, lambda { |role| where('role & ? > 0', 2**LOCAL_ROLES.index(role.to_s)) }
     end
   end
   
@@ -83,9 +84,7 @@ module DisiidUser
   # Get the remote user via get ActiveResource
   def remote_user
     @remote_user ||= DisiidUser::RemoteUser.find uuid, :params => { :auth_token => DisiidUser::RemoteUser.auth_token }
-  rescue
-    nil
-  end
+  rescue; nil; end
     
   # Return the uuid of a user
   # Last part of identity_url, after path 'user' (element_name of RemoteUser params)
@@ -106,7 +105,6 @@ module DisiidUser
   class RemoteUser < ActiveResource::Base
     self.site = 'http://localhost:3001'
     self.element_name = 'user'
-    self.format = :json
     cattr_accessor :auth_token
   end
  

data/spec/user.rb

@@ -12,7 +12,7 @@ end
 #   - identity_url (String)
 class User
   # stub methods and attributes
-  def self.named_scope(*args); end
+  def self.scope(*args); end
   attr_accessor :role, :identity_url
   
   include DisiidUser  
@@ -31,8 +31,7 @@ module ActiveResource
       # 3.0.x defaults to XML, 3.1.x defaults to JSON
       format.decode open(filename).read
     rescue
-      #raise ActiveResource::ResourceNotFound.new("dummy remote user didn't find that resource: #{path} #{args.inspect}")
-      nil
+      raise ActiveResource::ResourceNotFound.new("dummy remote user didn't find that resource: #{path} #{args.inspect}")
     end
   end
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: disiid_user
 version: !ruby/object:Gem::Version 
-  hash: 13
   prerelease: 
-  segments: 
-  - 2
-  - 0
-  - 1
-  version: 2.0.1
+  version: 3.0.1
 platform: ruby
 authors: 
 - Danilo Severina
@@ -16,8 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-16 00:00:00 +01:00
-default_executable: 
+date: 2011-11-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -27,56 +21,31 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
-  type: :development
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: bundler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: activeresource
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
+        version: "3"
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id003
 description: DISI - UniTN internal development
 email: 
 - tech@disi.unitn.it
@@ -94,16 +63,13 @@ files:
 - disiid_user.gemspec
 - lib/disiid_user.rb
 - lib/disiid_user/version.rb
-- spec/596568c5-d6e7-4328-815c-c532aeed1198.json
 - spec/596568c5-d6e7-4328-815c-c532aeed1198.xml
-- spec/6a002a40-bc63-4095-9bb0-f31bf386bf55.json
 - spec/6a002a40-bc63-4095-9bb0-f31bf386bf55.xml
 - spec/disiid_user_spec.rb
 - spec/remote_user_spec.rb
 - spec/spec_helper.rb
 - spec/stub_methods_spec.rb
 - spec/user.rb
-has_rdoc: true
 homepage: http://disi.unitn.it
 licenses: []
 
@@ -117,32 +83,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: disiid_user
-rubygems_version: 1.4.1
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: DISI ID global user
 test_files: 
-- spec/596568c5-d6e7-4328-815c-c532aeed1198.json
 - spec/596568c5-d6e7-4328-815c-c532aeed1198.xml
-- spec/6a002a40-bc63-4095-9bb0-f31bf386bf55.json
 - spec/6a002a40-bc63-4095-9bb0-f31bf386bf55.xml
 - spec/disiid_user_spec.rb
 - spec/remote_user_spec.rb

data/spec/596568c5-d6e7-4328-815c-c532aeed1198.json

@@ -1,15 +0,0 @@
-{
- "uuid": "596568c5-d6e7-4328-815c-c532aeed1198",
- "email":"nobody@example.org",
- "first_name":"Mr",
- "last_name":"Anonymous",
- "nickname":"mr.anon",
- "photo": "nobody.jpg",
- "homepage":"",
- "office_address":"via sommarive, 5",
- "office_num":"D44",
- "office_phone":"0461444444",
- "office_fax":"0461555555",
- "roles": []
-}
-

data/spec/6a002a40-bc63-4095-9bb0-f31bf386bf55.json

@@ -1,15 +0,0 @@
-{
- "uuid": "6a002a40-bc63-4095-9bb0-f31bf386bf55",
- "email":"admin@example.org",
- "first_name":"John",
- "last_name":"Smith",
- "nickname":"john.smith",
- "photo": "avatar.jpg",
- "homepage":"http://john.smith.example.org",
- "office_address":"via sommarive, 5",
- "office_num":"D14",
- "office_phone":"0461012345",
- "office_fax":"0461540123",
- "roles":["admin","whatever"]
-}
-