mls 0.11.3 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e89e868d54e413d5c6fe5154f40365864f166707
-  data.tar.gz: 16a800a009692818306743a61ea0c03d47938de3
+  metadata.gz: d7bf2fb1f45061601b3410b8d455f4237ca7a405
+  data.tar.gz: 159126570b0d6925baaa5593b5d911a9f01aba9e
 SHA512:
-  metadata.gz: 38025736bee6bcb381e1ffa130448ccbfcdb1f99acbe6c33394e0446e0524bc06f8414645178a3c42f6a341a71ab2e1addacc35531c74fb15edb55bd15d86134
-  data.tar.gz: 1c66cda57c20adc407595de56048b67db3b587558b03c7fb9c04c4fc36a2e4c891015af4f6e8d375fe72eba5a422b92b32b761d2149bd9544565755558123c5b
+  metadata.gz: 10ab6acf77fd576d34863564b5c6d55ee5439f53481473a06bcee79b55239abcca6637a7d1e1f2d3f5ce918d7237229f85a89ef7d7d8000f3ca454285e1fab04
+  data.tar.gz: afc56b84396934752bf50f3d1e6eaf809b7fd1e103588071ad29dec07bae40f2f7dad2cab06f4decbfada145da0b52a54b2a62d00fc9e77d9157a5d471551c46

data/lib/mls.rb

@@ -25,7 +25,7 @@ class MLS
 
   attr_reader :url, :user_agent
   attr_writer :asset_host, :image_host, :agent_profile
-  attr_accessor :api_key, :auth_key, :logger
+  attr_accessor :api_key, :auth_cookie, :logger
 
   # Sets the API Token and Host of the MLS Server
   #
@@ -36,12 +36,12 @@ class MLS
     @api_key = CGI.unescape(@url.user)
     @host, @port = @url.host, @url.port
   end
-  
+
   # Sets the user agent so that MLS can distinguish between multiple users
   # with the same auth
   def user_agent=(user_agent)
     @user_agent = user_agent
-  end  
+  end
 
   def logger # TODO: testme
     @logger ||= default_logger
@@ -58,11 +58,11 @@ class MLS
   def asset_host # TODO: testme
     @asset_host ||= get('/asset_host').body
   end
-  
+
   def image_host # TODO: testme
     raw_image_host % (rand(4))
   end
-  
+
   def raw_image_host
     @image_host ||= get('/image_host').body
   end
@@ -73,20 +73,19 @@ class MLS
   end
 
   def headers # TODO: testme
-    h = {
+    {
       'Content-Type' => 'application/json',
       'User-Agent' => @user_agent,
       'X-42Floors-API-Version' => API_VERSION,
       'X-42Floors-API-Key' => api_key
     }
-    h['X-42Floors-API-Auth-Key'] = auth_key if auth_key
-    h
   end
-  
-  def add_headers(req) # TODO: testme
+
+  def prepare_request(req) # TODO: testme
     headers.each { |k, v| req[k] = v }
+    req['Cookie'] = auth_cookie if auth_cookie
   end
-  
+
   # Gets to +url+ on the MLS Server. Automatically includes any headers returned
   # by the MLS#headers function.
   #
@@ -95,7 +94,7 @@ class MLS
   # * +url+ - The +url+ on the server to Get to. This url will automatically
   #   be prefixed with <tt>"/api"</tt>. To get to <tt>"/api/accounts"</tt>
   #   pass <tt>"/accounts"</tt> as +url+
-  # * +params+ - A Hash or Ruby Object that responds to #to_param. The result 
+  # * +params+ - A Hash or Ruby Object that responds to #to_param. The result
   #   of this method is appended on the URL as query params
   # * +valid_response_codes+ - An Array of HTTP response codes that should be
   #   considered accepable and not raise exceptions. For example If you don't
@@ -131,13 +130,13 @@ class MLS
   #  end
   def get(url, params={}, *valid_response_codes, &block)
     params ||= {}
-    
+
     req = Net::HTTP::Get.new("/api#{url}?" + params.to_param)
-    add_headers(req)
+    prepare_request(req)
 
     response = connection.request(req)
     handle_response(response, valid_response_codes)
-    
+
     response.body.force_encoding(Encoding::UTF_8)
     if block_given?
       yield(response, response.code.to_i)
@@ -145,7 +144,7 @@ class MLS
       response
     end
   end
-  
+
   # Puts to +url+ on the MLS Server. Automatically includes any headers returned
   # by the MLS#headers function.
   #
@@ -190,11 +189,11 @@ class MLS
   #  end
   def put(url, body={}, *valid_response_codes, &block)
     body ||= {}
-    
+
     req = Net::HTTP::Put.new("/api#{url}")
     req.body = Yajl::Encoder.encode(body)
-    add_headers(req)
-    
+    prepare_request(req)
+
     response = connection.request(req)
     handle_response(response, valid_response_codes)
 
@@ -203,8 +202,8 @@ class MLS
     else
       response
     end
-  end  
-  
+  end
+
   # Posts to +url+ on the MLS Server. Automatically includes any headers returned
   # by the MLS#headers function.
   #
@@ -249,11 +248,11 @@ class MLS
   #  end
   def post(url, body={}, *valid_response_codes, &block)
     body ||= {}
-    
+
     req = Net::HTTP::Post.new("/api#{url}")
     req.body = Yajl::Encoder.encode(body)
-    add_headers(req)
-    
+    prepare_request(req)
+
     response = connection.request(req)
     handle_response(response, valid_response_codes)
 
@@ -308,11 +307,11 @@ class MLS
   #  end
   def delete(url, body={}, *valid_response_codes, &block)
     body ||= {}
-    
+
     req = Net::HTTP::Delete.new("/api#{url}")
     req.body = Yajl::Encoder.encode(body)
-    add_headers(req)
-    
+    prepare_request(req)
+
     response = connection.request(req)
     handle_response(response, valid_response_codes)
     if block_given?
@@ -339,13 +338,13 @@ class MLS
   #
   #  #!ruby
   #  MLS.handle_response(<Net::HTTP::Response @code=200>) # => <Net::HTTP::Response @code=200>
-  #  
+  #
   #  MLS.handle_response(<Net::HTTP::Response @code=404>) # => raises MLS::Exception::NotFound
-  #  
+  #
   #  MLS.handle_response(<Net::HTTP::Response @code=500>) # => raises MLS::Exception
-  #  
+  #
   #  MLS.handle_response(<Net::HTTP::Response @code=404>, 404) # => <Net::HTTP::Response @code=404>
-  #  
+  #
   #  MLS.handle_response(<Net::HTTP::Response @code=500>, 404, 500) # => <Net::HTTP::Response @code=500>
   #
   #  MLS.handle_response(<Net::HTTP::Response @code=405>, 300, 400..499) # => <Net::HTTP::Response @code=405>
@@ -355,11 +354,11 @@ class MLS
     if response['X-42Floors-API-Version-Deprecated']
       logger.warn("DEPRECATION WARNING: API v#{API_VERSION} is being phased out")
     end
-    
+
     code = response.code.to_i
     valid_response_codes.flatten!
     valid_response_codes << (200..299)
-    
+
     if !valid_response_codes.detect{|i| i.is_a?(Range) ? i.include?(code) : i == code}
       case code
       when 400
@@ -376,16 +375,16 @@ class MLS
         raise MLS::Exception, code
       end
     end
-    
+
     response
   end
-  
+
   # Ping the MLS. If everything is configured and operating correctly <tt>"pong"</tt>
   # will be returned. Otherwise and MLS::Exception should be thrown.
   #
   #  #!ruby
   #  MLS.ping # => "pong"
-  #    
+  #
   #  MLS.ping # raises MLS::Exception::ServiceUnavailable if a 503 is returned
   def ping # TODO: testme
     get('/ping').body
@@ -405,7 +404,7 @@ class MLS
   def self.method_missing(method, *args, &block) #:nodoc:  # TODO: testme
     instance.__send__(method, *args, &block)
   end
-  
+
   def self.parse(json) # TODO: testme
     Yajl::Parser.new(:symbolize_keys => true).parse(json)
   end
@@ -416,21 +415,22 @@ require 'mls/errors'
 require 'mls/resource'
 require 'mls/parser'
 
-# Properties
-require 'mls/property'
-require 'mls/properties/fixnum'
-require 'mls/properties/boolean'
-require 'mls/properties/decimal'
-require 'mls/properties/datetime'
-require 'mls/properties/string'
-require 'mls/properties/hash'
-require 'mls/properties/array'
+# Attributes
+require 'mls/attribute'
+require 'mls/attributes/fixnum'
+require 'mls/attributes/boolean'
+require 'mls/attributes/decimal'
+require 'mls/attributes/datetime'
+require 'mls/attributes/string'
+require 'mls/attributes/hash'
+require 'mls/attributes/array'
 
 # Models
 require 'mls/model'
 require 'mls/models/account'
 require 'mls/models/listing'
 require 'mls/models/address'
+require 'mls/models/property'
 require 'mls/models/photo'
 require 'mls/models/video'
 require 'mls/models/pdf'

data/lib/mls/{property.rb → attribute.rb}

@@ -1,4 +1,4 @@
-class MLS::Property
+class MLS::Attribute
 	DEFAULT_OPTIONS = { :serialize => :always	}
 	
 	attr_reader :model, :name, :instance_variable_name, :options, :default
@@ -23,7 +23,7 @@ class MLS::Property
 	end
 
 	def self.determine_class(type)
-		return type if type < MLS::Property
+		return type if type < MLS::Attribute
 		find_class(::ActiveSupport::Inflector.demodulize(type))
 	end
 

data/lib/mls/{properties → attributes}/array.rb

@@ -1,4 +1,4 @@
-class MLS::Property::Array < MLS::Property
+class MLS::Attribute::Array < MLS::Attribute
   
   def load(value) # from_json
     value

data/lib/mls/{properties → attributes}/boolean.rb

@@ -1,4 +1,4 @@
-class MLS::Property::Boolean < MLS::Property
+class MLS::Attribute::Boolean < MLS::Attribute
 	
 	def load(value) # from_json
 		value

data/lib/mls/{properties → attributes}/datetime.rb

@@ -1,4 +1,4 @@
-class MLS::Property::DateTime < MLS::Property
+class MLS::Attribute::DateTime < MLS::Attribute
   
   def load(value) # from_json
     if value.is_a?(::String)

data/lib/mls/{properties → attributes}/decimal.rb

@@ -1,4 +1,4 @@
-class MLS::Property::Decimal < MLS::Property
+class MLS::Attribute::Decimal < MLS::Attribute
   
   def load(value) # from_json
     if value.nil?

data/lib/mls/{properties → attributes}/fixnum.rb

@@ -1,4 +1,4 @@
-class MLS::Property::Fixnum < ::MLS::Property
+class MLS::Attribute::Fixnum < ::MLS::Attribute
 	
 	def load(value) # from_json
 		if value.nil?

data/lib/mls/{properties → attributes}/hash.rb

@@ -1,4 +1,4 @@
-class MLS::Property::Hash < MLS::Property
+class MLS::Attribute::Hash < MLS::Attribute
   
   def load(value) # from_json
     if value.is_a?(Hash)

data/lib/mls/{properties → attributes}/string.rb

@@ -1,4 +1,4 @@
-class MLS::Property::String < MLS::Property
+class MLS::Attribute::String < MLS::Attribute
 	
 	def load(value) # from_json
 		if value.nil?

data/lib/mls/factories/listing.rb

@@ -1,11 +1,11 @@
 FactoryGirl.define do
   factory :listing, :class => MLS::Listing do
     before(:create) { |l|
-      MLS_GEM_CACHE['auth_key'] = MLS.auth_key
-      MLS.auth_key = l.account.auth_key
+      MLS_GEM_CACHE['auth_cookie'] = MLS.auth_cookie
+      MLS.auth_cookie = l.account.auth_cookie
     }
     after(:create) { |l|
-      MLS.auth_key = MLS_GEM_CACHE['auth_key']
+      MLS.auth_cookie = MLS_GEM_CACHE['auth_cookie']
     }
 
     association :account

data/lib/mls/model.rb

@@ -1,7 +1,7 @@
 module MLS::Model
 
   def self.extended(model) #:nodoc:
-    model.instance_variable_set(:@properties, {})
+    model.instance_variable_set(:@attributes, {})
     model.instance_variable_set(:@associations, {})
   end
 
@@ -24,34 +24,34 @@ module MLS::Model
     model
   end
 
-  # Properties ===================================================================================================
+  # Attributes ===================================================================================================
 
-  def property(name, type, options = {})
-    klass = MLS::Property.determine_class(type)
+  def attribute(name, type, options = {})
+    klass = MLS::Attribute.determine_class(type)
     raise NotImplementedError, "#{type} is not supported" unless klass
 
-    property = klass.new(name, options)
-    @properties[property.name] = property
-    @properties_excluded_from_comparison = []
+    attribute = klass.new(name, options)
+    @attributes[attribute.name] = attribute
+    @attributes_excluded_from_comparison = []
 
-    create_reader_for(property)
-    create_writer_for(property)
+    create_reader_for(attribute)
+    create_writer_for(attribute)
   end
 
-  def exclude_from_comparison(*properties)
-    @properties_excluded_from_comparison |= properties
+  def exclude_from_comparison(*attributes)
+    @attributes_excluded_from_comparison |= attributes
   end
 
-  def properties_excluded_from_comparison
-    @properties_excluded_from_comparison
+  def attributes_excluded_from_comparison
+    @attributes_excluded_from_comparison
   end
 
-  def properties
-    @properties
+  def attributes
+    @attributes
   end
 
-  def property_module
-    @property_module ||= begin
+  def attribute_module
+    @attribute_module ||= begin
       mod = Module.new
       class_eval do
         include mod
@@ -60,23 +60,23 @@ module MLS::Model
     end
   end
 
-  def create_reader_for(property)
-    reader_name             = property.name.to_s
+  def create_reader_for(attribute)
+    reader_name             = attribute.name.to_s
     boolean_reader_name     = "#{reader_name}?"
-    reader_visibility       = property.reader_visibility
-    instance_variable_name  = property.instance_variable_name
+    reader_visibility       = attribute.reader_visibility
+    instance_variable_name  = attribute.instance_variable_name
 
-    property_module.module_eval <<-RUBY, __FILE__, __LINE__ + 1
+    attribute_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
+        attribute = attributes[:#{reader_name}]
+        #{instance_variable_name} = attribute ? attribute.default : nil
       end
     RUBY
 
-    if property.kind_of?(MLS::Property::Boolean)
-      property_module.module_eval <<-RUBY, __FILE__, __LINE__ + 1
+    if attribute.kind_of?(MLS::Attribute::Boolean)
+      attribute_module.module_eval <<-RUBY, __FILE__, __LINE__ + 1
         #{reader_visibility}
         def #{boolean_reader_name}
           #{reader_name}
@@ -85,17 +85,17 @@ module MLS::Model
     end
   end
 
-  def create_writer_for(property)
-    name                    = property.name
+  def create_writer_for(attribute)
+    name                    = attribute.name
     writer_name             = "#{name}="
-    writer_visibility       = property.writer_visibility
-    instance_variable_name  = property.instance_variable_name
+    writer_visibility       = attribute.writer_visibility
+    instance_variable_name  = attribute.instance_variable_name
 
-    property_module.module_eval <<-RUBY, __FILE__, __LINE__ + 1
+    attribute_module.module_eval <<-RUBY, __FILE__, __LINE__ + 1
       #{writer_visibility}
       def #{writer_name}(value)
-        property = self.class.properties[:#{name}]
-        #{instance_variable_name} = property.load(value)
+        attribute = self.class.attributes[:#{name}]
+        #{instance_variable_name} = attribute.load(value)
       end
     RUBY
   end