jbuilder_rspec_generator 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b950f7c524fad22f56605af7dee4bf313b6d53a
-  data.tar.gz: a7dcb94c18ba1581a64ce65761f8e387d76f2e49
+  metadata.gz: a89167a84eeebe582e3c88f3f419a03581e65032
+  data.tar.gz: 8750eeb889593a5fd2eab307dcbc36d113fc3bd1
 SHA512:
-  metadata.gz: f207426438154c4669561903fad9f4746d2f4fd4cb1b578a0ee16c72035c149391c359312f0412c5aac8bfc0a24608480788022c54c18dd9df9c830f4b1fcc49
-  data.tar.gz: 504a0a60ad624d4086f80386496086111c38eeff8ac3a54dc81569b6204af30bc51f57ae7654ee8ad8efcc2f59aab48d187e3ded81388fdc47b7f1c1ce8c93be
+  metadata.gz: 33117bdbe977770e3bce23b1378fdc5950c01a4098eafea83ce92bfe4c09c349363e68d7eee2e4879d8b64afbf12aef971aab66ec6428615bfbdc7a71bec4878
+  data.tar.gz: 2f1889f3737d46f27aa616b923a950662283c16324705b9297fd7cd05a97b3249518408aee6326e3f85355b9049f73802b71e781538f88c2754e1d47ab084f45

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

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.1.0 ruby lib
+# stub: jbuilder_rspec_generator 1.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "jbuilder_rspec_generator"
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Dmitri Koulikoff"]
-  s.date = "2015-06-14"
+  s.date = "2016-03-22"
   s.description = "Generates RSpecs for jbuilder templates"
   s.email = "dima@koulikoff.ru"
   s.extra_rdoc_files = [
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/dima4p/jbuilder_rspec_generator"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.5.1"
   s.summary = "RSpecs for jbuilder templates"
 
   if s.respond_to? :specification_version then

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

@@ -5,6 +5,7 @@ require 'spec_helper'
 <% end -%>
 
 <% 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
   before(:each) do
 <% if Rails.application.config.generators.options[:rails][:cancan] -%>
@@ -20,6 +21,7 @@ describe "<%= ns_table_name %>/index.json.jbuilder", type: :view do
     )
 <% end -%>
     assign :<%= table_name %>, [@<%= ns_file_name %>, @<%= ns_file_name %>]
+    render
   end
 
   attributes = %w[
@@ -29,21 +31,48 @@ describe "<%= ns_table_name %>/index.json.jbuilder", type: :view do
 <% end -%>
     url
   ]
+<% if links.present? -%>
+  complex = %w[
+<% for attribute in links -%>
+    <%= attribute.name %>
+<% end -%>
+  ]
+<% for attribute in links -%>
+  <%= attribute.name %>_attributes = %w[
+    id
+    name
+    url
+  ]
+<% end -%>
+<% end -%>
 
   it "renders a list of <%= table_name %> as json with following attributes: #{attributes.join(', ')}" do
-    render
-
     hash = MultiJson.load rendered
     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)
+<% else -%>
     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')
+<% if links.present? -%>
+    expect(hash.except! *complex).to eq expected
+<% else -%>
     expect(hash).to eq expected
-    # expect(hash['id']).to eq @<%= ns_file_name %>.id.to_s
-<% for attribute in open_attributes -%>
-    # expect(hash['<%= attribute.name %>']).to eq @<%= ns_file_name %>.<%= attribute.name %>.to_s
 <% end -%>
-    # expect(hash['url']).to eq <%= ns_file_name %>_url(@<%= ns_file_name %>, format: 'json')
   end
+<% for attribute in links -%>
+
+  it "renders <%= attribute.name %> of the <%= table_name %> with the following attributes: #{<%= attribute.name %>_attributes.join(', ')}" 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 = MultiJson.load MultiJson.dump expected
+    expected['url'] = <%= attribute.name %>_url(@<%= ns_file_name %>.<%= attribute.name %>, format: 'json')
+    expect(hash).to eq expected
+  end
+<% end -%>
 end

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

@@ -5,6 +5,7 @@ require 'spec_helper'
 <% end -%>
 
 <% 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
   before(:each) do
 <% if Rails.application.config.generators.options[:rails][:cancan] -%>
@@ -21,6 +22,7 @@ describe "<%= ns_table_name %>/show.json.jbuilder", type: :view do
     ))
 <% end -%>
 <% end -%>
+    render
   end
 
   attributes = %w[
@@ -31,20 +33,46 @@ describe "<%= ns_table_name %>/show.json.jbuilder", type: :view do
     created_at
     updated_at
   ]
+<% if links.present? -%>
+  complex = %w[
+<% for attribute in links -%>
+    <%= attribute.name %>
+<% end -%>
+  ]
+<% for attribute in links -%>
+  <%= attribute.name %>_attributes = %w[
+    id
+    name
+    url
+  ]
+<% end -%>
+<% end -%>
 
   it "renders the following attributes of <%= ns_file_name %>: #{attributes.join(', ')} as json" do
-    render
-
     hash = MultiJson.load rendered
     expect(hash.keys.sort).to eq attributes.sort
+<% if links.present? -%>
+    expected = @<%= ns_file_name %>.attributes.slice *(attributes - complex)
+<% else -%>
     expected = @<%= ns_file_name %>.attributes.slice *attributes
+<% end -%>
     expected = MultiJson.load MultiJson.dump expected
+<% if links.present? -%>
+    expect(hash.except! *complex).to eq expected
+<% else -%>
     expect(hash).to eq expected
-    # expect(hash['id']).to eq @<%= ns_file_name %>.id.to_s
-<% for attribute in open_attributes -%>
-    # expect(hash['<%= attribute.name %>']).to eq @<%= ns_file_name %>.<%= attribute.name %>.to_s
 <% end -%>
-    # expect(hash['created_at']).to eq @<%= ns_file_name %>.created_at.to_s
-    # expect(hash['updated_at']).to eq @<%= ns_file_name %>.updated_at.to_s
   end
+<% for attribute in links -%>
+
+  it "renders <%= attribute.name %> of the <%= table_name %> with the following attributes: #{<%= attribute.name %>_attributes.join(', ')}" 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 = MultiJson.load MultiJson.dump expected
+    expected['url'] = <%= attribute.name %>_url(@<%= ns_file_name %>.<%= attribute.name %>, format: 'json')
+    expect(hash).to eq expected
+  end
+<% end -%>
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder_rspec_generator
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Dmitri Koulikoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-14 00:00:00.000000000 Z
+date: 2016-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: RSpecs for jbuilder templates