emojidex 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9a0a7030ddea5f1db4f22841a0abf07236d1092
-  data.tar.gz: 587a65ce35b88e0cc5e6d79f158b7e8c467abcbb
+  metadata.gz: 648e55c77ad697bef35fb98a1cd651781a530428
+  data.tar.gz: 201f1b2592e3a3fca196ade4736da7c5b4a3c2b4
 SHA512:
-  metadata.gz: cad92f427bf8968bd1dc181bffbdbecd964f11187851f9aeb5ab5039628db47b372f9bf0643e965d520846d4894914a1ba74e853d67017a8c38963048bfe1704
-  data.tar.gz: 3b5c9512c07b1700156cb9813387977b1805e167dd495a2e02f60c20d9f3dbaf2178151dd6a51a57184cd3e8dec86e5e800b89e69bd05c9470ebbc3ffc31caf8
+  metadata.gz: 674d45345806698569d741718e819e4e76a44de615ba30a02ae2e05b236ee9c9cfe06e88b20e8310c51492d2127622194dd5b693a8c76aa620f1c21bee2bd938
+  data.tar.gz: 321aa8d0fb717b48230b2414615346ee43d8c3ce00565af5c0d0659cf05e616acf5d64dc92ea770e187bcb48fee4a526786644413eb72834a334b6852935f7be

data/emojidex.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'emojidex'
-  s.version     = '0.5.1'
+  s.version     = '0.5.2'
   s.license     = 'emojiOL'
   s.summary     = 'emojidex Ruby tools'
   s.description = 'emojidex emoji handling, search and lookup, listing and caching functionality' \
@@ -15,7 +15,8 @@ Gem::Specification.new do |s|
                   ['emojidex.gemspec']
   s.require_paths = ['lib']
 
-  s.add_dependency 'faraday', '~> 0.10', '~> 0.10.1'
-  s.add_dependency 'faraday_middleware', '~> 0.10', '~> 0.10.1'
-  s.add_dependency 'typhoeus', '~> 1.1', '~> 1.1.2'
+  s.add_dependency 'faraday', '~> 0.13', '~> 0.13.1'
+  s.add_dependency 'faraday_middleware', '~> 0.12', '~> 0.12.2'
+  s.add_dependency 'typhoeus', '~> 1.3', '~> 1.3.0'
+  s.add_dependency 'msgpack', '~> 1.2'
 end

data/lib/emojidex/service/indexes.rb

@@ -47,7 +47,7 @@ module Emojidex
       #   the emoji short codes in the locale [language] specified (defaults to english).
       def self.moji_codes(locale = Emojidex::Defaults.lang)
         begin
-          res = Emojidex::Service::Transactor.get('moji_codes', locale: locale)
+          res = Emojidex::Service::Transactor.get('moji_codes.msgpack', locale: locale)
         rescue
           return { moji_string: '', moji_array: [], moji_index: {} }
         end

data/lib/emojidex/service/transactor.rb

@@ -3,6 +3,7 @@ require 'faraday_middleware'
 require 'typhoeus'
 require 'typhoeus/adapters/faraday'
 require 'json'
+require 'msgpack'
 require_relative '../../emojidex'
 require_relative 'error'
 
@@ -30,7 +31,6 @@ module Emojidex
       def self.get(endpoint, params = {})
         response = connect.get(
           "#{api_url}#{URI.encode(endpoint)}", params)
-
         _status_raiser(response)
         _datafy_json(response.body)
       end
@@ -53,6 +53,9 @@ module Emojidex
 
       def self.download(file_subpath)
         connect.get(URI.escape("#{cdn_url}#{file_subpath.tr(' ', '_')}"))
+      rescue Faraday::ConnectionFailed
+        _kludge_certs
+        connect.get(URI.escape("#{cdn_url}#{file_subpath.tr(' ', '_')}"))
       end
 
       def self.connect
@@ -62,10 +65,11 @@ module Emojidex
           #conn.request :retry, max: @@retries, interval: 0.05, interval_randomness: 0.5,
           #              backoff_factor: 2
           # conn.response :logger
+          conn.headers['Accept'] = 'application/msgpack'
           conn.use FaradayMiddleware::FollowRedirects, limit: 5
           conn.adapter :typhoeus #Faraday.default_adapter
         end
-        _kludge_windows if Gem.win_platform?
+        _kludge_certs if Gem.win_platform?
         @@connection
       end
 
@@ -94,20 +98,20 @@ module Emojidex
 
       def self._extract_status_line(response)
         data = _datafy_json(response.body)
-        status_line = (data.key?(:status) ? data[:status] : '')
-        status_line
+        data.fetch(:status, '')
       end
 
       def self._datafy_json(body)
         begin
-          data = JSON.parse(body, symbolize_names: true)
+          body = MessagePack.unpack(body)
+          data = JSON.parse(body.to_json, symbolize_names: true)
         rescue JSON::ParserError
           raise Error::InvalidJSON, 'could not parse JSON'
         end
         data
       end
 
-      def self._kludge_windows
+      def self._kludge_certs
         cert_loc = "#{__dir__}/cacert.pem"
         unless File.exist? cert_loc
           response = @@connection.get('http://curl.haxx.se/ca/cacert.pem')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emojidex
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Rei Kagetsuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-26 00:00:00.000000000 Z
+date: 2017-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,60 +16,74 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.13'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.13'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.13.1
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.12'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.12.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.12'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: msgpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 description: emojidex emoji handling, search and lookup, listing and caching functionality
   and user info (favorites/etc).
 email: info@emojidex.com
@@ -125,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: emojidex Ruby tools