plate_api 1.1.5 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 241acd37c44f327c4a66c225d00d0d85945924a81fa8dd84b4560d3c5ec35889
-  data.tar.gz: 5573a6e2cdb622e6aaf50126649cf6cb41d21932e3eb774693f95f6942fc8f65
+  metadata.gz: 251666f577ba0ea7439b6dfa90acfe15e9ac7724a827a8133f4eaf092124d109
+  data.tar.gz: a4e9c0676b64b4e324826864045cd09ba1b3e5ef68d4f6ed1b58821b136f54dd
 SHA512:
-  metadata.gz: c87dab560422762e7bfcfc62f8b8622c264954e7f4d4bbfb2c8f4c275981c17ab5a0af65b144bc7b4abc6c65c1533e29eaf73af5916df3b2fffa9d4a3cc704e7
-  data.tar.gz: 2717dc00e02a3432eea125d0ff8409c12b4a3a406fe596f549752428103764dda74636c38a8efe77a7bcfb269356842b47ff4ebe7e8656912430ae9828291b20
+  metadata.gz: a691fd2429453636ebb4f0c4fbe3aa1498a2550374f5eb220ba25135dc3580d95a4e34f074e4c948b6e5a326505c0a82e17fe928b2a0ac05d0cbb1556c307879
+  data.tar.gz: '09a484411bf28eb37862f11b514ae3e43385b904bad989fa448cb5174ef1b3ea2793c4289186d9b4b0de5eceb37a249fbcebc15d5ac885499eda6e309040b65f'

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

@@ -1,6 +1,5 @@
-source "https://rubygems.org"
+# frozen_string_literal: true
 
-# git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+source "https://rubygems.org"
 
-# Specify your gem's dependencies in plate_api.gemspec
-gemspec
+gemspec

data/Gemfile.lock

@@ -1,88 +1,85 @@
 PATH
   remote: .
   specs:
-    plate_api (1.1.5)
-      faraday (~> 0.15.4)
-      faraday_middleware (~> 0.13.1)
-      mimemagic (~> 0.3.3)
+    plate_api (1.2.2)
+      faraday (~> 1.0.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.2)
+    activesupport (6.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     ansi (1.5.0)
-    byebug (11.0.0)
-    concurrent-ruby (1.1.4)
+    byebug (11.1.3)
+    concurrent-ruby (1.1.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
-    docile (1.3.1)
-    factory_bot (5.0.1)
+    docile (1.3.2)
+    factory_bot (5.0.2)
       activesupport (>= 4.2.0)
-    faraday (0.15.4)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.13.1)
-      faraday (>= 0.7.4, < 1.0)
-    hashdiff (0.3.8)
-    hirb (0.7.3)
-    i18n (1.5.3)
+    hashdiff (1.0.1)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
-    json (2.1.0)
-    mimemagic (0.3.4)
-    minitest (5.11.3)
+    minitest (5.14.1)
     multipart-post (2.1.1)
-    public_suffix (3.0.3)
-    rake (10.5.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    public_suffix (4.0.5)
+    rake (13.0.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
     safe_yaml (1.0.5)
-    simplecov (0.16.1)
+    simplecov (0.18.5)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-console (0.4.2)
+      simplecov-html (~> 0.11)
+    simplecov-console (0.7.2)
       ansi
-      hirb
       simplecov
-    simplecov-html (0.10.2)
+      terminal-table
+    simplecov-html (0.12.2)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    webmock (3.5.1)
+    unicode-display_width (1.7.0)
+    webmock (3.8.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-      hashdiff
+      hashdiff (>= 0.4.0, < 2.0.0)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 2.1.4)
   byebug
   factory_bot (~> 5.0.1)
   plate_api!
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
   simplecov
   simplecov-console
   webmock (~> 3.0)
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

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/connector.rb

@@ -44,6 +44,7 @@ module PlateApi
         rows: PlateApi::PlateObject::Row,
         columns: PlateApi::PlateObject::Column,
         elements: PlateApi::PlateObject::Element,
+        content_objects: PlateApi::PlateObject::ContentObject,
         attachments: PlateApi::PlateObject::Attachment
       }
     end

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/plate_object/content_object.rb

@@ -0,0 +1,15 @@
+module PlateApi::PlateObject
+  class ContentObject < Base
+
+    has_one :site_translation, "PlateApi::PlateObject::SiteTranslation"
+
+    def self.api_name
+      "content_objects"
+    end
+
+    def self.parent_class
+      SiteTranslation
+    end
+
+  end
+end

data/lib/plate_api/plate_object/site.rb

@@ -9,6 +9,7 @@ module PlateApi::PlateObject
     has_many :rows, :row, "PlateApi::PlateObject::Row"
     has_many :columns, :column, "PlateApi::PlateObject::Column"
     has_many :elements, :element, "PlateApi::PlateObject::Element"
+    has_many :content_objects, :content_object, "PlateApi::PlateObject::ContentObject"
     has_many :attachment_folders, :attachment_folder, "PlateApi::PlateObject::AttachmentFolder"
     has_many :attachments, :attachment, "PlateApi::PlateObject::Attachment"
 

data/lib/plate_api/plate_object/site_translations.rb

@@ -7,6 +7,7 @@ module PlateApi::PlateObject
     has_many :rows, :row, "PlateApi::PlateObject::Row"
     has_many :columns, :column, "PlateApi::PlateObject::Column"
     has_many :elements, :element, "PlateApi::PlateObject::Element"
+    has_many :content_objects, :content_object, "PlateApi::PlateObject::ContentObject"
 
     def self.api_name
       "site_translations"

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,23 @@ 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)
+      IO.popen(["file", "--brief", "--mime-type", full_path], in: :close, err: :close) { |io| io.read.chomp }
+    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 = self.mime_type(full_path)
           parameters[key] = Faraday::UploadIO.new(full_path, mime_type)
         end
       end

data/lib/plate_api/request.rb

@@ -1,5 +1,5 @@
 require "faraday"
-require 'faraday_middleware'
+# require 'faraday_middleware'
 require 'time'
 require "base64"
 require "openssl"

data/lib/plate_api/version.rb

@@ -1,3 +1,3 @@
 module PlateApi
-  VERSION = "1.1.5"
+  VERSION = "1.2.2"
 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,27 +21,26 @@ 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", "~> 0.15.4"
-  spec.add_dependency "faraday_middleware", "~> 0.13.1"
-  spec.add_dependency "mimemagic", "~> 0.3.3"
+  spec.add_dependency "faraday", "~> 1.0.1"
+  # spec.add_dependency "faraday_middleware", "~> 0.13.1"
+  # spec.add_dependency "mimemagic", "~> 0.3.10"
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2.1.4"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "webmock", "~> 3.0"
   spec.add_development_dependency "factory_bot", "~> 5.0.1"
   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.5
+  version: 1.2.2
 platform: ruby
 authors:
 - David Kortleven
@@ -17,70 +17,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.4
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.4
-- !ruby/object:Gem::Dependency
-  name: faraday_middleware
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.13.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.13.1
-- !ruby/object:Gem::Dependency
-  name: mimemagic
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -189,6 +161,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
@@ -196,6 +169,7 @@ files:
 - lib/plate_api/plate_object/base.rb
 - lib/plate_api/plate_object/column.rb
 - lib/plate_api/plate_object/company.rb
+- lib/plate_api/plate_object/content_object.rb
 - lib/plate_api/plate_object/element.rb
 - lib/plate_api/plate_object/partner.rb
 - lib/plate_api/plate_object/post.rb
@@ -230,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Connector for the Plate API