restful-sharepoint 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29ca961a70f6e8c4b1a9a531debcbddeddd5fe4e12989b50155e918a213df993
-  data.tar.gz: 10aaba8bc8970492ffec41aca51674d8b5e4909e89395313c0288ccaee888f2d
+  metadata.gz: 44cef9ce93eb602accca9fff9cc11e3ee4a5a304b4351c7638b7453d6e789cfc
+  data.tar.gz: 950a9322055853209cb87413dd802d3128ec43eac8ab888060bd13940fea1f49
 SHA512:
-  metadata.gz: 4a05b21660334d86019530585a1589b08ede33a826d2f5653f9f03a0e379a18a4b5ed361fed0d5c98e1b2c49739ca49dfa83cf076ac652b91ef0a40c546ede52
-  data.tar.gz: f20ffa94d18cbc9f65ab957081c119811de59ff8436a49fd22c766931f93d6dc0f2c1371215b0049d4b271e6f39fe72f857d0b722d552c922d16204b637900fb
+  metadata.gz: 9094e55c0e4d386192d4afa5df01455f93613e54e85edbc71ccf5628110bb7e323a31134fdc4710d509c136b34763c84e30a8ad24b34cc9a97303db7a5ec8684
+  data.tar.gz: 5468b96644de62e3338495790bc10ed7963fcd4c66a03886de54b9eaae1533651219f1456ffd746dbfc315f02e42657dcb9a0e87c90dec352529065f2353b65a

data/lib/restful-sharepoint/connection.rb

@@ -23,22 +23,25 @@ module RestfulSharePoint
 
     # Path can be either relative to the site URL, or a complete URL itself.
     # Takes an optional `options` hash which are any number of valid OData query options (dollar sign prefix is added automatically)
-    # Also takes an optional block that is provided the HTTPI::Request instance, allowing customisation of the request.
     def request(path, method, options: {}, body: nil)
       url = URI.parse(path).is_a?(URI::HTTP) ? path : "#{@site_url}#{path}"
       options_str = options.map { |k,v| "$#{k}=#{CGI.escape v.to_s}" }.join('&')
       url += "?#{options_str}"
-      req = HTTPI::Request.new(url: url, headers: {'accept' => 'application/json; odata=verbose'})
-      req.auth.ntlm(@username, @password) if @username
+
+      httpclient = HTTPClient.new
+      httpclient.set_auth(nil, @username, @password) if @username
+      httpclient.ssl_config.set_default_paths
+      headers = {'accept' => 'application/json; odata=verbose'}
       if body
-        req.body = JSON.dump(body).gsub('/', '\\/') # SharePoint requires forward slashes be escaped in JSON (WTF!!!)
-        req.headers['Content-Type'] = 'application/json'
-        req.headers['X-HTTP-Method'] = 'MERGE' # TODO: Extend logic to support all operations
-        req.headers['If-Match'] = '*'
+        body = JSON.dump(body).gsub('/', '\\/') # SharePoint requires forward slashes be escaped in JSON (WTF!!!)
+        headers['Content-Type'] = 'application/json'
+        headers['X-HTTP-Method'] = 'MERGE' # TODO: Extend logic to support all operations
+        headers['If-Match'] = '*'
       end
-      yield(req) if block_given?
-      LOG.info "Making HTTP request to: #{req.url.to_s}"
-      response = HTTPI.request(method, req) { |x| x.ssl_config.set_default_paths }
+      
+      LOG.info "Making HTTP request to: #{url}"
+      response = httpclient.request(method, url, nil, body, headers)
+
       if response.body.empty?
         if response.code >= 300
           raise RestError, "Server returned HTTP status #{response.code} with no message body."
@@ -84,7 +87,7 @@ module RestfulSharePoint
     def parse_tree(tree)
       indices = tree.respond_to?(:keys) ? tree.keys : 0...tree.length
       indices.each do |i|
-        if tree[i].respond_to?(:=~) && tree[i] =~ /^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z$/
+        if tree[i].is_a?(String) && tree[i] =~ /^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z$/
           tree[i] = DateTime.parse(tree[i]).new_offset(DateTime.now.offset)
         elsif tree[i].respond_to?(:gsub!)
           # Convert relative paths to absolute URL's.

data/lib/restful-sharepoint/objects/attachment.rb

@@ -3,7 +3,7 @@ module RestfulSharePoint
 
     def endpoint
       url = URI.parse(connection.site_url)
-      url.path = URI.encode(@properties['ServerRelativeUrl'])
+      url.path = Addressable::URI.encode(@properties['ServerRelativeUrl'])
       url.to_s
     end
   end

data/lib/restful-sharepoint/objects/file.rb

@@ -11,7 +11,7 @@ module RestfulSharePoint
 
     def url
       url = URI.parse(connection.site_url)
-      url.path = URI.encode(self['ServerRelativeUrl'])
+      url.path = Addressable::URI.encode(self['ServerRelativeUrl'])
       url.to_s
     end
 

data/lib/restful-sharepoint/objects/list.rb

@@ -3,7 +3,7 @@ module RestfulSharePoint
 
     def self.from_title(title, connection)
       new(connection: connection).tap do |list|
-        list.define_singleton_method(:endpoint) { "/_api/web/lists/getbytitle('#{URI.encode title}')" }
+        list.define_singleton_method(:endpoint) { "/_api/web/lists/getbytitle('#{Addressable::URI.encode title}')" }
       end
     end
 

data/lib/restful-sharepoint/version.rb

@@ -1,3 +1,3 @@
 module RestfulSharePoint
-  VERSION = '0.2.4'
+  VERSION = '0.2.5'
 end

data/lib/restful-sharepoint.rb

@@ -1,13 +1,11 @@
 require 'json'
-require 'httpi'
 require 'httpclient'
+require 'addressable'
 require 'rubyntlm'
 require 'cgi'
 require 'logger'
 require 'forwardable'
 
-HTTPI.adapter = :httpclient
-
 module RestfulSharePoint
   OBJECT_MAP = {
     "SP.Web" => :Web,

data/restful-sharepoint.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new 'restful-sharepoint', RestfulSharePoint::VERSION do |s|
 
   s.required_ruby_version = '>= 2.0.0'
 
-  s.add_dependency 'httpi', '~> 2.4'
   s.add_dependency 'httpclient', '~> 2.8'
   s.add_dependency 'rubyntlm', '~> 0.6'
+  s.add_dependency 'addressable', '~> 2.8'
 end

data/spec/restfulsharepoint_spec.rb

@@ -23,13 +23,13 @@ module RestfulSharePoint
     end
 
     it "can work with an object" do
-      list = Object.new(connection: c, properties: c.get("/_api/web/lists/getbytitle('#{URI.encode CONFIG[:test_list_title]}')"))
+      list = Object.new(connection: c, properties: c.get("/_api/web/lists/getbytitle('#{Addressable::URI.encode CONFIG[:test_list_title]}')"))
       expect(list['Title']).to eq(CONFIG[:test_list_title])
     end
 
     it "can automatically get an object or collection" do
       lists = c.get_as_object('/_api/web/lists/')
-      list = c.get_as_object("/_api/web/lists/getbytitle('#{URI.encode CONFIG[:test_list_title]}')")
+      list = c.get_as_object("/_api/web/lists/getbytitle('#{Addressable::URI.encode CONFIG[:test_list_title]}')")
       expect(lists).to be_a(Collection)
       expect(list).to be_a(Object)
     end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: restful-sharepoint
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Tom Wardrop
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-22 00:00:00.000000000 Z
+date: 2021-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: httpi
+  name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
-  name: httpclient
+  name: rubyntlm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: rubyntlm
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '2.8'
 description: Provides a convenient object model to the OData REST API of SharePoint
   2013 and newer.
 email: tomw@msc.qld.gov.au