plate_api 1.1.8 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09bf65656de8336735c86096cbce1c5c951523f6b7cfa0d55ef6ed43dbeb1d78'
-  data.tar.gz: 7145e01a452dbfdb604d83f5d660587fc6deaef70fa98f0b61fcc1c21dfc9137
+  metadata.gz: 947c12da1663740de9378f1c065f158630eef3a7cccc901b728f523db3777194
+  data.tar.gz: 9c5e26eb8a8e70a7eca3b9511e38e649be72933a52975bcc793d6d79e4268d93
 SHA512:
-  metadata.gz: cdad0d6cfd4dee24ff415c3a781eb70d43c3141c340a2526f3cb22cb3748cd7bdf2a9de0151930454b106ea8ce9079f3b8e915e92730e07c00035f0b7d042f40
-  data.tar.gz: 8819d44883e6ca4be2c1c1a2a657ad76a326c2ddd38d79dced69ab9fd284eff210bd283ac4fa72a07460e93afcf14b69e1434a9514d2019802271893c9c46586
+  metadata.gz: 7f0e809ce4944a826e2c4ddf3e085e87ceb96e76a7cf96fa9261e24e27da78d3773abea76c93a8e24ee89fb6a9ba28bd8efa9249d5289248a3fd5df2f6796280
+  data.tar.gz: 736048b6087f9c42f0d246d0dc6f5b39d9c09f3dc08957056a47ca2f4c4079c11574691387dace9428fb692c829d7df3c30c41a0880b6b314ba7dfec2896a681

data/.travis.yml

@@ -6,7 +6,7 @@ sudo: false
 language: ruby
 rvm:
   - 2.5.1
-before_install: gem install bundler -v 1.16.1
+before_install: gem install bundler -v 2.1.4
 before_script:
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
   - chmod +x ./cc-test-reporter

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    plate_api (1.1.8)
+    plate_api (1.2.4)
       faraday (~> 1.0.1)
-      mimemagic (~> 0.3.3)
+      mime-types (~> 3.3.1)
 
 GEM
   remote: https://rubygems.org/
@@ -30,7 +30,9 @@ GEM
     hashdiff (1.0.1)
     i18n (1.8.2)
       concurrent-ruby (~> 1.0)
-    mimemagic (0.3.5)
+    mime-types (3.3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2021.0225)
     minitest (5.14.1)
     multipart-post (2.1.1)
     public_suffix (4.0.5)

data/lib/plate_api.rb

@@ -9,6 +9,7 @@ require "plate_api/delete_request"
 require "plate_api/post_request"
 require "plate_api/post_multipart_request"
 require "plate_api/put_request"
+require "plate_api/error"
 
 
 module PlateApi

data/lib/plate_api/error.rb

@@ -0,0 +1,5 @@
+module Error
+  class Response < StandardError
+
+  end
+end

data/lib/plate_api/object_handler.rb

@@ -5,39 +5,37 @@ module PlateApi
     attr_reader :handling_class
 
     def initialize(handling_class, api_connector)
-      raise ArgumentError.new("`handling_class` given for #new is not valid") unless handling_class
-      raise ArgumentError.new("`api_connector` given for #new is not valid") unless api_connector
+      raise ArgumentError, "`handling_class` given for #new is not valid" unless handling_class
+      raise ArgumentError, "`api_connector` given for #new is not valid" unless api_connector
       @handling_class = handling_class
       @api_connector = api_connector
     end
 
     def find(id)
-      raise ArgumentError.new("`id` given for #find is not valid") unless id
+      raise ArgumentError, "`id` given for #find is not valid" unless id
       result = @api_connector.get(resource_path(id))
       if result["data"]
         return new_object(result["data"])
       else
-        puts "PlateApi: No success: #{result}"
-        return nil
+        raise Error::Response, result
       end
     end
 
     def update(id, attributes)
-      raise ArgumentError.new("`id` given for #update is not valid") unless id
-      raise ArgumentError.new("`attributes` given for #update is not valid") unless attributes.is_a? Hash
+      raise ArgumentError, "`id` given for #update is not valid" unless id
+      raise ArgumentError, "`attributes` given for #update is not valid" unless attributes.is_a? Hash
       result = @api_connector.put(resource_path(id), {"data" => attributes})
 
       if result["data"]
         return new_object(result["data"])
       else
-        puts "PlateApi: No success: #{result}"
-        return nil
+        raise Error::Response, result
       end
     end
 
     def create(parent, attributes, create_method=:post)
-      raise ArgumentError.new("`parent` given for #create is not valid") unless parent
-      raise ArgumentError.new("`attributes` given for #create is not valid") unless attributes.is_a? Hash
+      raise ArgumentError, "`parent` given for #create is not valid" unless parent
+      raise ArgumentError, "`attributes` given for #create is not valid" unless attributes.is_a? Hash
       parameters = case create_method
       when :post
         {"data" => attributes}
@@ -50,32 +48,29 @@ module PlateApi
       if result["data"]
         return new_object(result["data"])
       else
-        puts "PlateApi: No success: #{result}"
-        return nil
+        raise Error::Response, result
       end
     end
 
     def delete(id)
-      raise ArgumentError.new("`id` given for #find is not valid") unless id
+      raise ArgumentError, "`id` given for #find is not valid" unless id
       result = @api_connector.delete(resource_path(id))
       if result["data"]
         return new_object(result["data"])
       else
-        puts "PlateApi: No success: #{result}"
-        return nil
+        raise Error::Response, result
       end
     end
 
     def index(parent_class, parent_id, extra_params={})
-      raise ArgumentError.new("`parent_id` given for #index is not valid") unless parent_id
-      raise ArgumentError.new("`parent_class` given for #index is not valid") unless parent_class
+      raise ArgumentError, "`parent_id` given for #index is not valid" unless parent_id
+      raise ArgumentError, "`parent_class` given for #index is not valid" unless parent_class
 
       result = @api_connector.get(collection_path(parent_class, parent_id), extra_params)
       if result["data"]
         return result["data"].map{|x| new_object(x)}
       else
-        puts "PlateApi: No success: #{result}"
-        return nil
+        raise Error::Response, result
       end
     end
 
@@ -84,8 +79,7 @@ module PlateApi
       if result["meta"]
         return result["meta"]["pagination"]["total_records"]
       else
-        puts "PlateApi: No success: #{result}"
-        return nil
+        raise Error::Response, result
       end
     end
 
@@ -107,7 +101,7 @@ module PlateApi
 
     def collection_path(parent_class=nil, parent_id=nil)
       if (parent_class != nil) ^ (parent_id != nil)
-        raise ArgumentError.new("An invalid combination `parent_class` and `parent_id` is given. Provide both or none.")
+        raise ArgumentError, "An invalid combination `parent_class` and `parent_id` is given. Provide both or none."
       end
 
       if parent_class

data/lib/plate_api/post_multipart_request.rb

@@ -1,11 +1,8 @@
-require 'mimemagic'
-
 module PlateApi
   class PostMultipartRequest < Request
     HttpAdapter = :net_http
-    MimeMagic.add('image/jpeg', extensions: "jfif")
 
-    def initialize(public_key, secret, path, parameters={}, custom_server=nil)
+    def initialize(public_key, secret, path, parameters = {}, custom_server = nil)
       super(public_key, secret, "POST", path, custom_server)
 
       @post_parameters = map_parameters(parameters)
@@ -13,19 +10,32 @@ module PlateApi
 
     def extra_builder_options(builder)
       builder.request :multipart
-	    builder.request :url_encoded
+      builder.request :url_encoded
     end
 
     def extra_request_options(request)
       request.body = @post_parameters
     end
 
+    def mime_type(full_path)
+      begin
+        IO.popen(["file", "--brief", "--mime-type", full_path], in: :close, err: :close) { |io| io.read.chomp }
+      rescue SystemCallError
+        # determine mime_type based on extension as a fallback, in case `file` is not installed on the client machine
+        mime_type_fallback(full_path)
+      end
+    end
+
+    def mime_type_fallback(full_path)
+      MIME::Types.type_for(full_path).first.content_type
+    end
+
     def map_parameters(parameters)
       parameters.keys.each do |key|
         val = parameters[key]
         if val.is_a? File
           full_path = File.expand_path(val)
-          mime_type = MimeMagic.by_path(full_path).type
+          mime_type = mime_type(full_path)
           parameters[key] = Faraday::UploadIO.new(full_path, mime_type)
         end
       end

data/lib/plate_api/request.rb

@@ -1,22 +1,22 @@
 require "faraday"
 # require 'faraday_middleware'
-require 'time'
+require "time"
 require "base64"
 require "openssl"
 require "json"
-
+require "mime-types"
 
 module PlateApi
   class Request
     DefaultApiBaseEndpoint = "https://www.startwithplate.com/api/v2"
     HttpAdapter = Faraday.default_adapter
 
-    def initialize(public_key, secret, method, path, custom_server=nil)
+    def initialize(public_key, secret, method, path, custom_server = nil)
       base_api_endpoint = custom_server ? custom_server : DefaultApiBaseEndpoint
 
       @connection = ::Faraday.new(url: base_api_endpoint) do |faraday|
         extra_builder_options(faraday)
-        faraday.adapter     HttpAdapter
+        faraday.adapter HttpAdapter
       end
 
       @public_key = public_key
@@ -25,20 +25,20 @@ module PlateApi
       @path = strip_path(path)
     end
 
-    def execute(response_type=:raw)
+    def execute(response_type = :raw)
       response = @connection.send(@method.downcase) do |request|
         request.url url_path
-        request.headers['Date'] = request_date
-        request.headers['Authorization'] = calculate_signature
+        request.headers["Date"] = request_date
+        request.headers["Authorization"] = calculate_signature
         extra_request_options(request)
       end
 
       return case response_type
-      when :raw
-        return response.body
-      when :json
-        return JSON.parse(response.body)
-      end
+             when :raw
+               return response.body
+             when :json
+               return JSON.parse(response.body)
+             end
     end
 
     def request_date
@@ -72,7 +72,7 @@ module PlateApi
     end
 
     def strip_path(path)
-      path.gsub(/^\/|\/$/, '')
+      path.gsub(/^\/|\/$/, "")
     end
   end
 end

data/lib/plate_api/version.rb

@@ -1,3 +1,3 @@
 module PlateApi
-  VERSION = "1.1.8"
+  VERSION = "1.2.4"
 end

data/plate_api.gemspec

@@ -1,20 +1,19 @@
-
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "plate_api/version"
 
 Gem::Specification.new do |spec|
-  spec.name        = 'plate_api'
-  spec.version     = PlateApi::VERSION
-  spec.date        = '2019-01-05'
-  spec.summary     = "Connector for the Plate API"
+  spec.name = "plate_api"
+  spec.version = PlateApi::VERSION
+  spec.date = "2019-01-05"
+  spec.summary = "Connector for the Plate API"
   spec.description = "This gem can be used to connect to the Plate API. It takes care 
   of the authentication procedure. It also provides a basic wrapper around the Plate API,
   so objects in Plate can be manipulated as local objects."
-  spec.authors     = ["David Kortleven", "Harmen Fuite"]
-  spec.email       = ['david@getplate.com', 'harmen@getplate.com']
-  spec.files       = ["lib/plate_api.rb"]
-  spec.license       = 'MIT'
+  spec.authors = ["David Kortleven", "Harmen Fuite"]
+  spec.email = ["david@getplate.com", "harmen@getplate.com"]
+  spec.files = ["lib/plate_api.rb"]
+  spec.license = "MIT"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
@@ -22,19 +21,20 @@ Gem::Specification.new do |spec|
     spec.metadata["allowed_push_host"] = "https://rubygems.org"
   else
     raise "RubyGems 2.0 or newer is required to protect against " \
-      "public gem pushes."
+          "public gem pushes."
   end
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_dependency "faraday", "~> 1.0.1"
+  spec.add_dependency "mime-types", "~> 3.3.1"
   # spec.add_dependency "faraday_middleware", "~> 0.13.1"
-  spec.add_dependency "mimemagic", "~> 0.3.3"
+  # spec.add_dependency "mimemagic", "~> 0.3.10"
 
   spec.add_development_dependency "bundler", "~> 2.1.4"
   spec.add_development_dependency "rake", "~> 13.0"
@@ -44,5 +44,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "simplecov-console"
   spec.add_development_dependency "byebug"
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plate_api
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.2.4
 platform: ruby
 authors:
 - David Kortleven
@@ -26,19 +26,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.1
 - !ruby/object:Gem::Dependency
-  name: mimemagic
+  name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 3.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 3.3.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -175,6 +175,7 @@ files:
 - lib/plate_api.rb
 - lib/plate_api/connector.rb
 - lib/plate_api/delete_request.rb
+- lib/plate_api/error.rb
 - lib/plate_api/get_request.rb
 - lib/plate_api/object_handler.rb
 - lib/plate_api/plate_object/attachment.rb