boxlet 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac3d01a156de1228f1c8d7fa47663204443a74c4
-  data.tar.gz: 7f988b9682f10bb78451089a03dc036f70f5f841
+  metadata.gz: 30054052af4a54d69ba6580adf2ba09790426b7f
+  data.tar.gz: 2d045f5a3b4f252446ee7f9e7965d109b7c5bcda
 SHA512:
-  metadata.gz: 69a2f5b627c5a3c4b7df7deafa989a4359591de7c471ec405ceb2f717957cacb653e626a12773e18765d1785c6e6fd0b82eb5fd7304e3cd980aca4cadbe8f993
-  data.tar.gz: 3aa132fcaae54c8ce28cdfdf71767f6d905a134b9810d9de3ad4df532d82022b9d4485c3eae1838f45650196bd830c899aa00eb21bb20d1f91f8d48a0418bfd4
+  metadata.gz: 497d7d5f65687c6c840147b8272d9512dac81fd5296a456d7cc9d230402a5ba52d1f2799ad7e680853d4b56444b351f375f616a7815689d6e9b7e9c711ddf489
+  data.tar.gz: ef9b10ae3bc60fbfaca5d9c4c567ab3a36c1cf0c1b3e3deba29c8b29b88d8e43aadfb037b791d3f5f995159752c947531cadb0de5a9fb32660fec3663a8cd324

data/config.yml

@@ -20,6 +20,7 @@ server_type: thin
 daemonize: false
 pid_file: server.pid
 log_file: server.log
+public_url: http://localhost:8077
 
 #use s3
 s3:

data/lib/boxlet/app/controller.rb

@@ -77,7 +77,8 @@ module Boxlet
       {
         capacity: Boxlet::Util.app_space_capacity,
         usage: Boxlet::Util.app_space_usage,
-        free_space: free_space?
+        free_space: free_space?,
+        base_upload_path: base_upload_path
       }
     end
 
@@ -145,7 +146,7 @@ module Boxlet
       @format = :json
 
       uuid = @params[:uuid]
-      db.collection('assets').find({uuid: uuid}).to_a
+      stats.merge(assets: db.collection('assets').find({uuid: uuid}).to_a)
     end
 
     def file_info
@@ -171,13 +172,13 @@ module Boxlet
 
       date = Date.parse(@params[:date])
       uuid = @params[:uuid]
-      db.collection('assets').find({
+      stats.merge(assets: db.collection('assets').find({
         uuid: uuid,
         asset_date: {
           '$gte' => date.to_time.strftime('%F'),
           '$lt' => (date + 1).to_time.strftime('%F')
         }
-      }).to_a
+      }).to_a)
     end
 
 
@@ -215,5 +216,13 @@ module Boxlet
       def free_space?
         Boxlet::Util.free_space > 50
       end
+
+      def base_upload_path
+        if Boxlet.config[:s3][:enabled]
+          "https://s3.amazonaws.com/#{Boxlet.config[:s3][:bucket]}/#{@params[:uuid]}"
+        else
+          "http://#{Boxlet.config[:public_url]}/#{Boxlet.config[:upload_dir]}/#{Digest::MD5.hexdigest(@params[:uuid])}"
+        end
+      end
   end
 end

data/lib/boxlet/version.rb

@@ -1,3 +1,3 @@
 module Boxlet
-  VERSION = "0.2.3"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: boxlet
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - arktisklada