mls 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff09dafc90a6ff857a40f593ba4f0c978c36bb31
-  data.tar.gz: ff991984c50826e07e700a37b67466632fc8be18
+  metadata.gz: 29b32b14a88b40ef3ba7e052b0b7879440e83082
+  data.tar.gz: 3301c63391f4d2d263d52de6365e2dd5b3263f12
 SHA512:
-  metadata.gz: fac30e5dbb965e6f5de1db007f22c4121b0b08a1385bb61ad63510acd7b23840c25379d40f01f464162b119471f5654253d577b25936d75fb1cddf6b1e3c89b4
-  data.tar.gz: 26ab3dcd0c351b104d55a887b78f1792b5cabe8a7d4b9f366f1db72f3227b620aad003d4e5ffd0f6a3aff3183c599fa0e1283043635dd66a2436c5f62d82db6b
+  metadata.gz: 2b93870aca8be84585b43c4a84770727d4e1f304ffa77bce61cc38733c5948b70a58097960d99dc109be9a4e0e81b3eec168be9c087d855e7cf70f6f633afeee
+  data.tar.gz: 534c1c533e91a10735594c4fa41ce3c479d051fec9079de033f63e878ac6348b61a6b31d393447dd751b937e90dc8fea7c3eabd4126d9f8d0a3cff5b8be5aaa3

data/lib/mls/models/listing.rb

@@ -153,9 +153,10 @@ class MLS::Listing < MLS::Resource
   end
   
   # TODO: remove /desk/mo conversions
-  def rate(units='/sqft/mo')
+  def rate(units=nil)
     return nil if !@rate
-
+    units ||= rate_units
+    
     price = if rate_units == '/sqft/mo'
       if units == '/sqft/mo'
         @rate
@@ -220,7 +221,7 @@ class MLS::Listing < MLS::Resource
       if units == '/sqft/mo'
         @rate / 200.0
       elsif units == '/sqft/yr'
-        ((@rate / 200.0) * 12) / @size.to_f
+        (@rate * 12) / 200.0
       elsif units == '/mo'
         @rate
       elsif units == '/yr'

data/mls.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "mls"
-  s.version     = '0.9.4'
+  s.version     = '0.9.5'
   s.authors     = ["James R. Bracy", "Jon Bracy"]
   s.email       = ["james@42floors.com"]
   s.homepage    = "http://mls.42floors.com"

data/test/units/models/test_listing.rb

@@ -194,7 +194,7 @@ class TestListing < ::Test::Unit::TestCase
   def test_rate_per_sqft_per_year
     listing = MLS::Listing.new(:rate => 126, :rate_units => '/sqft/yr', :size => 5)
   
-    assert_equal 10.5,  listing.rate
+    assert_equal 126,  listing.rate
     assert_equal 10.5,  listing.rate('/sqft/mo')
     assert_equal 126,   listing.rate('/sqft/yr')
     assert_equal 52.5,  listing.rate('/mo')
@@ -208,7 +208,7 @@ class TestListing < ::Test::Unit::TestCase
   def test_rate_per_month
     listing = MLS::Listing.new(:rate => 52.5, :rate_units => '/mo', :size => 5)
   
-    assert_equal 10.5,  listing.rate
+    assert_equal 52.5,  listing.rate
     assert_equal 10.5,  listing.rate('/sqft/mo')
     assert_equal 126,   listing.rate('/sqft/yr')
     assert_equal 52.5,  listing.rate('/mo')
@@ -222,7 +222,7 @@ class TestListing < ::Test::Unit::TestCase
   def test_rate_per_year
     listing = MLS::Listing.new(:rate => 630, :rate_units => '/yr', :size => 5)
   
-    assert_equal 10.5,  listing.rate
+    assert_equal 630,  listing.rate
     assert_equal 10.5,  listing.rate('/sqft/mo')
     assert_equal 126,   listing.rate('/sqft/yr')
     assert_equal 52.5,  listing.rate('/mo')
@@ -234,13 +234,13 @@ class TestListing < ::Test::Unit::TestCase
   end
   
   def test_rate_per_desk_per_month
-    listing = MLS::Listing.new(:rate => 630, :rate_units => '/yr', :size => 5)
+    listing = MLS::Listing.new(:rate => 2100, :rate_units => '/desk/mo', :size => 5)
   
-    assert_equal 10.5,  listing.rate
+    assert_equal 2100,  listing.rate
     assert_equal 10.5,  listing.rate('/sqft/mo')
     assert_equal 126,   listing.rate('/sqft/yr')
-    assert_equal 52.5,  listing.rate('/mo')
-    assert_equal 630, listing.rate('/yr')
+    assert_equal 2100,  listing.rate('/mo')
+    assert_equal 25200, listing.rate('/yr')
     assert_equal 2100,   listing.rate('/desk/mo')
     assert_raises RuntimeError do
       listing.rate('/random')
@@ -250,7 +250,6 @@ class TestListing < ::Test::Unit::TestCase
   def test_rate_percision
     listing = MLS::Listing.new(:rate => 47, :rate_units => '/sqft/yr', :size => 5)
 
-    assert_equal 3.92,  listing.rate
     assert_equal 3.92,  listing.rate('/sqft/mo')
     assert_equal 47,   listing.rate('/sqft/yr')
     assert_equal 19.58,  listing.rate('/mo')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mls
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - James R. Bracy