disiid_user 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa044938972c66d9e4fa7c5f005b589fdedc8d5a
-  data.tar.gz: 83f7a1427949832bd5b0caa9d813d8dc7d0a374b
+  metadata.gz: bbb68883236561190cd994567c2dc9bdd3770b9b
+  data.tar.gz: faf56b478b6a939acf2eac2999abdd275f93174c
 SHA512:
-  metadata.gz: dbd2a1293b0f9c721f91d466a07195f1eae238b45ca84bf3882969e430c7c05ae817c62074e0e99c9f3b0dcc378632807615dc45c32591fb35f615a4450e7936
-  data.tar.gz: bb62f8268cb8b65a80d5a8e3937f0047900fe651ad9a916b048b34b171fd59dbfc519e2510ea788b1783a53e302115b136ac10e15db02b10aa8bf7165a4d62c1
+  metadata.gz: 75613e9b4b2c5db2e716c04391a4f79c6b7a063a2b5fc0f273f1d473707f1a4b1e9e64a88f0dbf4b2cadacd0cc71c2c8f8f05078784a89cd1202ff51225c2a97
+  data.tar.gz: 1f4867c5c95d93379d03398578e1433b77f1727ece21db364124829a16eaf8d0c26866ce246f6c8800cb9f52a288cd31c10c7e3d02130227eaee7a6b33e68ed1

data/lib/disiid_user.rb

@@ -67,7 +67,7 @@ module DisiidUser
     # 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.
     def find_local_or_remote_by_uuid!(id)
-      user = first(conditions: ['identity_url LIKE ?', "%#{id}"])
+      user = where('identity_url LIKE ?', "%#{id}").first
       if !user && DisiidUser::RemoteUser.exists?(id, params: {auth_token: DisiidUser::RemoteUser.auth_token})
         # DisiidUser::RemoteUser.site is a URI::HTTP object, not a string
         user_url = DisiidUser::RemoteUser.site.merge("#{DisiidUser::RemoteUser.collection_name}/#{id}").to_s

data/lib/disiid_user/version.rb

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

data/spec/disiid_user_spec.rb

@@ -71,14 +71,14 @@ describe DisiidUser do
     
     it { should respond_to :find_local_or_remote_by_uuid! }
     it "should look for a local user" do
-      user.should_receive(:first).with(hash_including(conditions: ['identity_url LIKE ?', '%some-uuid'])).and_return(true)
+      expect(User).to receive(:where).and_return([@user])
       user.find_local_or_remote_by_uuid!('some-uuid')
     end
     
     context "when local user doesn't exist" do
       let(:new_user) { mock('new user', :save! => true) }
       before { 
-        user.stub(:first).and_return(nil) 
+        user.stub(:where).and_return([]) 
         user.stub(:build_from_identity).and_return(new_user)
       }
       
@@ -127,7 +127,7 @@ describe DisiidUser do
     
     context "when local user exists" do
       let(:existing_user) { mock('existing user') }
-      before { user.stub(:first).and_return(existing_user) }
+      before { user.stub(:where).and_return([existing_user]) }
       
       it "should not fetch from remote" do
         DisiidUser::RemoteUser.should_not_receive(:exists?)

data/spec/stub_user.rb

@@ -23,13 +23,11 @@ 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
@@ -37,28 +35,11 @@ module ActiveResource
   class Connection
     # taps into ActiveRecord to read data from stub files
     # instead of doing a real HTTP request
-##    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
-    
-#    # 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
+    
+    # stubs PUT request so to not do it for real
 #    def put(path, payload, headers)
 #      read_from_file(path)
 #    rescue; raise ActiveResource::ResourceNotFound; end
@@ -66,28 +47,18 @@ module ActiveResource
     private 
     
     def read_from_file(fake_url_path)
-#      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}"
+      if matched = /users\.(xml|json)/.match(fake_url_path)
+        filename = "#{File.dirname(__FILE__)}/users.#{matched[1]}"
       else
-        filename = "#{File.dirname(__FILE__)}/#{fake_url_path.split("?")[0].sub(/^\//, '')}"
+        # /collection_name/uuid?query
+        record = /\/[^\/]+\/([^\/\?]+)/.match(fake_url_path)[1]
+        # record string includes .xml or .json too
+        filename = "#{File.dirname(__FILE__)}/#{record}".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
-      { :body => /3\.1/.match(ActiveResource::VERSION::STRING) ? FakeResponse.new(data) : format.decode(data) }
+      /3\.1/.match(ActiveResource::VERSION::STRING) ? FakeResponse.new(data) : format.decode(data)
     end
   end
 end
@@ -103,4 +74,3 @@ module Rails
   def self.cache; StubCache; end
 end
 
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: disiid_user
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Danilo Severina
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec