disiid_user 3.1.4 → 4.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: aa044938972c66d9e4fa7c5f005b589fdedc8d5a
+  data.tar.gz: 83f7a1427949832bd5b0caa9d813d8dc7d0a374b
+SHA512:
+  metadata.gz: dbd2a1293b0f9c721f91d466a07195f1eae238b45ca84bf3882969e430c7c05ae817c62074e0e99c9f3b0dcc378632807615dc45c32591fb35f615a4450e7936
+  data.tar.gz: bb62f8268cb8b65a80d5a8e3937f0047900fe651ad9a916b048b34b171fd59dbfc519e2510ea788b1783a53e302115b136ac10e15db02b10aa8bf7165a4d62c1

data/Gemfile

@@ -1,4 +1,4 @@
 source "http://rubygems.org"
-
+gem 'activeresource', require: 'active_resource'
 # Specify your gem's dependencies in disiid_user.gemspec
 gemspec

data/disiid_user.gemspec

@@ -11,7 +11,8 @@ Gem::Specification.new do |s|
   s.homepage    = "http://disi.unitn.it"
   s.summary     = %q{DISI ID global user}
   s.description = %q{DISI - UniTN internal development}
-
+  s.license  = "MIT"
+  
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project = "disiid_user"
 
@@ -21,9 +22,10 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "bundler"
+  s.add_development_dependency "rspec", '~> 3'
+  s.add_development_dependency "rspec-mocks", '~> 3'
+  s.add_development_dependency "bundler", '~> 1'
   # runtime dependencies
-  s.add_runtime_dependency "activeresource", '~> 3'
-  s.add_runtime_dependency "activerecord", '~> 3'
+  s.add_runtime_dependency "activeresource", '~> 4'
+  s.add_runtime_dependency "activerecord", '~> 4'
 end

data/lib/disiid_user/version.rb

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

data/spec/disiid_user_spec.rb

@@ -1,5 +1,9 @@
 require 'spec_helper'
 require 'stub_user'
+require 'fakeweb'
+#require 'webmock/rspec'
+require 'active_resource'
+require 'active_resource/http_mock'
 
 # admin@example.org
 # 6a002a40-bc63-4095-9bb0-f31bf386bf55
@@ -39,8 +43,14 @@ describe DisiidUser do
   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' }
+#    its(:identity_url) { should == 'http://openid.provider.local/users/6a002a40-bc63-4095-9bb0-f31bf386bf55' }
+#    its(:uuid) { should == '6a002a40-bc63-4095-9bb0-f31bf386bf55' }
+    it "has correct identity url" do
+      expect(subject.identity_url).to eq 'http://openid.provider.local/users/6a002a40-bc63-4095-9bb0-f31bf386bf55'
+    end
+    it "has correct uuid" do
+      expect(subject.uuid).to eq '6a002a40-bc63-4095-9bb0-f31bf386bf55'
+    end
   end
   
   describe ".build_from_identity" do
@@ -243,15 +253,21 @@ describe DisiidUser do
     end
     
     context 'when exists' do
+      
       before {
-        @user.identity_url = "http://openid.provider.local/users/6a002a40-bc63-4095-9bb0-f31bf386bf55" 
+        @user.identity_url = "http://openid.provider.local/users/6a002a40-bc63-4095-9bb0-f31bf386bf55"
+        ActiveResource::HttpMock.respond_to do |mock|
+             mock.get "/users/#{@user.uuid}.xml?auth_token=#{DisiidUser::RemoteUser.auth_token}", {"Accept" => "application/xml"}, File.read("#{File.dirname(__FILE__)}/#{@user.uuid}.xml"), 200
+            mock.get "/users/#{@user.uuid}.json?auth_token=#{DisiidUser::RemoteUser.auth_token}", {"Accept" => "application/json"}, File.read("#{File.dirname(__FILE__)}/#{@user.uuid}.json"), 200
+          end
       }
     
       [:xml, :json].each { |format|
         it "should have remote attributes in #{format} format" do
           DisiidUser::RemoteUser.format = format
+          DisiidUser::RemoteUser.auth_token = 'sometoken'
           ActiveSupport.parse_json_times = true
-          
+          expect(@user.email).not_to be_nil
           @user.email.should == 'admin@example.org'
           @user.first_name.should == 'John'
           @user.last_name.should == 'Smith'
@@ -275,13 +291,17 @@ describe DisiidUser do
           @user.remote_updated_at.should == DateTime.parse('2011-12-06T11:15:33Z')
           # for this to evaluate to boolean 
           # XML tag should contain type="boolean" attribute
-          @user.hide_photo.should be_false
+          expect(@user.hide_photo).to be false
         end
       }
       
       it 'should have assign methods like email=(...)' do
-        @user.email = 'new@email.com'
-        @user.email.should == 'new@email.com'
+        DisiidUser::RemoteUser.format = :xml
+        DisiidUser::RemoteUser.auth_token = 'sometoken'
+        DisiidUser::RemoteUser.site = "http://openid.provider.local"
+        
+        @user.email ='new@email.com'
+        expect(@user.email).to eq 'new@email.com'
 
         @user.homepage = 'http://some.page.com'
         @user.homepage.should == 'http://some.page.com'
@@ -290,6 +310,7 @@ describe DisiidUser do
     
       it 'should get all roles, including remote' do
         @user.local_roles = 'manager'
+        
         @user.roles.should include 'admin' # remote
         @user.roles.should include 'manager' # local
       end
@@ -306,7 +327,14 @@ describe DisiidUser do
     end # context 'when exists' 
     
     context 'when search' do
-      before { DisiidUser::RemoteUser.auth_token = 'sometoken' }
+      before { 
+        DisiidUser::RemoteUser.auth_token = 'sometoken'
+        ActiveResource::HttpMock.respond_to do |mock|
+             mock.get "/users.xml?auth_token=#{DisiidUser::RemoteUser.auth_token}&q=e", {"Accept" => "application/xml"}, File.read("#{File.dirname(__FILE__)}/users.xml"), 200
+            mock.get "/users.json?auth_token=#{DisiidUser::RemoteUser.auth_token}&q=e", {"Accept" => "application/json"}, File.read("#{File.dirname(__FILE__)}/users.json"), 200
+        end
+      
+      }
     
       it 'should find a list of users with activeresource' do
         @users = DisiidUser::RemoteUser.find(:all , :params => {:q => 'e', :auth_token => 'sometoken'})

data/spec/spec_helper.rb

@@ -2,7 +2,25 @@ require 'rspec'
 require 'disiid_user'
 require 'active_record/errors'
 
+##
+# keep compatibility to rspec 2.x
+module DoubleAliases
+  def mock(*args, &block)
+    double(*args, &block)
+  end
+  alias stub mock
+end
+
 RSpec.configure do |config|
-  config.color_enabled = true
+  config.include DoubleAliases
+  config.color = true
   config.formatter     = 'documentation'
+  # keep compatibility to rspec 2.x
+  config.expect_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
+  # keep compatibility to rspec 2.x
+  config.mock_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
 end

data/spec/stub_user.rb

@@ -23,11 +23,13 @@ class User
   def self.scope(*args); end
   
   include DisiidUser
+  
 end
 
 class FakeResponse
   attr_accessor :body
   def initialize(body); @body = body; end
+  
 end
 
 # Stub ActiveRecord so that it won't do real HTTP requests
@@ -35,30 +37,57 @@ module ActiveResource
   class Connection
     # taps into ActiveRecord to read data from stub files
     # instead of doing a real HTTP request
-    def get(path, *args)
-      read_from_file(path)
-    rescue; raise ActiveResource::ResourceNotFound; end
+##    def get(path, *args)
+#    def get(path, headers = {})
+#      read_from_file(path)
+#    rescue; raise ActiveResource::ResourceNotFound; end
+#    
+#    # stubs PUT request so to not do it for real
+##    def put(path, payload, headers)
+#    def put(path, body = '', headers = {})
+#      read_from_file(path)
+#    rescue; raise ActiveResource::ResourceNotFound; end
+#    
+#    def patch(path, body = '', headers = {})
+#      read_from_file(path)
+#    rescue; raise ActiveResource::ResourceNotFound; end
     
-    # stubs PUT request so to not do it for real
-    def put(path, payload, headers)
-      read_from_file(path)
-    rescue; raise ActiveResource::ResourceNotFound; end
+#    # taps into ActiveRecord to read data from stub files
+#    # instead of doing a real HTTP request
+#    def get(path, *args)
+#      read_from_file(path)
+#    rescue; raise ActiveResource::ResourceNotFound; end
+#    
+#    # stubs PUT request so to not do it for real
+#    def put(path, payload, headers)
+#      read_from_file(path)
+#    rescue; raise ActiveResource::ResourceNotFound; end
     
     private 
     
     def read_from_file(fake_url_path)
-      if matched = /users\.(xml|json)/.match(fake_url_path)
-        filename = "#{File.dirname(__FILE__)}/users.#{matched[1]}"
+#      if matched = /users\.(xml|json)/.match(fake_url_path)
+#        filename = "#{File.dirname(__FILE__)}/users.#{matched[1]}"
+#      else
+#        # /collection_name/uuid?query
+#        record = /\/[^\/]+\/([^\/\?]+)/.match(fake_url_path)[1]
+#        # record string includes .xml or .json too
+#        filename = "#{File.dirname(__FILE__)}/#{record}".sub(/\?.*$/, '')
+#      end
+      # fake_url_path
+      # /users.xml?uuid=XXX
+      # /users.xml
+      if fake_url_path.match("uuid=")
+        name = fake_url_path.split("?uuid=")[1]
+        ext = fake_url_path.split("?uuid=")[0].split(".")[1]
+        filename = "#{File.dirname(__FILE__)}/#{name}.#{ext}"
       else
-        # /collection_name/uuid?query
-        record = /\/[^\/]+\/([^\/\?]+)/.match(fake_url_path)[1]
-        # record string includes .xml or .json too
-        filename = "#{File.dirname(__FILE__)}/#{record}".sub(/\?.*$/, '')
+        filename = "#{File.dirname(__FILE__)}/#{fake_url_path.split("?")[0].sub(/^\//, '')}"
       end
       # format is either ActiveResource::Formats::XmlFormat or JsonFormat
       # 3.0.x defaults to XML, 3.1.x defaults to JSON
       data = open(filename).read
-      /3\.1/.match(ActiveResource::VERSION::STRING) ? FakeResponse.new(data) : format.decode(data)
+      { :body => /3\.1/.match(ActiveResource::VERSION::STRING) ? FakeResponse.new(data) : format.decode(data) }
     end
   end
 end
@@ -74,3 +103,4 @@ module Rails
   def self.cache; StubCache; end
 end
 
+

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: disiid_user
 version: !ruby/object:Gem::Version
-  version: 3.1.4
-  prerelease: 
+  version: 4.0.1
 platform: ruby
 authors:
 - Danilo Severina
@@ -10,52 +9,78 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-28 00:00:00.000000000Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70313544551380 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: rspec-mocks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
-  version_requirements: *70313544551380
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70313544550720 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :development
   prerelease: false
-  version_requirements: *70313544550720
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: &70313544550160 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
-  version_requirements: *70313544550160
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70313544549320 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
-  version_requirements: *70313544549320
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
 description: DISI - UniTN internal development
 email:
 - tech@disi.unitn.it
@@ -63,8 +88,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rvmrc-template
+- ".gitignore"
+- ".rvmrc-template"
 - Gemfile
 - Rakefile
 - TODO
@@ -82,37 +107,27 @@ files:
 - spec/users.json
 - spec/users.xml
 homepage: http://disi.unitn.it
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: disiid_user
-rubygems_version: 1.8.10
+rubygems_version: 2.4.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: DISI ID global user
-test_files:
-- 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/stub_user.rb
-- spec/users.json
-- spec/users.xml
+test_files: []