jsonapi_compliable 0.11.34 → 1.0.alpha.2

data/lib/jsonapi_compliable/util/persistence.rb

@@ -11,6 +11,10 @@ class JsonapiCompliable::Util::Persistence
     @attributes    = attributes
     @relationships = relationships
     @caller_model  = caller_model
+
+    @attributes.each_pair do |key, value|
+      @attributes[key] = @resource.typecast(key, value, :writable)
+    end
   end
 
   # Perform the actual save logic.
@@ -37,6 +41,7 @@ class JsonapiCompliable::Util::Persistence
     update_foreign_key_for_parents(parents)
 
     persisted = persist_object(@meta[:method], @attributes)
+    persisted.instance_variable_set(:@__serializer_klass, @resource.serializer)
     assign_temp_id(persisted, @meta[:temp_id])
 
     associate_parents(persisted, parents)
@@ -65,7 +70,7 @@ class JsonapiCompliable::Util::Persistence
   #
   # This is not the case for HABTM, whose "foreign key" is a join table
   def update_foreign_key(parent_object, attrs, x)
-    return if x[:sideload].type == :habtm
+    return if x[:sideload].type == :many_to_many
 
     if [:destroy, :disassociate].include?(x[:meta][:method])
       attrs[x[:foreign_key]] = nil
@@ -77,8 +82,8 @@ class JsonapiCompliable::Util::Persistence
   end
 
   def update_foreign_type(attrs, x, null: false)
-    grouping_field = x[:sideload].parent.grouping_field
-    attrs[grouping_field] = null ? nil : x[:sideload].name
+    grouping_field = x[:sideload].parent.grouper.column_name
+    attrs[grouping_field] = null ? nil : x[:sideload].group_name
   end
 
   def update_foreign_key_for_parents(parents)
@@ -94,9 +99,21 @@ class JsonapiCompliable::Util::Persistence
     parents.each do |x|
       if x[:object] && object
         if x[:meta][:method] == :disassociate
-          x[:sideload].disassociate(x[:object], object)
+          if x[:sideload].type == :belongs_to
+            x[:sideload].disassociate(object, x[:object])
+          else
+            x[:sideload].disassociate(x[:object], object)
+          end
         else
-          x[:sideload].associate(x[:object], object)
+          if x[:sideload].type == :belongs_to
+            x[:sideload].associate(object, x[:object])
+          else
+            if [:has_many, :many_to_many].include?(x[:sideload].type)
+              x[:sideload].associate_all(object, Array(x[:object]))
+            else
+              x[:sideload].associate(x[:object], object)
+            end
+          end
         end
       end
     end
@@ -108,11 +125,15 @@ class JsonapiCompliable::Util::Persistence
         if x[:meta][:method] == :disassociate
           x[:sideload].disassociate(object, x[:object])
         elsif x[:meta][:method] == :destroy
-          if x[:sideload].type == :habtm
+          if x[:sideload].type == :many_to_many
             x[:sideload].disassociate(object, x[:object])
           end # otherwise, no need to disassociate destroyed objects
         else
-          x[:sideload].associate(object, x[:object])
+          if [:has_many, :many_to_many].include?(x[:sideload].type)
+            x[:sideload].associate_all(object, Array(x[:object]))
+          else
+            x[:sideload].associate(object, x[:object])
+          end
         end
       end
     end
@@ -133,6 +154,7 @@ class JsonapiCompliable::Util::Persistence
     [].tap do |processed|
       iterate(except: [:polymorphic_belongs_to, :belongs_to]) do |x|
         yield x
+
         x[:object] = x[:sideload].resource
           .persist_with_relationships(x[:meta], x[:attributes], x[:relationships], caller_model)
         processed << x

data/lib/jsonapi_compliable/util/relationship_payload.rb

@@ -21,7 +21,7 @@ module JsonapiCompliable
 
       def iterate
         payload.each_pair do |relationship_name, relationship_payload|
-          if sl = resource.sideload(relationship_name.to_sym)
+          if sl = resource.class.sideload(relationship_name.to_sym)
             if should_yield?(sl.type)
               if relationship_payload.is_a?(Array)
                 relationship_payload.each do |rp|
@@ -43,15 +43,15 @@ module JsonapiCompliable
       end
 
       def payload_for(sideload, relationship_payload)
-        if sideload.polymorphic?
+        if sideload.polymorphic_parent?
           type     = relationship_payload[:meta][:jsonapi_type]
-          sideload = sideload.polymorphic_child_for_type(type)
+          sideload = sideload.child_for_type(type.to_sym)
         end
         relationship_payload[:meta][:method] ||= :update
 
         {
           sideload: sideload,
-          is_polymorphic: !sideload.parent.nil?,
+          is_polymorphic: sideload.polymorphic_child?,
           primary_key: sideload.primary_key,
           foreign_key: sideload.foreign_key,
           attributes: relationship_payload[:attributes],

data/lib/jsonapi_compliable/util/render_options.rb

@@ -3,49 +3,21 @@ module JsonapiCompliable
     # Generate the options we end up passing to {{http://jsonapi-rb.org jsonapi-rb}}
     # @api private
     class RenderOptions
-      def self.generate(object, query_hash, overrides = {})
-        resolved = object.respond_to?(:resolve) ? object.resolve : object
+      def self.generate(overrides = {})
+
+
 
-        fields = query_hash[:fields].dup
-        extra_fields = query_hash[:extra_fields]
 
-        # Ensure fields doesnt clobber extra fields
-        extra_fields.each do |k,v|
-          fields[k] = fields[k] + v if fields[k]
-        end
 
         options            = {}
-        options[:class]    = inferrer
-        options[:include]  = query_hash[:include]
-        options[:jsonapi]  = resolved
+        options[:include]  = query.include_hash
         options[:fields]   = fields
         options.merge!(overrides)
         options[:meta]   ||= {}
         options[:expose] ||= {}
         options[:expose][:extra_fields] = extra_fields
-
-        if object.respond_to?(:resolve_stats)
-          stats = object.resolve_stats
-          options[:meta][:stats] = stats unless stats.empty?
-        end
-
         options
       end
-
-      def self.inferrer
-        ::Hash.new do |h, k|
-          names = k.to_s.split('::')
-          klass = names.pop
-          serializer_name = [*names, "Serializable#{klass}"].join('::')
-          serializer = serializer_name.safe_constantize
-          if serializer
-            h[k] = serializer
-          else
-            raise Errors::MissingSerializer.new(k, serializer_name)
-          end
-        end
-      end
-      private_class_method :inferrer
     end
   end
 end

data/lib/jsonapi_compliable/util/serializer_attributes.rb

@@ -0,0 +1,98 @@
+module JsonapiCompliable
+  module Util
+    class SerializerAttribute
+      def initialize(name, attr, resource, serializer, extra)
+        @name = name
+        @attr = attr
+        @resource = resource
+        @serializer = serializer
+        @extra = extra
+      end
+
+      def apply
+        return unless readable?
+
+        if @name == :id
+          @serializer.id(&@attr[:proc]) if @attr[:proc]
+        elsif @attr[:proc]
+          @serializer.send(_method, @name, serializer_options, &proc)
+        else
+          if @serializer.attribute_blocks[@name].nil?
+            @serializer.send(_method, @name, serializer_options, &proc)
+          else
+            inner = @serializer.attribute_blocks.delete(@name)
+            wrapped = wrap_proc(inner)
+            @serializer.send(_method, @name, serializer_options, &wrapped)
+          end
+        end
+      end
+
+      private
+
+      def _method
+        extra? ? :extra_attribute : :attribute
+      end
+
+      def extra?
+        !!@extra
+      end
+
+      def readable?
+        !!@attr[:readable]
+      end
+
+      def guard
+        _method = @attr[:readable]
+        instance = @resource.new
+        -> { instance.instance_eval(&_method) }
+      end
+
+      def guard?
+        @attr[:readable] != true
+      end
+
+      def serializer_options
+        {}.tap do |opts|
+          opts[:if] = guard if guard?
+        end
+      end
+
+      def default_proc
+        type_name = @attr[:type]
+        _name = @name
+        _resource = @resource.new
+        ->(_) {
+          _resource.typecast(_name, @object.send(_name), :readable)
+        }
+      end
+
+      def wrap_proc(inner)
+        type_name = @attr[:type]
+        ->(serializer_instance = nil) {
+          type = JsonapiCompliable::Types[type_name]
+          type[:read][serializer_instance.instance_eval(&inner)]
+        }
+      end
+
+      def proc
+        @attr[:proc] ? wrap_proc(@attr[:proc]) : default_proc
+      end
+    end
+
+    class SerializerAttributes
+      def initialize(resource, attributes, extra = false)
+        @resource = resource
+        @serializer = resource.serializer
+        @attributes = attributes
+        @extra = extra
+      end
+
+      def apply
+        @attributes.each_pair do |name, attr|
+          SerializerAttribute
+            .new(name, attr, @resource, @serializer, @extra).apply
+        end
+      end
+    end
+  end
+end

data/lib/jsonapi_compliable/util/validation_response.rb

@@ -22,7 +22,7 @@ class JsonapiCompliable::Util::ValidationResponse
   # Check to ensure no validation errors.
   # @return [Boolean] did the persistence call succeed?
   def success?
-    all_valid?(object, @deserialized_params.relationships)
+    all_valid?(object, relationships)
   end
 
   # @return [Array] the object and success state
@@ -39,34 +39,40 @@ class JsonapiCompliable::Util::ValidationResponse
 
   private
 
+  def relationships
+    if @deserialized_params
+      @deserialized_params.relationships
+    else
+      {}
+    end
+  end
+
   def valid_object?(object)
     !object.respond_to?(:errors) ||
       (object.respond_to?(:errors) && object.errors.blank?)
   end
 
   def all_valid?(model, deserialized_params)
-    checks = []
-    checks << valid_object?(model)
+    valid = true
+    return false unless valid_object?(model)
     deserialized_params.each_pair do |name, payload|
       if payload.is_a?(Array)
         related_objects = model.send(name)
-        related_objects.each_with_index do |r, index|
+        related_objects.each do |r|
           valid = valid_object?(r)
-          checks << valid
 
           if valid
-            checks << all_valid?(r, payload[index][:relationships] || {})
+            valid = all_valid?(r, deserialized_params[:relationships] || {})
           end
         end
       else
         related_object = model.send(name)
         valid = valid_object?(related_object)
-        checks << valid
         if valid
-          checks << all_valid?(related_object, payload[:relationships] || {})
+          valid = all_valid?(related_object, deserialized_params[:relationships] || {})
         end
       end
     end
-    checks.all? { |c| c == true }
+    valid
   end
 end

data/lib/jsonapi_compliable/version.rb

@@ -1,3 +1,3 @@
 module JsonapiCompliable
-  VERSION = "0.11.34"
+  VERSION = "1.0.alpha.2"
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi_compliable
 version: !ruby/object:Gem::Version
-  version: 0.11.34
+  version: 1.0.alpha.2
 platform: ruby
 authors:
 - Lee Richmond
-- Venkata Pasupuleti
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-24 00:00:00.000000000 Z
+date: 2018-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable
@@ -25,6 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: dry-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+- !ruby/object:Gem::Dependency
+  name: jsonapi_errorable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -65,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -115,10 +142,43 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
+- !ruby/object:Gem::Dependency
+  name: jsonapi_spec_helpers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.alpha.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.alpha.1
+description: 
 email:
 - richmolj@gmail.com
-- spasupuleti4@bloomberg.net
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -205,44 +265,63 @@ files:
 - gemfiles/rails_4.gemfile
 - gemfiles/rails_5.gemfile
 - jsonapi_compliable.gemspec
-- lib/generators/jsonapi/field_generator.rb
 - lib/generators/jsonapi/resource_generator.rb
 - lib/generators/jsonapi/templates/application_resource.rb.erb
 - lib/generators/jsonapi/templates/controller.rb.erb
-- lib/generators/jsonapi/templates/create_request_spec.rb.erb
-- lib/generators/jsonapi/templates/destroy_request_spec.rb.erb
-- lib/generators/jsonapi/templates/index_request_spec.rb.erb
-- lib/generators/jsonapi/templates/payload.rb.erb
 - lib/generators/jsonapi/templates/resource.rb.erb
-- lib/generators/jsonapi/templates/serializer.rb.erb
-- lib/generators/jsonapi/templates/show_request_spec.rb.erb
-- lib/generators/jsonapi/templates/update_request_spec.rb.erb
+- lib/generators/jsonapi/templates/resource_reads_spec.rb.erb
+- lib/generators/jsonapi/templates/resource_writes_spec.rb.erb
 - lib/jsonapi_compliable.rb
 - lib/jsonapi_compliable/adapters/abstract.rb
 - lib/jsonapi_compliable/adapters/active_record.rb
-- lib/jsonapi_compliable/adapters/active_record_sideloading.rb
+- lib/jsonapi_compliable/adapters/active_record/base.rb
+- lib/jsonapi_compliable/adapters/active_record/belongs_to_sideload.rb
+- lib/jsonapi_compliable/adapters/active_record/has_many_sideload.rb
+- lib/jsonapi_compliable/adapters/active_record/has_one_sideload.rb
+- lib/jsonapi_compliable/adapters/active_record/inferrence.rb
+- lib/jsonapi_compliable/adapters/active_record/many_to_many_sideload.rb
 - lib/jsonapi_compliable/adapters/null.rb
 - lib/jsonapi_compliable/base.rb
 - lib/jsonapi_compliable/configuration.rb
+- lib/jsonapi_compliable/context.rb
 - lib/jsonapi_compliable/deserializer.rb
 - lib/jsonapi_compliable/errors.rb
 - lib/jsonapi_compliable/extensions/boolean_attribute.rb
 - lib/jsonapi_compliable/extensions/extra_attribute.rb
 - lib/jsonapi_compliable/extensions/temp_id.rb
+- lib/jsonapi_compliable/filter_operators.rb
+- lib/jsonapi_compliable/hash_renderer.rb
 - lib/jsonapi_compliable/query.rb
 - lib/jsonapi_compliable/rails.rb
+- lib/jsonapi_compliable/railtie.rb
+- lib/jsonapi_compliable/renderer.rb
 - lib/jsonapi_compliable/resource.rb
+- lib/jsonapi_compliable/resource/configuration.rb
+- lib/jsonapi_compliable/resource/dsl.rb
+- lib/jsonapi_compliable/resource/interface.rb
+- lib/jsonapi_compliable/resource/polymorphism.rb
+- lib/jsonapi_compliable/resource/sideloading.rb
+- lib/jsonapi_compliable/resource_proxy.rb
+- lib/jsonapi_compliable/responders.rb
+- lib/jsonapi_compliable/runner.rb
 - lib/jsonapi_compliable/scope.rb
 - lib/jsonapi_compliable/scoping/base.rb
 - lib/jsonapi_compliable/scoping/default_filter.rb
-- lib/jsonapi_compliable/scoping/extra_fields.rb
+- lib/jsonapi_compliable/scoping/extra_attributes.rb
 - lib/jsonapi_compliable/scoping/filter.rb
 - lib/jsonapi_compliable/scoping/filterable.rb
 - lib/jsonapi_compliable/scoping/paginate.rb
 - lib/jsonapi_compliable/scoping/sort.rb
 - lib/jsonapi_compliable/sideload.rb
+- lib/jsonapi_compliable/sideload/belongs_to.rb
+- lib/jsonapi_compliable/sideload/has_many.rb
+- lib/jsonapi_compliable/sideload/has_one.rb
+- lib/jsonapi_compliable/sideload/many_to_many.rb
+- lib/jsonapi_compliable/sideload/polymorphic_belongs_to.rb
 - lib/jsonapi_compliable/stats/dsl.rb
 - lib/jsonapi_compliable/stats/payload.rb
+- lib/jsonapi_compliable/types.rb
+- lib/jsonapi_compliable/util/attribute_check.rb
 - lib/jsonapi_compliable/util/field_params.rb
 - lib/jsonapi_compliable/util/hash.rb
 - lib/jsonapi_compliable/util/hooks.rb
@@ -250,14 +329,15 @@ files:
 - lib/jsonapi_compliable/util/persistence.rb
 - lib/jsonapi_compliable/util/relationship_payload.rb
 - lib/jsonapi_compliable/util/render_options.rb
+- lib/jsonapi_compliable/util/serializer_attributes.rb
 - lib/jsonapi_compliable/util/sideload.rb
 - lib/jsonapi_compliable/util/validation_response.rb
 - lib/jsonapi_compliable/version.rb
-homepage:
+homepage: 
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -268,12 +348,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.6
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.6.11
+signing_key: 
 specification_version: 4
 summary: Easily build jsonapi.org-compatible APIs
 test_files: []