boxlet 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22646441910e91687f19be25595a7cc6c1108a2f
-  data.tar.gz: 83fe75aabecf937edc30ddd6122359278427ac88
+  metadata.gz: 2cad509b0ace0721f642bdbfa0a3642762eed408
+  data.tar.gz: 0f698f040646e23326774e6b71346b336a4d8232
 SHA512:
-  metadata.gz: a44b3cafb4d413ec7a7742589a4c8a7ad8bc59aa6e56226d9447b0b29d8b7edf970f088f4ff94765862e7182dc396e3d6d0267e3b1275821b443e7193ab2c100
-  data.tar.gz: a73abaeb3f52dd21a737737bcebc90e58f1ef2e9782f3db811d500ffe7061a5eb4a4f523ce7c3bd3ffb0ea47e00e60f39cbeb3cf4c2dbebe2cf5e2dc94bc1a2e
+  metadata.gz: 9efe8a0f63c60c1c8b82d06784225b5be520d18832aced1060397673adeae075c3a9377ba66408ce1a0b1105c4c656a3d8530424b41f3a67e4e80be84b97e7f0
+  data.tar.gz: 1b9c03604c0e9fd6b98ae4b70818a804f4c80a55b158d54f41d18ce299a6ccec30c81693caaab91cdca778a70b38776e2eb0252154e9f1504fdef7015da6b27e

data/README.md

@@ -51,6 +51,13 @@ host: localhost
 server_type: thin
 daemonize: false
 
+#use s3
+s3:
+  enabled: false
+  access_key_id:
+  secret_access_key:
+  bucket: boxlet
+
 # Database config
 db:
   development:
@@ -65,7 +72,7 @@ db:
 
 ```
 
-All config options are available as command-line parameters
+Many config options are available as command-line parameters
 
 - Path: `-f` or `--path`
   - Default: `./`

data/boxlet.gemspec

@@ -21,10 +21,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rack", "~> 1.5"
-  spec.add_dependency "rack-contrib", "~> 1.1"
+  spec.add_dependency "rack", "~> 1.5.2"
+  spec.add_dependency "rack-contrib", "~> 1.1.0"
   spec.add_dependency "thin", "~> 1.6"
   spec.add_dependency "ImageResize", "~> 0.0.5"
+  spec.add_dependency "aws-sdk", "~> 1.58.0"
 
   spec.add_runtime_dependency 'multi_json', '~> 1.10', '>= 1.10.1'
   spec.add_runtime_dependency 'mongo', '~> 1.10', '>= 1.10.2'
@@ -33,4 +34,4 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.3"
-end
+end

data/config.yml

@@ -21,6 +21,13 @@ daemonize: false
 pid_file: server.pid
 log_file: server.log
 
+#use s3
+s3:
+  enabled: false
+  access_key_id:
+  secret_access_key:
+  bucket: boxlet
+
 # Database config
 db:
   development:

data/lib/boxlet/app/controller.rb

@@ -2,6 +2,7 @@ require 'date'
 require 'digest'
 require 'thread'
 require 'ImageResize'
+require 'aws-sdk'
 
 # routes = {
 #   ["/", :get]                 => :index,
@@ -111,6 +112,28 @@ module Boxlet
 
         t = Thread.new do
           Image.resize(new_path, new_thumb_path, 150, 150)
+
+          if Boxlet.config[:s3][:enabled]
+            pp 'Uploading to S3...' if Boxlet.config[:debug]
+
+            s3 = AWS::S3.new(
+              :access_key_id => Boxlet.config[:s3][:access_key_id],
+              :secret_access_key => Boxlet.config[:s3][:secret_access_key]
+            )
+            if s3.buckets[Boxlet.config[:s3][:bucket]]
+                .objects["#{@params[:uuid]}/#{new_filename}"]
+                .write(:file => new_path) &&
+              s3.buckets[Boxlet.config[:s3][:bucket]]
+                .objects["#{@params[:uuid]}/#{new_thumb_filename}"]
+                .write(:file => new_thumb_path)
+
+              FileUtils.rm(new_path)
+              FileUtils.rm(new_thumb_path)
+              pp 'Uploading to S3... Done!' if Boxlet.config[:debug]
+            else
+              pp 'Uploading to S3... Error!!' if Boxlet.config[:debug]
+            end
+          end
         end
 
         {response: true}
@@ -147,61 +170,61 @@ module Boxlet
 
     private
 
-    def db
-      Boxlet::Db.connection
-    end
+      def db
+        Boxlet::Db.connection
+      end
 
-    def set_user
-      user_model.merge db.collection('users').find({uuid: @params[:uuid]}).to_a.first || {}
-    end
+      def set_user
+        user_model.merge db.collection('users').find({uuid: @params[:uuid]}).to_a.first || {}
+      end
 
-    def user_upload_dir
-      dir_name = @params[:uuid] || ''
-      user_upload_dir_name = Boxlet.config[:upload_dir] + "/" + dir_name
-      Dir.mkdir(user_upload_dir_name) unless File.exists?(user_upload_dir_name)
+      def user_upload_dir
+        dir_name = @params[:uuid] || ''
+        user_upload_dir_name = Boxlet.config[:upload_dir] + "/" + dir_name
+        Dir.mkdir(user_upload_dir_name) unless File.exists?(user_upload_dir_name)
 
-      if @params[:uuid]
-        dir_shortname = Digest::MD5.hexdigest(dir_name)
-        user_upload_dir_shortname = Boxlet.config[:upload_dir] + "/" + dir_shortname
+        if @params[:uuid]
+          dir_shortname = Digest::MD5.hexdigest(dir_name)
+          user_upload_dir_shortname = Boxlet.config[:upload_dir] + "/" + dir_shortname
 
-        File.symlink(dir_name, user_upload_dir_shortname) if !File.symlink? user_upload_dir_shortname
+          File.symlink(dir_name, user_upload_dir_shortname) if !File.symlink? user_upload_dir_shortname
 
-        if File.symlink? user_upload_dir_shortname
-          user_upload_dir_shortname
+          if File.symlink? user_upload_dir_shortname
+            user_upload_dir_shortname
+          else
+            user_upload_dir_name
+          end
         else
           user_upload_dir_name
         end
-      else
-        user_upload_dir_name
       end
-    end
 
-    def free_space?
-      Boxlet::App.free_space > 50
-    end
+      def free_space?
+        Boxlet::App.free_space > 50
+      end
 
 
-    # Models
+      # Models
 
-    def file_model
-      {
-        filename: '',
-        size: 0,
-        local_date: 0,
-        thumbnail: '',
-        asset_path: '',
-        asset_date: '',
-        uuid: []
-      }
-    end
+      def file_model
+        {
+          filename: '',
+          size: 0,
+          local_date: 0,
+          thumbnail: '',
+          asset_path: '',
+          asset_date: '',
+          uuid: []
+        }
+      end
 
-    def user_model
-      {
-        uuid: '',
-        notifications: 1,
-        last_activity: Time.now
-      }
-    end
+      def user_model
+        {
+          uuid: '',
+          notifications: 1,
+          last_activity: Time.now
+        }
+      end
 
   end
 end

data/lib/boxlet/version.rb

@@ -1,3 +1,3 @@
 module Boxlet
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/lib/handlers/thin.rb

@@ -20,7 +20,6 @@ module Boxlet
         # default_host = environment == 'development' ?  : '0.0.0.0'
         host = @params.delete(:Host) || 'localhost'
         port = @params.delete(:Port) || 8077
-# pp @params
         args = [host, port, @app, @params]
 
         # Thin versions below 0.8.0 do not support additional options

data/lib/rack/boxlet_url_map.rb

@@ -36,14 +36,14 @@ module Rack
     def call(env)
       path = env["PATH_INFO"]
       script_name = env['SCRIPT_NAME']
-      hHost = env['HTTP_HOST']
-      sName = env['SERVER_NAME']
-      sPort = env['SERVER_PORT']
+      http_host = env['HTTP_HOST']
+      server_name = env['SERVER_NAME']
+      server_port = env['SERVER_PORT']
 
       @mapping.each do |host, location, match, app|
-        unless hHost == host \
-            || sName == host \
-            || (!host && (hHost == sName || hHost == sName+':'+sPort))
+        unless http_host == host \
+            || server_name == host \
+            || (!host && (http_host == server_name || http_host == server_name + ':' + server_port))
           next
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: boxlet
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - arktisklada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2015-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: rack-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.5
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.58.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.58.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement