jsonapionify 0.10.2 → 0.11.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODc3NmE4NzVhYTc0N2NlZTE4ZDNiODAxOThmMzFmMmM1NjE4MTBhZg==
+    Y2Y5ZTgxYWU1NTJhOTMyOGY3OWQyMDQ1Y2RlZTZmZmFjYzQwOTRiZA==
   data.tar.gz: !binary |-
-    MGVlNWMyY2Q0NTFhMmRmNjc5YTAzNTA3NWFkODEzZTc3OTRhZGIzZg==
+    Yzg1ZmQyZmViOWZhYjM1MjQxOGUwZDc3YjdjMzJkYzdmZWUzMjJlZg==
 SHA512:
   metadata.gz: !binary |-
-    NDBjN2U5NDBjMWQ3MzI0MzUyOTU0YWEzZDYxM2FhNmMzMDAzMGZkZThkNDEy
-    ZTBhZThkYzMwNTIzY2JlOGQzNTU0N2MyNjllMjA1OGRhYTA5ZmFhYjVjYjQ3
-    ZDI2MTRkYmZkMWZhNjJlYzAzMDUyZjQzODJmZmM1YWVlMzk1ZjI=
+    NTZiMTc4NjZhZWU5MDk4Yjg5MzhlNmNkMTU0MThjNTRmMDY4YjlmY2M5ZWNj
+    Nzc1Njk0MTYzMTAxOTM4ODQ4NTVhZjljY2YyYTI3NTRiM2U4MjM5YWEzMThi
+    OThkYmMyODc0MDA3YTcwODllZTVlZTZkZTE4OTdkOTRjNGI4ZTg=
   data.tar.gz: !binary |-
-    NmI2ODFmYjU3ZjRhOWQ3ZjljZDQ2NTI5NDA1MzM4NGU5ZTIxNDVjZDY3Nzll
-    NGFkZmMxNzY3NzFjYmRlNTVmMDAyYjA5ZTJjMWE4MzQyNTc2NWZlYzkyZjg2
-    MGNlZTkyNGI3MDk1YzJjMTBjMmQ2YzcxNTdiY2I5Mjc3MDY4YTM=
+    MGYxNzUyZDcwMjdkMmY5MDUyMmQwZThjNGY2MzRiODRlZjUwMjQxZWNkYWZm
+    Yzc2OGZhNDEzNTU1NTg0MGFmNGZjZjg4Yzc3MDI1ZWJlYWFiOWI2YWE4OTNh
+    YzllY2E3YmEzYTVjNmFhYWI3YjQxZjRiMDVmNDA2NjdiYzg1OWM=

data/jsonapionify.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'mime-types'
 
   spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rocco'
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/jsonapionify/api/action/documentation.rb

@@ -20,17 +20,15 @@ module JSONAPIonify::Api
       when :resource
         {
           'data' => resource.build_resource(
-            context,
-            resource.example_instance_for_action(name, context),
-            relationships: false,
-            links:         false,
-            fields:        resource.fields_for_action(name, context)
+            context: context,
+            instance: resource.example_instance_for_action(name, context),
+            links:         false
           ).as_json
         }.to_json
       when :resource_identifier
         {
           'data' => resource.build_resource_identifier(
-            resource.example_instance_for_action(name, context)
+            instance: resource.example_instance_for_action(name, context)
           ).as_json
         }.to_json
       when Proc

data/lib/jsonapionify/api/attribute.rb

@@ -7,7 +7,7 @@ module JSONAPIonify::Api
 
     include Documentation
     using UnstrictProc
-    attr_reader :name, :type, :description, :read, :write, :required, :block
+    attr_reader :name, :type, :description, :read, :write, :required, :hidden, :block
 
     def initialize(
       name,
@@ -17,6 +17,7 @@ module JSONAPIonify::Api
       write: true,
       required: false,
       example: nil,
+      hidden: false,
       &block
     )
       unless type.is_a? JSONAPIonify::Types::BaseType
@@ -33,6 +34,7 @@ module JSONAPIonify::Api
       @block             = block&.freeze
       @writeable_actions = write
       @readable_actions  = read
+      @hidden            = !!hidden && (hidden == true || Array.wrap(hidden))
 
       freeze
     end
@@ -42,6 +44,11 @@ module JSONAPIonify::Api
         self.name == other.name
     end
 
+    def hidden_for_action?(action_name)
+      return false if hidden == false
+      Array.wrap(hidden).any? { |h| h == true || h.to_s == action_name.to_s }
+    end
+
     def supports_read_for_action?(action_name, context)
       case (setting = @readable_actions)
       when TrueClass, FalseClass

data/lib/jsonapionify/api/relationship.rb

@@ -63,15 +63,21 @@ module JSONAPIonify::Api
       end
     end
 
-    attr_reader :owner, :class_proc, :name, :resolve
+    attr_reader :owner, :class_proc, :name, :resolve, :hidden
 
-    def initialize(owner, name, resource: nil, includable: false, resolve: proc { |name, owner| owner.send(name) }, &block)
+    def initialize(owner, name, resource: nil, includable: false, hidden: :index, resolve: proc { |n, o| o.send(n) }, &block)
       @class_proc = block || proc {}
       @owner      = owner
       @name       = name
       @includable = includable
       @resource   = resource || name
       @resolve    = resolve
+      @hidden     = !!hidden && (hidden == true || Array.wrap(hidden))
+    end
+
+    def hidden_for_action?(action_name)
+      return false if hidden == false
+      Array.wrap(hidden).any? { |h| h == true || h.to_s == action_name.to_s }
     end
 
     def resource_class
@@ -82,9 +88,9 @@ module JSONAPIonify::Api
             rel
           end
 
-          rel.class_prepends.each { |prepend| class_eval &prepend }
+          rel.class_prepends.each { |prepend| class_eval(&prepend) }
           class_eval(&rel.class_proc)
-          rel.class_appends.each { |append| class_eval &append }
+          rel.class_appends.each { |append| class_eval(&append) }
         end
       end
     end

data/lib/jsonapionify/api/relationship/many.rb

@@ -16,7 +16,7 @@ module JSONAPIonify::Api
           prepend:      'relationships'
         }
         define_action(:show, 'GET', **options, &block).response status: 200 do |context|
-          context.response_object[:data] = build_identifier_collection(context.collection)
+          context.response_object[:data] = build_resource_identifier_collection(collection: context.collection)
           context.response_object.to_json
         end
       end
@@ -30,7 +30,7 @@ module JSONAPIonify::Api
           example_input: :resource_identifier
         }
         define_action(:replace, 'PATCH', **options, &block).response status: 200 do |context|
-          context.response_object[:data] = build_identifier_collection(context.collection)
+          context.response_object[:data] = build_resource_identifier_collection(collection: context.collection)
           context.response_object.to_json
         end
       end
@@ -44,7 +44,7 @@ module JSONAPIonify::Api
           example_input: :resource_identifier
         }
         define_action(:add, 'POST', **options, &block).response status: 200 do |context|
-          context.response_object[:data] = build_identifier_collection(context.collection)
+          context.response_object[:data] = build_resource_identifier_collection(collection: context.collection)
           context.response_object.to_json
         end
       end
@@ -59,7 +59,7 @@ module JSONAPIonify::Api
         }
         options[:prepend] = 'relationships'
         define_action(:remove, 'DELETE', **options, &block).response status: 200 do |context|
-          context.response_object[:data] = build_identifier_collection(context.collection)
+          context.response_object[:data] = build_resource_identifier_collection(collection: context.collection)
           context.response_object.to_json
         end
       end

data/lib/jsonapionify/api/relationship/one.rb

@@ -17,7 +17,7 @@ module JSONAPIonify::Api
           prepend:      'relationships'
         }
         define_action(:show, 'GET', **options, &block).response status: 200 do |context|
-          context.response_object[:data] = build_resource_identifier(context.instance)
+          context.response_object[:data] = build_resource_identifier(instance: context.instance)
           context.response_object.to_json
         end
       end
@@ -30,7 +30,7 @@ module JSONAPIonify::Api
           prepend:      'relationships'
         }
         define_action(:replace, 'PATCH', **options, &block).response status: 200 do |context|
-          context.response_object[:data] = build_resource_identifier(context.instance)
+          context.response_object[:data] = build_resource_identifier(instance: context.instance)
           context.response_object.to_json
         end
       end

data/lib/jsonapionify/api/resource/builders.rb

@@ -1,159 +1,48 @@
 module JSONAPIonify::Api
   module Resource::Builders
     extend ActiveSupport::Concern
+    extend JSONAPIonify::Autoload
+
+    autoload_all
+
     FALSEY_STRINGS = JSONAPIonify::FALSEY_STRINGS
     TRUTHY_STRINGS = JSONAPIonify::TRUTHY_STRINGS
-    Structure      = JSONAPIonify::Structure
 
     module ClassMethods
+      include JSONAPIonify::Structure
 
-      def build_resource(
-        context,
-        instance,
-        fields:,
-        relationships: true,
-        links: true,
-        include_cursor: false, &block
-      )
-        example_id        = generate_id
-        include_rel_param = context.params['include-relationships']
-        relationships     = false if FALSEY_STRINGS.include?(include_rel_param)
-        return nil unless instance
-        resource_url = build_url(context, instance)
-        id           = build_id(instance)
-        Structure::Objects::Resource.new.tap do |resource|
-          resource[:id]   = id
-          resource[:type] = type
-
-          resource[:attributes]    = fields[type.to_sym].each_with_object(
-            Structure::Objects::Attributes.new
-          ) do |member, attributes|
-            attribute = self.attributes.find { |a| a.name == member.to_sym }
-            unless attribute.supports_read_for_action?(context.action_name, context)
-              error_block =
-                context.resource.class.error_definitions[:internal_server_error]
-              context.errors.evaluate(
-                name,
-                error_block:   error_block,
-                runtime_block: proc {}
-              )
-            end
-            attributes[member.to_sym] = attribute.resolve(
-              instance, context, example_id: example_id
-            )
-          end
-
-          resource[:links]         = Structure::Objects::Links.new(
-            self: resource_url
-          ) if links
-
-          resource[:meta]          = {
-            cursor: build_cursor_from_instance(context, instance)
-          } if include_cursor
-
-          resource[:relationships] = relationship_definitions.each_with_object(
-            Structure::Maps::Relationships.new
-          ) do |rel, hash|
-            hash[rel.name] = build_relationship(context, instance, rel.name)
-          end if relationships || context.includes.present?
-
-          block.call(resource, instance) if block
-        end
+      def build_resource(**options, &block)
+        ResourceBuilder.build(self, **options)
       end
 
-      def build_resource_identifier(instance)
-        Structure::Objects::ResourceIdentifier.new(
-          id:   build_id(instance),
-          type: type.to_s
-        )
-      end
-
-      def build_collection(
-        context,
-        collection,
-        fields:,
-        include_cursors: false,
-        &block
-      )
-        include_rel_param = context.params['include-relationships']
-        relationships     = TRUTHY_STRINGS.include? include_rel_param
+      def build_resource_collection(context:, collection:, include_cursors: false, &block)
         collection.each_with_object(
-          Structure::Collections::Resources.new
+          Collections::Resources.new
         ) do |instance, resources|
-          resources << build_resource(
-            context,
-            instance,
-            fields:         fields,
-            relationships:  relationships,
-            include_cursor: include_cursors,
-            &block
-          )
+          resources << build_resource(context: context, instance: instance, include_cursor: include_cursors, &block)
         end
       end
 
-      def build_cursor_from_instance(context, instance)
-        sort_string       = context.params['sort']
-        sort_fields       = sort_fields_from_sort_string(sort_string)
-        attrs_with_values = sort_fields.each_with_object({}) do |field, hash|
-          hash[field.name] = instance.send(field.name)
-        end
-        Base64.urlsafe_encode64(JSON.dump(
-          {
-            t: type,
-            s: sort_string,
-            a: attrs_with_values
-          }
-        ))
+      def build_resource_identifier(instance:)
+        ResourceIdentifierBuilder.build(self, instance: instance)
       end
 
-      def build_identifier_collection(collection)
+      def build_resource_identifier_collection(collection:)
         collection.each_with_object(
-          JSONAPIonify::Structure::Collections::ResourceIdentifiers.new
+          Collections::ResourceIdentifiers.new
         ) do |instance, resource_identifiers|
-          resource_identifiers << build_resource_identifier(instance)
+          resource_identifiers << build_resource_identifier(instance: instance)
         end
       end
 
-      def build_relationship(context, instance, name, links: true, data: false)
-        resource_url = build_url(context, instance)
-        relationship = self.relationship(name)
-        JSONAPIonify::Structure::Objects::Relationship.new.tap do |rel|
-          rel[:links] = relationship.build_links(resource_url) if links
-          if data || context.includes.present?
-            rel[:data] =
-              if relationship.rel.is_a? Relationship::Many
-                instance.send(name).map do |child|
-                  relationship.build_resource_identifier(child)
-                end
-              elsif relationship.rel.is_a? Relationship::One
-                value = instance.send(name)
-                relationship.build_resource_identifier value if value
-              end
-          end
-        end
+      def build_cursor(**options)
+        CursorBuilder.build(self, **options)
       end
 
-      def build_url(context, instance = nil)
-        URI.parse(context.request.root_url).tap do |uri|
-          uri.path      =
-            if instance
-              File.join(uri.path, type, build_id(instance))
-            else
-              File.join(context.request.root_url, type)
-            end
-          sticky_params = self.sticky_params(context.params)
-          uri.query     = sticky_params.to_param if sticky_params.present?
-        end.to_s
-      end
-
-      def build_id(instance)
-        instance.send(id_attribute).to_s
-      end
     end
 
+    delegated_methods = ClassMethods.instance_methods - instance_methods
     included do
-      delegated_methods = ClassMethods.instance_methods -
-        JSONAPIonify::Api::Resource::Builders.instance_methods
       delegate(*delegated_methods, to: :class)
     end
 

data/lib/jsonapionify/api/resource/builders/attributes_builder.rb

@@ -0,0 +1,29 @@
+module JSONAPIonify::Api
+  module Resource::Builders
+    class AttributesBuilder < FieldsBuilder
+
+      delegate :attributes, to: :resource, prefix: true
+
+      private
+
+      def build_default
+        resource_attributes.each_with_object(Objects::Attributes.new) do |attribute, attrs|
+          if attribute.supports_read_for_action?(action_name, context) && !attribute.hidden_for_action?(action_name)
+            attrs[attribute.name] = attribute.resolve(instance, context, example_id: example_id)
+          end
+        end
+      end
+
+      def build_sparce
+        resource_fields.each_with_object(Objects::Attributes.new) do |field, attrs|
+          field = field.to_sym
+          attribute = resource_attributes.find { |attr| attr.name == field }
+          if attribute&.supports_read_for_action?(action_name, context)
+            attrs[field] = attribute.resolve(instance, context, example_id: example_id)
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/jsonapionify/api/resource/builders/base_builder.rb

@@ -0,0 +1,17 @@
+module JSONAPIonify::Api
+  module Resource::Builders
+    class BaseBuilder
+      include JSONAPIonify::Structure
+
+      def self.build(*args, &block)
+        new(*args, &block).build
+      end
+
+      attr_reader :resource
+
+      def initialize(resource)
+        @resource = resource
+      end
+    end
+  end
+end

data/lib/jsonapionify/api/resource/builders/cursor_builder.rb

@@ -0,0 +1,33 @@
+module JSONAPIonify::Api
+  module Resource::Builders
+    class CursorBuilder < BaseBuilder
+
+      attr_reader :context, :instance
+      delegate :type, to: :resource, prefix: true
+      delegate :sort_fields_from_sort_string, to: :resource
+      delegate :request, :params, to: :context
+
+      def initialize(resource, instance:, context:)
+        super(resource)
+        @instance = instance
+        @context  = context
+      end
+
+      def build
+        sort_string        = params['sort']
+        sort_fields        = sort_fields_from_sort_string(sort_string)
+        attrs_with_values  = sort_fields.each_with_object({}) do |field, hash|
+          hash[field.name] = instance.send(field.name)
+        end
+        Base64.urlsafe_encode64(JSON.dump(
+          {
+            t: resource_type,
+            s: sort_string,
+            a: attrs_with_values
+          }
+        ))
+      end
+
+    end
+  end
+end

data/lib/jsonapionify/api/resource/builders/fields_builder.rb

@@ -0,0 +1,26 @@
+module JSONAPIonify::Api
+  module Resource::Builders
+    class FieldsBuilder < BaseBuilder
+
+      attr_reader :context, :instance, :example_id
+      delegate :action_name, :fields, to: :context
+      delegate :type, to: :resource, prefix: true  
+
+      def initialize(resource, instance:, context:, example_id:)
+        super(resource)
+        @instance = instance
+        @context = context
+        @example_id = example_id
+      end
+
+      def resource_fields
+        fields[resource_type] || {}
+      end
+
+      def build
+        fields.nil? ? build_default : build_sparce
+      end
+
+    end
+  end
+end

data/lib/jsonapionify/api/resource/builders/identity_helper.rb

@@ -0,0 +1,17 @@
+module JSONAPIonify::Api
+  module Resource::Builders
+    module IdentityHelper
+      def build_url
+        URI.parse(request.root_url).tap do |uri|
+          uri.path      = File.join uri.path, resource_type, build_id
+          sticky_params = resource.sticky_params(context.params)
+          uri.query     = sticky_params.to_param if sticky_params.present?
+        end.to_s
+      end
+
+      def build_id
+        instance.send(resource.id_attribute).to_s
+      end
+    end
+  end
+end

data/lib/jsonapionify/api/resource/builders/relationship_builder.rb

@@ -0,0 +1,49 @@
+module JSONAPIonify::Api
+  module Resource::Builders
+    class RelationshipBuilder < BaseBuilder
+      include IdentityHelper
+      delegate :type, to: :resource, prefix: true
+      delegate :request, :includes, to: :context
+
+      attr_reader :relationship, :related_resource, :context, :instance
+
+      def initialize(resource, relationship:, context:, instance:)
+        super(resource)
+        @relationship = relationship
+        @context = context
+        @instance = instance
+        @related_resource = resource.relationship(relationship.name)
+      end
+
+      def build
+        Objects::Relationship.new.tap do |rel|
+          rel[:links] = related_resource.build_links(build_url)
+          rel[:data] = build_data if includes.present?
+        end
+      end
+
+      private
+
+      def build_data
+        case relationship
+        when Relationship::Many
+          resolution.map do |child|
+            relationship.build_resource_identifier(child)
+          end
+        when Relationship::One
+          relationship.build_resource_identifier resolution
+        end
+      end
+
+      def resolution
+        instance.instance_exec(
+          relationship.name,
+          instance,
+          context,
+          &relationship.resolve
+        )
+      end
+
+    end
+  end
+end

data/lib/jsonapionify/api/resource/builders/relationships_builder.rb

@@ -0,0 +1,36 @@
+module JSONAPIonify::Api
+  module Resource::Builders
+    class RelationshipsBuilder < FieldsBuilder
+
+      delegate :relationships, to: :resource, prefix: true
+
+      private
+
+      def build_default
+        resource_relationships.each_with_object(Objects::Relationships.new) do |relationship, attrs|
+          unless relationship.hidden_for_action?(action_name)
+            attrs[relationship.name] = build_relationship(relationship)
+          end
+        end
+      end
+
+      def build_sparce
+        resource_fields.each_with_object(Objects::Relationships.new) do |field, attrs|
+          field = field.to_sym
+          relationship = resource_relationships.find { |rel| rel.name == field }
+          attrs[field] = build_relationship(relationship) if relationship
+        end
+      end
+
+      def build_relationship(relationship)
+        RelationshipBuilder.build(
+          resource,
+          relationship: relationship,
+          context: context,
+          instance: instance
+        )
+      end
+
+    end
+  end
+end

data/lib/jsonapionify/api/resource/builders/resource_builder.rb

@@ -0,0 +1,66 @@
+module JSONAPIonify::Api
+  module Resource::Builders
+    class ResourceBuilder < ResourceIdentifierBuilder
+      delegate :attributes, :relationships, :type, :relationship, to: :resource, prefix: true
+      delegate :params, :includes, :fields, :action_name, :request, to: :context
+
+      attr_reader :context, :links, :include_cursor, :block
+
+      def initialize(resource, context:, links: true, include_cursor: false, **opts, &block)
+        super(resource, **opts)
+        @context = context
+        @links = links
+        @include_cursor = include_cursor
+        @block = block
+      end
+
+      def build
+        return nil unless instance
+        Objects::Resource.new.tap do |resource|
+          resource[:type] = resource_type
+          (id = build_id) && resource[:id] = id
+          (attributes = build_attributes).present? && resource[:attributes] = attributes
+          (relationships = build_relationships).present? && resource[:relationships] = relationships
+          (links = build_links).present? && resource[:links] = links
+          (meta = build_meta).present? && resource[:meta] = meta
+        end
+      end
+
+      private
+
+      def build_attributes
+        AttributesBuilder.build(
+          resource,
+          instance:   instance,
+          context:    context,
+          example_id: example_id
+        )
+      end
+
+      def build_relationships
+        RelationshipsBuilder.build(
+          resource,
+          instance:   instance,
+          context:    context,
+          example_id: example_id
+        )
+      end
+
+      def build_links
+        return unless links
+        Objects::Links.new(self: build_url)
+      end
+
+      def build_meta
+        Objects::Meta.new.tap do |meta|
+          (cursor = build_cursor).present? && meta[:cursor] = cursor
+        end
+      end
+
+      def build_cursor
+        return unless include_cursor
+        CursorBuilder.build(resource, instance: instance, context: context)
+      end
+    end
+  end
+end

data/lib/jsonapionify/api/resource/builders/resource_identifer_builder.rb

@@ -0,0 +1,25 @@
+module JSONAPIonify::Api
+  module Resource::Builders
+    class ResourceIdentifierBuilder < BaseBuilder
+      include IdentityHelper
+
+      attr_reader :example_id, :instance
+      delegate :type, to: :resource, prefix: true
+
+      def initialize(resource, instance:)
+        super(resource)
+        @instance = instance
+        @example_id = resource.generate_id
+      end
+
+      def build
+        return nil unless instance
+        Objects::ResourceIdentifier.new.tap do |resource|
+          resource[:type] = resource_type
+          (id = build_id) && resource[:id] = id
+        end
+      end
+
+    end
+  end
+end

data/lib/jsonapionify/api/resource/definitions/actions.rb

@@ -5,108 +5,82 @@ module JSONAPIonify::Api
   module Resource::Definitions::Actions
     ActionNotFound = Class.new StandardError
 
+    INSTANCE_RESPONSE = proc do |context|
+      builder                        =
+        context.respond_to?(:builder) ? context.builder : nil
+      context.response_object[:data] =
+        build_resource(
+          context: context,
+          instance: context.instance,
+          &builder
+        )
+      context.response_object.to_json
+    end
+
+    COLLECTION_RESPONSE = proc do |context|
+      builder                        = context.respond_to?(:builder) ? context.builder : nil
+      context.response_object[:data] = build_resource_collection(
+        context: context,
+        collection: context.response_collection,
+        include_cursors: (context.links.keys & [:first, :last, :next, :prev]).present?,
+        &builder
+      )
+      context.response_object.to_json
+    end
+
     def self.extended(klass)
       klass.class_eval do
         extend JSONAPIonify::InheritedAttributes
         include JSONAPIonify::Callbacks
         define_callbacks(
-          :request, :exception, :response,
-          :list, :commit_list,
-          :create, :commit_create,
-          :read, :commit_read,
-          :update, :commit_update,
-          :delete, :commit_delete,
-          :show, :commit_show,
-          :add, :commit_add,
-          :remove, :commit_remove,
+          :request,
+          :exception,
+          :response,
+          :list,    :commit_list,
+          :create,  :commit_create,
+          :read,    :commit_read,
+          :update,  :commit_update,
+          :delete,  :commit_delete,
+          :show,    :commit_show,
+          :add,     :commit_add,
+          :remove,  :commit_remove,
           :replace, :commit_replace
         )
         inherited_array_attribute :action_definitions
       end
     end
 
-    def list(content_type: nil, only_associated: false, callbacks: true, &block)
-      options = {
-        content_type:    content_type,
-        only_associated: only_associated,
-        callbacks:       callbacks,
-        cacheable:       true
-      }
-      define_action(:list, 'GET', **options, &block).tap do |action|
-        action.response status: 200 do |context|
-          builder                        = context.respond_to?(:builder) ? context.builder : nil
-          context.response_object[:data] = build_collection(
-            context,
-            context.response_collection,
-            fields:          context.fields,
-            include_cursors: (context.links.keys & [:first, :last, :next, :prev]).present?,
-            &builder
-          )
-          context.response_object.to_json
-        end
+    def list(**options, &block)
+      define_action(:list, 'GET', **options, cacheable: true, &block).tap do |action|
+        action.response(status: 200, &COLLECTION_RESPONSE)
       end
     end
 
-    def create(content_type: nil, only_associated: false, callbacks: true, &block)
-      options = {
-        content_type:    content_type,
-        only_associated: only_associated,
-        callbacks:       callbacks,
-        cacheable:       false,
-        example_input:   :resource
-      }
-      define_action(:create, 'POST', **options, &block).tap do |action|
-        action.response status: 201 do |context|
-          builder                        = context.respond_to?(:builder) ? context.builder : nil
-          context.response_object[:data] = build_resource(context, context.instance, fields: context.fields, &builder)
-          response_headers['Location']   = build_url(context, context.instance)
-          context.response_object.to_json
+    def create(**options, &block)
+      define_action(:create, 'POST', '', **options, cacheable: false, example_input: :resource, &block).tap do |action|
+        action.response(status: 201) do |context|
+          instance_exec(context, &INSTANCE_RESPONSE).tap do
+            response_headers['Location'] = context.response_object[:data][:links][:self]
+          end
         end
       end
     end
 
-    def read(content_type: nil, only_associated: false, callbacks: true, &block)
-      options = {
-        content_type:    content_type,
-        only_associated: only_associated,
-        callbacks:       callbacks,
-        cacheable:       true
-      }
-      define_action(:read, 'GET', '/:id', **options, &block).tap do |action|
-        action.response status: 200 do |context|
-          builder                        = context.respond_to?(:builder) ? context.builder : nil
-          context.response_object[:data] = build_resource(context, context.instance, fields: context.fields, &builder)
-          context.response_object.to_json
-        end
+    def read(**options, &block)
+      define_action(:read, 'GET', '/:id', **options, cacheable: true, &block).tap do |action|
+        action.response(status: 200, &INSTANCE_RESPONSE)
       end
     end
 
-    def update(content_type: nil, only_associated: false, callbacks: true, &block)
-      options = {
-        content_type:    content_type,
-        only_associated: only_associated,
-        callbacks:       callbacks,
-        cacheable:       false,
-        example_input:   :resource
-      }
-      define_action(:update, 'PATCH', '/:id', **options, &block).tap do |action|
-        action.response status: 200 do |context|
-          builder                        = context.respond_to?(:builder) ? context.builder : nil
-          context.response_object[:data] = build_resource(context, context.instance, fields: context.fields, &builder)
-          context.response_object.to_json
-        end
+    def update(**options, &block)
+      define_action(:update, 'PATCH', '/:id', **options, cacheable: false, example_input: :resource, &block).tap do |action|
+        action.response(status: 200, &INSTANCE_RESPONSE)
       end
     end
 
-    def delete(content_type: nil, only_associated: false, callbacks: true, &block)
-      options = {
-        content_type:    content_type,
-        only_associated: only_associated,
-        callbacks:       callbacks,
-        cacheable:       false
-      }
-      define_action(:delete, 'DELETE', '/:id', **options, &block).tap do |action|
-        action.response status: 204
+    def delete(**options, &block)
+      define_action(:delete, 'DELETE', '/:id', **options, cacheable: false, &block).tap do |action|
+        action.response(status: 204)
       end
     end
 
@@ -120,17 +94,12 @@ module JSONAPIonify::Api
       end
     end
 
-    def after(*action_names, &block)
-      return after_request &block if action_names.blank?
-      action_names.each do |action_name|
-        send("after_#{action_name}", &block)
-      end
-    end
-
-    def before(*action_names, &block)
-      return before_request &block if action_names.blank?
-      action_names.each do |action_name|
-        send("before_#{action_name}", &block)
+    %i{before after}.each do |cb|
+      define_method(cb) do |*action_names, &block|
+        return send(:"#{cb}_request", &block) if action_names.blank?
+        action_names.each do |action_name|
+          send("#{cb}_#{action_name}", &block)
+        end
       end
     end
 

data/lib/jsonapionify/api/resource/definitions/attributes.rb

@@ -9,31 +9,9 @@ module JSONAPIonify::Api
         delegate :id_attribute, :attributes, to: :class
 
         context(:fields, readonly: true) do |context|
-          should_error      = false
-          input_fields      = context.request.params['fields'] || {}
-          actionable_fields = self.class.fields_for_action(context.action_name, context)
-          input_fields.each_with_object(
-            actionable_fields
-          ) do |(type, fields), field_map|
-            type_sym            = type.to_sym
-            field_symbols       = fields.to_s.split(',').map(&:to_sym)
-            field_map[type_sym] =
-              field_symbols.each_with_object([]) do |field, field_list|
-                type_attributes = self.class.api.resource(type_sym).attributes
-                attribute       = type_attributes.find do |attribute|
-                  attribute.name == field &&
-                    attribute.supports_read_for_action?(context.action_name, context)
-                end
-                if attribute
-                  field_list << attribute.name
-                else
-                  error(:field_not_permitted, type, field)
-                  should_error = true
-                end
-              end
-          end.tap do
-            halt if should_error
-          end
+          context.params['fields']&.map do |type, fields|
+            [type, fields.split(',')]
+          end&.to_h
         end
       end
     end
@@ -57,10 +35,6 @@ module JSONAPIonify::Api
       attributes.delete_if { |attr| attr.name == name.to_sym }
     end
 
-    def fields
-      attributes.select(&:read?).map(&:name)
-    end
-
     def builder(&block)
       context :builder, readonly: true, persisted: true do |context|
         proc do |resource, instance|
@@ -69,19 +43,5 @@ module JSONAPIonify::Api
       end
     end
 
-    def field_valid?(name)
-      fields.include? name.to_sym
-    end
-
-    def fields_for_action(action, context)
-      api.fields.each_with_object({}) do |(type, attrs), fields|
-        fields[type] = attrs.select do |attr|
-          api.resource(type).attributes.find do |type_attr|
-            type_attr.name == attr
-          end.supports_read_for_action? action, context
-        end
-      end
-    end
-
   end
 end

data/lib/jsonapionify/api/resource/definitions/pagination.rb

@@ -51,8 +51,8 @@ module JSONAPIonify::Api
 
           links.first first: size
           links.last last: size
-          links.prev before: build_cursor_from_instance(context.request, slice.first), last: size unless !slice.first || slice.first == collection.first
-          links.next after: build_cursor_from_instance(context.request, slice.last), first: size unless !slice.last || slice.last == collection.last
+          links.prev before: build_cursor(context: context, instance: slice.first), last: size unless !slice.first || slice.first == collection.first
+          links.next after: build_cursor(context: context, instance: slice.last), first: size unless !slice.last || slice.last == collection.last
 
           slice
         end
@@ -82,8 +82,8 @@ module JSONAPIonify::Api
 
           links.first first: size
           links.last last: size
-          links.prev before: build_cursor_from_instance(context.request, slice.first), last: size unless !slice.first || slice.first == collection.first
-          links.next after: build_cursor_from_instance(context.request, slice.last), first: size unless !slice.last || slice.last == collection.last
+          links.prev before: build_cursor(context: context, instance: slice.first), last: size unless !slice.first || slice.first == collection.first
+          links.next after: build_cursor(context: context, instance: slice.last), first: size unless !slice.last || slice.last == collection.last
 
           slice
         end

data/lib/jsonapionify/api/resource/definitions/relationships.rb

@@ -25,14 +25,9 @@ module JSONAPIonify::Api
     def define_relationship_counter(rel_name, name, include: true)
       attribute name.to_sym, types.Integer, "The number of #{rel_name}.", write: false do |_, instance, context|
         rel          = context.resource.class.relationship(rel_name)
-        blank_fields = context.fields.map { |k, _| [k, {}] }.to_h
         rel_context  = rel.new(
           request:           context.request,
-          context_overrides: {
-            owner:  instance,
-            fields: blank_fields,
-            params: {}
-          }
+          context_overrides: { owner:  instance, fields: {}, params: {} }
         ).exec { |c| c }
         count        = rel_context.collection.uniq.count
         case count

data/lib/jsonapionify/api/resource/definitions/sorting.rb

@@ -23,20 +23,7 @@ module JSONAPIonify::Api
         end
 
         context(:sort_params, readonly: true, persisted: true) do |context|
-          sort_fields_from_sort_string(context.params['sort']).tap do |fields|
-            should_error = false
-            fields.each do |field|
-              unless self.class.field_valid?(field.name) || field.name == id_attribute
-                should_error = true
-                type         = self.class.type
-                error :sort_parameter_invalid do
-                  detail "resource `#{type}` does not have field: #{field.name}"
-                end
-                next
-              end
-            end
-            halt if should_error
-          end
+          sort_fields_from_sort_string(context.params['sort'])
         end
 
         define_sorting_strategy('Object') do |collection|

data/lib/jsonapionify/structure/objects/base.rb

@@ -91,6 +91,8 @@ module JSONAPIonify::Structure
 
       def to_json(**opts)
         Oj.dump(as_json **opts)
+      rescue NoMemoryError
+        binding.pry
       end
 
       def signature

data/lib/jsonapionify/version.rb

@@ -1,3 +1,3 @@
 module JSONAPIonify
-  VERSION = "0.10.2"
+  VERSION = "0.11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonapionify
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.11.0
 platform: ruby
 authors:
 - Jason Waldrip
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2016-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -206,6 +206,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rocco
   requirement: !ruby/object:Gem::Requirement
@@ -527,6 +541,15 @@ files:
 - lib/jsonapionify/api/relationship/one.rb
 - lib/jsonapionify/api/resource.rb
 - lib/jsonapionify/api/resource/builders.rb
+- lib/jsonapionify/api/resource/builders/attributes_builder.rb
+- lib/jsonapionify/api/resource/builders/base_builder.rb
+- lib/jsonapionify/api/resource/builders/cursor_builder.rb
+- lib/jsonapionify/api/resource/builders/fields_builder.rb
+- lib/jsonapionify/api/resource/builders/identity_helper.rb
+- lib/jsonapionify/api/resource/builders/relationship_builder.rb
+- lib/jsonapionify/api/resource/builders/relationships_builder.rb
+- lib/jsonapionify/api/resource/builders/resource_builder.rb
+- lib/jsonapionify/api/resource/builders/resource_identifer_builder.rb
 - lib/jsonapionify/api/resource/caching.rb
 - lib/jsonapionify/api/resource/caller.rb
 - lib/jsonapionify/api/resource/class_methods.rb