sfrest 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: edf073b0cb0a501406818044613d07af0f2105b2
-  data.tar.gz: b47e8e4f6d1c59ad1f5bd13eadfa675d032500dc
+SHA256:
+  metadata.gz: 08936ab1f2d5f8780cba9b3c74884806896886bd6c26210e3d3f69de44f6f510
+  data.tar.gz: 299199ecf27db665e2dacd3300a0a033251baf26a0964852592fb22a24d5dbf9
 SHA512:
-  metadata.gz: c2835b20da38d1762f099504dd5e7c97e39ee69d29fa3caddd6f1dccdf62ac0c77499e866af7c266752a15a9df3289d002248415b0886f9576c7f0e986e25312
-  data.tar.gz: 27c5cb395231d07733a9cb26e1379a0e8a0972de6fd7827be9e6cf2daba76f3d9b4253ddc30226a52b1bb8434bb0e5b5bff7352e856fa78c9d738025d2ffd342
+  metadata.gz: f76a2ec444911abdaa7c0eaac3d3c2797822f6e79c9b75096d7d7565ddd27151e3be0907779b78f1fc27fe3f0428dd48342f77aa690fbd2deb79cf064003494c
+  data.tar.gz: 5283104b05712b69a454d5a5b5c8e181b90f4168c53c8ce35a436283d61d9fd2b1e2dd35c9ad1e00f1493b90be5f414f57294d5d49573d08c7a89314e4348f3b

data/lib/sfrest/backup.rb

@@ -12,7 +12,7 @@ module SFRest
     def get_backups(site_id, datum = nil)
       current_path = "/api/v1/sites/#{site_id}/backups"
       pb = SFRest::Pathbuilder.new
-      @conn.get URI.parse(URI.encode(pb.build_url_query(current_path, datum))).to_s
+      @conn.get URI.parse(pb.build_url_query(current_path, datum)).to_s
     end
 
     # Deletes a site backup.

data/lib/sfrest/connection.rb

@@ -47,7 +47,6 @@ module SFRest
       begin
         data = access_check JSON(res.body), res.status
         return res.status, data
-
       rescue JSON::ParserError
         return res.status, res.body
       end
@@ -164,7 +163,7 @@ module SFRest
     #
     # If a new class is added, add the accessor to this list.
     # NOTE: accessor == Class_name.to_lower
-    REST_METHODS = %w(audit
+    REST_METHODS = %w[audit
                       backup
                       codebase
                       collection
@@ -179,7 +178,7 @@ module SFRest
                       update
                       usage
                       user
-                      variable).freeze
+                      variable].freeze
 
     REST_METHODS.each do |m|
       define_method(m) do

data/lib/sfrest/pathbuilder.rb

@@ -9,16 +9,9 @@ module SFRest
     def build_url_query(current_path, datum = nil)
       unless datum.nil?
         current_path += '?'
-        datum.each do |key, value|
-          current_path += '&' if needs_new_parameter? current_path
-          current_path += key.to_s + '=' + value.to_s
-        end
+        current_path += URI.encode_www_form datum
       end
       current_path
     end
-
-    private def needs_new_parameter?(path)
-      path[-1, 1] != '?' # if path has '?' then we need to create a new parameter
-    end
   end
 end

data/lib/sfrest/task.rb

@@ -146,7 +146,7 @@ module SFRest
     def find_tasks(datum = nil)
       current_path = '/api/v1/tasks'
       pb = SFRest::Pathbuilder.new
-      @conn.get URI.parse(URI.encode(pb.build_url_query(current_path, datum))).to_s
+      @conn.get URI.parse(pb.build_url_query(current_path, datum)).to_s
     end
 
     # Looks for a task with a specific name

data/lib/sfrest/usage.rb

@@ -38,7 +38,7 @@ module SFRest
     def monthly(stack_id = 1, datum = {})
       datum[stack_id] = stack_id
       current_path = '/api/v1/dynamic-requests/monthly'
-      @conn.get URI.parse(URI.encode(pb.build_url_query(current_path, datum))).to_s
+      @conn.get URI.parse(pb.build_url_query(current_path, datum)).to_s
     end
 
     # returns a Pathbuilder object for manipulating the query parameters

data/lib/sfrest/version.rb

@@ -1,4 +1,4 @@
 module SFRest
   # Just tracks the version of sfrest.
-  VERSION = '0.0.13'.freeze
+  VERSION = '0.0.14'.freeze
 end

data/lib/sfrest.rb

@@ -1,7 +1,7 @@
 # Simple wrappper around RestClient.Resource
-$LOAD_PATH.unshift(File.dirname(__FILE__)) unless
-    $LOAD_PATH.include?(File.dirname(__FILE__)) ||
-    $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__)))
+$LOAD_PATH.unshift(__dir__) unless
+    $LOAD_PATH.include?(__dir__) ||
+    $LOAD_PATH.include?(File.expand_path(__dir__))
 
 require 'excon'
 require 'json'
@@ -52,7 +52,7 @@ module SFRest
   # @param [String] key one of the user data returned (id, name, domain...)
   # @return [Object] Integer, String, Array, Hash depending on the collection data
   def self.find_data_from_results(res, field, datapat, key)
-    data = res.select { |k| !k.to_s.match(/time|count/) }
+    data = res.reject { |k| k.to_s.match(/time|count/) }
     raise InvalidDataError('The data you are searching is not a hash') unless data.is_a?(Hash)
     data.each_value do |datum|
       datum.each do |dat|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sfrest
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - ACSF Engineering
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Acquia Site Factory Rest API.