mls 0.11.3 → 0.12.1

data/lib/mls/models/account.rb

@@ -1,43 +1,45 @@
 class MLS::Account < MLS::Resource
-  
-  property :id,                      Fixnum,  :serialize => :if_present
-  property :type,                    String,  :default => 'Account'
-  property :name,                    String,  :serialize => :if_present
-  property :title,                   String,  :serialize => :if_present
-  property :email,                   String,  :serialize => :if_present
-  property :password,                String,  :serialize => :if_present
-  property :password_confirmation,   String,  :serialize => :if_present
-  property :perishable_token,        String,  :serialize => false
-  property :perishable_token_set_at, String,  :serialize => false
-  property :ghost,                   Boolean, :serialize => false, :default => false
-  
-  property :phone,                   String,  :serialize => :if_present
-  property :company,                 String,  :serialize => :if_present
-  property :license,                 String,  :serialize => :if_present
-  property :linkedin,                String,  :serialize => :if_present
-  property :twitter,                 String,  :serialize => :if_present
-  property :facebook,                String,  :serialize => :if_present
-  property :web,                     String,  :serialize => :if_present
-  
-  property :city,                    String,  :serialize => :if_present
-  property :state,                   String,  :serialize => :if_present
-  property :country,                 String,  :serialize => :if_present
-  
-  property :created_at,              DateTime,  :serialize => :false
-  property :updated_at,              DateTime,  :serialize => :false
-  
-  property :email_token,             String,  :serialize => false
-  property :auth_key,                String,  :serialize => false
-  property :start_hours_of_operation, Fixnum,  :serialize => :if_present
-  property :end_hours_of_operation,   Fixnum,  :serialize => :if_present
-  property :days_of_operation,        String,  :serialize => :if_present
-  property :timezone,                 String,  :serialize => :if_present
-  property :lead_status,              String,  :serialize => :if_present
-  property :buyer_id,                 Fixnum,  :serialize => :if_present
+
+  attribute :id,                      Fixnum,  :serialize => :if_present
+  attribute :type,                    String,  :default => 'Account'
+  attribute :name,                    String,  :serialize => :if_present
+  attribute :title,                   String,  :serialize => :if_present
+  attribute :email,                   String,  :serialize => :if_present
+  attribute :password,                String,  :serialize => :if_present
+  attribute :password_confirmation,   String,  :serialize => :if_present
+  attribute :perishable_token,        String,  :serialize => false
+  attribute :perishable_token_set_at, String,  :serialize => false
+  attribute :ghost,                   Boolean, :serialize => false, :default => false
+
+  attribute :phone,                   String,  :serialize => :if_present
+  attribute :company,                 String,  :serialize => :if_present
+  attribute :license,                 String,  :serialize => :if_present
+  attribute :linkedin,                String,  :serialize => :if_present
+  attribute :twitter,                 String,  :serialize => :if_present
+  attribute :facebook,                String,  :serialize => :if_present
+  attribute :web,                     String,  :serialize => :if_present
+  attribute :direct_phone,            String,  :serialize => :if_present
+  attribute :direct_email,            String,  :serialize => :if_present
+
+  attribute :city,                    String,  :serialize => :if_present
+  attribute :state,                   String,  :serialize => :if_present
+  attribute :country,                 String,  :serialize => :if_present
+
+  attribute :created_at,              DateTime,  :serialize => :false
+  attribute :updated_at,              DateTime,  :serialize => :false
+
+  attribute :email_token,             String,  :serialize => false
+  attribute :auth_cookie,                String,  :serialize => false
+  attribute :start_hours_of_operation, Fixnum,  :serialize => :if_present
+  attribute :end_hours_of_operation,   Fixnum,  :serialize => :if_present
+  attribute :days_of_operation,        String,  :serialize => :if_present
+  attribute :timezone,                 String,  :serialize => :if_present
+  attribute :lead_status,              String,  :serialize => :if_present
+  attribute :buyer_id,                 Fixnum,  :serialize => :if_present
 
   exclude_from_comparison :password, :password_confirmation
 
-  attr_accessor :password_required
+  attr_accessor :password_required, :brokerage
 
   attr_writer :favorites
 
@@ -47,7 +49,7 @@ class MLS::Account < MLS::Resource
       code == 200
     end
   end
-  
+
   # Save the Account to the MLS. @errors will be set on the account if there
   # are any errors. @persisted will also be set to +true+ if the Account was
   # succesfully created
@@ -81,7 +83,7 @@ class MLS::Account < MLS::Resource
   def favorited?(listing)
     favorites.include?(listing)
   end
-  
+
   def favorite(listing) # TODO: test me, i don't work on failures
     params_hash = {:id => listing.is_a?(MLS::Listing) ? listing.id : listing }
     MLS.post('/account/favorites', params_hash) do |response, code|
@@ -103,14 +105,14 @@ class MLS::Account < MLS::Resource
     hash[:password_required] = password_required unless password_required.nil?
     hash
   end
-    
+
   class << self
 
     def current
       response = MLS.get('/account')
       MLS::Account::Parser.parse(response.body)
     end
-    
+
     # Authenticate and Account via <tt>email</tt> and <tt>password</tt>. Returns
     # the <tt>Account</tt> object if successfully authenticated. Returns <tt>nil</tt>
     # if the account could not be found, password was incorrect, or the account
@@ -119,16 +121,20 @@ class MLS::Account < MLS::Resource
     # ==== Examples
     #  #!ruby
     #  Account.authenticate(:email => 'jon@does.net', :password => 'opensesame') # => #<Account>
-    #    
+    #
     #  Account.authenticate('jon@does.net', 'opensesame') # => #<Account>
     #
     #  Account.authenticate('jon@does.net', 'wrong') # => nil
     def authenticate(attrs_or_email, password=nil)
       email = attrs_or_email.is_a?(Hash) ? attrs_or_email[:email] : attrs_or_email
       password = attrs_or_email.is_a?(Hash) ? attrs_or_email[:password] : password
-      
-      response = MLS.get('/account', {:email => email, :password => password})
-      MLS::Account::Parser.parse(response.body)
+
+      response = MLS.post('/login', {:email => email, :password => password})
+      MLS.auth_cookie = response['set-cookie']
+
+      account = MLS::Account::Parser.parse(response.body)
+      account.auth_cookie = MLS.auth_cookie
+      account
     rescue MLS::Exception::Unauthorized => response
       nil
     end
@@ -151,12 +157,12 @@ class MLS::Account < MLS::Resource
     end
 
     def find(id)
-      response = MLS.get("/account/find", :id => id) 
+      response = MLS.get("/account/find", :id => id)
       MLS::Account::Parser.parse(response.body)
     end
 
   end
-  
+
 end
 
 class MLS::Account::Parser < MLS::Parser
@@ -165,4 +171,7 @@ class MLS::Account::Parser < MLS::Parser
     @object.favorites = favorites.map {|a| MLS::Listing::Parser.build(a) }
   end
 
+  def brokerage=(brokerage)
+    @object.brokerage = MLS::Brokerage::Parser.build(brokerage)
+  end
 end

data/lib/mls/models/address.rb

@@ -1,65 +1,21 @@
 class MLS::Address < MLS::Resource
 
-  property :id, Fixnum,   :serialize => :false
-  property :name, String, :serialize => :false
-  property :slug, String,   :serialize => :false
+  attribute :id,           Fixnum,   :serialize => :false
+  attribute :property_id,  Fixnum,   :serialize => :false
+  attribute :slug,         String,   :serialize => :false
   
-  property :latitude, Decimal
-  property :longitude, Decimal
+  attribute :formatted_address, String
+  attribute :street_number, String
+  attribute :street, String
+  attribute :neighborhood, String
+  attribute :city, String
+  attribute :county, String
+  attribute :state, String
+  attribute :country, String
+  attribute :postal_code, String
   
-  property :formatted_address, String
-  property :street_number, String
-  property :street, String
-  property :neighborhood, String
-  property :city, String
-  property :county, String
-  property :state, String
-  property :country, String
-  property :postal_code, String
-  property :min_rate_per_sqft_per_year, Decimal, :serialize => :false
-  property :max_rate_per_sqft_per_year, Decimal, :serialize => :false
-  property :max_size, Fixnum, :serialize => :false
-  property :min_size, Fixnum, :serialize => :false
-  property :description, String
-  property :year_built, Fixnum
-  property :size, Fixnum
-  property :floors, Fixnum
-
-  property :amenities,                    Hash
-
-  property :leed_certification, String
+  attr_accessor :property
   
-  # Counter caches
-  property :listings_count, Fixnum, :serialize => :false
-  property :leased_listings_count, Fixnum, :serialize => :false
-  property :hidden_listings_count, Fixnum, :serialize => :false
-  property :import_listings_count, Fixnum, :serialize => :false
-  property :active_listings_count, Fixnum, :serialize => :false
-
-  property :avatar_digest, String,   :serialize => false
-
-  property :listings_latest_created_at, DateTime, :serialize => :false
-
-  attr_accessor :listings, :listing_types, :photos, :videos
-
-  # should include an optional use address or no_image image
-  def avatar(size='100x200#', protocol='http')
-    params = {
-      :size => size,
-      :format => 'png',
-      :sensor => false,
-      :location => [formatted_address],
-      :fov => 120
-    }
-
-    if avatar_digest
-      "#{protocol}://#{MLS.image_host}/#{avatar_digest}.jpg?s=#{URI.escape(size)}"
-    else
-      params[:size] = params[:size].match(/\d+x\d+/)[0]
-      "#{protocol}://maps.googleapis.com/maps/api/streetview?" + params.map{|k,v| k.to_s + '=' + URI.escape(v.to_s) }.join('&')
-    end
-  end
-
   def save
     MLS.put("/addresses/#{id}", {:address => to_hash}, 400) do |response, code|
       if code == 200 || code == 400
@@ -71,45 +27,11 @@ class MLS::Address < MLS::Resource
     end
   end
 
-  def to_hash
-    hash = super
-    hash[:photo_ids] = photos.map(&:id) if photos
-    hash[:videos_attributes] = videos.map(&:to_hash) unless videos.blank?
-    hash
-  end
-
   def to_param
-    [state, city, "#{street_number} #{street}"].map(&:parameterize).join('/')
-  end
-
-  def url
-    if defined? Rails
-      case Rails.env
-      when "production"
-        host = "42floors.com"
-      when "staging"
-        host = "staging.42floors.com"
-      when "development","test"
-        host = "spire.dev"
-      end
-    else
-      host = "42floors.com"
-    end
-    "http://#{host}/#{slug}"
-  end
-
-  def find_listings(space_available, floor, unit)
-    response = MLS.get("/addresses/#{id}/find_listings", 
-      :floor => floor, :unit => unit, :space_available => space_available)
-    MLS::Listing::Parser.parse_collection(response.body)
+    slug
   end
 
   class << self
-    
-    def query(q)
-      response = MLS.get('/addresses/query', :query => q)
-      MLS::Address::Parser.parse_collection(response.body)
-    end
 
     def find(id)
       response = MLS.get("/addresses/#{id}")
@@ -122,36 +44,15 @@ class MLS::Address < MLS::Resource
       MLS::Address::Parser.parse_collection(response.body)
     end
 
-    def amenities
-      @amenities ||= Yajl::Parser.new(:symbolize_keys => true).parse(MLS.get('/addresses/amenities').body)
-    end
-
   end
   
 end
 
 
 class MLS::Address::Parser < MLS::Parser
-
-  def listings=(listings)
-    @object.listings = listings.map { |data|
-      listing = MLS::Listing::Parser.build(data)
-      listing.address = @object
-      listing
-    }
-  end
-
-  def listing_types=(listing_types)
-    @object.listing_types = listing_types
-  end
-
-  def photos=(photos)
-    @object.photos = photos.map {|p| MLS::Photo::Parser.build(p)}
-  end
-
-  def videos=(videos)
-    @object.videos = videos.map do |video|
-      MLS::Video::Parser.build(video)
-    end
+  
+  def property=(property)
+    @object.property = MLS::Property::Parser.build(property)
   end
+  
 end

data/lib/mls/models/brokerage.rb

@@ -1,11 +1,11 @@
 class MLS::Brokerage < MLS::Resource
 
-  property :id,       Fixnum,  :serialize => :if_present
-  property :name,     String,  :serialize => :if_present
-  property :admin_id, Fixnum,  :serialize => :if_present
-  property :slug,     String,  :serialize => false
-  property :palette,  Hash,    :serialize => :if_present
-  property :avatar_digest, String,   :serialize => false
+  attribute :id,       Fixnum,  :serialize => :if_present
+  attribute :name,     String,  :serialize => :if_present
+  attribute :admin_id, Fixnum,  :serialize => :if_present
+  attribute :slug,     String,  :serialize => false
+  attribute :palette,  Hash,    :serialize => :if_present
+  attribute :avatar_digest, String,   :serialize => false
 
   class << self
 

data/lib/mls/models/floorplan.rb

@@ -2,11 +2,11 @@ require 'restclient'
 
 class MLS::Floorplan < MLS::Resource
 
-  property :id, Fixnum
-  property :digest, String
-  property :avatar_digest, String
-  property :file_name, String
-  property :file_size, Fixnum
+  attribute :id, Fixnum
+  attribute :digest, String
+  attribute :avatar_digest, String
+  attribute :file_name, String
+  attribute :file_size, Fixnum
   
   def url(protocol='http')
     "#{protocol}://#{MLS.asset_host}/floorplans/#{digest}/compressed/#{file_name}"

data/lib/mls/models/flyer.rb

@@ -2,11 +2,11 @@ require 'restclient'
 
 class MLS::Flyer < MLS::Resource
 
-  property :id, Fixnum
-  property :digest, String
-  property :avatar_digest, String
-  property :file_name, String
-  property :file_size, Fixnum
+  attribute :id, Fixnum
+  attribute :digest, String
+  attribute :avatar_digest, String
+  attribute :file_name, String
+  attribute :file_size, Fixnum
   
   def url(protocol='http')
     "#{protocol}://#{MLS.asset_host}/flyers/#{digest}/compressed/#{file_name}"

data/lib/mls/models/listing.rb

@@ -10,85 +10,85 @@ class MLS::Listing < MLS::Resource
   SOURCE_TYPES = %w(website flyer)
   CHANNELS = %w(excavator mls staircase broker_dashboard)
 
-  property :id,                           Fixnum,   :serialize => :false
-  property :address_id,                   Fixnum,   :serialize => :false
-  property :slug,                         String,   :serialize => :false
-  property :use,                          String,   :serialize => :if_present
-  property :account_id,                   Fixnum
-  property :private,                      Boolean,  :default => false, :serialize => false
-  property :source,                       String
-  property :source_url,                   String
-  property :source_type,                  String, :serialize => :if_present
-  property :channel,                      String, :serialize => :if_present
-  property :photo_ids,                    Array,  :serialize => :if_present
-
-  property :name,                         String
-  property :type,                         String,   :default => 'lease'
-  property :workflow_state,               String,   :default => 'visible'
-  property :lease_state,                  String,   :default => 'listed'
-  property :space_type,                   String,   :default => 'unit'
-  property :unit,                         String
-  property :floor,                        Fixnum
-  property :description,                  String
-
-  property :size,                   Fixnum
-  property :maximum_contiguous_size,      Fixnum
-  property :minimum_divisible_size,       Fixnum
-
-  property :amenities,                    Hash
-  property :lease_terms,                  String
-  property :rate,                         Decimal
-  property :rate_units,                   String,   :default => '/sqft/mo'
-  property :low_rate,                     Decimal,  :serialize => :false
-  property :high_rate,                    Decimal,  :serialize => :false
-  property :sublease_expiration,          DateTime
-
-  property :forecast_rate_per_year,             Decimal,  :serialize => :false
-  property :forecast_rate_per_month,            Decimal,  :serialize => :false
-  property :forecast_rate_per_sqft_per_month,   Decimal,  :serialize => :false
-  property :forecast_rate_per_sqft_per_year,    Decimal,  :serialize => :false
-
-  property :available_on,                 DateTime
-  property :term,                         Fixnum
-  property :term_units,            String,   :default => 'years'
-
-  property :weekday_hours,                String
-  property :saturday_hours,               String
-  property :sunday_hours,                 String
-
-  property :offices,                      Fixnum
-  property :desks,                        Fixnum
-  property :conference_rooms,             Fixnum
-  property :bathrooms,                    Fixnum
-
-  property :kitchen,                      Boolean
-  property :showers,                      Boolean
-  property :patio,                        Boolean
-  property :reception_area,               Boolean
-  property :ready_to_move_in,             Boolean
-  property :furniture_available,          Boolean
-  property :natural_light,                Boolean
-  property :high_ceilings,                Boolean
-
-  property :created_at,                   DateTime,  :serialize => :false
-  property :updated_at,                   DateTime,  :serialize => :false
-  property :touched_at,                   DateTime,  :serialize => :false
-  property :leased_on,                    DateTime
-  property :photography_requested_on,     DateTime,  :serialize => :false
-
-  property :awesome_score,                Fixnum
-  property :awesome_needs,                Array,  :serialize => :if_present
-  property :awesome_label,                String
-
-  property :flyer_id,                     Fixnum,    :serialize => :if_present
-  property :floorplan_id,                 Fixnum,    :serialize => :if_present
-
-  property :avatar_digest,                String,   :serialize => false
+  attribute :id,                           Fixnum,   :serialize => :false
+  attribute :address_id,                   Fixnum,   :serialize => :false
+  attribute :slug,                         String,   :serialize => :false
+  attribute :use,                          String,   :serialize => :if_present
+  attribute :account_id,                   Fixnum
+  attribute :private,                      Boolean,  :default => false, :serialize => false
+  attribute :source,                       String
+  attribute :source_url,                   String
+  attribute :source_type,                  String, :serialize => :if_present
+  attribute :channel,                      String, :serialize => :if_present
+  attribute :photo_ids,                    Array,  :serialize => :if_present
+
+  attribute :name,                         String
+  attribute :type,                         String,   :default => 'lease'
+  attribute :workflow_state,               String,   :default => 'visible'
+  attribute :lease_state,                  String,   :default => 'listed'
+  attribute :space_type,                   String,   :default => 'unit'
+  attribute :unit,                         String
+  attribute :floor,                        Fixnum
+  attribute :description,                  String
+
+  attribute :size,                   Fixnum
+  attribute :maximum_contiguous_size,      Fixnum
+  attribute :minimum_divisible_size,       Fixnum
+
+  attribute :amenities,                    Hash
+  attribute :lease_terms,                  String
+  attribute :rate,                         Decimal
+  attribute :rate_units,                   String,   :default => '/sqft/mo'
+  attribute :low_rate,                     Decimal,  :serialize => :false
+  attribute :high_rate,                    Decimal,  :serialize => :false
+  attribute :sublease_expiration,          DateTime
+
+  attribute :forecast_rate_per_year,             Decimal,  :serialize => :false
+  attribute :forecast_rate_per_month,            Decimal,  :serialize => :false
+  attribute :forecast_rate_per_sqft_per_month,   Decimal,  :serialize => :false
+  attribute :forecast_rate_per_sqft_per_year,    Decimal,  :serialize => :false
+
+  attribute :available_on,                 DateTime
+  attribute :term,                         Fixnum
+  attribute :term_units,            String,   :default => 'years'
+
+  attribute :weekday_hours,                String
+  attribute :saturday_hours,               String
+  attribute :sunday_hours,                 String
+
+  attribute :offices,                      Fixnum
+  attribute :desks,                        Fixnum
+  attribute :conference_rooms,             Fixnum
+  attribute :bathrooms,                    Fixnum
+
+  attribute :kitchen,                      Boolean
+  attribute :showers,                      Boolean
+  attribute :patio,                        Boolean
+  attribute :reception_area,               Boolean
+  attribute :ready_to_move_in,             Boolean
+  attribute :furniture_available,          Boolean
+  attribute :natural_light,                Boolean
+  attribute :high_ceilings,                Boolean
+
+  attribute :created_at,                   DateTime,  :serialize => :false
+  attribute :updated_at,                   DateTime,  :serialize => :false
+  attribute :touched_at,                   DateTime,  :serialize => :false
+  attribute :leased_on,                    DateTime
+  attribute :photography_requested_on,     DateTime,  :serialize => :false
+
+  attribute :awesome_score,                Fixnum
+  attribute :awesome_needs,                Array,  :serialize => :if_present
+  attribute :awesome_label,                String
+
+  attribute :flyer_id,                     Fixnum,    :serialize => :if_present
+  attribute :floorplan_id,                 Fixnum,    :serialize => :if_present
+
+  attribute :avatar_digest,                String,   :serialize => false
 
   # Counter Caches
-  property :photos_count,                 Fixnum, :serialize => :false
+  attribute :photos_count,                 Fixnum, :serialize => :false
 
-  attr_accessor :address, :agents, :account, :photos, :flyer, :floorplan, :videos, :similar_photos, :spaces, :primary_agent
+  attr_accessor :property, :address, :agents, :account, :photos, :flyer, :floorplan, :videos, :similar_photos, :spaces, :primary_agent
 
   def avatar(size='150x100#', protocol='http')
     if avatar_digest
@@ -380,6 +380,10 @@ class MLS::Listing::Parser < MLS::Parser
     @object.address = MLS::Address::Parser.build(address)
   end
 
+  def property=(property)
+    @object.property = MLS::Property::Parser.build(property)
+  end
+
   def agents=(agents)
     @object.agents = agents.map {|a| MLS::Account::Parser.build(a) }
   end