mls 0.9.9 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a48350597f0c312c6b077ac66648738287dab16
-  data.tar.gz: 21a59dc3dcc2e25d80c0e9f07ec4d2c966445052
+  metadata.gz: 15fa6c7e0f58d2766b4edf9e9bdee9c08761dfe6
+  data.tar.gz: 0e136cf20c3a0484019cb02c1abb66a3dc32a19c
 SHA512:
-  metadata.gz: 2f8f9ba018aaac555e596c3652a02cba7ed27f6eec40c77b141e042178c20f3ae2361c7475e8f4bb7b348a6edcc3343f61d06b7507188bea5c3d9a80000e972e
-  data.tar.gz: bc7ae317b92a8f64bc0fc1192861ceffdde2c25da4ef0c536db829f545b353cdc5a80ecd324ff4dbd51c5c323fae9ebdb4fee69ac984025e15aaf67d5d5b9eee
+  metadata.gz: 8836988a9d517f26f7dbc2e40f8778e00272214da7b5d91d45976872557df2c4d5fe7c80ee8e1d62743479d7792d42488fa9eeaae6de2014ceaab6a1815751e5
+  data.tar.gz: ccc3d4e6f6a218d4a0eebb1d3628546574004c6d8130e3f9c3ba38e6b82e44c457763470eb9e9651453afd7e8898aa972daf715bd609f57e648d5817e6dca426

data/lib/mls.rb

@@ -438,3 +438,7 @@ require 'mls/models/tour'
 require 'mls/models/flyer'
 require 'mls/models/floorplan'
 require 'mls/models/region'
+require 'mls/models/brokerage'
+
+#factories
+require 'mls/factories_helper'

data/lib/mls/factories/account.rb

@@ -0,0 +1,34 @@
+FactoryGirl.define do
+  factory :account, :class => MLS::Account do
+    name { Faker::Name.name }
+    email { Faker::Internet.email }
+    password { 'test' }
+    password_confirmation 'test'
+  end
+  
+  factory :agent, :class => MLS::Account do
+    phone                   { Faker::PhoneNumber.phone_number }
+    company                 { Faker::Company.name }
+    license                 '12123123123'
+    name                    { Faker::Name.name }
+    email                   { Faker::Internet.email }
+    password                'test'
+    password_confirmation   'test'
+    type                    'Agent'
+  end
+
+  factory :admin, :class => MLS::Account do
+    name { Faker::Name.name }
+    email { Faker::Internet.email }
+    type {'Admin'}
+    password { 'admin_test' }
+    password_confirmation 'admin_test'
+  end
+  
+  factory :ghost_account, :class => MLS::Account do
+    name                    { Faker::Name.name }
+    email                   { Faker::Internet.email }
+    password_required       { false } 
+  end
+
+end

data/{test → lib/mls}/factories/address.rb

@@ -12,4 +12,5 @@ FactoryGirl.define do
     latitude      { Kernel.rand((-90.0)..(90.0)) }
     longitude     { Kernel.rand((-180.0)..(180.0)) }
   end
-end
+end
+

data/{test → lib/mls}/factories/listing.rb

@@ -1,17 +1,17 @@
 FactoryGirl.define do
   factory :listing, :class => MLS::Listing do
     before(:create) { |l|
-      CACHE['auth_key'] = MLS.auth_key
+      MLS_GEM_CACHE['auth_key'] = MLS.auth_key
       MLS.auth_key = l.account.auth_key
     }
     after(:create) { |l|
-      MLS.auth_key = CACHE['auth_key']
+      MLS.auth_key = MLS_GEM_CACHE['auth_key']
     }
 
     association :account
     association :address, :strategy => :build
 
-    #agents_attributes  { {'0' => FactoryGirl.attributes_for(:broker)} }
+    agents  { [FactoryGirl.attributes_for(:agent)] }
 
     use 'Office'
     size { Kernel.rand(3000..900000) }

data/lib/mls/factories_helper.rb

@@ -0,0 +1,7 @@
+require 'factory_girl'
+
+factories_dir = File.join(File.dirname(__FILE__), 'factories')
+FactoryGirl.definition_file_paths = [factories_dir]
+FactoryGirl.find_definitions
+
+MLS_GEM_CACHE={}

data/lib/mls/models/brokerage.rb

@@ -0,0 +1,27 @@
+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
+
+  class << self
+
+    def find(id)
+      response = MLS.get("/brokerages/#{id}")
+      MLS::Brokerage::Parser.parse(response.body)
+    end
+
+    def all(options={})
+      response = MLS.get('/brokerages', options)
+      MLS::Brokerage::Parser.parse_collection(response.body)
+    end
+
+  end
+
+end
+
+class MLS::Brokerage::Parser < MLS::Parser
+end

data/lib/mls/models/listing.rb

@@ -343,11 +343,6 @@ class MLS::Listing < MLS::Resource
       {:status => model.import, :model => model}
     end
 
-    def calculate(filters = {}, operation = nil, column = nil, group = nil)
-      response = MLS.get("/listings/calculate", :filters => filters, :operation => operation, :column => column, :group => group)
-      MLS::Parser.extract_attributes(response.body)[:listings]
-    end
-
     def amenities
       @amenities ||= Yajl::Parser.new.parse(MLS.get('/listings/amenities').body).map(&:to_sym)
     end

data/lib/mls/parser.rb

@@ -1,26 +1,26 @@
 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 {|k,v| self.send("#{k}=".to_sym, v) } if attributes
   end
-  
+
   def self.parse(data)
     self.new.parse(data)
   end
@@ -34,27 +34,27 @@ class MLS::Parser
     end
     collection
   end
-  
+
   def self.parse_collection(data, options={})
     build_collection(extract_attributes(data), options)
   end
-  
+
   def self.build(attributes)
     self.new.build(attributes)
   end
-  
+
   def self.update(object, data)
-    self.new(object).parse(data)    
+    self.new(object).parse(data)
   end
-  
+
   def method_missing(method, *args, &block)
     object.__send__(method, *args, &block) if object.methods.include?(method)
-  end  
-  
+  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
@@ -62,13 +62,13 @@ class MLS::Parser
   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/mls.gemspec

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

data/test/test_helper.rb

@@ -8,14 +8,14 @@ require 'mls'
 require 'turn'
 require 'faker'
 require 'test/unit'
-require 'factory_girl'
 require 'fakeweb'
 
-CACHE = {}
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__),'../'))
+require 'lib/mls/factories_helper'
+
 MLS_HOST = ENV['MLS_URL'] || 'http://localhost:4000/api'
-FactoryGirl.find_definitions
 
-MLS.url = ENV["MLS_TEST_URL"] || 'http://LBJXFC%2BhDiRRCYj6kXtXREfgNXRCJa8ALvPn%2FIeyjSe2QsQyHZ%2F%2BWwN2VZM2cw%3D%3D@localhost:4000'#
+MLS.url = ENV["MLS_TEST_URL"] || 'http://LBJXFC%2BhDiRRCYj6kXtXREfgNXRCJa8ALvPn%2FIeyjSe2QsQyHZ%2F%2BWwN2VZM2cw%3D%3D@localhost:5000'#
 # MLS.auth_key = MLS::Account.authenticate('jonbracy@gmail.com', 'test').auth_key
 
 # File 'lib/active_support/testing/declarative.rb', somewhere in rails....
@@ -43,4 +43,4 @@ def mock_response(method=:get, code='200', body='')
   when :post
     Net::HTTP.post_form(uri)
   end
-end
+end

data/test/units/models/test_address.rb

@@ -5,20 +5,11 @@ class TestAddress < ::Test::Unit::TestCase
   def test_properties
     address = MLS::Address.new
 
-    assert address.respond_to?(:id)
-    assert address.respond_to?(:name)
-    assert address.respond_to?(:slug)
-    assert address.respond_to?(:latitude)
-    assert address.respond_to?(:longitude)
-    assert address.respond_to?(:formatted_address)
-    assert address.respond_to?(:street_number)
-    assert address.respond_to?(:street)
-    assert address.respond_to?(:neighborhood)
-    assert address.respond_to?(:city)
-    assert address.respond_to?(:county)
-    assert address.respond_to?(:state)
-    assert address.respond_to?(:country)
-    assert address.respond_to?(:postal_code)
+    properties = [:id, :name, :slug, :latitude, :longitude, :formated_address, :streetnumber, :street, :neighbrhood, :city, :county, :state, :countr, :postalcode]
+
+    properties.each do |property|
+      assert address.respond_to?(property), "address should respond to #{property}"
+    end
   end
 
   def test_class_methods

data/test/units/models/test_listing.rb

@@ -1,134 +1,106 @@
 require 'test_helper'
 
-class TestListing < ::Test::Unit::TestCase
+class ListingTest < Test::Unit::TestCase
 
   def test_properties
     listing = MLS::Listing.new
-  
-    assert listing.respond_to?(:id)
-    assert listing.respond_to?(:address_id)
-    assert listing.respond_to?(:use)
-    assert listing.respond_to?(:account_id)
-    assert listing.respond_to?(:hidden)
-    assert listing.respond_to?(:name)
-    assert listing.respond_to?(:type)
-    assert listing.respond_to?(:space_type)
-    assert listing.respond_to?(:unit)
-    assert listing.respond_to?(:floor)
-    assert listing.respond_to?(:description)
-    assert listing.respond_to?(:size)
-    assert listing.respond_to?(:maximum_contiguous_size)
-    assert listing.respond_to?(:minimum_divisible_size)
-    assert listing.respond_to?(:lease_terms)
-    assert listing.respond_to?(:rate)
-    assert listing.respond_to?(:rate_units)
-    assert listing.respond_to?(:sublease_expiration)
-    assert listing.respond_to?(:available_on)
-    assert listing.respond_to?(:term)
-    assert listing.respond_to?(:offices)
-    assert listing.respond_to?(:conference_rooms)
-    assert listing.respond_to?(:bathrooms)
-    assert listing.respond_to?(:kitchen)
-    assert listing.respond_to?(:showers)
-    assert listing.respond_to?(:bikes_allowed)
-    assert listing.respond_to?(:reception_area)
-    assert listing.respond_to?(:patio)
-    assert listing.respond_to?(:dog_friendly)
-    assert listing.respond_to?(:ready_to_move_in)
-    assert listing.respond_to?(:furniture_available)
-    assert listing.respond_to?(:created_at)
-    assert listing.respond_to?(:updated_at)
+
+    properties = [:id, :address_id, :use, :account_id, :name, :type, :space_type, :unit, :floor, :description, :size, :maximum_contiguous_size, :minimum_divisible_size, :lease_terms, :rate, :rate_units, :sublease_expiration, :available_on, :term, :offices, :conference_rooms, :bathrooms, :kitchen, :showers, :ready_to_move_in, :furniture_available, :created_at, :updated_at]
+
+    properties.each do |property|
+      assert listing.respond_to?(property), "listing should respond to #{property}"
+    end
   end
-  
+
   def test_attr_accessors
     listing = MLS::Listing.new
-  
+
     assert listing.respond_to?(:address)
     assert listing.respond_to?(:agents)
   end
-  
+
   def test_instance_methods
     listing = MLS::Listing.new
-  
+
     assert listing.respond_to?(:photos)
   end
-  
+
   def test_class_methods
     assert MLS::Listing.respond_to?(:find)
   end
-  
+
   test '#request_tour for email without an account' do
     @listing = FactoryGirl.create(:listing)
     @name = Faker::Name.name
     @email = Faker::Internet.email
     tr = @listing.request_tour(@name, @email)
-  
-  
+
+
     assert_equal({}, tr.errors)
     assert_equal({}, tr.account.errors)
     # TODO assert_equal({}, tr.listing.errors)
     assert tr.id
   end
-  
+
   test '#request_tour for email on a ghost account' do
     @account = FactoryGirl.create(:ghost_account)
     @listing = FactoryGirl.create(:listing)
-    
+
     tr = @listing.request_tour(@account.name, @account.email)
     assert_equal({}, tr.errors)
     assert_equal({}, tr.account.errors)
     # TODO assert_equal({}, tr.listing.errors)
     assert tr.id
   end
-  
+
   test '#request_tour for email on an account' do
     @account = FactoryGirl.create(:account)
     @listing = FactoryGirl.create(:listing)
-  
+
     tr = @listing.request_tour(@account.name, @account.email)
     assert_equal({}, tr.errors)
     assert_equal({}, tr.account.errors)
     # TODO assert_equal({}, tr.listing.errors)
     assert tr.id
   end
-  
+
   test '#request_tour for an non-existant listing' do
     @listing = FactoryGirl.build(:listing, :id => 94332)
-    
+
     assert_raises(MLS::Exception::NotFound) do
       @listing.request_tour(Faker::Name.name, Faker::Internet.email)
     end
   end
-  
+
   test '#request_tour without and account name' do
     @listing = FactoryGirl.create(:listing)
-    
+
     tr = @listing.request_tour('', Faker::Internet.email)
     assert !tr.id
     assert_equal({:name => ["can't be blank"]}, tr.account.errors)
-    
+
     tr = @listing.request_tour(nil, Faker::Internet.email)
     assert !tr.id
     assert_equal({:name => ["can't be blank"]}, tr.account.errors)
   end
-  
+
   test '#request_tour without an account email' do
     @listing = FactoryGirl.create(:listing)
-    
+
     tr = @listing.request_tour(Faker::Name.name, '')
     assert !tr.id
     assert_equal({:email => ["can't be blank", "is invalid"]}, tr.account.errors)
-    
+
     tr = @listing.request_tour(Faker::Name.name, nil)
     assert !tr.id
     # assert !tr.persisted? #TODO move to persisted being based of id?
     assert_equal({:email => ["can't be blank", "is invalid"]}, tr.account.errors)
   end
-  
+
   test '#request_tour with an account email' do
     @account = FactoryGirl.create(:account)
     @listing = FactoryGirl.create(:listing)
-    
+
     tr = @listing.request_tour('', @account.email) # TODO should this try to set the name of the account?
     assert_equal({}, tr.errors)
     assert_equal({}, tr.account.errors)
@@ -136,38 +108,38 @@ class TestListing < ::Test::Unit::TestCase
     assert tr.id
     assert tr.persisted?
   end
-  
+
   test '#request_tour multiple times for a listing' do
     @account = FactoryGirl.create(:account)
     @listing = FactoryGirl.create(:listing)
-    
+
     tr1 = @listing.request_tour(@account.name, @account.email)
     assert_equal({}, tr1.errors) # TODO should errors be here for account?
     assert_equal({}, tr1.account.errors)
     # TODO assert_equal({}, tr.listing.errors)
     assert tr1.persisted?
-      
+
     tr2 = @listing.request_tour(@account.name, @account.email)
     assert_equal({}, tr2.errors)
     assert_equal({}, tr2.account.errors)
     # TODO assert_equal({}, tr.listing.errors)
     assert tr2.persisted?
-    
+
     assert_not_equal tr1.id, tr2.id
   end
-  
+
   test '#request_tour with optional info' do
     @listing = FactoryGirl.create(:listing)
-    
+
     info = {:company => '42Floors', :population => 10, :funding => 'string thing', :move_in_date => '2012-09-12'}
     tr = @listing.request_tour(Faker::Name.name, Faker::Internet.email, info)
-  
+
     assert tr.id
     assert_equal '42Floors', info[:company]
     assert_equal 10, info[:population]
     assert_equal 'string thing', info[:funding]
     assert_equal '2012-09-12', info[:move_in_date]
-    
+
     tr = @listing.request_tour('', nil, info)
     assert !tr.id
     assert_equal '42Floors', info[:company]
@@ -175,10 +147,10 @@ class TestListing < ::Test::Unit::TestCase
     assert_equal 'string thing', info[:funding]
     assert_equal '2012-09-12', info[:move_in_date]
   end
-  
+
   def test_rate_per_sqft_per_month
     listing = MLS::Listing.new(:rate => 10.5, :rate_units => '/sqft/mo', :size => 5)
-  
+
     assert_equal 10.5,  listing.rate
     assert_equal 10.5,  listing.rate('/sqft/mo')
     assert_equal 126,   listing.rate('/sqft/yr')
@@ -189,10 +161,10 @@ class TestListing < ::Test::Unit::TestCase
       listing.rate('/random')
     end
   end
-  
+
   def test_rate_per_sqft_per_year
     listing = MLS::Listing.new(:rate => 126, :rate_units => '/sqft/yr', :size => 5)
-  
+
     assert_equal 126,  listing.rate
     assert_equal 10.5,  listing.rate('/sqft/mo')
     assert_equal 126,   listing.rate('/sqft/yr')
@@ -203,10 +175,10 @@ class TestListing < ::Test::Unit::TestCase
       listing.rate('/random')
     end
   end
-  
+
   def test_rate_per_month
     listing = MLS::Listing.new(:rate => 52.5, :rate_units => '/mo', :size => 5)
-  
+
     assert_equal 52.5,  listing.rate
     assert_equal 10.5,  listing.rate('/sqft/mo')
     assert_equal 126,   listing.rate('/sqft/yr')
@@ -217,10 +189,10 @@ class TestListing < ::Test::Unit::TestCase
       listing.rate('/random')
     end
   end
-  
+
   def test_rate_per_year
     listing = MLS::Listing.new(:rate => 630, :rate_units => '/yr', :size => 5)
-  
+
     assert_equal 630,  listing.rate
     assert_equal 10.5,  listing.rate('/sqft/mo')
     assert_equal 126,   listing.rate('/sqft/yr')
@@ -231,10 +203,10 @@ class TestListing < ::Test::Unit::TestCase
       listing.rate('/random')
     end
   end
-  
+
   def test_rate_per_desk_per_month
     listing = MLS::Listing.new(:rate => 2100, :rate_units => '/desk/mo', :size => 5)
-  
+
     assert_equal 2100,  listing.rate
     assert_equal 10.5,  listing.rate('/sqft/mo')
     assert_equal 126,   listing.rate('/sqft/yr')
@@ -245,7 +217,7 @@ class TestListing < ::Test::Unit::TestCase
       listing.rate('/random')
     end
   end
-  
+
   def test_rate_percision
     listing = MLS::Listing.new(:rate => 47, :rate_units => '/sqft/yr', :size => 5)
 
@@ -255,10 +227,10 @@ class TestListing < ::Test::Unit::TestCase
     assert_equal 235, listing.rate('/yr')
     assert_equal 783.33,   listing.rate('/desk/mo')
   end
-  
+
   def test_null_rate
     listing = MLS::Listing.new(:rate => nil, :rate_units => '/yr', :size => 5)
-  
+
     assert_equal nil,  listing.rate
     assert_equal nil,  listing.rate('/sqft/mo')
     assert_equal nil,   listing.rate('/sqft/yr')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mls
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.11.0
 platform: ruby
 authors:
 - James R. Bracy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-26 00:00:00.000000000 Z
+date: 2013-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -192,9 +192,14 @@ files:
 - Rakefile
 - lib/mls.rb
 - lib/mls/errors.rb
+- lib/mls/factories/account.rb
+- lib/mls/factories/address.rb
+- lib/mls/factories/listing.rb
+- lib/mls/factories_helper.rb
 - lib/mls/model.rb
 - lib/mls/models/account.rb
 - lib/mls/models/address.rb
+- lib/mls/models/brokerage.rb
 - lib/mls/models/floorplan.rb
 - lib/mls/models/flyer.rb
 - lib/mls/models/listing.rb
@@ -235,10 +240,6 @@ files:
 - lib/rdoc/generator/template/42floors/resources/panel/index.html
 - lib/rdoc/generator/template/42floors/se_index.rhtml
 - mls.gemspec
-- test/factories/account.rb
-- test/factories/address.rb
-- test/factories/contact.rb
-- test/factories/listing.rb
 - test/fixtures/flyer.pdf
 - test/test_helper.rb
 - test/units/models/test_account.rb
@@ -278,10 +279,6 @@ signing_key:
 specification_version: 4
 summary: 42Floors MLS Client
 test_files:
-- test/factories/account.rb
-- test/factories/address.rb
-- test/factories/contact.rb
-- test/factories/listing.rb
 - test/fixtures/flyer.pdf
 - test/test_helper.rb
 - test/units/models/test_account.rb

data/test/factories/account.rb

@@ -1,18 +0,0 @@
-FactoryGirl.define do
-  factory :account, :class => MLS::Account do
-    name { Faker::Name.name }
-    email { Faker::Internet.email }
-    password { 'test' }
-    password_confirmation 'test'
-  end
-  
-  factory :broker, :class => MLS::Account, :parent => :account do
-    type 'Account'
-  end
-  
-  factory :ghost_account, :class => MLS::Account do
-    name                    { Faker::Name.name }
-    email                   { Faker::Internet.email }
-    password_required       { false } 
-  end
-end

data/test/factories/contact.rb

@@ -1,9 +0,0 @@
-FactoryGirl.define do
-  factory :tour, :class => MLS::Tour do
-    message { Faker::Lorem.paragraph }
-    company { Faker::Company.email }
-    population { Kernel.rand(2..200) }
-    funding { Faker::Lorem.sentance }
-    move_in_date '1234-12-21'
-  end  
-end