cre_property_matcher 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c89f865fd1d890cabf7443696e7df8fce9e8806e
-  data.tar.gz: 88f94b41f8e8bac3d95cce5948eba52484af5a2a
+  metadata.gz: 848c6bb51ab6cff770fb3756b06a24dcc16de1b6
+  data.tar.gz: 8fe4827ff2a1a8b77b69c4aa64c25cbeb44dd104
 SHA512:
-  metadata.gz: fb6870afb4e23a0790980c0e6202a17efcb1932b0b41f92dcb7152d52ce27c6769d52cfd7aed9cd53c10a2cd90b920998504fd7d3abae2a0e2a2c94352f97ddf
-  data.tar.gz: d0d9334cc6610b83ec82d10704e1c5eb00a6bd47cb59d9ddb29b68c6e18c6e478ad0ab4c5ee0aac5b197d8c2a14d3e41a0b9a3090a5facbac9a08ef0372be49d
+  metadata.gz: 1902b3c1b5637f2034ff9674227dda91e0f0b56d3d2f65c6cea9c9c59364abe050f45d8cb1ffe4e088e1841544dcedb8281501b85adb80b355c25d42dacba2d0
+  data.tar.gz: d0818fd6b3442319cc7aa1cfc43e9f38a729c94a37e5689e3b1d8ebbe38a827ecd30c244985ecf26d1847c066b712565714b8f657db1c8e8540ffc4b6a548bb7

data/lib/cre_property_matcher/property_data_calculator.rb

@@ -3,11 +3,21 @@ module PropertyDataCalculator
 
 	def get_average_by_reference_property_state(properties, reference, attribute)
 		state_properties = filter_properties_by_state(properties, reference.state)
-		values_array = get_attribute_from_properties(state_properties, attribute)
-		float_average_of_array(values_array)
+		get_average_by_attribute(state_properties, attribute)
+	end
+
+	def get_average_by_reference_property_state_and_property_type(properties, reference, attribute)
+		state_properties = filter_properties_by_state(properties, reference.state)
+		filtered_properties = filter_properties_by_property_type(state_properties, reference.general_property_type)
+		get_average_by_attribute(filtered_properties, attribute)
+	end
+
+	def get_average_for_all_by_property_type(properties, attribute, property_type)
+		filtered_properties = filter_properties_by_property_type(properties, property_type)
+		get_average_by_attribute(filtered_properties, attribute)
 	end
 
-	def get_average_for_all(properties, attribute)
+	def get_average_by_attribute(properties, attribute)
 		values_array = get_attribute_from_properties(properties, attribute)
 		float_average_of_array(values_array)
 	end
@@ -20,6 +30,12 @@ module PropertyDataCalculator
 		end
 	end
 
+	def filter_properties_by_property_type(properties, property_type)
+		properties.select do |property|
+			property.general_property_type == property_type
+		end
+	end
+
 	def normalize_state(state)
 		if state.nil?
 			"nothing"	

data/lib/cre_property_matcher/version.rb

@@ -1,3 +1,3 @@
 module CrePropertyMatcher
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/test/cre_property_matcher/property_data_calculator_test.rb

@@ -6,25 +6,36 @@ class TestPropertyDataCalculator < Minitest::Test
 	include PropertyDataCalculator 
 
 	def setup
+		@reference = Property.new({noi: 1, ncf: 2, uw_expenses: 3, uw_revenue: 4, state: "OH", general_property_type: "Retail"})
 		@properties = []
 		
 		states_array = ["OH", "OH", "NJ", "CT", "OH"]
+		property_type_array = ["Retail", "Office", "Manufactured Housing", "Retail", "Office"]
 
 		[1,2,3,4,5].each do |n|
-			@properties << Property.new({noi: n, ncf: n, uw_expenses: n, uw_revenue: n, state: states_array[n - 1]})
+			@properties << Property.new({noi: n, ncf: n, uw_expenses: n, uw_revenue: n, state: states_array[n - 1], general_property_type: property_type_array[n - 1]})
 		end
 
 		@properties
 	end
 
 	def test_get_average_for_all
-		result = get_average_for_all(@properties, "noi")
-		assert_equal 3, result
+		result = get_average_for_all_by_property_type(@properties, "noi", "Retail")
+		assert_equal 2.5, result
 	end
 
 	def test_get_average_by_reference_property_state
-		reference = {noi: 1, ncf: 2, uw_expenses: 3, uw_revenue: 4, state: "OH"}
-		result = get_average_by_reference_property_state(@properties, Property.new(reference), "noi")
+		result = get_average_by_reference_property_state(@properties, @reference, "noi")
 		assert_equal (8/3.0), result
 	end
+
+	def test_get_average_by_attribute
+		result = get_average_by_attribute(@properties, "noi")
+		assert_equal 3.0, result
+	end
+
+	def test_get_average_by_reference_property_state_and_property_type
+		result = get_average_by_reference_property_state_and_property_type(@properties, @reference, "noi")
+		assert_equal 1.0, result
+	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cre_property_matcher
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Brad Arner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-17 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler