mls 0.0.22 → 0.0.23

data/lib/mls/listing.rb

@@ -1,15 +1,14 @@
 class MLS::Listing < MLS::Resource
-
-  LEASES = ['Full Service', 'NNN', 'Gross', 'Industrial Gross', 'Modified Gross']
-
-  # validates :use, :presence => true
-  # validates :property, :presence => true
-  # validates :address, :presence => true, :inclusion => { :in => lambda { |l| l.property.try(:addresses).to_a } }
+  
+  KINDS = %w(lease shared coworking)
+  SPACE_TYPES = %w(unit floor building)
+  LEASE_TYPES = ['Full Service', 'NNN', 'Gross', 'Industrial Gross', 'Modified Gross', 'Triple Net', 'Modified Net']
+  
+  
   validates :total_size, :presence => true, :numericality => true
   validates :maximum_contiguous_size, :presence => true, :numericality => true
   validates :minimum_divisable_size, :presence => true, :numericality => true
-  validates :lease, :inclusion => {:in => LEASES, :allow_nil => true, :allow_blank => true}
-  validates :asking_rate, :numericality => { :allow_nil => true }
+  validates :rate, :numericality => { :allow_nil => true }
   validates :sublease_expiration, :presence => { :if => proc { |l| l.sublease? }}
   validates :nnn_expenses, :numericality => { :allow_nil => true }
   validates :available_on, :presence => true
@@ -17,14 +16,13 @@ class MLS::Listing < MLS::Resource
   validates :offices, :numericality => { :allow_nil => true }
   validates :conference_rooms, :numericality => { :allow_nil => true }
   validates :bathrooms, :numericality => { :allow_nil => true }
-  validates :showers, :numericality => { :allow_nil => true }
-  validates :maximum_rate, :numericality => { :allow_nil => true }
-  validates :minimum_rate, :numericality => { :allow_nil => true }
   validates :maximum_term_length, :numericality => { :allow_nil => true, :only_integer => true }
   validates :minimum_term_length, :numericality => { :allow_nil => true, :only_integer => true }
-  validates :kind, :presence => true, :inclusion => {:in => ['unit', 'floor', 'building']}
-  validates :rate_units, :presence => true, :inclusion => { :in => ['ft^2/year', 'ft^2/month'] }
-
+  validates :kind, :presence => true, :inclusion => {:in => KINDS}
+  validates :space_type, :presence => true, :inclusion => {:in => SPACE_TYPES}, :if => Proc.new{ |l| l.kind == 'lease' }
+  validates :lease_type, :inclusion => {:in => LEASE_TYPES}, :allow_nil => true, :if => Proc.new{ |l| l.kind == 'lease' }
+  validates :rate_units, :presence => true, :inclusion => { :in => ['ft^2/year', 'ft^2/month', 'desk/month'] }
+  
   def property
     attributes[:property] ||= attributes[:property_id].nil? ? nil : MLS::Property.find(property_id)
   end
@@ -37,8 +35,12 @@ class MLS::Listing < MLS::Resource
     attribute :minimum_divisable_size, :integer
     attribute :available_on, :date
     attribute :unit, :string
+    attribute :space_type, :string
     attribute :lease, :string
-    attribute :asking_rate, :decimal, :precision => 8,  :scale => 2
+    attribute :lease_type, :string
+    attribute :rate, :decimal, :precision => 8,  :scale => 2
+    attribute :rate_per_month, :decimal, :precision => 8,  :scale => 2
+    attribute :rate_per_year, :decimal, :precision => 8,  :scale => 2
     attribute :sublease_expiration, :date
     attribute :nnn_expenses, :decimal
     attribute :floor, :integer
@@ -76,8 +78,8 @@ class MLS::Listing < MLS::Resource
   def name
     return attributes[:name] if attributes[:name] && !attributes[:name].empty?
   
-    if property.name
-      name = property.name
+    if address.name
+      name = address.name
       if space_type == 'unit'
         name += ", Unit #{unit}" if unit
       elsif space_type == 'floor'

data/lib/mls/version.rb

@@ -1,3 +1,3 @@
 module MLS
-  VERSION = "0.0.22"
+  VERSION = "0.0.23"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mls
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-22 00:00:00.000000000 Z
+date: 2012-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70185155817580 !ruby/object:Gem::Requirement
+  requirement: &70282397812780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70185155817580
+  version_requirements: *70282397812780
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70185155816200 !ruby/object:Gem::Requirement
+  requirement: &70282397812140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70185155816200
+  version_requirements: *70282397812140
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70185155814240 !ruby/object:Gem::Requirement
+  requirement: &70282397811460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70185155814240
+  version_requirements: *70282397811460
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70185155810400 !ruby/object:Gem::Requirement
+  requirement: &70282397810760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70185155810400
+  version_requirements: *70282397810760
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70185155829380 !ruby/object:Gem::Requirement
+  requirement: &70282397810100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70185155829380
+  version_requirements: *70282397810100
 - !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: &70185155828280 !ruby/object:Gem::Requirement
+  requirement: &70282397809480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70185155828280
+  version_requirements: *70282397809480
 description: Ruby library for integrating with the 42Floors MLS
 email:
 - james@42floors.com