zenaton 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7939421fd535c9d50c3bc52a475ee7c747d817c535efb6c4f9f73e067ad43c64
-  data.tar.gz: d339d9dd2b93d09d35e65150b0adb02c8034095d68e60530eccc216d0bb9f24e
+  metadata.gz: a6a9c77b434d1e5d39b2360c9d5580653820c9a6ed7d0e4cbecc8adc7e1f6dea
+  data.tar.gz: 4c1ac27216af901b760dd663007f79e6b57b56787fbc2cb6cbc7166eb0173abe
 SHA512:
-  metadata.gz: a95ef6370c230b7abc53c04238d0655f653555b08cc51135c13015cc8c5717d2a59faf01cee4f35781bf2ecb7b53baf9312530c4f05a133ec2f29169debd3a25
-  data.tar.gz: 784fec1e1808ecc5d6444580c278cf6538365b34a2865423b3b9a144d2b27bdbc602f2c5af6f769f19d0a71b0a9881f4a19afaaed04640f15fbec77e20578835
+  metadata.gz: aa0e97fa56d7ddf29855763660213f9fb40eda55af32b91984161fcb8d1b8ee3e2c427b18af86b4c2f47902a52f0777125975eaefe4feb87752882526d42432a
+  data.tar.gz: 7e68f8714d40d9c8fdf52c222dd449c6950e98bf71ab709b0272c1816e871a6a1172537363a72d21d8db0b93d184d63738c476ae9de99c32ba3e49c7552d5872

data/CHANGELOG.md

@@ -0,0 +1,55 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [0.2.3] - 2018-08-13
+### Added
+- Introduce this changelog file.
+
+### Removed
+- Dependency on httparty
+
+## [0.2.2] - 2018-08-10
+### Fixed
+- [Serialization]: Distinct objects, even if equal to one another, now map to
+distinct entries in the data store.
+
+## [0.2.1] - 2018-08-10
+### Added
+- Serializer now handles the same objects as Ruby's built-in JSON library.
+- Instructions on how to use the gem in a Ruby on Rails application.
+
+### Changed
+- Fixed typos and broken links in the readme
+
+## [0.2.0] - 2018-08-08
+### Added
+- New serialization format for array and hashes. Currently running workflows
+should still be able to deserialize data in the old format.
+
+### Fixed
+- Arrays and hashes with circular structures no longer cause infinite loops when
+serializing.
+
+## [0.1.1] - 2018-08-03
+### Added
+- Run test suite against all currently supported ruby versions
+- Readme has a rubygems badge showing the current released version.
+
+### Fixed
+- Serialization should now be working on Ruby 2.3.
+
+## 0.1.0 - 2018-08-03
+### Added
+- Initial release.
+
+[Unreleased]: https://github.com/zenaton/zenaton-ruby/compare/v0.2.3...HEAD
+[0.2.3]: https://github.com/zenaton/zenaton-ruby/compare/v0.2.2...v0.2.3
+[0.2.2]: https://github.com/zenaton/zenaton-ruby/compare/v0.2.1...v0.2.2
+[0.2.1]: https://github.com/zenaton/zenaton-ruby/compare/v0.2.0...v0.2.1
+[0.2.0]: https://github.com/zenaton/zenaton-ruby/compare/v0.1.1...v0.2.0
+[0.1.1]: https://github.com/zenaton/zenaton-ruby/compare/v0.1.0...v0.1.1

data/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: .
   specs:
-    zenaton (0.2.2)
+    zenaton (0.2.3)
       activesupport
-      httparty
       tzinfo-data
 
 GEM
@@ -24,15 +23,12 @@ GEM
     diff-lcs (1.3)
     docile (1.3.1)
     hashdiff (0.3.7)
-    httparty (0.16.2)
-      multi_xml (>= 0.5.2)
     i18n (1.1.0)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.1)
     json (2.1.0)
     method_source (0.9.0)
     minitest (5.11.3)
-    multi_xml (0.6.0)
     parallel (1.12.1)
     parser (2.5.1.2)
       ast (~> 2.4.0)

data/lib/zenaton/services/http.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'httparty'
+require 'net/http'
 require 'zenaton/exceptions'
 
 module Zenaton
@@ -11,12 +11,26 @@ module Zenaton
     # - sets appropriate headers for each request type
     # - translates exceptions into Zenaton specific ones
     class Http
+      # Net::HTTP errors translated into a Zenaton::ConnectionError
+      ALL_NET_HTTP_ERRORS = [
+        Timeout::Error,
+        Errno::EINVAL,
+        Errno::ECONNRESET,
+        EOFError,
+        Net::HTTPBadResponse,
+        Net::HTTPHeaderSyntaxError,
+        Net::ProtocolError
+      ].freeze
+
       # Makes a GET request and sets the correct headers
       #
       # @param url [String] the url for the request
       # @return [Hash] the parsed json response
       def get(url)
-        request(:get, url, default_options)
+        parsed_url = parse_url(url)
+        request = Net::HTTP::Get.new(parsed_url[:uri])
+        set_body_and_headers(request, default_options)
+        make_request(request, parsed_url)
       end
 
       # Makes a POST request with some data and sets the correct headers
@@ -25,7 +39,10 @@ module Zenaton
       # @param body [Hash] the payload to send with the request
       # @return [Hash] the parsed json response
       def post(url, body)
-        request(:post, url, post_options(body))
+        parsed_url = parse_url(url)
+        request = Net::HTTP::Post.new(parsed_url[:uri])
+        set_body_and_headers(request, post_options(body))
+        make_request(request, parsed_url)
       end
 
       # Makes a PUT request with some data and sets the correct headers
@@ -34,25 +51,46 @@ module Zenaton
       # @param body [Hash] the payload to send with the request
       # @return [Hash] the parsed json response
       def put(url, body)
-        request(:put, url, put_options(body))
+        parsed_url = parse_url(url)
+        request = Net::HTTP::Put.new(parsed_url[:uri])
+        set_body_and_headers(request, put_options(body))
+        make_request(request, parsed_url)
       end
 
       private
 
-      def request(verb, url, options)
-        make_request(verb, url, options)
-      rescue SocketError, HTTParty::Error => error
-        raise Zenaton::ConnectionError, error
+      def parse_url(url)
+        uri = URI.parse(url)
+        { uri: uri, use_ssl: uri.scheme == 'https' }
+      end
+
+      def set_body_and_headers(request, options)
+        options[:headers].each do |key, value|
+          request[key] = value
+        end
+        request.body = options[:body].to_json if options[:body]
+      end
+
+      def make_request(request, parsed_url)
+        res = get_response(request, parsed_url)
+        raise Zenaton::InternalError, format_error(res) if errors?(res)
+        JSON.parse(res.body)
+      rescue *ALL_NET_HTTP_ERRORS
+        raise Zenaton::ConnectionError
       end
 
-      def make_request(verb, url, options)
-        response = HTTParty.send(verb, url, options)
-        raise Zenaton::InternalError, format_error(response) if errors? response
-        JSON.parse(response.body)
+      def get_response(request, parsed_url)
+        Net::HTTP.start(
+          parsed_url[:uri].hostname,
+          parsed_url[:uri].port,
+          use_ssl: parsed_url[:use_ssl]
+        ) do |http|
+          http.request(request)
+        end
       end
 
       def errors?(response)
-        response.code >= 400
+        response.code.to_i >= 400
       end
 
       def format_error(response)
@@ -67,7 +105,7 @@ module Zenaton
 
       def post_options(body)
         {
-          body: body.to_json,
+          body: body,
           headers: {
             'Accept' => 'application/json',
             'Content-Type' => 'application/json'

data/lib/zenaton/services/properties.rb

@@ -26,6 +26,7 @@ module Zenaton
         defined?(::BigDecimal) ? ::BigDecimal : nil
       ].compact.freeze
 
+      # Handle blank object instantiation differently for these classes
       NUMERIC_INITIALIATION = [
         ::Rational,
         ::Complex,

data/lib/zenaton/version.rb

@@ -2,5 +2,5 @@
 
 module Zenaton
   # This gem's current version
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/zenaton.gemspec

@@ -23,7 +23,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'activesupport'
-  spec.add_runtime_dependency 'httparty'
   spec.add_runtime_dependency 'tzinfo-data'
 
   spec.add_development_dependency 'bundler', '~> 1.16'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zenaton
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Zenaton
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-10 00:00:00.000000000 Z
+date: 2018-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: tzinfo-data
   requirement: !ruby/object:Gem::Requirement
@@ -204,6 +190,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".yardopts"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock