feat: Upgrade to latest version and upgrade rest client (#2)

Author: bartostefan

Gemfile

@@ -5,3 +5,4 @@ gemspec   # load filepicker_client.gemspec as a gem
 gem 'activesupport'
 gem 'rake'
 gem 'yard'
+gem 'minitest'

filepicker_client.gemspec

@@ -9,5 +9,5 @@ Gem::Specification.new do |s|
   s.files       = ["lib/filepicker_client.rb"]
   s.homepage    = "https://github.com/infowrap/filepicker_client"
 
-  s.add_dependency "rest-client", "~> 1.6"
+  s.add_dependency "rest-client", "~> 2.0"
 end

lib/filepicker_client.rb

@@ -47,7 +47,7 @@ def sign(options={})
     if options[:handle]
       policy['handle'] = options[:handle]
     elsif options[:path]
-      policy['path'] = (options[:path] + '/').gsub /\/+/, '/' # ensure path has a single, trailing '/'
+      policy['path'] = (options[:path] + '/').gsub(/\/+/, '/') # ensure path has a single, trailing '/'
     end
 
     if options[:min_size]
@@ -101,13 +101,15 @@ def file_read_uri_and_expiry(handle, expiry=DEFAULT_POLICY_EXPIRY)
 
     return convert_hash(
       uri: uri,
-      expiry: signage[:policy]['expiry'].to_i
+      expiry: signage[:policy]['expiry'].to_i,
+      signature: signage[:signature],
+      policy: signage[:encoded_policy]
     )
   end
 
   # Store the given file at the given storage path through Filepicker.
-  # @param path [String] Path the file should be organized under in the destination storage
   # @param file [File] File to upload
+  # @param path [String] Path the file should be organized under in the destination storage
   # @param options [Hash] optional additional filepicker.io request params
   # @return [FilepickerClientFile] Object representing the uploaded file in Filepicker
   def store(file, path=nil, options = {})
@@ -138,6 +140,26 @@ def store(file, path=nil, options = {})
     end
   end
 
+  # Store provided string in a file with the provided file name under the target storage path through Filepicker.
+  # @param content [String] Contents of the file which should created in in the destination storage
+  # @param file_name [String] Name that should be given to the file in Filepicker
+  # @param path [String] Path the file should be organized under in the destination storage
+  # @param options [Hash] optional additional filepicker.io request params
+  # @return [FilepickerClientFile] Object representing the uploaded file in Filepicker
+  def store_content(content, file_name, path=nil, options = {})
+    store_file = Tempfile.new(file_name)
+
+    begin
+      store_file.write content
+      store_file.rewind
+
+      return store(store_file, path, options)
+    ensure
+      store_file.close
+      store_file.unlink
+    end
+  end
+
   # Store the file located at the given URL under the target storage path through Filepicker.
   # @param path [String] Path the file should be organized under in the destination storage
   # @param file_url [String] URL to get the file to upload from
@@ -365,7 +387,7 @@ def remove(handle)
   private
 
   def get_fp_resource(uri)
-    resource = RestClient::Resource.new(
+    RestClient::Resource.new(
       uri.to_s,
       verify_ssl: (@filepicker_cert ? OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE),
       ssl_client_cert: @filepicker_cert

test/image.jpeg

@@ -1,8 +1,8 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'tempfile'
 require 'filepicker_client'
 
-class TestFilepickerClient < Test::Unit::TestCase
+class TestFilepickerClient < Minitest::Test
   def setup
     @api_key = ENV['FPAPIKEY']
     @api_secret = ENV['FPAPISECRET']
@@ -16,7 +16,7 @@ def test_file_uri
 
   def test_client_file_client_required
     begin
-      client_file = FilepickerClientFile.new({}, nil)
+      FilepickerClientFile.new({}, nil)
     rescue FilepickerClientError => e
       assert_equal "FilepickerClientFile client required", e.message
       error_fired = true
@@ -25,6 +25,78 @@ def test_client_file_client_required
     assert error_fired, "FilepickerClientFile did not require a client as it should"
   end
 
+  def test_store_string_text_file
+    assert @api_key, "Must set FPAPIKEY for this test"
+    assert @api_secret, "Must set FPAPISECRET for this test"
+
+    client = FilepickerClient.new @api_key, @api_secret
+    content = "test file content\n" * 10
+
+    begin
+      # store
+      file = client.store_content(content, 'filename.txt', 'test')
+
+      # file attributes
+      assert_match(/^filename\.txt/, file.filename)
+
+      #file_uri
+      file_uri = file.file_uri
+      assert_equal "https://www.filepicker.io/api/file/#{file.handle}", file_uri.to_s
+
+      # stat
+      stats = file.stat
+      assert_equal content.length, stats[:size]
+      assert_equal 'text/plain', stats[:mimetype]
+
+      # read
+      downloaded_content = file.read
+      assert_equal content, downloaded_content
+
+      #remove test file
+      assert file.remove
+    rescue Exception => e
+      raise e # reraise to have error reported
+    end
+  end
+
+  def test_store_string_image_file
+    assert @api_key, "Must set FPAPIKEY for this test"
+    assert @api_secret, "Must set FPAPISECRET for this test"
+
+    client = FilepickerClient.new @api_key, @api_secret
+
+    image_file = File.open('test/image.jpeg')
+    content = image_file.read
+
+    begin
+      # store
+      file = client.store_content(content, 'filename.jpeg', 'test')
+
+      # file attributes
+      assert_match(/^filename\.jpeg/, file.filename)
+
+      #file_uri
+      file_uri = file.file_uri
+      assert_equal "https://www.filepicker.io/api/file/#{file.handle}", file_uri.to_s
+
+      # stat
+      stats = file.stat
+      assert_equal image_file.size, stats[:size]
+      assert_equal 'text/plain', stats[:mimetype]
+
+      # read
+      downloaded_content = file.read
+      assert_equal content, downloaded_content
+
+      #remove test file
+      assert file.remove
+    rescue Exception => e
+      raise e # reraise to have error reported
+    end
+  end
+
+
+
   def test_file
     assert @api_key, "Must set FPAPIKEY for this test"
     assert @api_secret, "Must set FPAPISECRET for this test"
@@ -48,7 +120,7 @@ def test_file
       file = client.store(store_file, 'test')
 
       # file attributes
-      assert_match /^test\.txt/, file.filename
+      assert_match(/^test\.txt/, file.filename)
 
       #file_uri
       file_uri = file.file_uri
@@ -65,7 +137,7 @@ def test_file
 
       # store_url
       second_file = client.store_url file.file_read_uri_and_expiry[:uri], 'test'
-      assert_not_equal second_file.handle, file.handle
+      assert(second_file.handle != file.handle)
       assert_equal second_file.read, content
 
       # write