restful-sharepoint 0.2.2 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 676e57e07950be0b111e91a9675056ab7f9b3d90c39319dc1e9ac619476e7cec
-  data.tar.gz: 717a90610e1a58b0895eed3fe018f3d99faae5f7947ce1b81797c0e8cf9fe6c1
+  metadata.gz: c2e6bddfc8e8eb4afad9644e4fceb24043d312e04341485462de992153c49cdc
+  data.tar.gz: d476fd5cee073d7b86a966716898ffbd0dd510bca811997d9f93c8d46a45d53e
 SHA512:
-  metadata.gz: e448c10bb59bee93d58725f109f2c5ce8f55ed0b2bae7f27944ae865ec9352f1f133947a948f5fadce119b67c614a844f7f6c1435ac31cab6fafff9c7134a472
-  data.tar.gz: dd7afb07ce1d26484e3f48a070c8dfe28c67de1a52c02481b5a13d70f90d15e0e35ae91a4e4d545c98669402a02b20513dc6c43d7a35c59e1a6dd4cf637ea332
+  metadata.gz: d51978834840b49ea49236b599393d6199a1292ea04eb32e3931a9f69c9d8c645cb50e6776306f70ed3db08297989ce0bd2426ab018f8798422d2d9f81a5674e
+  data.tar.gz: b668f5b57dad92a36aad569443216783d061fb34750ecafe9afe7524b306e65bbf55d7116882a14e7ae9a4c982c1876334ac146ff54636e12a4b3b08c25f1fdf

data/lib/restful-sharepoint/connection.rb

@@ -9,6 +9,10 @@ module RestfulSharePoint
       @username = username
       @password = password
       @debug = debug
+
+      @httpclient = HTTPClient.new
+      @httpclient.set_auth(nil, @username, @password) if @username
+      @httpclient.ssl_config.set_default_paths
     end
 
     attr_reader :site_url
@@ -23,22 +27,22 @@ 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
+      
+      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)
+      
+      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."
@@ -77,7 +81,6 @@ module RestfulSharePoint
 
     def parse(str)
       data = JSON.load(str)
-      ::File.write('parsed.json', JSON.dump(data))
       raise RestError, "(#{data['error']['code']}): #{data['error']['message']['value']}" if data['error']
       parse_tree(data['d'])
     end
@@ -85,7 +88,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.2'
+  VERSION = '0.2.6'
 end

data/lib/restful-sharepoint.rb

@@ -1,10 +1,10 @@
 require 'json'
-require 'httpi'
-require 'curb'
+require 'httpclient'
+require 'addressable'
+require 'rubyntlm'
 require 'cgi'
 require 'logger'
-
-HTTPI.adapter = :curb
+require 'forwardable'
 
 module RestfulSharePoint
   OBJECT_MAP = {

data/restful-sharepoint.gemspec

@@ -9,10 +9,10 @@ Gem::Specification.new 'restful-sharepoint', RestfulSharePoint::VERSION do |s|
   s.homepage          = 'https://github.com/Wardrop/restful-sharepoint'
   s.license           = 'MIT'
   s.files             = Dir.glob(`git ls-files`.split("\n") - %w[.gitignore])
-  s.has_rdoc          = 'yard'
 
   s.required_ruby_version = '>= 2.0.0'
 
-  s.add_dependency 'httpi', '~> 2.4'
-  s.add_dependency 'curb', '~> 0.9'
+  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,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: restful-sharepoint
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.6
 platform: ruby
 authors:
 - Tom Wardrop
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-01 00:00:00.000000000 Z
+date: 2021-09-24 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: curb
+  name: rubyntlm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        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
@@ -85,8 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Provides a convenient object model to the OData REST API of SharePoint 2013