jbuilder_rspec_generator 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3494d08f40cfacade414dfb659ab6b8be48200e
-  data.tar.gz: ea17630278d2d963884d6c9f69f9269f2931157a
+  metadata.gz: 86e3a0f61821fd59aaf0e3e2a2a9aaf6b99d299c
+  data.tar.gz: 3cc3094fa98a757800f54311b085618228bbdf02
 SHA512:
-  metadata.gz: fdf49b3a1412002c6e766c496043d832c3c4a0b938f67ff1e5163257f4965009596164e53668a381a38497ebeed122ad239521657a86aa47d385f4699359ffc8
-  data.tar.gz: 2a1c08a7e22b37ce7e9a0717af5f0edd3b437c9c77d385fac851b5aa068b1866b9ee6d4fba841d43306bbf9d55c1249d45762ae5674a2562562583e66121dc55
+  metadata.gz: 42232c3559c2823fb972a5a166346f7ee14c28e8339994ecae6a332498c42a2eef1459bd67476ca02fe336bd9f8795367c40ff478a4c4f2c919f21294dc704bd
+  data.tar.gz: 0a61ad63b40c9983fa083e1469ff0149d2645ad243ac07e92275bf7a0664071d0ce1554329b478eee1ec91328af17c545694b8fdeb31e1850705460a21b0154a

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.3.1

data/jbuilder_rspec_generator.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: jbuilder_rspec_generator 1.3.0 ruby lib
+# stub: jbuilder_rspec_generator 1.3.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "jbuilder_rspec_generator"
-  s.version = "1.3.0"
+  s.version = "1.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

data/lib/generators/rails/jbuilder/jbuilder_generator.rb

@@ -3,6 +3,11 @@ require 'generators/rails/jbuilder_generator'
 module Rails
   module Generators
     class JbuilderGenerator < NamedBase # :nodoc:
+      class_option :with_api, type: :boolean,
+                         desc: "Generates also API controller in 'app/contorllers/api'"
+      class_option :api_version, type: :string,
+                         desc: "Adds specified path as version to 'app/contorllers/api'"
+
       source_paths.unshift File.expand_path('../templates', __FILE__)
 
       hook_for :test_framework

data/lib/generators/rails/jbuilder/templates/partial.json.jbuilder

@@ -1,2 +1,2 @@
 json.extract! <%= singular_table_name %>, <%= attributes_list_with_timestamps %>
-json.url <%= "api_v1_" if Rails::Generators::ScaffoldControllerGenerator.class_options[:with_api] %><%= singular_table_name %>_url(<%= singular_table_name %>, format: :json)
+json.url <%= "api_" if options[:with_api] %><%= "#{options[:api_version]}_" if options[:with_api] and options[:api_version].present? %><%= singular_table_name %>_url(<%= singular_table_name %><%= ", format: 'json'" unless options[:with_api] %>)

data/lib/generators/rspec/jbuilder_generator.rb

@@ -6,6 +6,11 @@ module Rspec
     class JbuilderGenerator < Base
       include ::Rails::Generators::ResourceHelpers
 
+      class_option :with_api, type: :boolean,
+                         desc: "Generates also API controller in 'app/contorllers/api'"
+      class_option :api_version, type: :string,
+                         desc: "Adds specified path as version to 'app/contorllers/api'"
+
       argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
 
       def generate_view_specs

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

@@ -58,7 +58,7 @@ describe "<%= ns_table_name %>/index.json.jbuilder", type: :view do
     expected = @<%= ns_file_name %>.attributes.slice *attributes
 <% end -%>
     expected = MultiJson.load MultiJson.dump expected
-    expected['url'] = <%= ns_file_name %>_url(@<%= ns_file_name %>, format: 'json')
+    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] %>)
 <% if links.present? -%>
     expect(hash.except! *complex).to eq expected
 <% else -%>
@@ -73,7 +73,7 @@ describe "<%= ns_table_name %>/index.json.jbuilder", type: :view do
     expect(hash.keys.sort).to eq <%= attribute.name %>_attributes.sort
     expected = @<%= ns_file_name %>.<%= attribute.name %>.attributes.slice *<%= attribute.name %>_attributes
     expected = MultiJson.load MultiJson.dump expected
-    expected['url'] = <%= attribute.name %>_url(@<%= ns_file_name %>.<%= attribute.name %>, format: 'json')
+    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] %>)
     expect(hash).to eq expected
   end
 <% end -%>

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

@@ -32,6 +32,7 @@ describe "<%= ns_table_name %>/show.json.jbuilder", type: :view do
 <% end -%>
     created_at
     updated_at
+    url
   ]
 <% if links.present? -%>
   complex = %w[
@@ -57,6 +58,7 @@ describe "<%= ns_table_name %>/show.json.jbuilder", type: :view do
     expected = @<%= 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] %>)
 <% if links.present? -%>
     expect(hash.except! *complex).to eq expected
 <% else -%>
@@ -71,7 +73,7 @@ describe "<%= ns_table_name %>/show.json.jbuilder", type: :view do
     expect(hash.keys.sort).to eq <%= attribute.name %>_attributes.sort
     expected = @<%= ns_file_name %>.<%= attribute.name %>.attributes.slice *<%= attribute.name %>_attributes
     expected = MultiJson.load MultiJson.dump expected
-    expected['url'] = <%= attribute.name %>_url(@<%= ns_file_name %>.<%= attribute.name %>, format: 'json')
+    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] %>)
     expect(hash).to eq expected
   end
 <% end -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder_rspec_generator
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Dmitri Koulikoff