jbuilder_rspec_generator 1.4 → 1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67e103e34bfc0a8ef9d83f095e125f5460244d00501cc25f74056b513079673e
-  data.tar.gz: 8f3287fb66ed746ae6cbd4cddbcf9c065454b0440250ab734011a033913b0555
+  metadata.gz: fca0d9fdcdee7a324a2783bfbdf52082d8721414c6f540bf467143658d2c1726
+  data.tar.gz: 8308572944df8297353661ed23b1ec95feea14c1c3fd97b7cb18b8193595c517
 SHA512:
-  metadata.gz: 3533db5c8cd37ec36da99dc4bce3866400db108dc553bfaf973f722c0e5e8a351816667f60d282cf49ab5453a06c586f634e6c9a72ec71dab21d74143ef26980
-  data.tar.gz: adf9e1d467a8a664a9b781d0577d227ca8c0e2e65b3c022c98f571fc0299e0eabfb950e87b88d8f25c07bd8a5665f7d752262184bc1b243409d32574b3fc2ae6
+  metadata.gz: 30a6281a929fce2d8c0e955546ee889f462b39faa574538eddea11320ff5943d1d085df947196d332b221b6a54e9c2f90181d8255e170e6b53fff1198e1a2349
+  data.tar.gz: 52ae8bdefc2b5a674f3c309d2b9f9ca152d6fd3e318ad8d90ef66b2c58cc888ab712668262fa53563212659b7e80bf2e8fc049467fc202053c0a12178166347e

data/VERSION

@@ -1 +1 @@
-1.4
+1.5

data/jbuilder_rspec_generator.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: jbuilder_rspec_generator 1.4 ruby lib
+# stub: jbuilder_rspec_generator 1.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "jbuilder_rspec_generator".freeze
-  s.version = "1.4"
+  s.version = "1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Dmitri Koulikoff".freeze]
-  s.date = "2019-05-22"
+  s.date = "2020-04-30"
   s.description = "Generates RSpecs for jbuilder templates".freeze
   s.email = "dima@koulikoff.ru".freeze
   s.extra_rdoc_files = [

data/lib/generators/rspec/templates/index_spec.rb

@@ -6,21 +6,25 @@ require 'spec_helper'
 
 <% open_attributes = attributes.reject(&:password_digest?) -%>
 <% links = open_attributes.select{|a| [:belongs_to, :references].include? a.type} -%>
+
 describe "<%= ns_table_name %>/index.json.jbuilder", type: :view do
+<% if Rails.application.config.generators.options[:rails][:fixture_replacement] == :factory_bot -%>
+<% factory = true -%>
+  let(:<%= ns_file_name %>) { create :<%= ns_file_name %> }
+
+<% end -%>
   before(:each) do
 <% if Rails.application.config.generators.options[:rails][:cancan] -%>
     allow(controller).to receive(:can?).and_return(true)
 <% end -%>
-<% if Rails.application.config.generators.options[:rails][:fixture_replacement] == :factory_bot -%>
-    @<%= ns_file_name %> = create(:<%= ns_file_name %>)
-<% else -%>
+<% unless factory -%>
     @<%= ns_file_name %> = <%= class_name %>.create(<%= open_attributes.empty? ? ')' : '' %>
 <% open_attributes.each_with_index do |attribute, attribute_index| -%>
       <%= attribute.name %>: <%= value_for(attribute) %><%= attribute_index == open_attributes.length - 1 ? '' : ','%>
 <% end -%>
     )
 <% end -%>
-    assign :<%= table_name %>, [@<%= ns_file_name %>, @<%= ns_file_name %>]
+    assign :<%= table_name %>, [<% unless factory -%>@<% end -%><%= ns_file_name %>, <% unless factory -%>@<% end -%><%= ns_file_name %>]
     render
   end
 
@@ -53,12 +57,12 @@ describe "<%= ns_table_name %>/index.json.jbuilder", type: :view do
     expect(hash.first).to eq(hash = hash.last)
     expect(hash.keys.sort).to eq attributes.sort
 <% if links.present? -%>
-    expected = @<%= ns_file_name %>.attributes.slice *(attributes - complex)
+    expected = <% unless factory -%>@<% end -%><%= ns_file_name %>.attributes.slice *(attributes - complex)
 <% else -%>
-    expected = @<%= ns_file_name %>.attributes.slice *attributes
+    expected = <% unless factory -%>@<% end -%><%= ns_file_name %>.attributes.slice *attributes
 <% end -%>
     expected = MultiJson.load MultiJson.dump expected
-    expected['url'] = <%= "api_" if options[:with_api] %><%= "#{options[:api_version]}_" if options[:with_api] and options[:api_version].present? %><%= ns_file_name %>_url(@<%= ns_file_name %><%= ", format: 'json'" unless options[:with_api] %>)
+    expected['url'] = <%= "api_" if options[:with_api] %><%= "#{options[:api_version]}_" if options[:with_api] and options[:api_version].present? %><%= ns_file_name %>_url(<% unless factory -%>@<% end -%><%= ns_file_name %><%= ", format: 'json'" unless options[:with_api] %>)
 <% if links.present? -%>
     expect(hash.except! *complex).to eq expected
 <% else -%>
@@ -71,9 +75,9 @@ describe "<%= ns_table_name %>/index.json.jbuilder", type: :view do
     hash = MultiJson.load(rendered).last
     hash = hash['<%= attribute.name %>']
     expect(hash.keys.sort).to eq <%= attribute.name %>_attributes.sort
-    expected = @<%= ns_file_name %>.<%= attribute.name %>.attributes.slice *<%= attribute.name %>_attributes
+    expected = <% unless factory -%>@<% end -%><%= ns_file_name %>.<%= attribute.name %>.attributes.slice *<%= attribute.name %>_attributes
     expected = MultiJson.load MultiJson.dump expected
-    expected['url'] = <%= "api_" if options[:with_api] %><%= "#{options[:api_version]}_" if options[:with_api] and options[:api_version].present? %><%= attribute.name %>_url(@<%= ns_file_name %>.<%= attribute.name %><%= ", format: 'json'" unless options[:with_api] %>)
+    expected['url'] = <%= "api_" if options[:with_api] %><%= "#{options[:api_version]}_" if options[:with_api] and options[:api_version].present? %><%= attribute.name %>_url(<% unless factory -%>@<% end -%><%= ns_file_name %>.<%= attribute.name %><%= ", format: 'json'" unless options[:with_api] %>)
     expect(hash).to eq expected
   end
 <% end -%>

data/lib/generators/rspec/templates/show_spec.rb

@@ -6,13 +6,19 @@ require 'spec_helper'
 
 <% open_attributes = attributes.reject(&:password_digest?) -%>
 <% links = open_attributes.select{|a| [:belongs_to, :references].include? a.type} -%>
+
 describe "<%= ns_table_name %>/show.json.jbuilder", type: :view do
+<% if Rails.application.config.generators.options[:rails][:fixture_replacement] == :factory_bot -%>
+<% factory = true -%>
+  let(:<%= ns_file_name %>) { create :<%= ns_file_name %> }
+
+<% end -%>
   before(:each) do
 <% if Rails.application.config.generators.options[:rails][:cancan] -%>
     allow(controller).to receive(:can?).and_return(true)
 <% end -%>
-<% if Rails.application.config.generators.options[:rails][:fixture_replacement] == :factory_bot -%>
-    @<%= ns_file_name %> = assign(:<%= ns_file_name %>, create(:<%= ns_file_name %>))
+<% if factory -%>
+    assign :<%= ns_file_name %>, <%= ns_file_name %>
 <% else -%>
     @<%= ns_file_name %> = assign(:<%= ns_file_name %>, <%= class_name %>.create(<%= open_attributes.empty? ? '))' : '' %>
 <% open_attributes.each_with_index do |attribute, attribute_index| -%>
@@ -53,12 +59,12 @@ describe "<%= ns_table_name %>/show.json.jbuilder", type: :view do
     hash = MultiJson.load rendered
     expect(hash.keys.sort).to eq attributes.sort
 <% if links.present? -%>
-    expected = @<%= ns_file_name %>.attributes.slice *(attributes - complex)
+    expected = <% unless factory -%>@<% end -%><%= ns_file_name %>.attributes.slice *(attributes - complex)
 <% else -%>
-    expected = @<%= ns_file_name %>.attributes.slice *attributes
+    expected = <% unless factory -%>@<% end -%><%= ns_file_name %>.attributes.slice *attributes
 <% end -%>
     expected = MultiJson.load MultiJson.dump expected
-    expected['url'] = <%= "api_" if options[:with_api] %><%= "#{options[:api_version]}_" if options[:with_api] and options[:api_version].present? %><%= ns_file_name %>_url(@<%= ns_file_name %><%= ", format: 'json'" unless options[:with_api] %>)
+    expected['url'] = <%= "api_" if options[:with_api] %><%= "#{options[:api_version]}_" if options[:with_api] and options[:api_version].present? %><%= ns_file_name %>_url(<% unless factory -%>@<% end -%><%= ns_file_name %><%= ", format: 'json'" unless options[:with_api] %>)
 <% if links.present? -%>
     expect(hash.except! *complex).to eq expected
 <% else -%>
@@ -71,9 +77,9 @@ describe "<%= ns_table_name %>/show.json.jbuilder", type: :view do
     hash = MultiJson.load(rendered)
     hash = hash['<%= attribute.name %>']
     expect(hash.keys.sort).to eq <%= attribute.name %>_attributes.sort
-    expected = @<%= ns_file_name %>.<%= attribute.name %>.attributes.slice *<%= attribute.name %>_attributes
+    expected = <% unless factory -%>@<% end -%><%= ns_file_name %>.<%= attribute.name %>.attributes.slice *<%= attribute.name %>_attributes
     expected = MultiJson.load MultiJson.dump expected
-    expected['url'] = <%= "api_" if options[:with_api] %><%= "#{options[:api_version]}_" if options[:with_api] and options[:api_version].present? %><%= attribute.name %>_url(@<%= ns_file_name %>.<%= attribute.name %><%= ", format: 'json'" unless options[:with_api] %>)
+    expected['url'] = <%= "api_" if options[:with_api] %><%= "#{options[:api_version]}_" if options[:with_api] and options[:api_version].present? %><%= attribute.name %>_url(<% unless factory -%>@<% end -%><%= ns_file_name %>.<%= attribute.name %><%= ", format: 'json'" unless options[:with_api] %>)
     expect(hash).to eq expected
   end
 <% end -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder_rspec_generator
 version: !ruby/object:Gem::Version
-  version: '1.4'
+  version: '1.5'
 platform: ruby
 authors:
 - Dmitri Koulikoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-22 00:00:00.000000000 Z
+date: 2020-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json