mls 0.2.3 → 0.2.4

data/README.rdoc

@@ -5,7 +5,7 @@ Listings provided by 42Floors.com.
 
 *home*  - https://mls.42floors.com
 
-*docs* - The best way to get this is to run `rake docs`. We plan to upload this
+*docs* - http://docs.42floors.com
 
 *bugs* - https://github.com/42floors/mls/issues
 

data/lib/mls.rb

@@ -411,4 +411,4 @@ require 'mls/models/address'
 require 'mls/models/photo'
 require 'mls/models/tour_request'
 require 'mls/models/flyer'
-require 'mls/models/area'
+require 'mls/models/region'

data/lib/mls/models/address.rb

@@ -1,8 +1,8 @@
 class MLS::Address < MLS::Resource
 
-  property :id, Fixnum,   :serialize => :if_present
+  property :id, Fixnum,   :serialize => :false
   property :name, String, :serialize => :false
-  property :slug, String,   :serialize => :if_present
+  property :slug, String,   :serialize => :false
   
   property :latitude, Decimal
   property :longitude, Decimal
@@ -37,6 +37,8 @@ class MLS::Address < MLS::Resource
   property :import_listings_count, Fixnum, :serialize => :false
   property :active_listings_count, Fixnum, :serialize => :false
 
+  property :avatar_digest, String,   :serialize => false
+
   attr_accessor :listings, :listing_kinds, :photos
 
   # should include an optional use address or no_image image
@@ -49,11 +51,27 @@ class MLS::Address < MLS::Resource
       :fov => 120
     }
 
-    "#{protocol}://maps.googleapis.com/maps/api/streetview?" + params.map{|k,v| k.to_s + '=' + URI.escape(v.to_s) }.join('&')
+    if avatar_digest
+      "#{protocol}://#{MLS.asset_host}/photos/#{size}/#{avatar_digest}.jpg"
+    else
+      "#{protocol}://maps.googleapis.com/maps/api/streetview?" + params.map{|k,v| k.to_s + '=' + URI.escape(v.to_s) }.join('&')
+    end
+  end
+
+  def to_hash
+    hash = super
+    hash[:photo_ids] = photos.map(&:id) if photos
+    hash
+  end
+
+  def to_hash_for_listing
+    hash = to_hash
+    hash[:slug] = slug
+    hash
   end
 
   def to_param
-    [state, city, name].map(&:parameterize).join('/')
+    [state, city, "#{street_number} #{street}"].map(&:parameterize).join('/')
   end
 
   def url
@@ -115,6 +133,8 @@ class MLS::Address::Parser < MLS::Parser
   end
 
   def photos=(photos)
-    @object.photos = photos.map {|d| MLS::Photo.new({:digest => d})}
+    @object.photos = photos.map do |p|
+      MLS::Photo.new(:digest => p[:digest], :id => p[:id].to_i)
+    end
   end
 end

data/lib/mls/models/listing.rb

@@ -5,6 +5,8 @@ class MLS::Listing < MLS::Resource
   LEASE_TYPES = ['Full Service', 'NNN', 'Gross', 'Industrial Gross', 'Modified Gross', 'Triple Net', 'Modified Net']
   RATE_UNITS = ['ft^2/year', 'ft^2/month', 'desk/month']
   USES = ["Office", "Creative", "Loft", "Medical Office", "Flex Space", "R&D", "Office Showroom", "Industrial", "Retail"]
+  SOURCE_TYPES = %w(website flyer)
+  CHANNELS = %w(excavator mls staircase broker_dashboard)
   
   property :id,                           Fixnum,   :serialize => :false
   property :address_id,                   Fixnum,   :serialize => :false
@@ -15,6 +17,8 @@ class MLS::Listing < MLS::Resource
   property :source,                       String
   property :source_url,                   String
   property :flyer_url,                    String, :serialize => false
+  property :source_type,                  String, :serialize => :if_present
+  property :channel,                      String, :serialize => :if_present
     
   property :name,                         String
   property :kind,                         String,   :default => 'lease'
@@ -102,11 +106,23 @@ class MLS::Listing < MLS::Resource
     
     case space_type
     when 'unit'
-      "Unit #{unit || 'Lease'}"
+      if unit 
+        "Unit #{unit}"
+      elsif floor
+        "#{floor.ordinalize} Floor"
+      else
+        "Unit Lease"
+      end
     when 'building'
       "Entire Building"
     when 'floor'
-      "Floor #{floor || 'Lease'}"
+      if floor
+        "#{floor.ordinalize} Floor"
+      elsif unit 
+        "Unit #{unit}"
+      else
+        "Floor Lease"
+      end
     end
   end
 
@@ -170,7 +186,7 @@ class MLS::Listing < MLS::Resource
   end
   
   def to_param
-    [address.state, address.city, address.name, id.to_s].map(&:parameterize).join('/')
+    "#{address.to_param}/#{id}"
   end
 
   def import #TODO test me
@@ -197,6 +213,10 @@ class MLS::Listing < MLS::Resource
     "#{address.url}/#{id}"
   end
 
+  def all_photos
+    photos + address.photos
+  end
+
   class << self
 
     def find(id)
@@ -204,7 +224,7 @@ class MLS::Listing < MLS::Resource
       MLS::Listing::Parser.parse(response.body)
     end
 
-    def all(filters = {}, limit = nil, order = nil)
+    def all(filters = {}, limit = nil, order = 'listings.id')
       response = MLS.get('/listings', :filters => filters, :limit => limit, :order => order)
       MLS::Listing::Parser.parse_collection(response.body)
     end

data/lib/mls/models/region.rb

@@ -0,0 +1,33 @@
+class MLS::Region < MLS::Resource
+
+  property :id,             Fixnum, :serialize => :if_present
+  property :name,           String, :serialize => :if_present
+  property :common_name,    String, :serialize => :if_present
+  property :description,    String, :serialize => :if_present
+  property :code,           String, :serialize => :if_present
+  property :type,           String, :serialize => :if_present
+  property :source,         String, :serialize => :if_present
+  property :minimum_zoom,   Fixnum, :serialize => :if_present
+  property :maximum_zoom,   Fixnum, :serialize => :if_present
+  property :slug,           String, :serialize => false
+  property :geometry,       Hash,   :serialize => false
+  property :envelope,       Hash,   :serialize => false
+  
+  # Counter caches
+  property :listings_count, Fixnum, :serialize => :false
+
+  class << self
+    
+    def find(id)
+      response = MLS.get("/regions/#{id}")
+      MLS::Region::Parser.parse(response.body)
+    end
+    
+  end
+
+end
+
+
+class MLS::Region::Parser < MLS::Parser
+
+end

data/lib/mls/parser.rb

@@ -18,9 +18,7 @@ class MLS::Parser
   end
   
   def update_attributes(attributes)
-    attributes.each do |k,v|
-      self.send("#{k}=".to_sym, v)
-    end
+    attributes.each {|k,v| self.send("#{k}=".to_sym, v) } if attributes
   end
   
   def self.parse(data)

data/mls.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mls
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2012-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70194752800700 !ruby/object:Gem::Requirement
+  requirement: &70245559798020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70194752800700
+  version_requirements: *70245559798020
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70194752799380 !ruby/object:Gem::Requirement
+  requirement: &70245559797580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70194752799380
+  version_requirements: *70245559797580
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70194752798720 !ruby/object:Gem::Requirement
+  requirement: &70245559797160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70194752798720
+  version_requirements: *70245559797160
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70194752797320 !ruby/object:Gem::Requirement
+  requirement: &70245559796740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70194752797320
+  version_requirements: *70245559796740
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70194752795360 !ruby/object:Gem::Requirement
+  requirement: &70245559796320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70194752795360
+  version_requirements: *70245559796320
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &70194747990780 !ruby/object:Gem::Requirement
+  requirement: &70245559795900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70194747990780
+  version_requirements: *70245559795900
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70194747990360 !ruby/object:Gem::Requirement
+  requirement: &70245559795480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70194747990360
+  version_requirements: *70245559795480
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70194747989940 !ruby/object:Gem::Requirement
+  requirement: &70245559795060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70194747989940
+  version_requirements: *70245559795060
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70194747989520 !ruby/object:Gem::Requirement
+  requirement: &70245559794640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70194747989520
+  version_requirements: *70245559794640
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70194747989100 !ruby/object:Gem::Requirement
+  requirement: &70245559794220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70194747989100
+  version_requirements: *70245559794220
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70194747988680 !ruby/object:Gem::Requirement
+  requirement: &70245559793800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70194747988680
+  version_requirements: *70245559793800
 description: Ruby library for integrating with the 42Floors MLS
 email:
 - james@42floors.com
@@ -148,10 +148,10 @@ files:
 - lib/mls/model.rb
 - lib/mls/models/account.rb
 - lib/mls/models/address.rb
-- lib/mls/models/area.rb
 - lib/mls/models/flyer.rb
 - lib/mls/models/listing.rb
 - lib/mls/models/photo.rb
+- lib/mls/models/region.rb
 - lib/mls/models/tour_request.rb
 - lib/mls/models/use.rb
 - lib/mls/parser.rb

data/lib/mls/models/area.rb

@@ -1,27 +0,0 @@
-class MLS::Area < MLS::Resource
-
-  property :id,             Fixnum, :serialize => :if_present
-  property :name,           String, :serialize => :if_present
-  property :level,          Fixnum, :serialize => :if_present
-  property :type,           String, :serialize => :if_present
-  property :source,         String, :serialize => :if_present
-  property :geometry,       Hash,   :serialize => false
-  
-  # Counter caches
-  property :listings_count, Fixnum, :serialize => :false
-
-  class << self
-    
-    def find(id)
-      response = MLS.get("/areas/#{id}")
-      MLS::Area::Parser.parse(response.body)
-    end
-    
-  end
-
-end
-
-
-class MLS::Area::Parser < MLS::Parser
-
-end