graphiti_scaffold_generator 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72142c6e69ed6bf0be8d2893242fd870ca0f4b070b7a506cacbafa9ab0c9dca3
-  data.tar.gz: 7f52f99f0bac0e7c93b890c9fbe83fd9acd8bc8453d87f761417c4833cf91d89
+  metadata.gz: fe50af1227fbf67ae6966ebdc03b8d61ed12fc9bcc9aaa08137a93df3845fb73
+  data.tar.gz: 05e51a9ace3926e919aa34248f238736495f2768e5c67fb99fa590431fe7b69c
 SHA512:
-  metadata.gz: a9e34364e9e999694c41b05a8d1a14961d687fb1a205197f3127691103d36f404f83cd27a1fe163ca8efd14fca58a5973a898c0dae061f97087209d4c0ff31e3
-  data.tar.gz: a6f0239585b55862449777a1ae578e02a05aecd49f6a21fa62600d5772a5feeedd5be7ae4518eec724efca4909cb58f4f65c4c762388bbd1cc6791932041b743
+  metadata.gz: 14cfcd09d212a2658df7be76d8d20543b85a516fb373475785f2d21e837e7c8efd8ae151d413bb323b99dddd29130c9d41bdff45a1bd1d636dec0048017409d4
+  data.tar.gz: ecb3429e7e30718baa38955bf64a45d913b7b559ce9e96bb2d99dc2e2df99fe8e85ffded52fa63f99a581f27cd77c1806495556a8405a040ffb7e14fcbe5a1b4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    graphiti_scaffold_generator (0.1.1)
+    graphiti_scaffold_generator (0.1.2)
 
 GEM
   remote: https://rubygems.org/

data/lib/generators/graphiti_resource_generator/rspec/templates/resource_spec.rb

@@ -22,7 +22,6 @@
   end
   all_attributes = id_attr + all_attributes
 -%>
-
 <% if File.exist?(File.join %w[spec rails_helper.rb]) -%>
 require 'rails_helper'
 <% else -%>

data/lib/graphiti_scaffold_generator/generators/rails/templates/api_controller.rb

@@ -1,8 +1,8 @@
 <% resource = class_name + 'Resource' -%>
 <% pundit = defined?(Pundit) -%>
 <% module_namespacing do -%>
-class <%= controller_class_name %>Controller < ApplicationController
-  before_action :set_<%= pundit ? 'and_authorise_' : '' %><%= singular_table_name %>, only: %i[ show update destroy ]
+class <%= controller_class_name %>Controller < GraphitiApiController
+  before_action :set_<%= pundit ? 'and_authorize_' : '' %><%= singular_table_name %>, only: %i[show update destroy]
 
   # GET <%= route_url %>
   def index
@@ -23,18 +23,18 @@ class <%= controller_class_name %>Controller < ApplicationController
 <% end -%>
 
     if @<%= singular_table_name %>.save
-      render jsonapi: <%= singular_table_name %>, status: :created
+      render jsonapi: @<%= singular_table_name %>, status: :created
     else
-      render jsonapi_errors: <%= singular_table_name %>
+      render jsonapi_errors: @<%= singular_table_name %>
     end
   end
 
   # PATCH/PUT <%= route_url %>/1
   def update
     if @<%= singular_table_name %>.update_attributes
-      render jsonapi: <%= singular_table_name %>
+      render jsonapi: @<%= singular_table_name %>
     else
-      render jsonapi_errors: <%= singular_table_name %>
+      render jsonapi_errors: @<%= singular_table_name %>
     end
   end
 
@@ -46,10 +46,10 @@ class <%= controller_class_name %>Controller < ApplicationController
   private
 
   # Use callbacks to share common setup or constraints between actions.
-  def set_<%= pundit ? 'and_authorise_' : '' %><%= singular_table_name %>
+  def set_<%= pundit ? 'and_authorize_' : '' %><%= singular_table_name %>
     @<%= singular_table_name %> = <%= resource %>.find(params)
 <% if pundit -%>
-    authorize @<%= singular_table_name %>
+    authorize @<%= singular_table_name %>.data
 <% end -%>
   end
 
@@ -61,7 +61,7 @@ class <%= controller_class_name %>Controller < ApplicationController
     list = %i[
       <%= attributes_names.join(' ') %>
     ]
-    params.require(:<%= singular_table_name %>).permit(*list)
+    params.require(:data).require(:attributes).permit(*list)
 <%- end -%>
   end
 end

data/lib/graphiti_scaffold_generator/generators/rails/templates/api_request_spec.rb

@@ -57,6 +57,16 @@ describe "Request /<%= name.underscore.pluralize %>", <%= type_metatag(:request)
     {}
   }
 
+<% if pundit -%>
+  before do
+    allow_any_instance_of(GraphitiApiController).to receive(:authorize)
+        .and_return UserAbsence
+    allow_any_instance_of(GraphitiApiController).to receive(:current_user)
+        .and_return(user)
+    allow_any_instance_of(GraphitiApiController).to receive :authenticate_user!
+  end
+<% end -%>
+
 <% unless options[:singleton] -%>
   describe 'GET /index' do
     it "renders a successful response" do
@@ -152,10 +162,10 @@ describe "Request /<%= name.underscore.pluralize %>", <%= type_metatag(:request)
         attributes: new_attributes,
       }
     end
-    let(:new_attributes) {
+    let(:new_attributes) do
       skip("Add a hash of attributes valid for <%= class_name %>")
       {  <%= attribute_name %>: 'New <%= attribute_name %>' }
-    }
+    end
 
     context "with valid parameters" do
       it "updates the requested <%= file_name %>" do

data/lib/graphiti_scaffold_generator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GraphitiScaffoldGenerator
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphiti_scaffold_generator
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Dmitry Kulikov