graphiti 1.0.alpha.5 → 1.0.alpha.6

data/lib/graphiti/sideload.rb

@@ -31,6 +31,7 @@ module Graphiti
       @writable              = opts[:writable]
       @as                    = opts[:as]
       @link                  = opts[:link]
+      @single                = opts[:single]
 
       # polymorphic-specific
       @group_name            = opts[:group_name]
@@ -39,8 +40,6 @@ module Graphiti
       if polymorphic_child?
         parent.resource.polymorphic << resource_class
       end
-
-      check! if defined?(::Rails)
     end
 
     def self.scope(&blk)
@@ -67,25 +66,8 @@ module Graphiti
       self.link_proc = blk
     end
 
-    def check!
-      return if scope_proc
-      case type
-      when :has_many, :has_one
-        unless resource.filters[foreign_key]
-          raise Errors::MissingSideloadFilter.new parent_resource_class,
-            self, foreign_key
-        end
-      when :belongs_to
-        unless resource.filters[primary_key]
-          raise Errors::MissingSideloadFilter.new parent_resource_class,
-            self, primary_key
-        end
-      when :many_to_many
-        unless resource.filters[true_foreign_key]
-          raise Errors::MissingSideloadFilter.new parent_resource_class,
-            self, true_foreign_key
-        end
-      end
+    def errors
+      @errors ||= []
     end
 
     def readable?
@@ -96,6 +78,10 @@ module Graphiti
       !!@writable
     end
 
+    def single?
+      !!@single
+    end
+
     def link?
       return true if link_proc
 
@@ -159,7 +145,7 @@ module Graphiti
       params_proc.call(params, parents) if params_proc
       opts = load_options(parents, query)
       proxy = resource.class._all(params, opts, base_scope)
-      pre_load_proc.call(proxy) if pre_load_proc
+      pre_load_proc.call(proxy, parents) if pre_load_proc
       proxy.to_a
     end
 
@@ -197,6 +183,10 @@ module Graphiti
     end
 
     def resolve(parents, query)
+      if single? && parents.length > 1
+        raise Errors::SingularSideload.new(self, parents.length)
+      end
+
       if self.class.scope_proc
         sideload_scope = fire_scope(parents)
         sideload_scope = Scope.new sideload_scope,
@@ -264,6 +254,7 @@ module Graphiti
       {}.tap do |opts|
         opts[:default_paginate] = false
         opts[:sideload_parent_length] = parents.length
+        opts[:query] = query
         opts[:after_resolve] = ->(results) {
           fire_assign(parents, results)
         }

data/lib/graphiti/sideload/belongs_to.rb

@@ -4,14 +4,23 @@ class Graphiti::Sideload::BelongsTo < Graphiti::Sideload
   end
 
   def load_params(parents, query)
-    query.to_hash.tap do |hash|
+    query.hash.tap do |hash|
       hash[:filter] ||= {}
       hash[:filter].merge!(base_filter(parents))
     end
   end
 
+  def load(parents, query)
+    if ids_for_parents(parents).empty?
+      []
+    else
+      super
+    end
+  end
+
   def base_filter(parents)
-    { primary_key => ids_for_parents(parents).join(',') }
+    parent_ids = ids_for_parents(parents)
+    { primary_key => parent_ids.join(',') }
   end
 
   def assign_each(parent, children)

data/lib/graphiti/sideload/has_many.rb

@@ -4,7 +4,7 @@ class Graphiti::Sideload::HasMany < Graphiti::Sideload
   end
 
   def load_params(parents, query)
-    query.to_hash.tap do |hash|
+    query.hash.tap do |hash|
       hash[:filter] ||= {}
       hash[:filter].merge!(base_filter(parents))
     end

data/lib/graphiti/sideload/polymorphic_belongs_to.rb

@@ -82,9 +82,8 @@ class Graphiti::Sideload::PolymorphicBelongsTo < Graphiti::Sideload::BelongsTo
     parents.group_by(&grouper.field_name).each_pair do |group_name, group|
       next if group_name.nil?
 
-      match = ->(name, sl) { sl.group_name == group_name.to_sym }
-      if child = children.find(&match)
-        sideload = child[1]
+      match = ->(c) { c.group_name == group_name.to_sym }
+      if sideload = children.values.find(&match)
         query = remove_invalid_sideloads(sideload.resource, query)
         sideload.resolve(group, query)
       else

data/lib/graphiti/types.rb

@@ -40,7 +40,7 @@ module Graphiti
 
     Bool = create(nil) do |input|
       input = Dry::Types['params.bool'][input]
-      Dry::Types['strict.bool'][input] if input
+      Dry::Types['strict.bool'][input] unless input.nil?
     end
 
     PresentBool = create(nil) do |input|

data/lib/graphiti/util/class.rb

@@ -4,16 +4,19 @@ module Graphiti
       def self.infer_resource_class(parent_resource_class, sideload_name)
         namespace = namespace_for(parent_resource_class)
         inferred_name = "#{sideload_name.to_s.singularize.classify}Resource"
-        klass = "#{namespace}::#{inferred_name}".safe_constantize
+        klass_name = "#{namespace}::#{inferred_name}"
+        tried = [klass_name, inferred_name]
+        klass = klass_name.safe_constantize
         klass ||= inferred_name.safe_constantize
         unless klass
-          raise Errors::ResourceNotFound.new(parent_resource_class, sideload_name)
+          raise Errors::ResourceNotFound.new(parent_resource_class, sideload_name, tried)
         end
         klass
       end
 
       def self.namespace_for(klass)
         namespace = klass.name
+        return '' unless namespace
         split = namespace.split('::')
         split[0,split.length-1].join('::')
       end

data/lib/graphiti/util/persistence.rb

@@ -41,7 +41,7 @@ class Graphiti::Util::Persistence
     update_foreign_key_for_parents(parents)
 
     persisted = persist_object(@meta[:method], @attributes)
-    persisted.instance_variable_set(:@__serializer_klass, @resource.serializer)
+    @resource.decorate_record(persisted)
     assign_temp_id(persisted, @meta[:temp_id])
 
     associate_parents(persisted, parents)

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.0.alpha.5"
+  VERSION = "1.0.alpha.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.0.alpha.5
+  version: 1.0.alpha.6
 platform: ruby
 authors:
 - Lee Richmond
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-08 00:00:00.000000000 Z
+date: 2018-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable
@@ -218,17 +218,20 @@ files:
 - gemfiles/rails_4.gemfile
 - gemfiles/rails_5.gemfile
 - graphiti.gemspec
-- 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/resource.rb.erb
-- lib/generators/jsonapi/templates/resource_reads_spec.rb.erb
-- lib/generators/jsonapi/templates/resource_writes_spec.rb.erb
-- lib/generators/jsonapi/templates/show_request_spec.rb.erb
-- lib/generators/jsonapi/templates/update_request_spec.rb.erb
+- lib/generators/graphiti/api_test_generator.rb
+- lib/generators/graphiti/generator_mixin.rb
+- lib/generators/graphiti/resource_generator.rb
+- lib/generators/graphiti/resource_test_generator.rb
+- lib/generators/graphiti/templates/application_resource.rb.erb
+- lib/generators/graphiti/templates/controller.rb.erb
+- lib/generators/graphiti/templates/create_request_spec.rb.erb
+- lib/generators/graphiti/templates/destroy_request_spec.rb.erb
+- lib/generators/graphiti/templates/index_request_spec.rb.erb
+- lib/generators/graphiti/templates/resource.rb.erb
+- lib/generators/graphiti/templates/resource_reads_spec.rb.erb
+- lib/generators/graphiti/templates/resource_writes_spec.rb.erb
+- lib/generators/graphiti/templates/show_request_spec.rb.erb
+- lib/generators/graphiti/templates/update_request_spec.rb.erb
 - lib/graphiti.rb
 - lib/graphiti/adapters/abstract.rb
 - lib/graphiti/adapters/active_record.rb

data/lib/generators/jsonapi/resource_generator.rb

@@ -1,169 +0,0 @@
-module Jsonapi
-  class ResourceGenerator < ::Rails::Generators::NamedBase
-    source_root File.expand_path('../templates', __FILE__)
-
-    argument :attributes, type: :array, default: [], banner: "field[:type][:index] field[:type][:index]"
-
-    class_option :'omit-comments',
-      type: :boolean,
-      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"'
-
-    desc "This generator creates a resource file at app/resources, as well as corresponding controller/specs/route/etc"
-    def copy_resource_file
-      unless model_klass
-        raise "You must define a #{class_name} model before generating the corresponding resource."
-      end
-
-      generate_controller
-      generate_application_resource unless application_resource_defined?
-      generate_route
-      generate_resource_specs
-      generate_api_specs
-      generate_resource
-    end
-
-    private
-
-    def actions
-      @options['actions'] || %w(index show create update destroy)
-    end
-
-    def actions?(*methods)
-      methods.any? { |m| actions.include?(m) }
-    end
-
-    def omit_comments?
-      @options['omit-comments']
-    end
-
-    def responders?
-      defined?(Responders)
-    end
-
-    def generate_controller
-      to = File.join('app/controllers', class_path, "#{file_name.pluralize}_controller.rb")
-      template('controller.rb.erb', to)
-    end
-
-    def generate_application_resource
-      to = File.join('app/resources', class_path, "application_resource.rb")
-      template('application_resource.rb.erb', to)
-    end
-
-    def application_resource_defined?
-      'ApplicationResource'.safe_constantize.present?
-    end
-
-    def generate_route
-      code = "      resources :#{type}"
-      code << ", only: [#{actions.map { |a| ":#{a}" }.join(', ')}]" if actions.length < 5
-      code << "\n"
-      inject_into_file 'config/routes.rb', after: "scope path: '/v1' do\n" do
-        code
-      end
-    end
-
-    def generate_resource_specs
-      to = File.join("spec/resources/#{file_name}", class_path, "reads_spec.rb")
-      template('resource_reads_spec.rb.erb', to)
-
-      to = File.join("spec/resources/#{file_name}", class_path, "writes_spec.rb")
-      template('resource_writes_spec.rb.erb', to)
-    end
-
-    def generate_api_specs
-      if actions?('index')
-        to = File.join "spec/api/v1/#{file_name.pluralize}",
-          class_path,
-          "index_spec.rb"
-        template('index_request_spec.rb.erb', to)
-      end
-
-      if actions?('show')
-        to = File.join "spec/api/v1/#{file_name.pluralize}",
-          class_path,
-          "show_spec.rb"
-        template('show_request_spec.rb.erb', to)
-      end
-
-      if actions?('create')
-        to = File.join "spec/api/v1/#{file_name.pluralize}",
-          class_path,
-          "create_spec.rb"
-        template('create_request_spec.rb.erb', to)
-      end
-
-      if actions?('update')
-        to = File.join "spec/api/v1/#{file_name.pluralize}",
-          class_path,
-          "update_spec.rb"
-        template('update_request_spec.rb.erb', to)
-      end
-
-      if actions?('destroy')
-        to = File.join "spec/api/v1/#{file_name.pluralize}",
-          class_path,
-          "destroy_spec.rb"
-        template('destroy_request_spec.rb.erb', to)
-      end
-    end
-
-    def generate_resource
-      to = File.join('app/resources', class_path, "#{file_name}_resource.rb")
-      template('resource.rb.erb', to)
-    end
-
-    def jsonapi_config
-      File.exists?('.jsonapicfg.yml') ? YAML.load_file('.jsonapicfg.yml') : {}
-    end
-
-    def update_config!(attrs)
-      config = jsonapi_config.merge(attrs)
-      File.open('.jsonapicfg.yml', 'w') { |f| f.write(config.to_yaml) }
-    end
-
-    def prompt(header: nil, description: nil, default: nil)
-      say(set_color("\n#{header}", :magenta, :bold)) if header
-      say("\n#{description}") if description
-      answer = ask(set_color("\n(default: #{default}):", :magenta, :bold))
-      answer = default if answer.blank? && default != 'nil'
-      say(set_color("\nGot it!\n", :white, :bold))
-      answer
-    end
-
-    def api_namespace
-      @api_namespace ||= begin
-        ns = jsonapi_config['namespace']
-
-        if ns.blank?
-          ns = prompt \
-            header: "What is your API namespace?",
-            description: "This will be used as a route prefix, e.g. if you want the route '/books_api/v1/authors' your namespace would be 'books_api'",
-            default: 'api'
-          update_config!('namespace' => ns)
-        end
-
-        ns
-      end
-    end
-
-    def model_klass
-      class_name.safe_constantize
-    end
-
-    def resource_klass
-      "#{model_klass}Resource"
-    end
-
-    def type
-      model_klass.name.underscore.pluralize
-    end
-  end
-end

data/lib/generators/jsonapi/templates/index_request_spec.rb.erb

@@ -1,22 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe "<%= file_name.pluralize %>#index", type: :request do
-  let(:params) { {} }
-
-  subject(:make_request) do
-    jsonapi_get "/<%= api_namespace %>/v1/<%= file_name.pluralize %>", params: params
-  end
-
-  describe 'basic fetch' do
-    let!(:<%= file_name %>1) { create(:<%= file_name %>) }
-    let!(:<%= file_name %>2) { create(:<%= file_name %>) }
-
-    it 'works' do
-      expect(<%= resource_klass %>).to receive(:all).and_call_original
-      make_request
-      expect(response.status).to eq(200)
-      expect(d.map(&:jsonapi_type).uniq).to eq(['<%= file_name.pluralize %>'])
-      expect(d.map(&:id)).to eq([<%= file_name %>1.id, <%= file_name %>2.id])
-    end
-  end
-end

data/lib/generators/jsonapi/templates/show_request_spec.rb.erb

@@ -1,21 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe "<%= file_name.pluralize %>#show", type: :request do
-  let(:params) { {} }
-
-  subject(:make_request) do
-    jsonapi_get "/<%= api_namespace %>/v1/<%= file_name.pluralize %>/#{<%= file_name %>.id}", params: params
-  end
-
-  describe 'basic fetch' do
-    let!(:<%= file_name %>) { create(:<%= file_name %>) }
-
-    it 'works' do
-      expect(<%= resource_klass %>).to receive(:find).and_call_original
-      make_request
-      expect(response.status).to eq(200)
-      expect(d.jsonapi_type).to eq('<%= file_name.pluralize %>')
-      expect(d.id).to eq(<%= file_name %>.id)
-    end
-  end
-end