appraisermetrics_report_service 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d4ca9ad4041390d69d2c9f5cdde8e00269d4c96
-  data.tar.gz: 75ef9a1275a9be42fb8e137ba4a593fcdf150d1a
+  metadata.gz: 6c1943150bf8449feab4a3a0c0b491de2dc1b9af
+  data.tar.gz: 69ad532b4a0c36300e2657f1443909c9d305e154
 SHA512:
-  metadata.gz: fae4f6fc15fbef80f763ca5a489fdb6e488f18696e245bafe92afa0e2fccfdc4dc6725a115dccba1feeb1428592cd2fc43d2f820ef4764ed705af3c27faa6bd3
-  data.tar.gz: 03b54fd044302884d899113a204b5fab507783e27d25901069acbf7b3deebe245c24e194dc6b86f1655a98fb7f913fd1aee0ab4d180e7d94189b0a2a34726035
+  metadata.gz: 5176424d1dac01ddaea2b9a36b31b8f19fb83813384c98af5614b3e95880202532244eb2f878c9606386ae206293695ba0d82f25f9dc4e941d339b7d349673a2
+  data.tar.gz: d12e1d8e29e46dcc5490f04bc8bb9ffeed386af49d8a5e333136c4953e98d630d87c419e2b200a9ae89de455ed1df58baead2968279361f97116c7f27729a074

data/lib/appraisermetrics_report_service/version.rb

@@ -1,3 +1,3 @@
 module AppraisermetricsReportService
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/closed_sale.rb

@@ -303,10 +303,29 @@ class ClosedSale < Prawn::Document
 
 	def comments
 		comments_data = [
-			["Comments"],
-			["#{@rep[:general_comments]}"]
+			["Comments"]
 		]
 
+		comment_sections = [
+			:sale_adjustment_comments,
+			:general_comments,
+			:atmarket_comments,
+			:lease_comments,
+			:change_of_use,
+			:water_rights_cont,
+			:water_distribution_comment,
+			:easements_description,
+			:mineral_rights,
+			:permanent_plantings,
+			:property_improvement_comments
+		]
+
+		comment_sections.each do |c| # only include if exists
+			if @rep[c]
+				comments_data << ["#{@rep[c]}"]
+			end
+		end
+
 		table(comments_data) do
 			row(0).style align: :center
 			column(0).width = 270

data/lib/eval_report.rb

@@ -45,8 +45,6 @@ class EvalReport < Prawn::Document
 		ag_sales_map
 		val_method_and_recon
 		assumptions_and_conditions
-		addendum_a
-		addendum_b
 		additional_docs
 		finish_toc
 	end
@@ -343,7 +341,7 @@ class EvalReport < Prawn::Document
 	end
 
 	def topo_maps
-		header("LOCAL AREA MAP")
+		header("SUBJECT MAPS")
 		move_down 25
 		text "MAPS", size: 14, align: :center
 
@@ -374,7 +372,7 @@ class EvalReport < Prawn::Document
 
 	def property_description
 		header("PROPERTY DESCRIPTION")
-		move_down 25
+		move_down 10
 		text "PROPERTY DESCRIPTION, SURROUNDING LAND USES, REGIONAL ECONOMIC AND DEMOGRAPHIC OVERVIEW", size: 14, style: :bold
 		font_size 6
 		bounding_box([0, 645], height: 300, width: 340) do
@@ -670,6 +668,9 @@ class EvalReport < Prawn::Document
 	end
 
 	def property_features # container method to create various tables
+		move_down 3
+		header("PROPERTY DESCRIPTION")
+		move_down 5
 		font_size 7
 		stroke_bounds
 		if @sub[:transactions] && @sub[:transactions].any?
@@ -744,7 +745,7 @@ class EvalReport < Prawn::Document
 
 	def property_comparison
 		header("DIRECT COMPARISON ANALYSIS")
-		move_down 25
+		move_down 10
 		font_size 7
 
 		table(flip_comp_array(@comps.first(5))) do
@@ -752,12 +753,15 @@ class EvalReport < Prawn::Document
 			columns(1..6).width = 75
 			cells.padding = [1, 2.5]
 			columns(1..6).style(align: :center)
+			row(0).style(border_right_width: 0, border_top_width: 0, border_left_width: 0, border_bottom_width: 0)
+			row(0).style(font_style: :bold, size: 11)
 		end
 
 		if @comps.length > 5
 			start_new_page
+			font_size 11
 			header("DIRECT COMPARISON ANALYSIS")
-			move_down 25
+			move_down 10
 			font_size 7
 
 			second_page_comps = flip_comp_array(@comps[5..9])
@@ -767,6 +771,8 @@ class EvalReport < Prawn::Document
 				columns(1..6).width = 75
 				cells.padding = [1, 2.5]
 				columns(1..6).style(align: :center)
+				row(0).style(border_right_width: 0, border_top_width: 0, border_left_width: 0, border_bottom_width: 0)
+				row(0).style(font_style: :bold, size: 11)
 			end
 		end
 
@@ -775,13 +781,13 @@ class EvalReport < Prawn::Document
 	end
 
 	def discussion_of_sales
-		header("DIRECT COMPARISON ANALYSIS")
-		font_size 10
 		if @comps && @comps.any? # just skip the table if there aren't any comps
+			header("COMPARABLE SALES COMMENTS")
+			font_size 9
 
 			table(flip_discussions(@comps.first(5))) do
 				cells.padding = [1, 2.5]
-				columns(0..5).width = 90
+				columns(0..4).width = 108
 				row(0).style(align: :center, background_color: 'd7d7d7')
 				cells.style(border_width: 0)
 				columns(0..5).style(border_right_width: 0.5)
@@ -789,10 +795,10 @@ class EvalReport < Prawn::Document
 
 			if @comps.length > 5
 				start_new_page 
-				header("DIRECT COMPARISON ANALYSIS")
+				header("COMPARABLE SALES COMMENTS")
 				table(flip_discussions(@comps[5..9])) do
 					cells.padding = [1, 2.5]
-					columns(0..5).width = 90
+					columns(0..4).width = 108
 					row(0).style(align: :center, background_color: 'd7d7d7')
 					cells.style(border_width: 0)
 					columns(0..5).style(border_right_width: 0.5)
@@ -806,9 +812,9 @@ class EvalReport < Prawn::Document
 	def flip_discussions(comps_to_flip)
 		@discussion_increment ||= 1
 		discussion_data = [
-				["Subject"]
+				[]
 			]
-			sale_discussions = ["N/A"]
+			sale_discussions = []
 
 			comps_to_flip.each do |c|
 				c_string = " "
@@ -842,7 +848,7 @@ class EvalReport < Prawn::Document
 	end
 
 	def ag_sales_map
-		header("AGRICULTURE SALES LOCATION MAP")
+		header("SALES LOCATION MAP")
 		move_down 50
 		if @docs[:agsalesmap] && @docs[:agsalesmap].any?
 			image "#{@docs[:agsalesmap][0]}", width: 500, position: :center
@@ -957,34 +963,6 @@ class EvalReport < Prawn::Document
 		text "Evaluators Associated with this Evaluation Report are identified as follows:"
 		move_down 10
 		text "#{@sub[:validentification]}"
-		start_new_page
-	end
-
-	def addendum_a
-		# if an engagement letter is present, use it as a template for this page
-		if @docs[:engagementletter] && @docs[:engagementletter].any?
-			start_new_page(template: @docs[:engagementletter][0])
-			header("ENGAGEMENT LETTER")
-		else
-			start_new_page
-			header("ENGAGEMENT LETTER")
-			move_down 25
-			text "No engagement letter present.", size: 14, style: :bold
-		end
-	end
-
-	def addendum_b
-
-		if @docs[:legaldescription] && @docs[:legaldescription].any?
-			start_new_page(template: @docs[:legaldescription][0])
-			header("LEGAL DESCRIPTION")
-		else
-			start_new_page
-			header("LEGAL DESCRIPTION")
-			move_down 25
-			text "No Legal Description file present.", size: 14, style: :bold
-		end
-		# end of document
 	end
 
 	def additional_docs
@@ -1004,6 +982,8 @@ class EvalReport < Prawn::Document
 			end
 		end
 
+		pdf_doc_proc.call(:engagementletter, "ENGAGEMENT LETTER")
+		pdf_doc_proc.call(:legaldescription, "LEGAL DESCRIPTION")
 		pdf_doc_proc.call(:warrantydeed, "WARRANTY DEED/TRANSFER DEED")
 		pdf_doc_proc.call(:titleinsurancepolicy, "TITLE INSURANCE POLICY")
 		pdf_doc_proc.call(:lease, "LEASE")
@@ -1056,7 +1036,7 @@ class EvalReport < Prawn::Document
 		props = [@sub, comps_to_flip].compact.flatten
 		@comp_increment ||= 0
 		final_a = [
-			[{content: 'Valuation Analysis - Sales Comparison Approach', colspan: 7}], # [0]
+			[{content: 'Valuation Analysis', colspan: 7}], # [0]
 			['Characteristic', 'Subject'], # [1]
 			['Record No.'], ['Tax Parcel #(s)'], ['Address'], ['City'], ['State'], ['Zip Code'], ['Sale Date'], ['Sale Price'], # [2] -> [9]
 			['Conditions of Sale'], ['Adjusted Sale Price'], ['Property Rights Conveyed'], ['Unit of Comparison'], # [10 -> 13]

data/spec/lib/eval_report_spec.rb

@@ -300,7 +300,7 @@ describe 'eval report class' do
 				end
 
 				@comparison_content = PDF::Reader.new(StringIO.new(@pdf.render)).page(1).to_s
-				expect(@comparison_content).to include('DIRECT', 'Sales', 'Conditions')
+				expect(@comparison_content).to include('DIRECT', 'Conditions')
 			end
 
 			it 'renders dynamic content from keys' do
@@ -327,7 +327,7 @@ describe 'eval report class' do
 				end
 
 				@comparison_content = PDF::Reader.new(StringIO.new(@pdf.render)).page(1).to_s
-				expect(@comparison_content).to include('DIRECT', 'Sales', 'Conditions')
+				expect(@comparison_content).to include('DIRECT', 'Conditions')
 			end
 		end
 	end
@@ -360,7 +360,7 @@ describe 'eval report class' do
 		end
 
 		context 'without keys' do
-			it 'renders static content' do
+			it 'does not render content' do
 				@pdf = EvalReport.new do
 					@sub = Sampler.get_eval1
 					@comps = []
@@ -368,7 +368,7 @@ describe 'eval report class' do
 				end
 
 				@discussion_content = PDF::Reader.new(StringIO.new(@pdf.render)).page(1).to_s
-				expect(@discussion_content).to include('DIRECT')
+				expect(@discussion_content).to include('')
 			end
 		end
 
@@ -483,84 +483,6 @@ describe 'eval report class' do
 		end
 	end
 
-	describe '#addendum_a' do
-		context 'with keys' do
-			it 'renders static content' do
-				@pdf = EvalReport.new do
-					@sub = Sampler.get_eval1
-					@docs = {engagementletter: ['./spec/test_data/pdfs/engagement_letter.pdf']}
-					addendum_a
-				end
-
-				@addendum_a_content = PDF::Reader.new(StringIO.new(@pdf.render)).page(2).to_s
-				expect(@addendum_a_content).to include('ENGAGEMENT')
-			end
-
-			it 'renders dynamic content from keys' do
-				@pdf = EvalReport.new do
-					@sub = Sampler.get_eval1
-					@docs = {engagementletter: ['./spec/test_data/pdfs/engagement_letter.pdf']}
-					addendum_a
-				end
-
-				@addendum_a_content = PDF::Reader.new(StringIO.new(@pdf.render)).page(2).to_s
-				expect(@addendum_a_content).to include('test')
-			end
-		end
-
-		context 'without keys' do
-			it 'renders static content' do
-				@pdf = EvalReport.new do
-					@sub = {}
-					@docs = {}
-					addendum_a
-				end
-
-				@addendum_a_content = PDF::Reader.new(StringIO.new(@pdf.render)).page(2).to_s
-				expect(@addendum_a_content).to include('ENGAGEMENT', 'present')
-			end
-		end
-	end
-
-	describe '#addendum_b' do
-		context 'with keys' do
-			it 'renders static content' do
-				@pdf = EvalReport.new do
-					@sub = {}
-					@docs = {legaldescription: ['./spec/test_data/pdfs/legal_description.pdf']}
-					addendum_b
-				end
-
-				@addendum_b_content = PDF::Reader.new(StringIO.new(@pdf.render)).page(2).to_s
-				expect(@addendum_b_content).to include('LEGAL')
-			end
-
-			it 'renders inserts dynamic content from pdf' do
-				@pdf = EvalReport.new do
-					@sub = Sampler.get_eval1
-					@docs = {legaldescription: ['./spec/test_data/pdfs/legal_description.pdf']}
-					addendum_b
-				end
-
-				@addendum_b_content = PDF::Reader.new(StringIO.new(@pdf.render)).page(2).to_s
-				expect(@addendum_b_content).to include('test')
-			end
-		end
-
-		context 'without keys' do
-			it 'renders static content' do
-				@pdf = EvalReport.new do
-					@sub = Sampler.get_eval1
-					@docs = {}
-					addendum_b
-				end
-
-				@addendum_b_content = PDF::Reader.new(StringIO.new(@pdf.render)).page(2).to_s
-				expect(@addendum_b_content).to include('LEGAL')
-			end
-		end
-	end
-
 	describe '#header' do
 		context 'with keys' do
 			it 'renders static header content'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appraisermetrics_report_service
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - StackPoint
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-22 00:00:00.000000000 Z
+date: 2015-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ttfunk
@@ -210,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: '["A service to generate pdf reports"]'