fmrest 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79fff3279b30b2bf4ba228646218abc622366aa97f48b1a60eee06d1cea249c8
-  data.tar.gz: a7b9c8fb36117733176ec355e6e80ef6981ee0e990f1b42fb5721a0baca46ff4
+  metadata.gz: f72f9afbde054df91f3abc73b54752c7c19cca4f4ec1c5299ab6cc2edb8978fb
+  data.tar.gz: 3ff30b1db7976a76783cbe99c14d9224e5477a8f8d3ba68e8df27adb9d547678
 SHA512:
-  metadata.gz: 1e38235d837ddd968164256c78f64bab77ed9464c2f33ee69d4e4f5920d093eeea082b0547f544edc409c5416d470bdd13998b42cb1ac2c501a2f485709ff5a5
-  data.tar.gz: 813305093670cbe0a684f0d63d079e9a5d799373521099d6229cf22a4cf34d3107167ac5a6b8750bf6abd410bc24f89fd84ea7aacf040e696c8196e57d8f21b4
+  metadata.gz: 7aee8096187d1082475e941ae4f4b9509d7b16a8d3f660c0e6989632f1b11ae7d7da5569fd5788862975190810a4dd91643d5f0c66630191bbdea95c2fcd4c7f
+  data.tar.gz: 6775c47687abcf09a0a27e06697deaa90021114559675c82d1189420ee58d5181d8e6cac9d6b20628f468223aaed7e8a075838b06b9a818e68eaf8465eddfc05

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Changelog
 
+### 0.5.2
+
+* Improved support for legacy ActiveModel 4.x
+
 ### 0.5.1
 
 * Alias `:username` option as `:account_name` for ginjo-rfm gem

data/fmrest.gemspec

@@ -29,8 +29,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "spyke"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "pry-byebug"
-  spec.add_development_dependency "activerecord"
-  spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "activerecord", ENV["ACTIVE_RECORD_VERSION"]
+  spec.add_development_dependency "sqlite3", ENV["SQLITE3_VERSION"]
   spec.add_development_dependency "mock_redis"
   spec.add_development_dependency "moneta"
   spec.add_development_dependency "yard"

data/lib/fmrest/spyke/model/attributes.rb

@@ -71,7 +71,16 @@ module FmRest
             # In case of an existing Spyke object return it as is so that we
             # don't accidentally remove dirty data from associations
             return super if attributes_or_object.is_a?(::Spyke::Base)
-            super.tap { |record| record.clear_changes_information }
+            super.tap do |record|
+              # In ActiveModel 4.x #clear_changes_information is a private
+              # method, so we need to call it with send() in that case, but
+              # keep calling it normally for AM5+
+              if record.respond_to?(:clear_changes_information)
+                record.clear_changes_information
+              else
+                record.send(:clear_changes_information)
+              end
+            end
           end
 
           def _fmrest_attribute_methods_container

data/lib/fmrest/spyke/model/orm.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "fmrest/spyke/relation"
+require "fmrest/spyke/validation_error"
 
 module FmRest
   module Spyke
@@ -155,6 +156,14 @@ module FmRest
           self.mod_id = reloaded.mod_id
         end
 
+        # ActiveModel 5+ implements this method, so we only needed if we're in
+        # the older AM4
+        if ActiveModel::VERSION::MAJOR == 4
+          def validate!(context = nil)
+            valid?(context) || raise_validation_error
+          end
+        end
+
         private
 
         def perform_save_validations(context, options)
@@ -190,6 +199,12 @@ module FmRest
             end
           end
         end
+
+        # Overwrite ActiveModel's raise_validation_error to use our own class
+        #
+        def raise_validation_error # :doc:
+          raise(ValidationError.new(self))
+        end
       end
     end
   end

data/lib/fmrest/spyke/validation_error.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module FmRest
+  module Spyke
+    # ActiveModel 4 doesn't include a ValidationError class, which we want to
+    # raise when model.validate! fails.
+    #
+    # In order to break the least amount of code that uses AM5+, while still
+    # supporting AM4 we use this proxy class that inherits from
+    # AM::ValidationError if it's there, or reimplements it otherwise
+    if defined?(::ActiveModel::ValidationError)
+      class ValidationError < ::ActiveModel::ValidationError; end
+    else
+      class ValidationError < StandardError
+        attr_reader :model
+
+        def initialize(model)
+          @model = model
+          errors = @model.errors.full_messages.join(", ")
+          super("Invalid model: #{errors}")
+        end
+      end
+    end
+  end
+end

data/lib/fmrest/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FmRest
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fmrest
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Pedro Carbajal
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-28 00:00:00.000000000 Z
+date: 2020-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -240,6 +240,7 @@ files:
 - lib/fmrest/spyke/model/uri.rb
 - lib/fmrest/spyke/portal.rb
 - lib/fmrest/spyke/relation.rb
+- lib/fmrest/spyke/validation_error.rb
 - lib/fmrest/token_store.rb
 - lib/fmrest/token_store/active_record.rb
 - lib/fmrest/token_store/base.rb