acfs 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53acc88297d3217a5d01db2ce713f935835b05438471fd2b69918029b5480954
-  data.tar.gz: d61a2f4e5014dab37d4e1a857d548df8dfb42afcaba219005556f203ea68da65
+  metadata.gz: 55e1388e9df4207138b2a54f1e9d56c349ac407e52364b849887e9682abfee7e
+  data.tar.gz: ccf1b3550de8f5222988333d14e480ec07742fb0398d3adfb9504be4ca4168b4
 SHA512:
-  metadata.gz: 35f66d3569256b183cb7c78fed7c41f0ce916f41ec081e60696693af8b869d47e797a53474942c4847cefb621e58d3d52ddf629168c63b7b2d558d1db23cf74a
-  data.tar.gz: 5e03be0b16cb469061b55a3c4467a4fa71496925caa086ed5d024ed79aaefdcc568afd970d526c284b08b8db06593f51886d8642f035f78f2ed7f89bd1b8f311
+  metadata.gz: d34c6fd3d4e83e22757633efc72c8d399778b86665f4b5bb6fb46c8d4f93782f996fe307904ac83f9b16701157ecb8418977466cad9d9c5a78c6ea1074e9ddd7
+  data.tar.gz: 3460436cd3a9d61241155658e4c46ef556b69d00fd389aca73c78ca6484b29bac9b3c45a0fd310b41259aba68f8aad55c7ca95a259e18075c2d88b2515bacd52

data/CHANGELOG.md

@@ -14,6 +14,13 @@
 ### Breaks
 
 
+## 1.5.1 - (2020-12-30)
+---
+
+### Changes
+* Revert back to using `::MultiJson`
+
+
 ## 1.5.0 - (2020-06-19)
 ---
 

data/acfs.gemspec

@@ -28,15 +28,9 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'actionpack', '>= 5.2'
   spec.add_runtime_dependency 'activemodel', '>= 5.2'
   spec.add_runtime_dependency 'activesupport', '>= 5.2'
+  spec.add_runtime_dependency 'multi_json', '~> 1.0'
   spec.add_runtime_dependency 'rack'
   spec.add_runtime_dependency 'typhoeus', '~> 1.0'
 
   spec.add_development_dependency 'bundler'
-
-  if ENV['TRAVIS_BUILD_NUMBER'] && !ENV['TRAVIS_TAG']
-    # Append travis build number for auto-releases
-    # rubocop:disable Gemspec/DuplicatedAssignment
-    spec.version = "#{spec.version}.1.b#{ENV['TRAVIS_BUILD_NUMBER']}"
-    # rubocop:enable Gemspec/DuplicatedAssignment
-  end
 end

data/lib/acfs/middleware/json.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'json'
+require 'multi_json'
 
 module Acfs
   module Middleware
@@ -12,11 +12,13 @@ module Acfs
       end
 
       def encode(data)
-        ::JSON.dump data
+        ::MultiJson.dump(data)
       end
 
       def decode(body)
-        ::JSON.load body
+        ::MultiJson.load(body)
+      rescue ::MultiJson::ParseError => e
+        raise ::JSON::ParserError.new(e)
       end
     end
 

data/lib/acfs/resource/attributes.rb

@@ -244,9 +244,9 @@ class Acfs::Resource
         @local_attributes ||= {}
       end
 
-      def define_attribute(name, type, opts = {})
+      def define_attribute(name, type, **opts)
         name      = name.to_s
-        attribute = type.new opts
+        attribute = type.new(**opts)
 
         local_attributes[name] = attribute
         define_attribute_method name

data/lib/acfs/resource/attributes/date_time.rb

@@ -22,7 +22,7 @@ module Acfs::Resource::Attributes
     def cast_value(value)
       if value.blank?
         nil
-      elsif value.acts_like?(:time) || value.acts_like?(:date)
+      elsif !value.is_a?(::String) && value.respond_to?(:to_datetime)
         value.to_datetime
       else
         ::DateTime.iso8601 value

data/lib/acfs/resource/validation.rb

@@ -2,12 +2,6 @@
 
 class Acfs::Resource
   module Validation
-    def valid?(*args)
-      super
-      remote_errors.each {|f, e| errors.add f, e }
-      errors.empty?
-    end
-
     def remote_errors
       @remote_errors ||= ActiveModel::Errors.new self
     end
@@ -35,5 +29,21 @@ class Acfs::Resource
 
       super
     end
+
+    if ::ActiveModel.version >= Gem::Version.new('6.1')
+      def valid?(*args)
+        super
+
+        remote_errors.each {|e| errors.add(e.attribute, e.message) }
+        errors.empty?
+      end
+    else
+      def valid?(*args)
+        super
+
+        remote_errors.each {|f, e| errors.add(f, e) }
+        errors.empty?
+      end
+    end
   end
 end

data/lib/acfs/version.rb

@@ -4,7 +4,7 @@ module Acfs
   module VERSION
     MAJOR = 1
     MINOR = 5
-    PATCH = 0
+    PATCH = 1
     STAGE = nil
 
     STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.')

data/spec/acfs/middleware/json_spec.rb

@@ -28,6 +28,20 @@ describe Acfs::Middleware::JSON do
         expect(JSON.parse(request.body)).to eq data.map(&:stringify_keys)
       end
     end
+
+    context 'with #to_json objects' do
+      let(:data) do
+        Class.new do
+          def to_json(*)
+            '{"a": 1, "b": 2}'
+          end
+        end.new
+      end
+
+      it 'should serialize data with #to_json' do
+        expect(JSON.parse(request.body)).to eq 'a' => 1, 'b' => 2
+      end
+    end
   end
 
   describe 'decode' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acfs
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-19 00:00:00.000000000 Z
+date: 2020-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -214,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: An abstract API base client for service oriented application.