mls 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 394774786bfa36695f06cbc1629564bb3383a502
-  data.tar.gz: dcb908d31bea54620d9b2d225b5c1034032f039c
+  metadata.gz: cb4f1f49e4d47a1947018382340a4189a949fe96
+  data.tar.gz: 413f3241e6392a275e93ffbcbdc2e8ee9f5da48c
 SHA512:
-  metadata.gz: ed460f3af42891c93935da8f8ec1aff84abd83b360b46f808b663f27429a38ad7eee636f9ad637d49092f56da729623b6be7a065a4728031205d3ede59e65a06
-  data.tar.gz: 2de742f1e7d57b0e200526e53940597b73eda2ab68da98cb106c7ae6002794a2f77bf3f086f7c159d8a2d5f3ddc64c4dc9e5a7f62330e439e9d6299b510fce6a
+  metadata.gz: 7039ef61eedc1426662d6bbf3d52e7c308537f404a111c6e2f83fc1a8d36da2d328729e43c3678eb73a79a87070b2a3dcbf97d2b630d042733c1b76dac51be75
+  data.tar.gz: 3ec113f6972d240cfe47f04f1b4998ad5eeaa370d3ad1e8cd93e15ceb025bb25b6e971dd006a27edbeff7879dc74a2eacabbe67eaa1d03f86cb76537f932fb83

data/lib/mls.rb

@@ -70,15 +70,24 @@ module MLS::Avatar
   end
 
   def avatar_url(options={})
+    
     options.reverse_merge!({
       :style => nil,
-      :protocol => "http",
       :bg => nil,
-      :format => "jpg"
+      :protocol => 'https',
+      :format => "jpg",
+      :host => MLS.image_host
     });
 
-    url_params = {s: options[:style], bg: options[:bg]}.select{ |k, v| v }
-    result = "#{options[:protocol]}://#{MLS.image_host}/#{avatar_digest}.#{options[:format]}"
+    url_params = { s: options[:style], bg: options[:bg] }.select{ |k, v| v }
+
+    if options[:protocol] == :relative # Protocol Relative
+      result = '//'
+    else options[:protocol]
+      result = "#{options[:protocol]}://"
+    end
+    
+    result += "#{options[:host]}/#{avatar_digest}.#{options[:format]}"
     result += "?#{url_params.to_param}" if url_params.size > 0
 
     result

data/lib/mls/account.rb

@@ -1,5 +1,6 @@
 class Account < MLS::Model
 
+  include MLS::Slugger
   include MLS::Avatar
 
   has_one :lead, foreign_key: :account_id

data/lib/mls/listing.rb

@@ -16,7 +16,8 @@ class Listing < MLS::Model
     '/yr' => 'rate_per_year',
   }
   TERM_UNITS = ['years', 'months']
-  AMENITIES = %W(kitchen showers patio reception ready_to_move_in furniture natural_light high_ceilings)
+  AMENITIES = %W(kitchen showers outdoor_space reception turnkey build_to_suit furniture
+                  natural_light high_ceilings plug_and_play additional_storage storefront)
 
   belongs_to :property
   belongs_to :floorplan
@@ -24,7 +25,7 @@ class Listing < MLS::Model
 
   has_many :spaces
 
-  has_many :photos, -> { order('photos.order ASC') }, :as => :subject, :inverse_of => :subject
+  has_many :photos, -> { order(:order => :asc) }, :as => :subject, :inverse_of => :subject
 
   has_many :agencies, -> { order(:order) }, :as => :subject
   has_many :agents, -> { order('agencies.order') }, :through => :agencies, :source => :agent

data/lib/mls/organization.rb

@@ -1,6 +1,9 @@
 class Organization < MLS::Model
   include MLS::Avatar
-
+  include MLS::Slugger
+  
+  has_many :agents, :class_name => 'Account'
+  
   def name
     common_name || legal_name
   end

data/lib/mls/photo.rb

@@ -5,14 +5,26 @@ class Photo < MLS::Model
   def url(options={})
     options.reverse_merge!({
       :style => nil,
-      :protocol => "http",
       :bg => nil,
-      :format => "jpg"
+      :protocol => 'https',
+      :format => "jpg",
+      :host => MLS.image_host
     });
+
     url_params = {s: options[:style], bg: options[:bg]}.select{ |k, v| v }
-    result = "#{options[:protocol]}://#{MLS.image_host}/#{digest}.#{options[:format]}"
+
+    if options[:protocol] == :relative # Protocol Relative
+      result = '//'
+    else options[:protocol]
+      result = "#{options[:protocol]}://"
+    end
+
+    result += "#{options[:host]}/#{digest}.#{options[:format]}"
     result += "?#{url_params.to_param}" if url_params.size > 0
 
     result
   end
-end
+end
+
+
+class InternalPhoto < Photo; end 

data/lib/mls/property.rb

@@ -8,11 +8,14 @@ class Property < MLS::Model
   has_many :listings
   has_many :localities
   has_many :regions, :through => :localities
-  has_many :photos, -> { order('photos.order ASC') }, :as => :subject, :inverse_of => :subject
-  # has_many :regions
+  has_many :photos, -> { where(:type => "Photo").order(:order => :asc) }, :as => :subject, :inverse_of => :subject
+  has_many :internal_photos, -> { order(:order => :asc) }, :as => :subject, :inverse_of => :subject
 
-  has_many   :addresses
-  has_one    :address, -> { where(:primary => true) }
+  has_many   :addresses do
+    def primary
+      where(:primary => true).first
+    end
+  end
 
   def default_contact
     @default_contact ||= listings.where(lease_state: :listed, ghost: false, authorized: true)

data/mls.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mls
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Jon Bracy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake