ledger_sync 1.3.5 → 1.4.0

data/lib/ledger_sync/resource_attribute.rb

@@ -36,8 +36,8 @@ module LedgerSync
     def assert_valid(args = {})
       value = args.fetch(:value)
 
-      return if valid_with?(value: value)
-
+      type.assert_valid(value: value)
+    rescue Error::TypeError::ValueClassError
       raise ResourceAttributeError::TypeError.new(
         attribute: self,
         resource_class: resource_class,
@@ -46,7 +46,7 @@ module LedgerSync
     end
 
     def cast(value)
-      type.cast(value)
+      type.cast(value: value)
     end
 
     # This is for ActiveModel::Dirty, since we define @attributes
@@ -61,17 +61,16 @@ module LedgerSync
     end
 
     def valid_with?(value:)
-      type.valid_without_casting?(value: value)
+      type.valid?(value: value)
     end
 
     def value=(val)
-      assert_valid(value: val)
-      @value = type.cast(val)
+      @value = type.cast(value: val)
     end
 
     def will_change?(val)
       assert_valid(value: val)
-      value != type.cast(val)
+      value != type.cast(value: val)
     end
   end
 end

data/lib/ledger_sync/resource_attribute/dirty_mixin.rb

@@ -61,6 +61,10 @@ module LedgerSync
         @mutations_from_database = ActiveModel::ForcedMutationTracker.new(self) # Manually set to expected value
         resource_attributes.references_many.map(&:save)
       end
+
+      def save!
+        save
+      end
     end
   end
 end

data/lib/ledger_sync/resource_attribute/mixin.rb

@@ -36,7 +36,7 @@ module LedgerSync
               resource_attribute.value = val
             end
 
-            serialize attributes: [name]
+            simply_serialize attributes: [name]
           end
         end
 

data/lib/ledger_sync/resource_attribute/reference/many.rb

@@ -7,35 +7,23 @@ module LedgerSync
   class ResourceAttribute
     class Reference
       class Many < Reference
-        class ManyArray
+        class ManyArray < Array
           include ActiveModel::Dirty
 
           ARRAY_METHODS_TO_OVERRIDE_WITH_DIRTY = %w[<< | []= + -].freeze
 
-          delegate  :count,
-                    :each,
-                    :include?,
-                    :map,
-                    to: :value
-
-          attr_accessor :value
-
           define_attribute_methods :value
 
-          def initialize
-            @value = []
-          end
-
           ARRAY_METHODS_TO_OVERRIDE_WITH_DIRTY.each do |array_method|
             define_method(array_method) do |val|
               value_will_change!
-              @value = @value.send(array_method, val)
+              super(val)
             end
           end
 
           def ==(other)
-            return false unless other.is_a?(ManyArray)
-            return false unless other.sorted_fingerprints == sorted_fingerprints
+            return false unless other.is_a?(ManyArray) || other.is_a?(Array)
+            return false unless sorted_fingerprints(other) == sorted_fingerprints
 
             true
           end
@@ -44,8 +32,12 @@ module LedgerSync
             changes_applied
           end
 
-          def sorted_fingerprints
-            value.map(&:fingerprint).sort
+          def sorted_fingerprints(other = nil)
+            (other || self).map(&:fingerprint).sort
+          end
+
+          def value
+            self
           end
         end
 

data/lib/ledger_sync/resource_attribute/reference/one.rb

@@ -13,7 +13,12 @@ module LedgerSync
           end
 
           module ClassMethods
-            def references_one(name, to:)
+            def references_one(name, to: nil)
+              to ||= begin
+                require "ledger_sync/ledgers/#{inferred_client_class.root_key}/resources/#{name}"
+                inferred_client_class.resources[name]
+              end
+
               resource_attribute = ResourceAttribute::Reference::One.new(
                 name: name,
                 resource_class: self,

data/lib/ledger_sync/result.rb

@@ -31,7 +31,7 @@ module LedgerSync
 
       def self.included(base)
         base.class_eval do
-          serialize only: %i[operation resource response]
+          simply_serialize only: %i[operation resource response]
         end
       end
 
@@ -64,7 +64,7 @@ module LedgerSync
       def self.included(base)
         base.class_eval do
           # TODO: removed next and previous searcher, because it causes a string of them.  We should add next_searcher_params which would be easier to serialize.
-          serialize only: %i[resources searcher]
+          simply_serialize only: %i[resources searcher]
         end
       end
 
@@ -100,7 +100,7 @@ module LedgerSync
 
       def self.included(base)
         base.class_eval do
-          serialize only: %i[validator]
+          simply_serialize only: %i[validator]
         end
       end
 

data/lib/ledger_sync/serialization/attribute.rb

@@ -3,10 +3,11 @@
 Gem.find_files('ledger_sync/serialization/type/**/*.rb').each { |path| require path }
 
 module LedgerSync
-  class Serialization
+  module Serialization
     class Attribute
       attr_reader :block,
                   :hash_attribute,
+                  :if_method,
                   :resource_attribute,
                   :resource_class,
                   :type
@@ -16,7 +17,8 @@ module LedgerSync
         @hash_attribute     = args.fetch(:hash_attribute, nil).try(:to_s)
         @resource_attribute = args.fetch(:resource_attribute, nil).try(:to_s)
         @resource_class     = args.fetch(:resource_class, nil)
-        @type               = args.fetch(:type, nil) || Type::ValueType.new
+        @type               = args.fetch(:type, nil) || LedgerSync::Type::Value.new
+        @if_method          = args.fetch(:if, nil)
       end
 
       def block_value_for(args = {})
@@ -31,14 +33,6 @@ module LedgerSync
         references_many? || references_one?
       end
 
-      def references_many?
-        type.is_a?(Type::ReferencesManyType)
-      end
-
-      def references_one?
-        type.is_a?(Type::ReferencesOneType)
-      end
-
       def resource_attribute_dot_parts
         @resource_attribute_dot_parts ||= resource_attribute.split('.')
       end

data/lib/ledger_sync/serialization/attribute_set_mixin.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module LedgerSync
-  class Serialization
+  module Serialization
     module AttributeSetMixin
       include Util::Mixins::DelegateIterableMethodsMixin
 

data/lib/ledger_sync/serialization/deserializer_attribute.rb

@@ -3,30 +3,48 @@
 require_relative 'attribute'
 
 module LedgerSync
-  class Serialization
+  module Serialization
     class DeserializerAttribute < Attribute
       def initialize(args = {})
         super
 
         raise 'Missing resource_attribute' if resource_attribute.blank?
-        raise 'block and hash_attribute cannot both be present' unless block.nil? || hash_attribute.nil?
+
+        if block.present?
+          raise 'block and hash_attribute cannot both be present' if hash_attribute.present?
+        else
+          @hash_attribute ||= resource_attribute
+        end
+      end
+
+      def references_many?
+        type.is_a?(Type::DeserializerReferencesManyType)
+      end
+
+      def references_one?
+        type.is_a?(Type::DeserializerReferencesOneType)
       end
 
       def value_from_hash(hash:, resource:)
-        value = hash.dig(*hash_attribute.split('.'))
+        return block_value_for(hash: hash) if block.present?
 
-        value = type.convert(value: value)
+        value = hash.dig(*hash_attribute.split('.'))
 
-        return value if resource_attribute_dot_parts.count <= 1
+        if type.is_a?(Type::DeserializerType)
+          type.cast(deserializer_attribute: self, resource: resource, value: value)
+        else
+          value = type.cast(value: value)
+          return value if resource_attribute_dot_parts.count <= 1
 
-        nested_resource = resource.send(resource_attribute_dot_parts.first)
-        nested_resource ||= resource_attribute_class(resource: resource).new
+          nested_resource = resource.send(resource_attribute_dot_parts.first)
+          nested_resource ||= resource_attribute_class(resource: resource).new
 
-        build_resource_value_from_nested_attributes(
-          nested_resource,
-          value,
-          resource_attribute_dot_parts[1..-1]
-        )
+          build_resource_value_from_nested_attributes(
+            nested_resource,
+            value,
+            resource_attribute_dot_parts[1..-1]
+          )
+        end
       end
 
       private

data/lib/ledger_sync/serialization/deserializer_attribute_set.rb

@@ -3,7 +3,7 @@
 require_relative 'attribute_set_mixin'
 
 module LedgerSync
-  class Serialization
+  module Serialization
     class DeserializerAttributeSet
       include AttributeSetMixin
 

data/lib/ledger_sync/serialization/mixin.rb

@@ -3,9 +3,10 @@
 Gem.find_files('ledger_sync/type/**/*.rb').each { |path| require path }
 require_relative 'attribute'
 require_relative 'attribute_set_mixin'
+require_relative '../ledgers/mixins/infer_serializer_mixin'
 
 module LedgerSync
-  class Serialization
+  module Serialization
     module Mixin
       module ClassMethods
         #
@@ -25,19 +26,12 @@ module LedgerSync
           raise NotImplementedError
         end
 
-        def references_many(args = {})
-          _attribute(
+        def mapping(destination_attribute, args = {})
+          attribute(
+            destination_attribute,
             {
-              type: Type::ReferencesManyType.new(serializer: self)
-            }.merge(args)
-          )
-        end
-
-        def references_one(args = {})
-          _attribute(
-            {
-              type: Type::ReferencesOneType.new(serializer: self)
-            }.merge(args)
+              type: Type::MappingType.new(hash: args.fetch(:hash))
+            }.merge(args.except(:hash))
           )
         end
 
@@ -47,15 +41,17 @@ module LedgerSync
 
         def _build_attribute(args)
           block              = args.fetch(:block, nil)
-          hash_attribute     = args.fetch(:hash_attribute)
+          hash_attribute     = args.fetch(:hash_attribute, nil)
           resource_attribute = args.fetch(:resource_attribute, nil)
           resource_class     = args.fetch(:resource_class, nil)
           serializer         = args.fetch(:serializer, nil)
           type               = args.fetch(:type, nil)
+          if_method          = args.fetch(:if, nil)
 
           attribute_class.new(
             block: block,
             hash_attribute: hash_attribute,
+            if: if_method,
             resource_attribute: resource_attribute,
             resource_class: resource_class,
             serializer: serializer,
@@ -66,6 +62,8 @@ module LedgerSync
 
       def self.included(base)
         base.extend(ClassMethods)
+        base.include(LedgerSync::Ledgers::Mixins::InferSerializerMixin)
+        base.include(SimplySerializable::Mixin)
       end
     end
   end

data/lib/ledger_sync/serialization/serializer_attribute.rb

@@ -3,13 +3,18 @@
 require_relative 'attribute'
 
 module LedgerSync
-  class Serialization
+  module Serialization
     class SerializerAttribute < Attribute
       def initialize(args = {})
         super
 
         raise 'Missing hash_attribute' if hash_attribute.blank?
-        raise 'block and resource_attribute cannot both be present' unless block.nil? || resource_attribute.nil?
+
+        if block.present?
+          raise 'block and hash_attribute cannot both be present' if resource_attribute.present?
+        else
+          @resource_attribute ||= hash_attribute
+        end
       end
 
       # Make nested/dot calls (e.g. `vendor.ledger_id`)
@@ -37,6 +42,14 @@ module LedgerSync
         hash_attribute_dot_parts.reverse.inject(value) { |a, n| { n => a } }
       end
 
+      def references_many?
+        type.is_a?(Type::SerializerReferencesManyType)
+      end
+
+      def references_one?
+        type.is_a?(Type::SerializerReferencesOneType)
+      end
+
       def value(resource:)
         value = if block.nil?
                   dot_value_for(resource: resource)
@@ -44,7 +57,7 @@ module LedgerSync
                   block_value_for(resource: resource)
                 end
 
-        type.convert(value: value)
+        type.cast(value: value)
       end
     end
   end

data/lib/ledger_sync/serialization/serializer_attribute_set.rb

@@ -3,7 +3,7 @@
 require_relative 'attribute_set_mixin'
 
 module LedgerSync
-  class Serialization
+  module Serialization
     class SerializerAttributeSet
       include AttributeSetMixin
 

data/lib/ledger_sync/serialization/type/deserializer_references_many_type.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require_relative 'deserializer_type'
+
+module LedgerSync
+  module Serialization
+    module Type
+      class DeserializerReferencesManyType < DeserializerType
+        def cast_value(args = {})
+          deserializer_attribute = args.fetch(:deserializer_attribute)
+          value                  = args.fetch(:value)
+          resource               = args.fetch(:resource)
+
+          return if value.nil?
+
+          first_dot = deserializer_attribute.resource_attribute_dot_parts.first.to_sym
+          nested_resource = resource.class.resource_attributes[first_dot].type.resource_class.new
+
+          value.map do |one_value|
+            deserializer.new.deserialize(hash: one_value, resource: nested_resource)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ledger_sync/serialization/type/deserializer_references_one_type.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require_relative 'serializer_type'
+
+module LedgerSync
+  module Serialization
+    module Type
+      class DeserializerReferencesOneType < DeserializerType
+      end
+    end
+  end
+end

data/lib/ledger_sync/serialization/type/deserializer_type.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module LedgerSync
+  module Serialization
+    module Type
+      class DeserializerType < LedgerSync::Type::Value
+        attr_reader :deserializer
+
+        def initialize(args = {})
+          @deserializer = args.fetch(:deserializer)
+        end
+
+        def cast_value(args = {})
+          deserializer_attribute = args.fetch(:deserializer_attribute)
+          resource               = args.fetch(:resource)
+          value                  = args.fetch(:value)
+
+          first_dot = deserializer_attribute.resource_attribute_dot_parts.first.to_sym
+          nested_resource = resource.send(first_dot)
+          nested_resource ||= resource.class.resource_attributes[first_dot].type.resource_class.new
+
+          return if value.nil?
+
+          deserializer.new.deserialize(hash: value, resource: nested_resource)
+        end
+      end
+    end
+  end
+end