mls 1.5.0 → 1.5.1

data/lib/mls/region.rb

@@ -4,6 +4,8 @@ class Region < MLS::Model
   
   self.inheritance_column = nil
 
+  CITY_TYPES = ["City", "Municipality", "Village", "Rural Municipality", "Town", "Resort Village", "Community Government"]
+
   belongs_to :cover_photo, :class_name => 'Image'
   belongs_to :market, :class_name => 'Region'
   belongs_to :flagship, :class_name => 'Region'
@@ -23,6 +25,10 @@ class Region < MLS::Model
     end
   end
   
+  def tree_name
+    slug.split("/").map(&:humanize).map(&:titleize).map{|r| r.length == 2 ? r.upcase : r}.reverse.join(", ")
+  end
+  
   def cover_photo_url(options={})
 
     options.reverse_merge!({

data/lib/mls/session.rb

@@ -10,8 +10,8 @@ class Session < MLS::Model
       email_address = email_address[:email_address]
     end
     
-    Session.create(:email_address => email_address, :password => password)
-  rescue Sunstone::Exception::Unauthorized
+    Session.create!(:email_address => email_address, :password => password)
+  rescue Sunstone::Exception::Unauthorized, ActiveRecord::RecordInvalid
     nil
   end
 

data/lib/mls/source.rb

@@ -2,14 +2,15 @@ class Source < MLS::Model
 
   has_many :tasks, :as => :subject
   has_many :emails
+  has_many :email_addresses
+  has_many :webpages, :inverse_of => :source
   
   belongs_to :account
   belongs_to :organization
   belongs_to :upload, class_name: 'Flyer'
   
   def name
-    return email_address if email_address.present?
-    url.match(/^(?:https?:\/\/)?(?:www\.)?([^\/]+)/)[1]
+    domain
   end
   
 end

data/lib/mls/subscription.rb

@@ -0,0 +1,24 @@
+class Subscription < MLS::Model
+  self.inheritance_column = nil
+
+  belongs_to :membership
+  belongs_to :subject, polymorphic: true
+  belongs_to :credit_card
+
+  def name
+    case self.type
+    when "unlimited"
+      "Unlimited Premium Listings"
+    when "premium"
+      "Premium Listings"
+    when "elite"
+      "Elite Account"
+    when "coworking"
+      "Coworking Space"
+    end
+  end
+    
+  def cost
+    read_attribute(:cost) / 100.0 if read_attribute(:cost)
+  end
+end

data/lib/mls/task.rb

@@ -3,6 +3,7 @@ class Task < MLS::Model
 
   belongs_to  :subject, :polymorphic => true
   belongs_to  :account
+  belongs_to  :source
   
   has_many :events
   has_many :mistakes
@@ -15,7 +16,7 @@ class Task < MLS::Model
   end
   
   def for_task?
-    subject_type == "Taks"
+    subject_type == "Task"
   end
   
   def review?
@@ -30,23 +31,28 @@ class Task < MLS::Model
     type == "parse"
   end
   
+  def crawl?
+    type == "crawl"
+  end
+  
+  def paused?
+    status == 'paused'
+  end
+  
   def duration
-    time_logs.where(:started_at => true, :stopped_at => true).sum("duration")
+      time_logs.where(TimeLog.arel_table[:started_at].not_eq(nil)).where(TimeLog.arel_table[:stopped_at].not_eq(nil)).sum("duration")
   end
   
   def pause
-    log = time_logs.where(:started_at => true, :stopped_at => false).first
+    log = time_logs.where(:stopped_at => nil).where(TimeLog.arel_table[:started_at].not_eq(nil)).first
     if log
       log.update(:stopped_at => Time.now)
     end
   end
   
   def resume
-    time_logs << TimeLog.create(:started_at => Time.now)
-  end
-  
-  def paused?
-    !started_at.nil? && completed_at.nil? && time_logs.where(:started_at => true, :stopped_at => false).length == 0
+    #time_logs << TimeLog.create(:started_at => Time.now)
+    TimeLog.create(task_id: self.id, started_at: Time.now)
   end
   
 end

data/lib/mls/team.rb

@@ -0,0 +1,6 @@
+class Team < MLS::Model
+  
+  has_and_belongs_to_many :accounts
+  belongs_to :organization
+  
+end

data/lib/mls/view.rb

@@ -1,3 +1,27 @@
 class View < MLS::Model
   belongs_to :subject, polymorphic: true
+  
+  def self.by_day(filter)
+    req = Net::HTTP::Get.new("/views/by_day")
+    req.body = {
+      where: filter
+    }.to_json
+    connection.instance_variable_get(:@connection).send_request(req).body
+  end
+  
+  def self.by_week(filter)
+    req = Net::HTTP::Get.new("/views/by_week")
+    req.body = {
+      where: filter
+    }.to_json
+    connection.instance_variable_get(:@connection).send_request(req).body
+  end
+  
+  def self.by_month(filter)
+    req = Net::HTTP::Get.new("/views/by_month")
+    req.body = {
+      where: filter
+    }.to_json
+    connection.instance_variable_get(:@connection).send_request(req).body
+  end
 end

data/lib/mls/webpage.rb

@@ -6,7 +6,7 @@ class Webpage < MLS::Model
   validates :url, presence: true
 
   def name
-    url.match(/^(?:https?:\/\/)?(?:www\.)?([^\/]+)/)[1]
+    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.5.0'
+  s.version     = '1.5.1'
   s.authors     = ["Jon Bracy", "James R. Bracy"]
   s.email       = ["jon@42floors.com", "james@42floors.com"]
   s.homepage    = "http://mls.42floors.com"
@@ -31,6 +31,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'sdoc-templates-42floors'
 
   # Runtime
+  s.add_runtime_dependency 'phony'
+  s.add_runtime_dependency 'arel-extensions'
   s.add_runtime_dependency 'rgeo', '>= 0.4.0'
   s.add_runtime_dependency 'sunstone', '>= 2.0.1'
+  s.add_runtime_dependency 'bcrypt'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mls
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Jon Bracy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2017-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -165,6 +165,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: phony
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: arel-extensions
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rgeo
   requirement: !ruby/object:Gem::Requirement
@@ -193,6 +221,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.1
+- !ruby/object:Gem::Dependency
+  name: bcrypt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby library for integrating with the 42Floors MLS
 email:
 - jon@42floors.com
@@ -207,25 +249,33 @@ files:
 - Rakefile
 - lib/mls.rb
 - lib/mls/account.rb
+- lib/mls/accounts_region.rb
+- lib/mls/action.rb
 - lib/mls/address.rb
-- lib/mls/agency.rb
-- lib/mls/change.rb
+- lib/mls/api_key.rb
 - lib/mls/comment.rb
 - lib/mls/coworking_space.rb
+- lib/mls/credit_card.rb
+- lib/mls/datum.rb
 - lib/mls/document.rb
 - lib/mls/email.rb
 - lib/mls/email_address.rb
+- lib/mls/email_digest.rb
 - lib/mls/event.rb
-- lib/mls/event_action.rb
+- lib/mls/flyer.rb
 - lib/mls/geometry.rb
-- lib/mls/green_sheet.rb
 - lib/mls/image_ordering.rb
+- lib/mls/impression_count.rb
 - lib/mls/inquiry.rb
+- lib/mls/invoice.rb
 - lib/mls/lead.rb
 - lib/mls/listing.rb
 - lib/mls/locality.rb
+- lib/mls/membership.rb
+- lib/mls/metadatum.rb
 - lib/mls/mistake.rb
 - lib/mls/organization.rb
+- lib/mls/ownership.rb
 - lib/mls/phone.rb
 - lib/mls/property.rb
 - lib/mls/recommendation.rb
@@ -236,9 +286,10 @@ files:
 - lib/mls/source.rb
 - lib/mls/space.rb
 - lib/mls/stat.rb
+- lib/mls/subscription.rb
 - lib/mls/task.rb
+- lib/mls/team.rb
 - lib/mls/time_log.rb
-- lib/mls/unit.rb
 - lib/mls/use.rb
 - lib/mls/vendor.rb
 - lib/mls/view.rb
@@ -268,7 +319,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mls
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: 42Floors MLS Client

data/lib/mls/agency.rb

@@ -1,6 +0,0 @@
-class Agency < MLS::Model
-
-  belongs_to :listing
-  belongs_to :agent, :class_name => 'Account', :inverse_of => :agencies
-
-end

data/lib/mls/change.rb

@@ -1,40 +0,0 @@
-class Change < MLS::Model
-  self.inheritance_column = nil
-  
-  belongs_to :subject, :polymorphic => true
-  has_many :event_actions, :as => :action
-  has_many :mistakes
-  
-  # Returns the association instance for the given name, instantiating it if it doesn't already exist
-  def association(name) #:nodoc:
-    association = super
-
-    return association if name.to_s != 'subject'
-
-    association.instance_exec do
-      def klass
-        type = owner[reflection.foreign_type]
-        type.presence && type.constantize
-      rescue NameError
-        nil
-      end
-
-      def reader(force_reload=false)
-        if klass
-          if force_reload
-            klass.uncached { reload }
-          elsif !loaded? || stale_target?
-            reload
-          end
-
-          target
-        else
-          nil
-        end
-      end
-    end
-
-    association
-  end
-  
-end

data/lib/mls/event_action.rb

@@ -1,6 +0,0 @@
-class EventAction < MLS::Model
-  
-  belongs_to :event
-  belongs_to :action, polymorphic: true
-  
-end

data/lib/mls/green_sheet.rb

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

data/lib/mls/unit.rb

@@ -1,38 +0,0 @@
-class Unit < MLS::Model
-  self.inheritance_column = nil
-
-  include MLS::Slugger
-  include MLS::Avatar
-
-  belongs_to :property
-  belongs_to :floorplan, :class_name => 'Document'
-
-  has_many :listings
-  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
-
-  has_and_belongs_to_many :uses
-
-  def tags
-    read_attribute(:tags) || []
-  end
-
-  def name
-    name = ""
-    case self.type
-    when 'unit'
-      name += "Unit"
-      name += " #{self.number}" if self.number
-      name += " (Floor #{self.floor})" if self.floor
-    when 'floor'
-      name += "Floor"
-      name += " #{self.floor}" if self.floor
-      name += " (Unit #{self.number})" if self.number
-    when 'building'
-      "Entire Building"
-    end
-    name
-  end
-
-end