mls 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61267aa211891a0f0f6d22339b6997745fa532cdb4d50390b5b8645cfb887ffe
-  data.tar.gz: 1df8ded07de72295b7ea2852323cb51838398c77a2a782dffa0c6b4ff03c2c0b
+  metadata.gz: ac6d0d6ddd4d6b888fc8b8340eae0ab697a99a6aa4368ac8d7596974fb169c6b
+  data.tar.gz: dbcc04dd676749244ff3bb20f30a2b1874dd66106d89f01a815feabbcd602fc1
 SHA512:
-  metadata.gz: 169618f8b6f8aec727b99d2a4a893cdcd292ae925095f57df1431d28f72d1fde6a6a3891b65505abd935de9268a5c8b639b1f5c72393c7bff72ee4391c790593
-  data.tar.gz: 983cc885eb785faa6dc33e4dce9246b368b9519ab4d451aca20708e0fc47f282401d9238ed5fbc8b33ef253b8715df88200247768b1b72882d17c819a8b143d7
+  metadata.gz: 92927db2d0dd6856cc80a9fbd3ef4930aa359252597bf197890614e659dc6090cab727baf8384f1fd875b1cf4a3f31fb211f6d8838a21ca15d52287fcef42f4a
+  data.tar.gz: ba932bc2c69e00d6d998c0bbd78a058f96a9351934d943b88ebedeb94c0d138bfda5f8c2e9a39cbec01056e8ee9b477fe0522ab3059cb3b400accaf2ea04c21d

data/bin/mls

@@ -21,18 +21,26 @@ when "documents:migrate"
     exit 1
   end
 
-  b2 = MLS::CLI::Storage::B2.new(MLS::CLI.options[:b2])
-  Document.where(excludes: 'b2/sha256').find_each do |document|
+  b2 = StandardStorage::B2.new(MLS::CLI.options[:b2])
+  shas = []
+  
+  Document.where(provider: {excludes: 'b2/sha256'}).limit(1000).each do |document|
+    next if shas.include?(document.sha256)
     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))), {
+      b2.write(document.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
       })
+      
+      Documents.where(md5: document.md5).find_each do |d|
+        next if d.sha256 != document.sha256
+        d.update!(provider: d.provider + ['b2/sha256'])
+      end
+      shas << document.sha256
     end
   end
-when "documents:check"
 else
   puts "Usage: mls documents:backup dir [options...]"
-end
+end

data/lib/mls/cli.rb

@@ -35,7 +35,7 @@ module MLS::CLI
           MLS::CLI.options[:b2] = {
             account_id:         URI.unescape(url.user),
             application_key:    URI.unescape(url.password),
-            bucket:             URI.unescape(url.host)
+            bucket:             URI.unescape(url.host),
             prefix:             url.path&.empty? ? url.path : nil
           }
           url.query.split('&').each do |qp|
@@ -56,5 +56,5 @@ module MLS::CLI
   
 end
 
-require File.expand_path('../cli/storage', __FILE__)
+require 'standard_storage'
 require File.expand_path('../cli/documents', __FILE__)

data/lib/mls/cli/documents.rb

@@ -45,7 +45,7 @@ module MLS::CLI::Documents
       end
       
       if document.provider.nil? || document.provider.include?('s3/hash_key')
-        storage_engine = MLS::CLI::Storage::S3.new(MLS::CLI.options[:s3])
+        storage_engine = StandardStorage::S3.new(MLS::CLI.options[:s3])
         key = 'hash_key'
       else
         raise 'unkown storage engine'
@@ -67,6 +67,4 @@ module MLS::CLI::Documents
     end
   end
 
-end
-
-
+end

data/lib/mls/models/document.rb

@@ -19,11 +19,11 @@ class Document < MLS::Model
   end
   
   def url(style=:original)
-    MLS.config['document_host'].gsub(/\/$/, '') + '/' + path(style)
+    File.join(MLS.config['document_host'].gsub(/\/$/, ''), path(style))
   end
   
   def path(style=:original)
-    "#{partition(style == :original ? hash_key : "#{hash_key}-#{style}")}"
+    File.join("documents", "#{partition(style == :original ? hash_key : "#{hash_key}-#{style}")}")
   end
 
   def partition(value)

data/lib/mls/models/task.rb

@@ -4,6 +4,7 @@ class Task < MLS::Model
   belongs_to  :subject, :polymorphic => true
   belongs_to  :account
   belongs_to  :source
+  belongs_to  :team
   
   has_many :events
   has_many :mistakes

data/lib/mls/models/team.rb

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

data/lib/mls/railtie.rb

@@ -13,20 +13,37 @@ class MLS::Railtie < Rails::Railtie
   
   initializer 'mls' do |app|
     
-    url = app.config.mls.fetch('url') { app.secrets.mls }
+    configs = if app.secrets.mls.is_a?(String)
+      h = ActiveRecord::ConnectionAdapters::ConnectionSpecification::ConnectionUrlResolver.new(app.secrets.mls).to_hash.symbolize_keys
+      h[:api_key] = h.delete(:username)
+      if h[:adapter] != 'sunstone'
+        h[:use_ssl] = h[:adapter] == 'https'
+        h[:adapter] = 'sunstone'
+      end
+      h
+    elsif app.config_for(:mls)['url']
+      ActiveSupport::Deprecation.warn("Using mls.yml has been deprecated. Move to secrets.yml")
+      h = ActiveRecord::ConnectionAdapters::ConnectionSpecification::ConnectionUrlResolver.new(app.config_for(:mls)['url']).to_hash.symbolize_keys
+      h[:api_key] = h.delete(:username)
+      if h[:adapter] != 'sunstone'
+        h[:use_ssl] = h[:adapter] == 'https'
+        h[:adapter] = 'sunstone'
+      end
+      h
+    else
+      app.secrets.mls
+    end
+    
+
     user_agent = []
     user_agent << app.config.mls.fetch('user_agent') {
       app.class.name.split('::')[0..-2].join('::')
     }
     user_agent << "Rails/#{Rails.version}"
+    configs[:user_agent] = user_agent.compact.join(' ')
     
     
-    MLS::Model.establish_connection({
-      adapter: 'sunstone',
-      url: url,
-      user_agent: user_agent.compact.join(' ')
-    })
-
+    MLS::Model.establish_connection(configs)
   end
   
-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.7.0'
+  s.version     = '1.8.0'
   s.authors     = ["Jon Bracy", "James R. Bracy"]
   s.email       = ["jon@42floors.com", "james@42floors.com"]
   s.homepage    = "http://mls.42floors.com"
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'sdoc-templates-42floors'
 
   # Runtime
+  s.add_runtime_dependency 'standardstorage'
   s.add_runtime_dependency 'phony'
   s.add_runtime_dependency 'arel-extensions'
   s.add_runtime_dependency 'rgeo', '>= 0.4.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mls
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Jon Bracy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-18 00:00:00.000000000 Z
+date: 2019-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -165,6 +165,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: standardstorage
+  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: phony
   requirement: !ruby/object:Gem::Requirement
@@ -252,9 +266,6 @@ files:
 - lib/mls.rb
 - 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
 - lib/mls/models/accounts_region.rb

data/lib/mls/cli/storage.rb

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

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

@@ -1,87 +0,0 @@
-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/cli/storage/s3.rb

@@ -1,99 +0,0 @@
-require 'aws-sdk-s3'
-
-module MLS::CLI::Storage
-  class S3
-    
-    def initialize(configs = {})
-      @configs = configs
-      @configs[:region] ||= 'us-east-1'
-      @configs[:prefix] ||= ""
-      
-      @client = Aws::S3::Client.new({
-        access_key_id: configs[:access_key_id],
-        secret_access_key: configs[:secret_access_key],
-        region: configs[:region]
-      })
-    end
-    
-    def object_for(key)
-      Aws::S3::Object.new(@configs[:bucket], key, client: @client)
-    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(/^\//, '')#delete_prefix('/')
-    end
-    
-    def exists?(key)
-      object_for(destination(key)).exists?
-    end
-    
-    # def write(key, file, meta_info)
-    #   file = file.tempfile if file.is_a?(ActionDispatch::Http::UploadedFile)
-    #
-    #   object_for(destination(key)).upload_file(file, {
-    #     :acl => 'public-read',
-    #     :content_disposition => "inline; filename=\"#{meta_info[:filename]}\"",
-    #     :content_type => meta_info[:content_type]
-    #   })
-    # end
-    
-    def read(key, &block)
-      object_for(destination(key)).get()
-    end
-    
-    def cp(key, path)
-      object_for(destination(key)).get({ response_target: path })
-      true
-    end
-    
-    def delete(key)
-      object_for(destination(key)).delete
-    end
-    
-    def copy_to_tempfile(key)
-      tmpfile = Tempfile.new([File.basename(key), File.extname(key)], binmode: true)
-      cp(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 md5(key)
-      object_for(destination(key)).etag
-    end
-  
-    def last_modified(key)
-      object_for(destination(key)).last_modified
-    end
-    
-    def mime_type(key)
-      object_for(destination(key)).content_type
-    end
-    
-  end
-end