graphiti 1.0.beta.16 → 1.0.beta.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff5dc08a7d35f114a138a26759c857eb11a226de
-  data.tar.gz: 00d815886fc13aca087ce7b140fc472020cbfd5c
+  metadata.gz: 40e367c51c95cce626468a8e5fc363d1e5b462bb
+  data.tar.gz: 6456a1f6d474505b2364039083221a056e5f7cba
 SHA512:
-  metadata.gz: bff46d68fcb42853a4d9e31e169ce1a06ea6bb84007728f86cc5f3b2901a3b7b5e310c906e5ad147b14161fc215c7158dd56b92b7dd12b810fd9a599c6b7f74a
-  data.tar.gz: f519c2331d8c4e30550bcd5481ff07c03ab9ce020855e6b1c7993f60e94d1a12f4930a39eebb4c1c4615cb7cf588ee4127bb6c820d17d4c67ed552c4b61cf20e
+  metadata.gz: 110202c3f62d3b1dd711f36ae0eac8baa746dc0711e8b30b20f7838c18db22544a89d8485ac361378afe8f7f27c1786396a0233da4823bcf616098a75c3a6469
+  data.tar.gz: 95db7dd5fcaa17800abb4d8a0aa80ebe76273ec20de154facbacf994a677bf0f3299c567855ed0a0047782ab2c6e3f6089072e627024784e5e61a3f0e1f797de

data/gemfiles/rails_4.gemfile

@@ -3,15 +3,15 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 4.1"
-gem "jsonapi-rails", "~> 0.3.1", :require => "jsonapi/rails"
+gem "jsonapi-rails", "~> 0.3.1", require: "jsonapi/rails"
 gem "rspec-rails"
 
 group :test do
   gem "pry"
-  gem "pry-byebug", :platform => [:mri]
+  gem "pry-byebug", platform: [:mri]
   gem "appraisal"
   gem "guard"
   gem "guard-rspec"
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_5.gemfile

@@ -3,15 +3,15 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 5.2"
-gem "jsonapi-rails", "~> 0.3.1", :require => "jsonapi/rails"
+gem "jsonapi-rails", "~> 0.3.1", require: "jsonapi/rails"
 gem "rspec-rails"
 
 group :test do
   gem "pry"
-  gem "pry-byebug", :platform => [:mri]
+  gem "pry-byebug", platform: [:mri]
   gem "appraisal"
   gem "guard"
   gem "guard-rspec"
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/lib/graphiti/resource/configuration.rb

@@ -28,6 +28,13 @@ module Graphiti
           end
         end
 
+        # The .stat call stores a proc based on adapter
+        # So if we assign a new adapter, reconfigure
+        def adapter=(val)
+          super
+          stat total: [:count]
+        end
+
         def model
           klass = super
           unless klass || abstract_class?

data/lib/graphiti/resource/documentation.rb

@@ -26,12 +26,22 @@ module Graphiti
           desc = all_attributes[attr_name][:description]
           return desc if desc.present?
 
+          resolve_i18n_field_description(attr_name, field_type: :attributes)
+        end
+
+        # @api private
+        def sideload_description(sideload_name)
+          sideloads[sideload_name].description
+        end
+
+        # @api private
+        def resolve_i18n_field_description(name, field_type:)
           if defined?(::I18n)
             desc = ::I18n.t :description,
-              scope: [*i18n_type_scope, :attributes, attr_name],
+              scope: [*i18n_type_scope, field_type, name],
               default: nil
             desc ||= ::I18n.t :description,
-              scope: [*i18n_resource_scope, :attributes, attr_name],
+              scope: [*i18n_resource_scope, field_type, name],
               default: nil
           end
         end

data/lib/graphiti/schema.rb

@@ -188,7 +188,7 @@ module Graphiti
     def relationships(resource)
       {}.tap do |r|
         resource.sideloads.each_pair do |name, config|
-          schema = { type: config.type.to_s }
+          schema = { type: config.type.to_s, description: config.description }
           if config.type == :polymorphic_belongs_to
             schema[:resources] = config.children.values
               .map(&:resource).map(&:class).map(&:name)

data/lib/graphiti/sideload.rb

@@ -10,7 +10,8 @@ module Graphiti
       :primary_key,
       :parent,
       :group_name,
-      :link
+      :link,
+      :description
 
     class_attribute :scope_proc,
       :assign_proc,
@@ -34,6 +35,8 @@ module Graphiti
       @single                = opts[:single]
       apply_belongs_to_many_filter if type == :many_to_many
 
+      @description           = opts[:description]
+
       # polymorphic-specific
       @group_name            = opts[:group_name]
       @polymorphic_child     = opts[:polymorphic_child]
@@ -133,6 +136,11 @@ module Graphiti
       raise 'Override #load_params in subclass'
     end
 
+    def description
+      return @description if @description.present?
+      parent_resource_class.resolve_i18n_field_description(name, field_type: :relationships)
+    end
+
     def base_scope
       if @base_scope
         @base_scope.respond_to?(:call) ? @base_scope.call : @base_scope

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.0.beta.16"
+  VERSION = "1.0.beta.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.0.beta.16
+  version: 1.0.beta.17
 platform: ruby
 authors:
 - Lee Richmond
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-27 00:00:00.000000000 Z
+date: 2018-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable