mls 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2038b3ee1f58d0c9b529c5ecfe3ef927af8068b8
-  data.tar.gz: 87d5a02cfa10037c074923202903c17f81c6211a
+  metadata.gz: 49407504285320c314076642711aa51cbcffb1ea
+  data.tar.gz: 1f01d0b23a0b9e5d89744a3020615ff59c420a6f
 SHA512:
-  metadata.gz: 60cc8dba490166630d4c498828d2a5b2d82374a86bb496a7a409c65d172718bd1bc6cdd7da9e9e012c0c8c33e704636ab082244fdd4a24bdd8bcf1f47652a7d9
-  data.tar.gz: 659c7557d36e305f7fe8a5c79f328f7854dc2535608cd2daa3013f9d63b0dc7028a63aafd0506d72845f7b92f8ac660d1783740f9271b25cb8b8db24dbc6a43e
+  metadata.gz: 96d45047e9069909a6e05f80fa8335188da8e81dd99e9c6d1aa0c7c898b1a84372aaac30320884f5b11233fec7d0f9f1b68fb34579bff6ae2be3bd6bb0faf0b1
+  data.tar.gz: d3fc967552d7105a79cd845ce8024b91e0f78a903ad87d300c63831d8f28bc2497eb50445e0e61e251cef952f02a24595aa99d395f5b5e062d6ceb75f6c4817f

data/lib/mls/models/account.rb

@@ -29,7 +29,6 @@ class MLS::Account < MLS::Resource
   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
@@ -129,12 +128,8 @@ class MLS::Account < MLS::Resource
     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.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

data/lib/mls/models/brokerage.rb

@@ -1,19 +1,14 @@
 class MLS::Brokerage < MLS::Resource
 
+  attr_accessor :avatar
+
   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
-    
-    def avatar(format='png', protocol='http')
-      if avatar_digest
-        "#{protocol}://assets.42floors.com/photos/original/#{avatar_digest}.png"
-      end
-    end
 
     def find(id)
       response = MLS.get("/brokerages/#{id}")
@@ -30,4 +25,7 @@ class MLS::Brokerage < MLS::Resource
 end
 
 class MLS::Brokerage::Parser < MLS::Parser
+  def avatar=(avatar)
+    @object.avatar = MLS::Photo::Parser.build(avatar)
+  end
 end

data/lib/mls/models/floorplan.rb

@@ -20,7 +20,7 @@ class MLS::Floorplan < MLS::Resource
     attrs[:file].rewind
     url = MLS.url.dup
     url.user = nil
-    url.path = "/api/floorplans"
+    url.path = "/floorplans"
     
     if attrs[:subject]
       attrs[:subject_id] = attrs[:subject].id

data/lib/mls/models/flyer.rb

@@ -20,7 +20,7 @@ class MLS::Flyer < MLS::Resource
     attrs[:file].rewind
     url = MLS.url.dup
     url.user = nil
-    url.path = "/api/flyers"
+    url.path = "/flyers"
     
     if attrs[:subject]
       attrs[:subject_id] = attrs[:subject].id

data/lib/mls/models/photo.rb

@@ -26,7 +26,7 @@ class MLS::Photo < MLS::Resource
     attrs[:file].rewind
     url = MLS.url.dup
     url.user = nil
-    url.path = "/api/photos"
+    url.path = "/photos"
     response = RestClient.post(url.to_s, {:photo => attrs}, MLS.headers)
     attrs[:file].close unless attrs[:file].closed?
 

data/lib/mls.rb

@@ -6,6 +6,7 @@ require 'singleton'
 require 'yajl'
 require 'bigdecimal'
 require 'bigdecimal/util'
+require 'active_support'
 require 'active_support/core_ext'
 require 'date'
 require 'time'
@@ -25,7 +26,7 @@ class MLS
 
   attr_reader :url, :user_agent
   attr_writer :asset_host, :image_host, :agent_profile
-  attr_accessor :api_key, :auth_cookie, :logger
+  attr_accessor :api_key, :cookie_jar, :logger, :branch, :server, :forwarded_for
 
   # Sets the API Token and Host of the MLS Server
   #
@@ -77,17 +78,21 @@ class MLS
   end
 
   def headers # TODO: testme
-    {
+    headers = {
       'Content-Type' => 'application/json',
       'User-Agent' => @user_agent,
       'X-42Floors-API-Version' => API_VERSION,
       'X-42Floors-API-Key' => api_key
     }
+    headers['X-42Floors-Branch'] = branch if branch
+    headers['X-42Floors-Server'] = server if server
+    headers['X-Forwarded-For'] = forwarded_for if forwarded_for
+    headers
   end
 
   def prepare_request(req) # TODO: testme
     headers.each { |k, v| req[k] = v }
-    req['Cookie'] = auth_cookie if auth_cookie
+    req['Cookie'] = cookie_jar[:api_session] if cookie_jar[:api_session]
   end
 
   # Gets to +url+ on the MLS Server. Automatically includes any headers returned
@@ -95,8 +100,7 @@ class MLS
   #
   # Paramaters::
   #
-  # * +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>
+  # * +url+ - The +url+ on the server to Get to. To get to <tt>"/accounts"</tt>
   #   pass <tt>"/accounts"</tt> as +url+
   # * +params+ - A Hash or Ruby Object that responds to #to_param. The result
   #   of this method is appended on the URL as query params
@@ -135,7 +139,7 @@ class MLS
   def get(url, params={}, *valid_response_codes, &block)
     params ||= {}
 
-    req = Net::HTTP::Get.new("/api#{url}?" + params.to_param)
+    req = Net::HTTP::Get.new(url + '?' + params.to_param)
     prepare_request(req)
 
     response = connection.request(req)
@@ -154,8 +158,7 @@ class MLS
   #
   # Paramaters::
   #
-  # * +url+ - The +url+ on the server to Put to. This url will automatically
-  #   be prefixed with <tt>"/api"</tt>. To put to <tt>"/api/accounts"</tt>
+  # * +url+ - The +url+ on the server to Put to. To put to <tt>"/accounts"</tt>
   #   pass <tt>"/accounts"</tt> as +url+
   # * +body+ - A Ruby object which is converted into JSON and added in the request
   #   Body.
@@ -194,7 +197,7 @@ class MLS
   def put(url, body={}, *valid_response_codes, &block)
     body ||= {}
 
-    req = Net::HTTP::Put.new("/api#{url}")
+    req = Net::HTTP::Put.new(url)
     req.body = Yajl::Encoder.encode(body)
     prepare_request(req)
 
@@ -213,8 +216,7 @@ class MLS
   #
   # Paramaters::
   #
-  # * +url+ - The +url+ on the server to Post to. This url will automatically
-  #   be prefixed with <tt>"/api"</tt>. To post to <tt>"/api/accounts"</tt>
+  # * +url+ - The +url+ on the server to Post to. To post to <tt>"/accounts"</tt>
   #   pass <tt>"/accounts"</tt> as +url+
   # * +body+ - A Ruby object which is converted into JSON and added in the request
   #   Body.
@@ -253,7 +255,7 @@ class MLS
   def post(url, body={}, *valid_response_codes, &block)
     body ||= {}
 
-    req = Net::HTTP::Post.new("/api#{url}")
+    req = Net::HTTP::Post.new(url)
     req.body = Yajl::Encoder.encode(body)
     prepare_request(req)
 
@@ -272,8 +274,7 @@ class MLS
   #
   # Paramaters::
   #
-  # * +url+ - The +url+ on the server to Post to. This url will automatically
-  #   be prefixed with <tt>"/api"</tt>. To delete to <tt>"/api/accounts"</tt>
+  # * +url+ - The +url+ on the server to Post to. To delete to <tt>"/accounts"</tt>
   #   pass <tt>"/accounts"</tt> as +url+
   # * +body+ - A Ruby object which is converted into JSON and added in the request
   #   Body.
@@ -312,7 +313,7 @@ class MLS
   def delete(url, body={}, *valid_response_codes, &block)
     body ||= {}
 
-    req = Net::HTTP::Delete.new("/api#{url}")
+    req = Net::HTTP::Delete.new(url)
     req.body = Yajl::Encoder.encode(body)
     prepare_request(req)
 
@@ -384,6 +385,9 @@ class MLS
       end
     end
 
+    cookie_jar[:api_session] = response['Set-Cookie'] if response['Set-Cookie']
+    cookie_jar[:api_session_id] = response['X-42Floors-API-Session-Id'] if response['X-42Floors-API-Session-Id']
+    
     response
   end
 

data/mls.gemspec

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

data/test/test_helper.rb

@@ -13,7 +13,7 @@ require 'fakeweb'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__),'../'))
 require 'lib/mls/factories_helper'
 
-MLS_HOST = ENV['MLS_URL'] || 'http://localhost:4000/api'
+MLS_HOST = ENV['MLS_URL'] || 'http://localhost:4000'
 
 MLS.url = ENV["MLS_TEST_URL"] || 'http://LBJXFC%2BhDiRRCYj6kXtXREfgNXRCJa8ALvPn%2FIeyjSe2QsQyHZ%2F%2BWwN2VZM2cw%3D%3D@localhost:5000'#
 # MLS.auth_cookie = MLS::Account.authenticate('jonbracy@gmail.com', 'test').auth_cookie

data/test/units/test_mls.rb

@@ -40,7 +40,7 @@ class TestMLS < ::Test::Unit::TestCase
     FakeWeb.register_uri(:get, "#{MLS_HOST}/test?key=value", :body => 'get')
     response = MLS.get('/test', :key => 'value')
 
-    assert_equal '/api/test?key=value', FakeWeb.last_request.path
+    assert_equal '/test?key=value', FakeWeb.last_request.path
   end
 
   test '#get to 404 raises MLS::Exception::NotFound' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mls
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - James R. Bracy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -275,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mls
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: 42Floors MLS Client