graphiti 1.0.rc.23 → 1.0.rc.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88bb564c76122827bc72cd0126f4ea22fc25a37cf9c8d00a1a145869dcb220f3
-  data.tar.gz: f3dc237a65ca60b5492699b1cf118a663c3a7e29807eb69bbf009acf9c703829
+  metadata.gz: d67c2cb973db323b43cb172e2de8a2b99e363643aaaaf32fe3dfb40136c495d7
+  data.tar.gz: a2c8f90f58a5d87fa1ec7bba822c0ac8b4e50a59d7ad1d3f0b71e031d97084d8
 SHA512:
-  metadata.gz: c15a15f119ef23f72ef9bcace90f26de31aa114472f2a083a0ee82da5a1dea14b84539f8c56ac6067d3632fa42db0cd76994bd4169155a41fd1c846a9cee5df2
-  data.tar.gz: 54394fb25b0cae16f0f0cd463434406f51d8360a6b8e4419a3b518d2645396896d8ed1973ab395a0131557add30ced2d63f092d3b8b9903d14be4f159620060f
+  metadata.gz: 8b08c3eb3a4ab96dfeb1af6642004c1b22d052fd6d3e0d897ee9dc8ddbc84430b49623c819fab06e4744673d5fa61e8b4b289df2d79f0853a79b2d1fc4f7c9d7
+  data.tar.gz: 05c816f48067d09d0d7f498c0dbdd5011d4552d1c720e947bf72513d3a761dec0425ef4d138f49de056833fd1c9998582a8bfabc9d5a26a9889ba91ffb2d605c

data/graphiti.gemspec

@@ -18,8 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = "~> 2.3"
 
-  # Pinning this version until backwards-incompatibility is addressed
-  spec.add_dependency "jsonapi-serializable", "= 0.3.0"
+  spec.add_dependency "jsonapi-serializable", "~> 0.3.0"
   spec.add_dependency "dry-types", "~> 0.13"
   spec.add_dependency "graphiti_errors", "~> 1.0.beta.1"
   spec.add_dependency "concurrent-ruby", "~> 1.0"

data/lib/generators/graphiti/resource_generator.rb

@@ -14,12 +14,19 @@ module Graphiti
       default: false,
       aliases: ["--omit-comments", "-c"],
       desc: "Generate without documentation comments"
+
     class_option :actions,
       type: :array,
       default: nil,
       aliases: ["--actions", "-a"],
       desc: 'Array of controller actions to support, e.g. "index show destroy"'
 
+    class_option :'attributes-from',
+      banner: "Model",
+      type: :string,
+      aliases: ["--model", "-m"],
+      desc: "Specify to use attributes from a particular model"
+
     desc "This generator creates a resource file at app/resources, as well as corresponding controller/specs/route/etc"
     def generate_all
       generate_model
@@ -58,6 +65,54 @@ module Graphiti
       @options["omit-comments"]
     end
 
+    def attributes_class
+      return @attributes_class if @attributes_class
+
+      case @options["attributes-from"]
+      # thor will set the value to the key if no value is specified
+      when "attributes-from"
+        klass = class_name
+      when :kind_of?, String
+        klass = @options["attributes-from"].classify
+      else
+        # return nil if attributes-from isn't set or has an invalid value
+        return
+      end
+      begin
+        @attributes_class = klass.safe_constantize
+      rescue NameError
+        raise NameError, "attributes-from #{klass.inspect} does not exist."
+      end
+    end
+
+    ##
+    # Generates a list of OpenStruct(:name, :type) objects that map to
+    # the +attributes_class+ columns.
+    ##
+    def default_attributes
+      unless attributes_class.is_a?(Class) && attributes_class <= ApplicationRecord
+        raise "Unable to set #{self} default_attributes from #{attributes_class}. #{attributes_class} must be a kind of ApplicationRecord"
+      end
+      if attributes_class.table_exists?
+        return attributes_class.columns.map do |c|
+          OpenStruct.new({name: c.name.to_sym, type: c.type})
+        end
+      else
+        raise "#{attributes_class} table must exist. Please run migrations."
+      end
+    end
+
+    def resource_attributes
+      # set a temporary variable because overriding attributes causes
+      # weird behavior when the generator is run. It will override
+      # everytime regardless of the conditional.
+      if !attributes_class.nil?
+        default_attributes
+      else
+        attributes
+      end
+    end
+
     def responders?
       defined?(Responders)
     end

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

@@ -1,7 +1,7 @@
 <% module_namespacing do -%>
 class <%= class_name %>Resource < ApplicationResource
-  <%- attributes.each do |a| -%>
-  <%- if [:created_at, :updated_at].include?(a.name.to_sym) -%>
+  <%- resource_attributes.each do |a| -%>
+  <%- if [:id, :created_at, :updated_at].include?(a.name.to_sym) -%>
   attribute :<%= a.name %>, :<%= a.type %>, writable: false
   <%- else -%>
   attribute :<%= a.name %>, :<%= a.type %>

data/lib/graphiti/jsonapi_serializable_ext.rb

@@ -35,9 +35,23 @@ module Graphiti
       end
     end
 
+    # See above comment
+    module ResourceForOverride
+      def resource_for(object, options, inferrer)
+        resource = object.instance_variable_get(:@__graphiti_resource)
+        klass = object.instance_variable_get(:@__graphiti_serializer)
+        klass.new(options.merge(object: object, resource: resource))
+      end
+    end
+
     JSONAPI::Serializable::Relationship
       .send(:prepend, RelationshipOverrides)
-    JSONAPI::Serializable::Renderer
-      .send(:prepend, RendererOverrides)
+
+    if JSONAPI::Serializable.methods.include?(:resource_for)
+      JSONAPI::Serializable.singleton_class.send(:prepend, ResourceForOverride)
+    else
+      JSONAPI::Serializable::Renderer
+        .send(:prepend, RendererOverrides)
+    end
   end
 end

data/lib/graphiti/renderer.rb

@@ -45,7 +45,7 @@ module Graphiti
         options[:expose][:proxy] = proxy
         options[:include] = proxy.include_hash
         options[:links] = proxy.pagination.links if proxy.pagination.links?
-        options[:meta] ||= {}
+        options[:meta] ||= proxy.meta
         options[:meta][:stats] = proxy.stats unless proxy.stats.empty?
         options[:meta][:debug] = Debugger.to_a if debug_json?
 

data/lib/graphiti/resource_proxy.rb

@@ -33,7 +33,6 @@ module Graphiti
     end
 
     def jsonapi_render_options(opts = {})
-      opts[:meta]   ||= {}
       opts[:expose] ||= {}
       opts[:expose][:context] = Graphiti.context[:object]
       opts
@@ -64,6 +63,10 @@ module Graphiti
     end
     alias to_a data
 
+    def meta
+      @meta ||= data.respond_to?(:meta) ? data.meta : {}
+    end
+
     def each(&blk)
       to_a.each(&blk)
     end

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.0.rc.23"
+  VERSION = "1.0.rc.24"
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.0.rc.23
+  version: 1.0.rc.24
 platform: ruby
 authors:
 - Lee Richmond
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-09 00:00:00.000000000 Z
+date: 2019-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency