mls 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '05855a1a8a8ff7514aa0d09798c336972c6443cc'
-  data.tar.gz: 689bc19414f3f6516d74bb8f8721d6019fb86060
+SHA256:
+  metadata.gz: 61267aa211891a0f0f6d22339b6997745fa532cdb4d50390b5b8645cfb887ffe
+  data.tar.gz: 1df8ded07de72295b7ea2852323cb51838398c77a2a782dffa0c6b4ff03c2c0b
 SHA512:
-  metadata.gz: e675d1684d26d1fc2a5c64fe995bce74f185090a161844091bc24b5bfc7d6f36d723d2a6f57700ee41589dedb58d77044ab29a752ed75c3783f714fa2bdc827b
-  data.tar.gz: a94d1a6219a065cbc0c436e167f06a333c90662aec2160d5cf62e3a4dd1bed96100d2296e364d1ce71c9fd1b9cb6488aaaced1e66cdd0f9e60bf683534fad5ae
+  metadata.gz: 169618f8b6f8aec727b99d2a4a893cdcd292ae925095f57df1431d28f72d1fde6a6a3891b65505abd935de9268a5c8b639b1f5c72393c7bff72ee4391c790593
+  data.tar.gz: 983cc885eb785faa6dc33e4dce9246b368b9519ab4d451aca20708e0fc47f282401d9238ed5fbc8b33ef253b8715df88200247768b1b72882d17c819a8b143d7

data/bin/mls

@@ -3,7 +3,7 @@ require File.expand_path('../../lib/mls/cli', __FILE__)
 
 case ARGV.shift.downcase.strip
 when "documents:backup"
-  MLS::CLI.parse_args(ARGV).inspect
+  MLS::CLI.parse_args(ARGV)
   directory = ARGV.shift
   
   if directory.nil? || !File.directory?(directory)
@@ -12,6 +12,27 @@ when "documents:backup"
   end
     
   MLS::CLI::Documents.backup(directory)
+when "documents:migrate"
+  MLS::CLI.parse_args(ARGV)
+  directory = ARGV.shift
+
+  if directory.nil? || !File.directory?(directory)
+    puts "Usage: mls documents:backup dir [options...]"
+    exit 1
+  end
+
+  b2 = MLS::CLI::Storage::B2.new(MLS::CLI.options[:b2])
+  Document.where(excludes: 'b2/sha256').find_each do |document|
+    if document.sha256 && File.exists?(File.join(directory, MLS::CLI::Documents.partition(document.sha256)))
+      b2.upload_file(documents.sha256, File.open(File.join(directory, MLS::CLI::Documents.partition(document.sha256))), {
+        filename: document.filename,
+        sha1: document.sha1,
+        content_type: document.content_type,
+        size: document.size
+      })
+    end
+  end
+when "documents:check"
 else
   puts "Usage: mls documents:backup dir [options...]"
 end

data/lib/mls/cli.rb

@@ -32,7 +32,19 @@ module MLS::CLI
             end
           end
         when 'b2'
-          
+          MLS::CLI.options[:b2] = {
+            account_id:         URI.unescape(url.user),
+            application_key:    URI.unescape(url.password),
+            bucket:             URI.unescape(url.host)
+            prefix:             url.path&.empty? ? url.path : nil
+          }
+          url.query.split('&').each do |qp|
+            key, value = qp.split('=').map { |d| URI.unescape(d) }
+            case key
+            when 'partition'
+              MLS::CLI.options[:b2][:partition] = value.to_i
+            end
+          end
         when 'mls'
           arg = arg.sub('mls://', 'https://')
           MLS::CLI.options[:mls] = arg

data/lib/mls/cli/documents.rb

@@ -33,7 +33,7 @@ module MLS::CLI::Documents
     
     query = if File.exist?(last_sync_file)
       from_timestamp = Time.iso8601(File.read(last_sync_file))
-      Document.filter(created_at: {gte: from_timestamp})
+      Document.where(Document.arel_table['created_at'].gteq(from_timestamp))
     else
       Document.all
     end
@@ -51,15 +51,16 @@ module MLS::CLI::Documents
         raise 'unkown storage engine'
       end
       
-      puts "Downloading #{document.id}"
+      print "Downloading #{document.id.to_s.ljust(7)} "
       storage_engine.copy_to_tempfile(document.send(key)) do |file|
         digests = calculate_digest(file)
+        puts partition(document.sha256)
         
         raise 'MD5 does not match' if digests[:md5] != document.md5
         document.update!(digests.merge({provider: ['s3/hash_key']}))
         
         FileUtils.mkdir_p(File.dirname(File.join(dir, partition(document.sha256))))
-        FileUtils.mv(file.path, File.join(dir, partition(document.sha256)), verbose: true)
+        FileUtils.mv(file.path, File.join(dir, partition(document.sha256)))
       end
       
       File.write(last_sync_file, document.created_at.iso8601(6))

data/lib/mls/cli/storage.rb

@@ -1 +1,2 @@
-require File.expand_path('../storage/s3', __FILE__)
+require File.expand_path('../storage/s3', __FILE__)
+require File.expand_path('../storage/b2', __FILE__)

data/lib/mls/cli/storage/b2.rb

@@ -0,0 +1,87 @@
+require 'b2'
+
+module MLS::CLI::Storage
+  class B2
+    
+    def initialize(configs = {})
+      @configs = configs
+      @configs[:prefix] ||= ""
+      
+      @client = B2::Bucket.new({
+        'bucketId' => configs[:bucket_id]
+      }, B2.new({
+        account_id: configs[:account_id],
+        application_key: configs[:application_key]
+      }))
+    end
+    
+    def local?
+      false
+    end
+      
+    # def url(key)
+    #   [host, destination(key)].join('/')
+    # end
+    
+    # def host
+    #   h = @configs[:bucket_host_alias] || "https://s3.amazonaws.com/#{@configs[:bucket]}"
+    #   h.delete_suffix('/')
+    # end
+    
+    def destination(key)
+      "#{@configs[:prefix]}#{partition(key)}".gsub(/^\//, '')
+    end
+    
+    def exists?(key)
+      @client.has_key?(destination(key))
+    end
+    
+    def write(key, file, meta_info)
+      file = file.tempfile if file.is_a?(ActionDispatch::Http::UploadedFile)
+      file = File.open(file) if file.is_a?(String)
+      
+      @client.upload_file(key, file, mime_type: meta_info[:content_type], sha1: meta_info[:sha1], content_disposition: "inline; filename=\"#{meta_info[:filename]}\"")
+    end
+    
+    def download(key, to=nil, &block)
+      @client.download(destination(key), to, &block)
+    end
+    
+    def delete(key)
+      @client.delete!(key)
+    end
+    
+    def copy_to_tempfile(key)
+      tmpfile = Tempfile.new([File.basename(key), File.extname(key)], binmode: true)
+      download(key, tmpfile.path)
+      if block_given?
+        begin
+          yield(tmpfile)
+        ensure
+          tmpfile.close!
+        end
+      else
+        tmpfile
+      end
+    end
+    
+    def partition(value)
+      return value unless @configs[:partition]
+      split = value.scan(/.{1,4}/)
+      split.shift(@configs[:partition_depth] || 3).join("/") + split.join("")
+    end
+    
+    def sha1(key)
+      @client.file(destination(key)).sha1
+    end
+  
+    def last_modified(key)
+      @client.file(destination(key)).uploaded_at
+    end
+    
+    def mime_type(key)
+      @client.file(destination(key)).mime_type
+    end
+    
+  end
+end

data/lib/mls/models/account.rb

@@ -21,6 +21,7 @@ class Account < MLS::Model
   
   has_many :searches
   has_many :suggestions, foreign_key: "suggested_by_id"
+  has_many :broadcasts, foreign_key: :sender_id
   
   has_many :credit_cards
 

data/lib/mls/models/broadcast.rb

@@ -0,0 +1,11 @@
+class Broadcast < MLS::Model
+
+  belongs_to :sender, class_name: 'Account'
+  
+  has_many :emails
+  
+  has_and_belongs_to_many :regions
+  has_and_belongs_to_many :listings
+  has_and_belongs_to_many :attachments, class_name: 'Document'
+  
+end

data/lib/mls/models/document.rb

@@ -1,6 +1,7 @@
 class Document < MLS::Model
   
   has_many :image_orderings, foreign_key: :image_id
+  has_many :reviews
   
   def self.create(file)
     if doc = find_matching(file)
@@ -18,7 +19,7 @@ class Document < MLS::Model
   end
   
   def url(style=:original)
-    MLS.config['document_host'] + '/' + path(style)
+    MLS.config['document_host'].gsub(/\/$/, '') + '/' + path(style)
   end
   
   def path(style=:original)

data/lib/mls/models/listing.rb

@@ -168,7 +168,7 @@ class Listing < MLS::Model
      "Leased"
     elsif self.archived
      "Deleted"
-    elsif self.touched_at < 90.days.ago
+    elsif self.touched_at < 180.days.ago
      "Expired"
     else
      "Active"

data/lib/mls/models/property.rb

@@ -33,7 +33,7 @@ class Property < MLS::Model
   accepts_nested_attributes_for :image_orderings, :addresses
 
   def contacts
-    @contact ||= listings.eager_load(:accounts => [:email_addresses, :phones, :organization]).filter(leased_at: nil, authorized: true, type: ['Lease', 'Sublease'], :touched_at => {:gte => 90.days.ago})
+    @contact ||= listings.eager_load(:accounts => [:email_addresses, :phones, :organization]).filter(leased_at: nil, authorized: true, type: ['Lease', 'Sublease'], :touched_at => {:gte => 180.days.ago})
             .order(size: :desc).first.try(:contacts)
   end
 
@@ -128,7 +128,7 @@ class Property < MLS::Model
     region = neighborhood_region
     region ||= city_region
     region ||= market
-    region ||= regions.where(depth: true).sort_by(&:depth).reverse.first
+    region ||= regions.filter(depth: true).select{ |r| r.type != "Zip Code Tabulation Area" }.sort_by(&:depth).reverse.first
     region
   end
 

data/lib/mls/models/region.rb

@@ -15,6 +15,7 @@ class Region < MLS::Model
   has_one  :geometry, as: :subject
   has_many :stats, as: :subject
   
+  has_and_belongs_to_many :tasks
   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'

data/lib/mls/models/review.rb

@@ -0,0 +1,18 @@
+class Review < MLS::Model
+  
+  belongs_to :document
+  belongs_to :account
+  
+  def approved?
+    approval == true
+  end
+  
+  def rejected?
+    approval == false
+  end
+  
+  def pending?
+    approval == nil
+  end
+
+end

data/lib/mls/models/task.rb

@@ -11,6 +11,8 @@ class Task < MLS::Model
   has_many :reviews, -> { where(:type => "review") }, :class_name => "Task", :as => :subject, :inverse_of => :subject
   has_many :fixes, -> { where(:type => "fix") }, :class_name => "Task", :as => :subject, :inverse_of => :subject
   
+  has_and_belongs_to_many :regions
+
   def for_source?
     subject_type == "Source"
   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.6.0'
+  s.version     = '1.7.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.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Jon Bracy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-07 00:00:00.000000000 Z
+date: 2018-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -253,6 +253,7 @@ files:
 - lib/mls/cli.rb
 - lib/mls/cli/documents.rb
 - lib/mls/cli/storage.rb
+- lib/mls/cli/storage/b2.rb
 - lib/mls/cli/storage/s3.rb
 - lib/mls/comment.rb
 - lib/mls/models/account.rb
@@ -260,6 +261,7 @@ files:
 - lib/mls/models/action.rb
 - lib/mls/models/address.rb
 - lib/mls/models/api_key.rb
+- lib/mls/models/broadcast.rb
 - lib/mls/models/coworking_space.rb
 - lib/mls/models/credit_card.rb
 - lib/mls/models/datum.rb
@@ -286,6 +288,7 @@ files:
 - lib/mls/models/recommendation.rb
 - lib/mls/models/reference.rb
 - lib/mls/models/region.rb
+- lib/mls/models/review.rb
 - lib/mls/models/search.rb
 - lib/mls/models/service.rb
 - lib/mls/models/session.rb
@@ -331,7 +334,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mls
-rubygems_version: 2.6.11
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: 42Floors MLS Client