mls 0.1.2 → 0.2.0

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+.rvmrc

data/.rvmrc

@@ -0,0 +1 @@
+rvm use 1.9.3@mls-gem --create

data/lib/mls.rb

@@ -1,59 +1,193 @@
-require 'mls/version'
+require 'uri'
+require 'cgi'
+require 'logger'
+require 'net/https'
+require 'singleton'
+require 'yajl'
+require 'bigdecimal'
+require 'bigdecimal/util'
+require 'active_support'
 require 'active_resource'
+require 'date'
+require 'time'
 
-module MLS
+class BigDecimal
+  old_to_s = instance_method :to_s
 
-  class << self
+  define_method :to_s do |param='F'|
+    old_to_s.bind(self).(param)
+  end
+end
+
+class Decimal
+end
+class Boolean
+end
 
-    attr_accessor :environment
+class MLS
+  include Singleton
+
+  API_VERSION = '0.1.0'
+
+  attr_accessor :url, :api_key, :auth_key, :logger
+
+  def url=(uri)
+    @url = uri
+
+    uri = URI.parse(uri)
+    @api_key = CGI.unescape(uri.user)
+    @host = uri.host
+    @port = uri.port
+  end
 
-    def env
-      @environment ||= 'development'
+  def logger
+    @logger ||= default_logger
+  end
+
+  def connection
+    @connection ||= Net::HTTP.new(@host, @port)
+  end
+
+  def add_headers(req)
+    req['Content-Type'] = 'application/json'
+    req['X-42Floors-API-Version'] = API_VERSION
+    req['X-42Floors-API-Key'] = api_key
+    req['X-42Floors-API-Auth-Key'] = auth_key if auth_key
+  end
+  
+  def put(url, body={})
+    req = Net::HTTP::Put.new("/api#{url}")
+    req.body = Yajl::Encoder.encode(body)
+    add_headers(req)
+    
+    response = connection.request(req)
+    if block_given?
+      yield(response.code.to_i, response)
+    else
+      handle_response(response)
     end
+  end
 
-    def site
-      env == 'production' ? 'http://mls.42floors.com' : 'http://staging.mls.42floors.com'
+  def post(url, body={})
+    req = Net::HTTP::Post.new("/api#{url}")
+    req.body = Yajl::Encoder.encode(body)
+    add_headers(req)
+    
+    response = connection.request(req)
+    if block_given?
+      yield(response.code.to_i, response)
+    else
+      handle_response(response)
     end
+  end
 
-    def asset_host=(host)
-      @asset_host = host
+  def delete(url, body={})
+    req = Net::HTTP::Delete.new("/api#{url}")
+    req.body = Yajl::Encoder.encode(body)
+    add_headers(req)
+    
+    response = connection.request(req)
+    if block_given?
+      yield(response.code.to_i, response)
+    else
+      handle_response(response)
     end
+  end
 
-    def asset_host
-      return @asset_host if @asset_host
-      env == 'production' ? 'assets.42floors.com' : 's3.amazonaws.com/staging-assets.42floors.com'
+  def get(url, params={})
+    url = "/api#{url}?" + params.to_param
+    req = Net::HTTP::Get.new(url)
+    add_headers(req)
+    response = connection.request(req)
+    if block_given?
+      yield(response.code.to_i, response)
+    else
+      handle_response(response)
     end
+    
+    response
+  end
 
+  def handle_response(response)
+    if response['X-42Floors-API-Version-Deprecated']
+      logger.warn("DEPRECATION WARNING: API v#{API_VERSION} is being phased out")
+    end
+    
+    raise(response.code, response.body)
+    response.body
+  end
+  
+  def raise(error_code, message=nil)
+    case error_code.to_i
+    when 401
+      super Unauthorized, message
+    when 404, 410
+      super NotFound, message
+    when 422
+      super ApiVersionUnsupported, message
+    when 300...400
+      super MLS::Exception, error_code
+    when 400
+      super MLS::BadRequest, message
+    when 401...500
+      super MLS::Exception, error_code
+    when 500...600
+      super MLS::Exception, error_code
+    end
   end
 
-  class Resource < ActiveResource::Base
-    self.site      = MLS.site
-    self.prefix    = '/api/'
-    self.user      = nil
-    self.password  = nil
+  def ping
+    get('/ping').body
+  end
 
-    # def create
-    #   json = JSON.generate({self.class.element_name => JSON.parse(encode)})
-    #   connection.post(collection_path, json, self.class.headers).tap do |response|
-    #     self.id = id_from_response(response)
-    #     load_attributes_from_response(response)
-    #   end
-    # end
+  def auth_ping
+    post('/ping').body
+  end
 
-    private
+  def default_logger
+    logger = Logger.new(STDOUT)
+    logger.level = Logger::INFO
+    logger
+  end
 
-    def self.instantiate_collection(collection, prefix_options = {})
-      collection[self.collection_name].collect! do |record|
-        instantiate_record(record, prefix_options)
-      end
-    end
-    
+  def self.method_missing(method, *args, &block)
+    instance.__send__(method, *args, &block)
+  end
+  
+  def self.parse(json)
+    Yajl::Parser.new(:symbolize_keys => true).parse(json)
   end
 
 end
 
-require 'mls/use'
-require 'mls/user'
-require 'mls/photo'
-require 'mls/address'
-require 'mls/listing'
+#require File.expand_path('../mls/errors', __FILE__)
+#require File.expand_path('../mls/resource', __FILE__)
+#require File.expand_path('../mls/model', __FILE__)
+#require File.expand_path('../mls/property', __FILE__)
+#require File.expand_path('../mls/parser', __FILE__)
+
+require 'mls/errors'
+require 'mls/resource'
+require 'mls/model'
+require 'mls/property'
+require 'mls/parser'
+
+#require File.expand_path('../mls/properties/fixnum', __FILE__)
+#require File.expand_path('../mls/properties/boolean', __FILE__)
+#require File.expand_path('../mls/properties/decimal', __FILE__)
+#require File.expand_path('../mls/properties/datetime', __FILE__)
+#require File.expand_path('../mls/properties/string', __FILE__)
+
+require 'mls/properties/fixnum'
+require 'mls/properties/boolean'
+require 'mls/properties/decimal'
+require 'mls/properties/datetime'
+require 'mls/properties/string'
+
+#require File.expand_path('../mls/models/account', __FILE__)
+#require File.expand_path('../mls/models/listing', __FILE__)
+#require File.expand_path('../mls/models/address', __FILE__)
+
+require 'mls/models/account'
+require 'mls/models/listing'
+require 'mls/models/address'

data/lib/mls/errors.rb

@@ -0,0 +1,14 @@
+class MLS::Exception < Exception
+end
+
+class MLS::BadRequest < MLS::Exception
+end
+
+class MLS::Unauthorized < MLS::Exception
+end
+
+class MLS::NotFound < MLS::Exception
+end
+
+class MLS::ApiVersionUnsupported < MLS::Exception
+end

data/lib/mls/model.rb

@@ -0,0 +1,94 @@
+module MLS::Model
+
+  def self.extended(model)
+    model.instance_variable_set(:@properties, {})
+    model.instance_variable_set(:@associations, {})
+  end
+
+  # Properties ===================================================================================================
+  
+  def property(name, type, options = {})
+    klass = MLS::Property.determine_class(type)
+    raise NotImplementedError, "#{type} is not supported" unless klass
+
+    property = klass.new(name, options)
+    @properties[property.name] = property
+
+    create_reader_for(property)
+    create_writer_for(property)
+  end
+
+  def properties
+    @properties
+  end
+
+  def property_module
+    @property_module ||= begin
+      mod = Module.new
+      class_eval do
+        include mod
+      end
+      mod
+    end
+  end
+
+  def create_reader_for(property)
+    reader_name             = property.name.to_s
+    boolean_reader_name     = "#{reader_name}?"
+    reader_visibility       = property.reader_visibility
+    instance_variable_name  = property.instance_variable_name
+
+    property_module.module_eval <<-RUBY, __FILE__, __LINE__ + 1
+      #{reader_visibility}
+      def #{reader_name}
+        return #{instance_variable_name} if defined?(#{instance_variable_name})
+        property = properties[:#{reader_name}]
+        #{instance_variable_name} = property ? property.default : nil
+      end
+    RUBY
+
+    if property.kind_of?(MLS::Property::Boolean)
+      property_module.module_eval <<-RUBY, __FILE__, __LINE__ + 1
+        #{reader_visibility}
+        def #{boolean_reader_name}
+          #{reader_name}
+        end
+      RUBY
+    end
+  end
+
+  def create_writer_for(property)
+    name                    = property.name
+    writer_name             = "#{name}="
+    writer_visibility       = property.writer_visibility
+    instance_variable_name  = property.instance_variable_name
+
+    property_module.module_eval <<-RUBY, __FILE__, __LINE__ + 1
+      #{writer_visibility}
+      def #{writer_name}(value)
+        property = self.class.properties[:#{name}]
+        #{instance_variable_name} = property.load(value)
+      end
+    RUBY
+  end
+
+  #== for rails form stuff
+  def model_name
+    self
+  end
+  
+  def param_key
+    root_element.to_s
+  end
+  
+  # used for parser
+  
+  def root_element
+    @root_element ||= ActiveSupport::Inflector.demodulize(self).downcase.to_sym
+  end
+  
+  def collection_root_element
+    @collection_root_element ||= ActiveSupport::Inflector.demodulize(self).downcase.pluralize.to_sym
+  end
+  
+end

data/lib/mls/models/account.rb

@@ -0,0 +1,150 @@
+class MLS::Account < MLS::Resource
+  
+  ROLES = %w(user broker property_manager landlord analyst assistant other)
+  DEFAULTS = {:role => 'user'}
+
+  property :id,                      Fixnum
+  property :role,                    String,   :default => 'user'
+  property :name,                    String
+  property :email,                   String
+  property :password,                String,   :serialize => :if_present
+  property :password_confirmation,   String,   :serialize => :if_present
+  property :perishable_token,        String
+  property :perishable_token_set_at, String
+  
+  property :phone,                   String
+  property :company,                 String
+  property :license,                 String
+  property :linkedin,                String
+  property :twitter,                 String
+  property :facebook,                String
+  property :web,                     String
+  
+  property :state,                   String
+  property :zip,                     String
+  
+  property :auth_key,                String
+  
+  def update!
+    MLS.put('/account', to_hash) do |code, response|
+      case code
+      when 400
+        @errors = MLS.parse(response.body)[:errors]
+        return false
+      else
+        MLS.handle_response(response)
+        MLS::Account::Parser.update(self, response.body)
+      end
+    end
+  end
+  
+  def create!
+    Rails.logger.warn(to_hash)
+    MLS.post('/account', to_hash) do |code, response|
+      case code
+      when 400
+        @errors = MLS.parse(response.body)[:errors]
+        return false
+      else
+        MLS.handle_response(response)
+        MLS::Account::Parser.update(self, response.body)
+      end
+    end
+  end
+
+  def agent?
+    role != 'user' && role != ''
+  end
+
+  def favorites(page=nil, per_page=nil)
+    params_hash = {:page => page, :per_page => per_page}
+    Rails.logger.warn(params_hash)
+    MLS.get('/account/favorites', params_hash) do |code, response|
+      case code
+      when 400
+        @errors = MLS.parse(response.body)[:errors]
+        return false
+      else
+        MLS.handle_response(response)
+        return MLS::Listing::Parser.parse_collection(response.body)
+      end
+    end
+  end
+  
+  def favorite(listing_id)
+    params_hash = {:id => listing_id}
+    Rails.logger.warn(params_hash)
+    MLS.post('/account/favorites', params_hash) do |code, response|
+      case code
+      when 400
+        @errors = MLS.parse(response.body)[:errors]
+        return false
+      else
+        MLS.handle_response(response)
+        return true
+      end
+    end
+  end
+
+  def unfavorite(listing_id)
+    MLS.delete("/account/favorites/#{listing_id}") do |code, response|
+      case code
+      when 400
+        @errors = MLS.parse(response.body)[:errors]
+        return false
+      else
+        MLS.handle_response(response)
+        return true
+      end
+    end
+  end
+  
+  class << self
+    
+    def current
+      response = MLS.get('/account')
+      MLS::Account::Parser.parse(response.body)
+    end
+    
+    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)
+    rescue MLS::Unauthorized => response
+      nil
+    end
+
+    def reset_password!(email)
+      params_hash = {:email => email}
+      Rails.logger.warn(params_hash)
+      MLS.post('/accounts/password/reset', params_hash) do |code, response|
+        case code
+        when 400
+          @errors = MLS.parse(response.body)[:errors]
+          return false
+        else
+          MLS.handle_response(response)
+          return true
+        end
+      end
+    end
+
+    def update_password!(params_hash)
+      Rails.logger.warn(params_hash)
+      response = MLS.put('/accounts/password', params_hash)
+      MLS::Account::Parser.parse(response)
+    rescue MLS::BadRequest => response
+      @errors = MLS.parse(response.message)
+      return false
+    end
+
+    
+  end
+  
+end
+
+class MLS::Account::Parser < MLS::Parser
+
+end

data/lib/mls/models/address.rb

@@ -0,0 +1,39 @@
+class MLS::Address < MLS::Resource
+
+  property :id, Fixnum
+  property :name, String
+  property :slug, String
+  
+  property :latitude, Decimal
+  property :longitude, Decimal
+  
+  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
+
+  class << self
+    
+    def query(q)
+      response = MLS.get('/addresses/query', :query => q)
+      MLS::Address::Parser.parse_collection(response.body)
+    end
+
+    # Bounds is passed as 'n,e,s,w' or [n, e, s, w]
+    def box_cluster(bounds, zoom, filters={})
+      response = MLS.get('/addresses/box_cluster', :bounds => bounds, :zoom => zoom, :filters => filters)
+    end
+    
+  end
+  
+end
+
+
+class MLS::Address::Parser < MLS::Parser
+  
+end

data/lib/mls/models/listing.rb

@@ -0,0 +1,97 @@
+class MLS::Listing < MLS::Resource
+  
+  KINDS = %w(lease sublease coworking)
+  SPACE_TYPES = %w(unit floor building)
+  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"]
+  
+  property :id,                           Fixnum
+  property :address_id,                   Fixnum
+  property :use_id,                       Fixnum
+  property :use,                          String
+  property :account_id,                   Fixnum
+  property :hidden,                       Boolean, :default => false
+    
+  property :name,                         String
+  property :kind,                         String, :default => 'lease'
+  property :space_type,                   String, :default => 'unit'
+  property :unit,                         String
+  property :floor,                        Fixnum
+  property :comments,                     String
+    
+  property :total_size,                   Fixnum
+  property :maximum_contiguous_size,      Fixnum
+  property :minimum_divisable_size,       Fixnum
+
+  property :lease_type,                   String
+  property :rate,                         Decimal
+  property :rate_units,                   String, :default => 'ft^2/month'
+  property :rate_per_month,               Decimal
+  property :rate_per_year,                Decimal
+  property :tenant_improvements,          String
+  property :nnn_expenses,                 Decimal
+  property :sublease_expiration,          DateTime
+
+  property :available_on,                 DateTime
+  property :maximum_term_length,          Fixnum
+  property :minimum_term_length,          Fixnum
+
+  property :offices,                      Fixnum
+  property :conference_rooms,             Fixnum
+  property :bathrooms,                    Fixnum
+  property :desks,                        Fixnum
+  
+  property :kitchen,                      Boolean, :default => false
+  property :showers,                      Boolean, :default => false
+  property :bike_rack,                    Boolean, :default => false
+  property :bikes_allowed,                Boolean, :default => false
+  property :server_room,                  Boolean, :default => false
+  property :reception_area,               Boolean, :default => false
+  property :turnkey,                      Boolean, :default => false
+  property :patio,                        Boolean, :default => false
+  property :copy_room,                    Boolean, :default => false
+  property :dog_friendly,                 Boolean, :default => false
+  property :cabling,                      Boolean, :default => false
+  property :ready_to_move_in,             Boolean, :default => false
+  property :recent_space_improvements,    Boolean, :default => false
+  property :printers,                     Boolean, :default => false
+  property :furniture_available,          Boolean, :default => false
+  
+  property :created_at,                   DateTime
+  property :updated_at,                   DateTime
+  
+  
+  attr_accessor :address, :agents
+  
+  def photos
+    []
+  end
+  
+  class << self
+    
+    def find(id)
+      response = MLS.get("/listings/#{id}")
+      MLS::Listing::Parser.parse(response.body)
+    end
+
+  end
+  
+end
+
+
+class MLS::Listing::Parser < MLS::Parser
+  
+  def photos=(photos)
+    puts photos
+  end
+   
+  def address=(address)
+    @object.address = MLS::Address::Parser.build(address)
+  end
+  
+  def agents=(agents)
+    puts agents
+  end
+  
+end

data/lib/mls/parser.rb

@@ -0,0 +1,69 @@
+class MLS::Parser
+  
+  attr_reader :object
+  
+  def initialize(object=nil, persisted=true)
+    @object = object || self.class.object_class.new({}, persisted)
+  end
+  
+  def parse(data)
+    attributes = extract_attributes(data)[self.class.root_element]
+    update_attributes(attributes)
+    object
+  end
+  
+  def build(attributes)
+    update_attributes(attributes)
+    object
+  end
+  
+  def update_attributes(attributes)
+    attributes.each do |k,v|
+      self.send("#{k}=".to_sym, v)
+    end
+  end
+  
+  def self.parse(data)
+    self.new.parse(data)
+  end
+  
+  def self.parse_collection(data)
+    collection = []
+    extract_attributes(data)[collection_root_element].each do |attrs|
+      collection << build(attrs)
+    end
+    collection
+  end
+  
+  def self.build(attributes)
+    self.new.build(attributes)
+  end
+  
+  def self.update(object, data)
+    self.new(object).parse(data)    
+  end
+  
+  def method_missing(method, *args, &block)
+    object.__send__(method, *args, &block)
+  end  
+  
+  def extract_attributes(data)
+    Yajl::Parser.new(:symbolize_keys => true).parse(data)
+  end
+  def self.extract_attributes(data)
+    Yajl::Parser.new(:symbolize_keys => true).parse(data)
+  end
+
+  def self.object_class
+    @object_class ||= ActiveSupport::Inflector.constantize(self.to_s.sub('::Parser',''))
+  end
+  
+  def self.root_element
+    object_class.root_element
+  end
+  
+  def self.collection_root_element
+    object_class.collection_root_element
+  end
+  
+end

data/lib/mls/properties/boolean.rb

@@ -0,0 +1,9 @@
+class MLS::Property::Boolean < MLS::Property
+	
+	def load(value) # from_json
+		!!value # !! booleanizes the value
+	end
+	
+	alias :dump :load #only for primatives
+	
+end

data/lib/mls/properties/datetime.rb

@@ -0,0 +1,21 @@
+class MLS::Property::DateTime < MLS::Property
+  
+  def load(value) # from_json
+    if value.is_a?(::String)
+      ::DateTime.iso8601(value)
+    elsif value.nil? || value.is_a?(::DateTime)
+      value
+    else
+      raise 'unsupported date type'
+    end
+  end
+  
+  def dump(value)
+    if value.is_a?(::DateTime)
+      value.iso8601
+    else
+      raise 'unsupported date type'
+    end
+  end
+
+end

data/lib/mls/properties/decimal.rb

@@ -0,0 +1,19 @@
+class MLS::Property::Decimal < MLS::Property
+  
+  def load(value) # from_json
+    if value.is_a?(BigDecimal)
+      value
+    else
+      BigDecimal.new(value.to_s)
+    end
+  end
+  
+  def dump(value)
+    if value.is_a?(BigDecimal)
+      value.to_s
+    else
+      value
+    end
+  end
+
+end

data/lib/mls/properties/fixnum.rb

@@ -0,0 +1,16 @@
+class MLS::Property::Fixnum < ::MLS::Property
+	
+	def load(value) # from_json
+		if value.nil?
+			nil
+		elsif value.is_a?(::Fixnum)
+			value
+		else
+			value.to_i
+		end
+		
+	end
+	
+	alias :dump :load #only for primatives
+	
+end

data/lib/mls/properties/string.rb

@@ -0,0 +1,15 @@
+class MLS::Property::String < MLS::Property
+	
+	def load(value) # from_json
+		if value.nil?
+			nil
+		elsif value.is_a?(::String)
+			value
+		else
+			value.to_s
+		end
+	end
+	
+	alias :dump :load #only for primatives
+	
+end

data/lib/mls/property.rb

@@ -0,0 +1,44 @@
+class MLS::Property
+	DEFAULT_OPTIONS = { :serialize => :always	}
+	
+	attr_reader :model, :name, :instance_variable_name, :options, :default
+	attr_reader :reader_visibility, :writer_visibility
+
+	def initialize(name, options={})
+		@name                   = name
+		@instance_variable_name = "@#{@name}".freeze
+		@options                = DEFAULT_OPTIONS.merge(options)
+
+		set_default_value
+		determine_visibility
+	end
+
+	def set_default_value
+		@default = @options[:default]
+	end
+
+	def determine_visibility # default :public
+		@reader_visibility = @options[:reader] || :public
+		@writer_visibility = @options[:writer] || :public
+	end
+
+	def self.determine_class(type)
+		return type if type < MLS::Property
+		find_class(::ActiveSupport::Inflector.demodulize(type))
+	end
+
+	def self.inherited(descendant)
+		demodulized_names[::ActiveSupport::Inflector.demodulize(descendant.name)] ||= descendant
+	end
+
+	def self.demodulized_names
+		@demodulized_names ||= {}
+	end
+
+	def self.find_class(name)
+		klass   = demodulized_names[name]
+		klass ||= const_get(name) if const_defined?(name)
+		klass
+	end
+	
+end

data/lib/mls/resource.rb

@@ -0,0 +1,69 @@
+class MLS::Resource
+
+  attr_reader :errors, :persisted
+
+  def self.inherited(subclass)
+    subclass.extend(MLS::Model)
+  end
+
+  def initialize(attributes = {}, persisted = false)
+    @persisted = persisted
+    @errors = {}
+    
+    set_default_values
+    update_attributes(attributes)
+  end
+  
+  def new_record?
+    !@persisted
+  end
+  
+  def persisted?
+    @persisted
+  end
+  
+  def save
+    new_record? ? create! : update!
+  end
+  
+  # Properties ===================================================================================================
+  
+  def properties
+    self.class.properties
+  end
+  
+  def set_default_values
+    properties.each do |name, property|
+      self.send("#{name}=".to_sym, property.default) if property.default
+    end
+  end
+
+  def update_attributes(attrs)
+    attrs.each { |k, v| self.send("#{k}=".to_sym, v) }
+  end
+  
+  # Combo Breaker ================================================================================================
+
+  def to_hash
+    hash = {}
+    
+    properties.each do |name, property|
+      serialize = property.options[:serialize] || :always
+      case serialize
+      when :always
+        hash[name] = property.dump(self.send(name))
+      when :if_present
+        hash[name] = property.dump(self.send(name)) if self.send(name)
+      end
+    end
+    
+    hash
+  end
+  
+  #== for rails form stuff
+  
+  def to_key
+    persisted? ? [id] : nil
+  end
+  
+end

data/lib/mls/version.rb

@@ -1,3 +1,3 @@
 module MLS
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/mls.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'turn'
   s.add_runtime_dependency 'activeresource'
+  s.add_runtime_dependency 'yajl-ruby'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mls
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-04 00:00:00.000000000 Z
+date: 2012-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70095576893220 !ruby/object:Gem::Requirement
+  requirement: &70151949432680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70095576893220
+  version_requirements: *70151949432680
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70095576892800 !ruby/object:Gem::Requirement
+  requirement: &70151949432160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70095576892800
+  version_requirements: *70151949432160
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70095576892380 !ruby/object:Gem::Requirement
+  requirement: &70151949431660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70095576892380
+  version_requirements: *70151949431660
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70095576891960 !ruby/object:Gem::Requirement
+  requirement: &70151949431180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70095576891960
+  version_requirements: *70151949431180
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70095576891540 !ruby/object:Gem::Requirement
+  requirement: &70151949430400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70095576891540
+  version_requirements: *70151949430400
 - !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: &70095576907480 !ruby/object:Gem::Requirement
+  requirement: &70151949429880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70095576907480
+  version_requirements: *70151949429880
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: &70151949429420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70151949429420
 description: Ruby library for integrating with the 42Floors MLS
 email:
 - james@42floors.com
@@ -85,14 +96,26 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rvmrc
 - Gemfile
 - Rakefile
 - lib/mls.rb
-- lib/mls/address.rb
-- lib/mls/listing.rb
-- lib/mls/photo.rb
-- lib/mls/use.rb
-- lib/mls/user.rb
+- lib/mls/errors.rb
+- lib/mls/model.rb
+- lib/mls/models/account.rb
+- lib/mls/models/address.rb
+- lib/mls/models/listing.rb
+- lib/mls/models/photo.rb
+- lib/mls/models/use.rb
+- lib/mls/models/user.rb
+- lib/mls/parser.rb
+- lib/mls/properties/boolean.rb
+- lib/mls/properties/datetime.rb
+- lib/mls/properties/decimal.rb
+- lib/mls/properties/fixnum.rb
+- lib/mls/properties/string.rb
+- lib/mls/property.rb
+- lib/mls/resource.rb
 - lib/mls/version.rb
 - mls.gemspec
 homepage: http://mls.42floors.com

data/lib/mls/address.rb

@@ -1,7 +0,0 @@
-class MLS::Address < MLS::Resource
-  
-  def self.query(q)
-    get :query, :query => q
-  end
-
-end

data/lib/mls/listing.rb

@@ -1,95 +0,0 @@
-class MLS::Listing < MLS::Resource
-  
-  KINDS = %w(lease sublease 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 :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
-  validates :floor, :numericality => { :allow_nil => true }
-  validates :offices, :numericality => { :allow_nil => true }
-  validates :conference_rooms, :numericality => { :allow_nil => true }
-  validates :bathrooms, :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 => 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
-  
-  schema do
-    # attribute :use, :string
-    attribute :total_size, :integer
-    attribute :sublease, :boolean
-    attribute :maximum_contiguous_size, :integer
-    attribute :minimum_divisable_size, :integer
-    attribute :available_on, :date
-    attribute :unit, :string
-    attribute :space_type, :string
-    attribute :lease, :string
-    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
-    attribute :tenant_improvement, :string
-    attribute :commnets, :text
-    attribute :kitchen, :boolean, :default => false
-    attribute :offices, :integer
-    attribute :conference_rooms, :integer
-    attribute :bathrooms, :integer
-    attribute :showers, :boolean, :default => false
-    attribute :bike_rake, :boolean, :default => false
-    attribute :server_room, :boolean, :default => false
-    attribute :reception_area, :boolean, :default => false
-    attribute :turnkey, :boolean, :default => false
-    attribute :patio, :boolean, :default => false
-    attribute :created_at, :datetime
-    attribute :updated_at, :datetime
-    attribute :deleted_at, :datetime
-    attribute :copy_room, :boolean
-    attribute :term_length, :integer
-    attribute :bikes_allowed, :boolean
-    attribute :dog_friendly, :boolean
-    attribute :furniture_available, :boolean
-    attribute :cabling, :boolean
-    attribute :ready_to_move_in, :boolean
-    attribute :recent_space_improvements, :boolean
-    attribute :maximum_term_length, :integer
-    attribute :minimum_term_length, :integer
-    attribute :minimum_rate, :decimal, :precision => 8,  :scale => 2
-    attribute :maximum_rate, :decimal, :precision => 8,  :scale => 2
-    attribute :kind, :string
-    attribute :rate_units, :string
-  end
-
-  def available_on
-    Date.parse(attributes[:available_on])
-  end
-
-  def sublease_expiration
-    Date.parse(attributes[:sublease_expiration]) if attributes[:sublease_expiration]
-  end
-
-  def photos
-    return @photos if @photos
-    @photos = []
-    attributes[:photos].each do |digest|
-      @photos << MLS::Photo.new(digest)
-    end
-    @photos
-  end
-
-end