disiid_user 3.1.3 → 3.1.4

data/lib/disiid_user.rb

@@ -21,11 +21,11 @@ require 'active_resource'
 #
 module DisiidUser
   
-  def self.included(klass)    
+  def self.included(klass)
     klass.class_eval do
+      extend ClassMethods
       scope :with_local_role, lambda { |role| where('role & ? > 0', 2**LOCAL_ROLES.index(role.to_s)) }
     end
-    klass.extend(ClassMethods)
   end
   
   ########################################################################
@@ -55,12 +55,14 @@ module DisiidUser
     # if you want to persist it in a local database.
     #
     # Note: your local :users table should :identity_url string attribute for this to work.
-    def build_from_identity(url)
+    def build_from_identity_url(url)
       user = new
       user.identity_url = url
       user
     end
     
+    alias :build_from_identity :build_from_identity_url
+    
     # Looks for a local user record with a given UUID by matching its local attribute :identity_url.
     # Creates a new user if it doesn't exist locally but is present remotely using #build_from_identity method.
     # This method will throw ActiveRecord::RecordNotFound exception if persistance process didn't go well.

data/lib/disiid_user/version.rb

@@ -1,3 +1,3 @@
 module DisiidUser
-  VERSION = "3.1.3"
+  VERSION = "3.1.4"
 end

data/spec/disiid_user_spec.rb

@@ -36,13 +36,23 @@ describe DisiidUser do
     @user.uuid.should be_nil
   end
   
-  it "should build a new user with correct identity url" do
-    u = User.build_from_identity 'http://openid.provider.local/users/6a002a40-bc63-4095-9bb0-f31bf386bf55'
-    
-    u.should be_instance_of(User)
-    u.should be_new_record
-    u.identity_url.should == 'http://openid.provider.local/users/6a002a40-bc63-4095-9bb0-f31bf386bf55'
-    u.uuid.should == '6a002a40-bc63-4095-9bb0-f31bf386bf55'
+  shared_examples_for "new user from identity" do
+    it { should be_instance_of(User) }
+    it { should be_new_record }
+    its(:identity_url) { should == 'http://openid.provider.local/users/6a002a40-bc63-4095-9bb0-f31bf386bf55' }
+    its(:uuid) { should == '6a002a40-bc63-4095-9bb0-f31bf386bf55' }
+  end
+  
+  describe ".build_from_identity" do
+    it_should_behave_like "new user from identity" do
+      subject { User.build_from_identity('http://openid.provider.local/users/6a002a40-bc63-4095-9bb0-f31bf386bf55') }
+    end
+  end
+  
+  describe ".build_from_identity_url" do
+    it_should_behave_like "new user from identity" do
+      subject { User.build_from_identity_url('http://openid.provider.local/users/6a002a40-bc63-4095-9bb0-f31bf386bf55') }
+    end
   end
   
   describe "#find_local_or_remote_by_uuid!" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: disiid_user
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-12-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70235164696820 !ruby/object:Gem::Requirement
+  requirement: &70313544551380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70235164696820
+  version_requirements: *70313544551380
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70235164696060 !ruby/object:Gem::Requirement
+  requirement: &70313544550720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70235164696060
+  version_requirements: *70313544550720
 - !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: &70235164695120 !ruby/object:Gem::Requirement
+  requirement: &70313544550160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *70235164695120
+  version_requirements: *70313544550160
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70235164694120 !ruby/object:Gem::Requirement
+  requirement: &70313544549320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,7 +55,7 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *70235164694120
+  version_requirements: *70313544549320
 description: DISI - UniTN internal development
 email:
 - tech@disi.unitn.it