mls 1.4.3 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb0e3846ad2100b2167d386911bf6e4d504ffb47
-  data.tar.gz: f413e79ba06c41ccb8d105d88cae096c338374de
+  metadata.gz: 9caa8aa44855ec88845d59e8732212c33e9ae86f
+  data.tar.gz: e443bbd96ee37784f7bd360d185cafab43e4d0d4
 SHA512:
-  metadata.gz: b9d84713798402d9da3f892e09c036918432c965ffdd2030ccc35286033b0dec2022419d65e2ea049355c41c5aa6c816afce9e31ff3243f6b8891881b96fa5a0
-  data.tar.gz: ce4f8326d2255448f5513fffc31a8438bae12d7c68ff6e781831e523634a9bc51c871fb1ac95161471efc7742f0d5528cb7190a4b5486da42438ce76349d8307
+  metadata.gz: c0b278d87cf5e782045105c1f8461a8feda501f74da7af7bc8cc33a14d1d38e614632073609b208f1f6aaf978f029a0680f11e6fa10cfc088374fb6640581ef5
+  data.tar.gz: 19ebd1f220371778d1c74a5ebfde587bfea7c076f62fac80c912d6b966a34adc710ed459b557bf58bae3bb03466e6016c4fde716bee6ab8c21d423d22048e699

data/lib/mls.rb

@@ -48,21 +48,97 @@ module MLS::Slugger
 
   extend ActiveSupport::Concern
 
-  module ClassMethods
+  included do
+    class_attribute :slugger
+    send :include, MLS::Slugger::ActiveRecordBaseSluggerExtension
+    relation.class.send :include, MLS::Slugger::ActiveRecordRelationSluggerExtension
+  end
 
-    def find(*ids)
-      friendly = -> (id) { id.respond_to?(:to_i) && id.to_i.to_s != id.to_s }
-      return super if ids.size > 1 || !ids.all? { |x| friendly.call(x) }
+  module ActiveRecordBaseSluggerExtension
+    extend ActiveSupport::Concern
 
-      find_by_slug!(ids)
+    # TODO: Test
+    def to_param
+      slug? ? slug : super
     end
 
-  end
+    def set_slug
+      generated_slug = if self.slugger[:proc].is_a?(Proc)
+        if (self.slugger[:proc].arity == 1)
+          self.slugger[:proc].call(self)
+        else
+          self.slugger[:proc].call
+        end
+      else
+        send(self.slugger[:proc])
+      end
+      generated_slug = generated_slug ? generated_slug.split('/').map(&:parameterize).join('/') : nil
+
+      if self.slugger[:options][:history]
+        self.slugger[:slug_was] = self.slug
+      end
+
+      if [:before_validation, :after_validation, :before_save, :before_create].include?(self.slugger[:options][:trigger])
+        self.slug = generated_slug
+      else
+        update_column(:slug, generated_slug) if slug != generated_slug
+      end
+    end
+
+    module ClassMethods
+
+      def slug(method, options={}, &block)
+        options = options.with_indifferent_access
+        options[:trigger] ||= :after_save
+        self.slugger = { :proc => method || block, :options => options }
+        self.send(options[:trigger], :set_slug)
+        self.send(:include, Slugger::History) if options[:history]
+      end
+
+      def find(*ids)
+        friendly = -> (id) { id.respond_to?(:to_i) && id.to_i.to_s != id.to_s }
+        return super if ids.size > 1 || !ids.all? { |x| friendly.call(x) }
+
+        find_by_slug!(ids.first)
+      end
+
+    end
 
-  def to_param
-    slug
   end
 
+  module ActiveRecordRelationSluggerExtension
+
+    def find_one(id)
+      friendly = id.respond_to?(:to_i) && id.to_i.to_s != id.to_s
+      friendly ? find_by_slug!(id) : super
+    end
+
+    def find_some(ids)
+      friendly = -> (id) { id.respond_to?(:to_i) && id.to_i.to_s != id.to_s }
+      return super if !ids.all? { |x| friendly.call(x) }
+
+      result = where(table['slug'].in(ids)).to_a
+
+      expected_size =
+      if limit_value && ids.size > limit_value
+        limit_value
+      else
+        ids.size
+      end
+
+      # 11 ids with limit 3, offset 9 should give 2 results.
+      if offset_value && (ids.size - offset_value < expected_size)
+        expected_size = ids.size - offset_value
+      end
+
+      if result.size == expected_size
+        result
+      else
+        raise_record_not_found_exception!(ids, result.size, expected_size)
+      end
+    end
+
+  end
 end
 
 module MLS::Avatar
@@ -74,6 +150,7 @@ module MLS::Avatar
   end
 
   def avatar_url(options={})
+    return nil unless avatar_hash_key
 
     options.reverse_merge!({
       :style => nil,

data/lib/mls/account.rb

@@ -6,6 +6,7 @@ class Account < MLS::Model
   has_one :lead, foreign_key: :account_id
 
   belongs_to :organization
+  belongs_to :green_sheet, :foreign_key => :green_sheet_uuid
 
   has_many :tasks
   has_many :sources
@@ -13,14 +14,14 @@ class Account < MLS::Model
   
   has_and_belongs_to_many :regions, :foreign_key => :agent_id
 
-  has_many :email_addresses, :dependent => :destroy do
+  has_many :email_addresses do
     def primary
       # For cases where the number is not primary we order
       order(:primary => :desc).first
     end
   end
 
-  has_many :phones, dependent: :destroy do
+  has_many :phones do
 
     def primary
       # For cases where the number is not primary we order
@@ -44,5 +45,10 @@ class Account < MLS::Model
       phones.primary.try(:number)
     end
   end
+  
+  def company_name
+    return organization.name if organization
+    return company
+  end
 
 end

data/lib/mls/address.rb

@@ -1,4 +1,4 @@
 class Address < MLS::Model
 
-
+  belongs_to :property
 end

data/lib/mls/coworking_space.rb

@@ -1,12 +1,18 @@
 class CoworkingSpace < MLS::Model
   include MLS::Slugger
-
-  belongs_to :unit
-
-  has_one  :address
-  has_one :property, through: :unit
-
-  has_many :spaces
-  has_many :addresses
+  include MLS::Avatar
+  
+  belongs_to  :organization
+  belongs_to  :property
+  has_many    :image_orderings, as: :subject
+  has_many    :photos, through: :image_orderings, source: :image
+  has_many    :spaces
+  has_many    :addresses, :through => :property
+  
+  def name
+    output = organization.name
+    output += " - " + read_attribute(:name) if read_attribute(:name)
+    output
+  end
 
 end

data/lib/mls/event.rb

@@ -5,9 +5,9 @@ class Event < MLS::Model
   belongs_to :account
   belongs_to :task
   
-  has_many :event_actions, :dependent => :destroy
+  has_many :event_actions
   
-  has_many :regards, :dependent => :destroy
+  has_many :regards
   
   def actions
     event_actions.map(&:action)

data/lib/mls/geometry.rb

@@ -0,0 +1,7 @@
+class Geometry < MLS::Model
+  
+  self.inheritance_column = nil
+
+  belongs_to :subject, polymorphic: true
+
+end

data/lib/mls/green_sheet.rb

@@ -0,0 +1,5 @@
+class GreenSheet < MLS::Model
+
+  has_one :account, :foreign_key => :green_sheet_uuid
+  
+end

data/lib/mls/listing.rb

@@ -19,8 +19,7 @@ class Listing < MLS::Model
 
   belongs_to :flyer, :class_name => 'Document'
   belongs_to :unit
-
-  has_one  :property,  :through => :unit
+  belongs_to :property
 
   has_many :photos, -> { order(:order => :asc) }, :as => :subject, :inverse_of => :subject
 

data/lib/mls/property.rb

@@ -5,7 +5,7 @@ class Property < MLS::Model
 
   has_many :units
   has_many :references, as: :subject
-  has_many :listings, :through => :units
+  has_many :listings
   has_many :localities
   has_many :regions, :through => :localities
   has_many :image_orderings, as: :subject
@@ -29,29 +29,104 @@ class Property < MLS::Model
     addresses.find(&:primary)
   end
   
+  def longitude
+    location.x
+  end
+  
+  def latitude
+    location.y
+  end
+  
+  def automated_description
+    external_data['narrativescience.com']
+  end
+  
+  def internet_providers
+    data = []
+    
+    if external_data['broadbandmap.gov']
+      if external_data['broadbandmap.gov']['wirelineServices']
+        external_data['broadbandmap.gov']['wirelineServices'].sort_by{|p| p['technologies'].sort_by{|t| t['maximumAdvertisedDownloadSpeed']}.reverse.first['maximumAdvertisedDownloadSpeed']}.reverse.each do |provider|
+           tech = provider['technologies'].sort_by{|t| t['maximumAdvertisedDownloadSpeed']}.reverse.first
+           speedcase = -> (speedCode) {
+             case speedCode
+             when 1 then '200 kbps'
+             when 2 then '768 kbps'
+             when 3 then '1.5 Mb/s'
+             when 4 then '3 Mb/s'
+             when 5 then '6 Mb/s'
+             when 6 then '10 Mb/s'
+             when 7 then '25 Mb/s'
+             when 8 then '50 Mb/s'
+             when 9 then '100 Mb/s'
+             when 10 then '1 Gb/s'
+             when 11 then '1 Gb/s+'
+             else 'Unknown'
+             end
+           }
+
+           data << {
+             provider_name: provider['doingBusinessAs'] || provider['providerName'],
+             provider_url: provider['providerURL'],
+             technology: case tech['technologyCode']
+               when 10 then 'DSL'
+               when 20 then 'DSL'
+               when 30 then 'Copper Wireline'
+               when 40 then 'Cable'
+               when 41 then 'Cable'
+               when 50 then 'Fiber'
+               when 90 then 'Power Line'
+               else 'Other'
+               end,
+             bandwidth: {
+               up: speedcase.call(tech['maximumAdvertisedUploadSpeed']),
+               down: speedcase.call(tech['maximumAdvertisedDownloadSpeed'])
+             }
+           }
+        end
+      end
+    end
+
+    data
+  end
+  
+  def closest_region
+    region = neighborhood_region
+    region ||= city_region
+    region ||= market
+    region
+  end
+  
   def neighborhood_region
-    params = {:query => address.neighborhood} if address.try(:neighborhood)
-    params ||= {:query => neighborhood} if neighborhood
-    params ||= {:type => "Neighborhood"}
-    fetch_region(params)
+    return @neighborhood_region if defined? @neighborhood_region
+    params = {:query => neighborhood} if neighborhood
+    params = {:type => "Neighborhood"}
+    @neighborhood_region = fetch_region(params)
   end
   
   def city_region
-    fetch_region(:type => "City")
+    return @city_region if defined? @city_region
+    @city_region = fetch_region(:type => "City")
   end
   
   def market
-    fetch_region(:is_market => true)
+    return @market if defined? @market
+    @market = fetch_region(:is_market => true)
   end
   
-  def target_region
-    fetch_region(:target => true)
+  def flagship
+    return @flagship if defined? @flagship
+    @flagship = fetch_region(:is_flagship => true)
   end
   
   def fetch_region(params)
     if regions.loaded?
       params = params.map{|k,v| [k, v]}
-      regions.to_a.find{|r| r[params[0][0]] == params[0][1]}
+      if params[0][0] == :query
+        regions.to_a.find{|r| r.name == params[0][1]}
+      else
+        regions.to_a.find{|r| r[params[0][0]] == params[0][1]}
+      end
     else
       regions.where(params).first
     end

data/lib/mls/region.rb

@@ -6,7 +6,12 @@ class Region < MLS::Model
 
   belongs_to :cover_photo, :class_name => 'Image'
   belongs_to :market, :class_name => 'Region'
-    
+  belongs_to :flagship, :class_name => 'Region'
+  
+  has_one  :geometry, as: :subject
+  has_many :stats, as: :subject
+  
+  has_and_belongs_to_many :organizations  
   has_and_belongs_to_many :parents, :join_table => 'regions_regions', :class_name => 'Region', :foreign_key => 'child_id', :association_foreign_key => 'parent_id'
   has_and_belongs_to_many :children, :join_table => 'regions_regions', :class_name => 'Region', :foreign_key => 'parent_id', :association_foreign_key => 'child_id'
   
@@ -18,16 +23,6 @@ class Region < MLS::Model
     end
   end
   
-  def target
-    return @target if @target
-    @target = children.where(:target => true).first
-    @target ||= market.try(:target)
-    @target ||= market
-    @target ||= self
-    
-    @target
-  end
-  
   def cover_photo_url(options={})
 
     options.reverse_merge!({

data/lib/mls/space.rb

@@ -1,5 +1,7 @@
 class Space < MLS::Model
 
-  belongs_to :coworking_space
+  belongs_to  :coworking_space
+  has_many    :image_orderings, as: :subject
+  has_many    :photos, through: :image_orderings, source: :image
 
 end

data/lib/mls/stat.rb

@@ -0,0 +1,3 @@
+class Stat < MLS::Model
+  belongs_to :subject, polymorphic: true
+end

data/lib/mls/unit.rb

@@ -8,7 +8,7 @@ class Unit < MLS::Model
   belongs_to :floorplan, :class_name => 'Document'
 
   has_many :listings
-  has_many :image_orderings, as: :subject, dependent: :destroy
+  has_many :image_orderings, as: :subject
   has_many :photos, through: :image_orderings, source: :image
   # has_many :photos, -> { order(:order => :asc) }, :as => :subject, :inverse_of => :subject
 

data/lib/mls/vendor.rb

@@ -7,7 +7,7 @@ class Vendor < MLS::Model
   has_and_belongs_to_many :regions
   belongs_to :account
 
-  has_many :image_orderings, as: :subject, dependent: :destroy
+  has_many :image_orderings, as: :subject
   has_many :photos, through: :image_orderings, source: :image
   
 end

data/lib/mls/view.rb

@@ -0,0 +1,3 @@
+class View < MLS::Model
+  belongs_to :subject, polymorphic: true
+end

data/lib/mls/webpage.rb

@@ -1,7 +1,12 @@
 class Webpage < MLS::Model
 
-  has_one :task, as: :subject
+  belongs_to :source
+  has_many :tasks, as: :subject
 
   validates :url, presence: true
 
+  def name
+    url.match(/^(?:https?:\/\/)?(?:www\.)?([^\/]+)/)[1]
+  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     = '1.4.3'
+  s.version     = '1.5.0'
   s.authors     = ["Jon Bracy", "James R. Bracy"]
   s.email       = ["jon@42floors.com", "james@42floors.com"]
   s.homepage    = "http://mls.42floors.com"
@@ -31,5 +31,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'sdoc-templates-42floors'
 
   # Runtime
-  s.add_runtime_dependency 'sunstone'
+  s.add_runtime_dependency 'rgeo', '>= 0.4.0'
+  s.add_runtime_dependency 'sunstone', '>= 2.0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mls
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.5.0
 platform: ruby
 authors:
 - Jon Bracy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-25 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -165,20 +165,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rgeo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: sunstone
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.1
 description: Ruby library for integrating with the 42Floors MLS
 email:
 - jon@42floors.com
@@ -203,6 +217,8 @@ files:
 - lib/mls/email_address.rb
 - lib/mls/event.rb
 - lib/mls/event_action.rb
+- lib/mls/geometry.rb
+- lib/mls/green_sheet.rb
 - lib/mls/image_ordering.rb
 - lib/mls/inquiry.rb
 - lib/mls/lead.rb
@@ -219,11 +235,13 @@ files:
 - lib/mls/slug.rb
 - lib/mls/source.rb
 - lib/mls/space.rb
+- lib/mls/stat.rb
 - lib/mls/task.rb
 - lib/mls/time_log.rb
 - lib/mls/unit.rb
 - lib/mls/use.rb
 - lib/mls/vendor.rb
+- lib/mls/view.rb
 - lib/mls/webpage.rb
 - mls.gemspec
 - test/fixtures/flyer.pdf