graphiti 1.0.rc.15 → 1.0.rc.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a17652c7e2b5ef86f6c496038c6de48b0411f6a4
-  data.tar.gz: 6135de42df9f8f4144b1bdd4b514c385e462ecd1
+  metadata.gz: d46aa4ca6068b172194920f8e4a01cbf1fb2bc4b
+  data.tar.gz: 753ed53b934af42504e07688e2c0158c350de890
 SHA512:
-  metadata.gz: 6e502e58dbc078b48b01720d59394609078b5bedd0cbd58c42b86292323913f1ee5f2a269299c566380d861bdda508fb80c71a9445326d96c2e13fcffb2bf88f
-  data.tar.gz: 619c67bb1648568d79d5a8a56449248dfe68a39f08c2a6d892cac150f6657aba38bc5c07f27327608714428c201a2f38dc0fcb0b356a3a339fabfa17c70edcfd
+  metadata.gz: fc840114e74811c060a3ebedc9e14f6f5a316020e285c058991e02223cabed0f3cf1b079c04a693b8690e578aa6c4c30e48abd57fad1a6af8090f514547b8be6
+  data.tar.gz: 5d21cda6032b24a26f11e40357f73731038e357903dc464ee77a1aee2cbc50d1ce25073fd63a517f5554143be3b430efdc2f900d0fd3676112243472b70f9519

data/Appraisals

@@ -2,10 +2,16 @@ appraise "rails-4" do
   gem "rails", "~> 4.1"
   gem 'jsonapi-rails', '~> 0.3.1', require: 'jsonapi/rails'
   gem 'rspec-rails'
+  gem 'sqlite3', '~> 1.3.6'
+  gem 'database_cleaner'
+  gem 'kaminari', '~> 0.17'
 end
 
 appraise "rails-5" do
   gem "rails", "~> 5.2"
   gem 'jsonapi-rails', '~> 0.3.1', require: 'jsonapi/rails'
   gem 'rspec-rails'
+  gem 'sqlite3', '~> 1.3.6'
+  gem 'database_cleaner'
+  gem 'kaminari', '~> 0.17'
 end

data/gemfiles/rails_4.gemfile

@@ -5,6 +5,9 @@ source "https://rubygems.org"
 gem "rails", "~> 4.1"
 gem "jsonapi-rails", "~> 0.3.1", require: "jsonapi/rails"
 gem "rspec-rails"
+gem "sqlite3", "~> 1.3.6"
+gem "database_cleaner"
+gem "kaminari", "~> 0.17"
 
 group :test do
   gem "pry"

data/gemfiles/rails_5.gemfile

@@ -5,6 +5,9 @@ source "https://rubygems.org"
 gem "rails", "~> 5.2"
 gem "jsonapi-rails", "~> 0.3.1", require: "jsonapi/rails"
 gem "rspec-rails"
+gem "sqlite3", "~> 1.3.6"
+gem "database_cleaner"
+gem "kaminari", "~> 0.17"
 
 group :test do
   gem "pry"

data/graphiti.gemspec

@@ -26,12 +26,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activesupport', ['>= 4.1', '< 6']
 
   spec.add_development_dependency "faraday", '~> 0.15'
-  spec.add_development_dependency "activerecord", ['>= 4.1', '< 6']
   spec.add_development_dependency "kaminari", '~> 0.17'
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "sqlite3"
-  spec.add_development_dependency "database_cleaner"
   spec.add_development_dependency "activemodel", ['>= 4.1', '< 6']
   spec.add_development_dependency "graphiti_spec_helpers", '1.0.beta.4'
 end

data/lib/generators/graphiti/templates/create_request_spec.rb.erb

@@ -6,13 +6,21 @@ RSpec.describe "<%= type %>#create", type: :request do
   end
 
   describe 'basic create' do
+    let(:params) do
+      <%- if defined?(FactoryBot) -%>
+      attributes_for(:<%= type.to_s.singularize %>).
+        except("created_at", "updated_at")
+      <%- else -%>
+      {
+        # ... your attrs here
+      }
+      <%- end -%>
+    end
     let(:payload) do
       {
         data: {
           type: '<%= type %>',
-          attributes: {
-            # ... your attrs here
-          }
+          attributes: params
         }
       }
     end

data/lib/generators/graphiti/templates/resource_writes_spec.rb.erb

@@ -6,7 +6,12 @@ RSpec.describe <%= resource_class %>, type: :resource do
       {
         data: {
           type: '<%= type %>',
+      <%- if defined?(FactoryBot) -%>
+          attributes: attributes_for(:<%= type.to_s.singularize %>).
+            except("created_at", "updated_at")
+       <%- else -%>
           attributes: { }
+       <%- end -%>
         }
       }
     end
@@ -17,7 +22,7 @@ RSpec.describe <%= resource_class %>, type: :resource do
 
     it 'works' do
       expect {
-        expect(instance.save).to eq(true)
+        expect(instance.save).to eq(true), instance.errors.full_messages.to_sentence
       }.to change { <%= model_class %>.count }.by(1)
     end
   end

data/lib/graphiti/delegates/pagination.rb

@@ -36,7 +36,11 @@ module Graphiti
       end
 
       def last_page
-        return @last_page if @last_page || page_size == 0
+        if @last_page
+          return @last_page
+        elsif page_size == 0 || item_count == 0
+          return nil
+        end
         @last_page = (item_count / page_size)
         @last_page += 1 if item_count % page_size > 0
         @last_page
@@ -57,6 +61,7 @@ module Graphiti
           # Graphiti.logger.warn(e.message)
           @item_count = 0
         end
+        @item_count
       end
 
       def current_page

data/lib/graphiti/resource.rb

@@ -114,9 +114,11 @@ module Graphiti
       adapter.resolve(scope)
     end
 
-    def before_commit(model, method)
-      hook = self.class.config[:before_commit][method]
-      hook.call(model) if hook
+    def before_commit(model, metadata)
+      hooks = self.class.config[:before_commit][metadata[:method]] || []
+      hooks.each do |hook|
+        instance_exec(model, metadata, &hook)
+      end
     end
 
     def transaction

data/lib/graphiti/resource/dsl.rb

@@ -82,7 +82,8 @@ module Graphiti
 
         def before_commit(only: [:create, :update, :destroy], &blk)
           Array(only).each do |verb|
-            config[:before_commit][verb] = blk
+            config[:before_commit][verb] ||= []
+            config[:before_commit][verb] << blk
           end
         end
 

data/lib/graphiti/resource/persistence.rb

@@ -69,64 +69,64 @@ module Graphiti
         end
       end
 
-      def create(create_params)
+      def create(create_params, meta = nil)
         model_instance = nil
 
-        run_callbacks :persistence, :create, create_params do
-          run_callbacks :attributes, :create, create_params do |params|
-            model_instance = build(model)
-            assign_attributes(model_instance, params)
+        run_callbacks :persistence, :create, create_params, meta do
+          run_callbacks :attributes, :create, create_params, meta do |params|
+            model_instance = call_with_meta(:build, model, meta)
+            call_with_meta(:assign_attributes, model_instance, params, meta)
             model_instance
           end
 
-          run_callbacks :save, :create, model_instance do
-            model_instance = save(model_instance)
+          run_callbacks :save, :create, model_instance, meta do
+            model_instance = call_with_meta(:save, model_instance, meta)
           end
 
           model_instance
         end
       end
 
-      def update(update_params)
+      def update(update_params, meta = nil)
         model_instance = nil
         id = update_params.delete(:id)
 
-        run_callbacks :persistence, :update, update_params do
-          run_callbacks :attributes, :update, update_params do |params|
+        run_callbacks :persistence, :update, update_params, meta do
+          run_callbacks :attributes, :update, update_params, meta do |params|
             model_instance = self.class._find(params.merge(id: id)).data
-            assign_attributes(model_instance, params)
+            call_with_meta(:assign_attributes, model_instance, params, meta)
             model_instance
           end
 
-          run_callbacks :save, :update, model_instance do
-            model_instance = save(model_instance)
+          run_callbacks :save, :update, model_instance, meta do
+            model_instance = call_with_meta(:save, model_instance, meta)
           end
         end
 
         model_instance
       end
 
-      def destroy(id)
+      def destroy(id, meta = nil)
         model_instance = self.class._find(id: id).data
-        run_callbacks :destroy, :destroy, model_instance do
-          delete(model_instance)
+        run_callbacks :destroy, :destroy, model_instance, meta do
+          call_with_meta(:delete, model_instance, meta)
         end
         model_instance
       end
 
-      def build(model)
+      def build(model, meta = nil)
         adapter.build(model)
       end
 
-      def assign_attributes(model_instance, update_params)
+      def assign_attributes(model_instance, update_params, meta = nil)
         adapter.assign_attributes(model_instance, update_params)
       end
 
-      def save(model_instance)
+      def save(model_instance, meta = nil)
         adapter.save(model_instance)
       end
 
-      def delete(model_instance)
+      def delete(model_instance, meta = nil)
         adapter.destroy(model_instance)
       end
 
@@ -136,7 +136,7 @@ module Graphiti
         fire_around_callbacks(kind, action, *args) do |*yieldargs|
           fire_callbacks(kind, :before, action, *yieldargs)
           result = yield(*yieldargs)
-          fire_callbacks(kind, :after, action, result)
+          fire_callbacks(kind, :after, action, *[result, args.last])
           result
         end
       end
@@ -147,16 +147,24 @@ module Graphiti
           callbacks.each do |config|
             callback = config[:callback]
             next unless config[:only].include?(action)
-
-            if callback.respond_to?(:call)
-              instance_exec(*args, &callback)
-            else
-              send(callback, *args)
-            end
+            call_with_meta(callback, *args)
           end
         end
       end
 
+      # Convenience for calling a method or proc
+      # while taking into account 'meta' is an optional argument
+      def call_with_meta(callback, *args)
+        if callback.respond_to?(:call)
+          instance_exec(*args, &callback)
+        else
+          arity = method(callback).arity
+          args = args[0..0] if arity == 1
+          args = args[0..1] if arity == 2
+          send(callback, *args)
+        end
+      end
+
       def fire_around_callbacks(kind, action, *args, &blk)
         callbacks = self.class.config[:callbacks][kind].try(:[], :around) || []
         callbacks = callbacks.select { |cb| cb[:only].include?(action) }
@@ -177,6 +185,7 @@ module Graphiti
         if callbacks[index + 1]
           proc do
             r = nil
+            args = args[0..0] if method(method_name).arity == 1
             send(method_name, *args) do |r2|
               wrapped = around_callback_proc(callbacks, index+1, r2, &blk)
               r = instance_exec(r2, &wrapped)
@@ -184,9 +193,10 @@ module Graphiti
             r
           end
         else
-          proc do |result|
+          proc do |*args2|
             r = nil
-            send(callbacks[index][:callback], result) do |r2|
+            args2 = args2[0..0] if method(callbacks[index][:callback]).arity == 1
+            send(callbacks[index][:callback], *args2) do |r2|
               r = instance_exec(r2, &blk)
             end
             r

data/lib/graphiti/resource/sideloading.rb

@@ -61,7 +61,8 @@ module Graphiti
           allow_sideload(name, opts, &blk)
         end
 
-        def polymorphic_has_many(name, opts = {}, as:, &blk)
+        def polymorphic_has_many(name, opts = {}, &blk)
+          as = opts.delete(:as)
           opts[:foreign_key] ||= :"#{as}_id"
           opts[:polymorphic_as] ||= as
           _model = model

data/lib/graphiti/resource_proxy.rb

@@ -115,12 +115,13 @@ module Graphiti
 
     def destroy
       validator = @resource.transaction do
-        model = @resource.destroy(@query.filters[:id])
+        metadata = { method: :destroy }
+        model = @resource.destroy(@query.filters[:id], metadata)
         model.instance_variable_set(:@__serializer_klass, @resource.serializer)
         validator = ::Graphiti::Util::ValidationResponse.new \
           model, @payload
         validator.validate!
-        @resource.before_commit(model, :destroy)
+        @resource.before_commit(model, metadata)
         validator
       end
       @data, success = validator.to_a

data/lib/graphiti/util/link.rb

@@ -4,11 +4,15 @@ module Graphiti
       def initialize(sideload, model)
         @sideload = sideload
         @model = model
+        @linkable = true
 
         if @sideload.type == :polymorphic_belongs_to
-          type = @model.send(@sideload.grouper.field_name)
-          @sideload = @sideload.children.values.find do |c|
-            c.group_name == type.to_sym
+          if type = @model.send(@sideload.grouper.field_name)
+            @sideload = @sideload.children.values.find do |c|
+              c.group_name == type.to_sym
+            end
+          else
+            @linkable = false
           end
         end
       end
@@ -25,7 +29,7 @@ module Graphiti
         if @sideload.type == :belongs_to
           not @model.send(@sideload.foreign_key).nil?
         else
-          true
+          @linkable
         end
       end
 

data/lib/graphiti/util/persistence.rb

@@ -61,7 +61,7 @@ class Graphiti::Util::Persistence
 
     post_process(persisted, parents)
     post_process(persisted, children)
-    before_commit = -> { @resource.before_commit(persisted, @meta[:method]) }
+    before_commit = -> { @resource.before_commit(persisted, metadata) }
     add_hook(before_commit)
     persisted
   end
@@ -218,22 +218,23 @@ class Graphiti::Util::Persistence
     end
   end
 
-  # In the Resource, we want to allow:
-  #
-  # def create(attrs)
-  #
-  # and
-  #
-  # def create(attrs, parent = nil)
-  #
-  # 'parent' is an optional parameter that should not be part of the
-  # method signature in most use cases.
+  def metadata
+    {
+      method: @meta[:method],
+      temp_id: @meta[:temp_id],
+      caller_model: @caller_model,
+      attributes: @attributes,
+      relationships: @relationships
+    }
+  end
+
   def call_resource_method(method_name, attributes, caller_model)
     method = @resource.method(method_name)
-    if [2,-2].include?(method.arity)
-      method.call(attributes, caller_model)
-    else
+
+    if method.arity == 1
       method.call(attributes)
+    else
+      method.call(attributes, metadata)
     end
   end
 end

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.0.rc.15"
+  VERSION = "1.0.rc.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.0.rc.15
+  version: 1.0.rc.16
 platform: ruby
 authors:
 - Lee Richmond
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-04 00:00:00.000000000 Z
+date: 2019-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable
@@ -100,26 +100,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.15'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  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: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -162,34 +142,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  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: database_cleaner
-  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: activemodel
   requirement: !ruby/object:Gem::Requirement