boxlet 0.2.8 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 956d2071a94833442316b9e97b35eaaf40284976
-  data.tar.gz: a6997a8a7258f156543cddc80eff0b6527d740b3
+  metadata.gz: e0446d59f5924ddab50d982f411f5cc9d0f0c663
+  data.tar.gz: d8100c4c6811458fe5c1918177cb1054c738ba45
 SHA512:
-  metadata.gz: b2162347f5df7546e58b33372afe319fca9360d46551a8bcdc1e549f47961be04fc207c0b4404f899d04e316415f7749e81d1f0902db5d939989c276f646b55f
-  data.tar.gz: a550939df3ccbd8588f7a9a62af995f36aa3d6a9fc941b2066a7c9491d03a9665ac81e58a41c598f2137011eadc52b0e522df553603baeb806c93b5455b9aeb0
+  metadata.gz: dbb800ce150cef6bc836367b19d853df6c6d4be5144125c895ffb9c0dd52a8419544f310aad4fe6028b9631e67d2c77afe7af67e48656323f40fadc4b389817e
+  data.tar.gz: 3b8642b22e637aa03a46d151ce4d94ff2bb7c78b3327376c075a05e0fd9eda9be2526ca7e2ff4b2c411fe59c20ef788e5f0eab915afaf1cde8d0d62a3acd50c8

data/boxlet.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |spec|
   spec.files         = %w[config.yml LICENSE.txt README.md Rakefile boxlet.gemspec]
   spec.files         += Dir.glob('lib/**/*.rb')
   spec.files         += Dir.glob('lib/boxlet/app/*.rb')
+  spec.files         += Dir.glob('lib/boxlet/app/views/*.html')
 
   spec.executables   = 'boxlet'
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})

data/config.yml

@@ -22,6 +22,9 @@ pid_file: server.pid
 log_file: server.log
 public_url: http://localhost:8077
 
+gallery_username: asdf
+gallery_password: asdf
+
 #use s3
 s3:
   enabled: false

data/lib/boxlet.rb

@@ -12,6 +12,11 @@ module Boxlet
   extend self
   extend Boxlet::Config
 
+  PUBLIC_COMMANDS = {
+    run: "Run the Boxlet server",
+    stop: "Stop a daemonized server"
+  }.freeze
+
   attr_accessor :runner, :config, :raw_params, :raw_config
 
   def run!(argv, command='run', config_file='config.yml', &blk)
@@ -68,13 +73,24 @@ module Boxlet
     def print_menu
       puts "Usage: boxlet command [args]"
       puts
-      puts "Available commands are as follows:"
-      commands_with_descriptions = App::PUBLIC_COMMANDS.merge run: "Run the Boxlet server"
+      puts "Common commands:"
+      commands_with_descriptions = PUBLIC_COMMANDS.merge(App::PUBLIC_COMMANDS)
       commands = commands_with_descriptions.keys
-      max_chars = commands.sort { |a, b| a.length <=> b.length }.last.length
-      commands.sort.each do |command|
-        puts " #{command.to_s.ljust(max_chars)}   #{commands_with_descriptions[command]}"
+      max_command_chars = commands.sort { |a, b| a.length <=> b.length }.last.length
+      PUBLIC_COMMANDS.each do |command, description|
+        print_menu_command command, max_command_chars, description
+      end
+
+      puts
+      puts "Additional commands:"
+      App::PUBLIC_COMMANDS.each do |command, description|
+        print_menu_command command, max_command_chars, description
       end
+
+    end
+
+    def print_menu_command(command, max_command_chars, description)
+      puts "  #{command.to_s.ljust(max_command_chars)}   #{description}"
     end
 end
 

data/lib/boxlet/app.rb

@@ -4,6 +4,7 @@ require 'rack/response'
 require 'rack/file_upload'
 require 'boxlet/db'
 require 'boxlet/util'
+require 'handlers/auth'
 require 'boxlet/app/router'
 require 'boxlet/app/models'
 
@@ -29,7 +30,9 @@ module Boxlet
         ["/file_list"]              => :file_list,
         ["/file_info"]              => :file_info,
         ["/resync", :get]           => :resync,
-        ["/flashback", :post]       => :flashback
+        ["/flashback", :post]       => :flashback,
+        ["/gallery", :get]          => :gallery,
+        ["/gallery/images", :get]   => :gallery_images,
       }
     end
 

data/lib/boxlet/app/controller.rb

@@ -3,17 +3,21 @@ require 'digest'
 require 'thread'
 require 'ImageResize'
 require 'aws-sdk'
+require 'boxlet/app/templates'
 
 # routes = {
-#   ["/", :get]                 => :index,
-#   ["/auth"]                   => :auth,
-#   ["/register_device", :post] => :register_device,
-#   ["/notifications", :post]   => :notifications,
-#   ["/push_files", :post]      => :push_files,
-#   ["/file_list"]              => :file_list,
-#   ["/file_info"]              => :file_info,
-#   ["/resync", :get]           => :resync,
-#   ["/flashback", :post]       => :flashback
+  # ["/", :get]                 => :index,
+  # ["/auth"]                   => :auth,
+  # ["/register_device", :post] => :register_device,
+  # ["/notifications", :*]      => :notifications,
+  # ["/stats", :post]           => :stats,
+  # ["/push_files", :post]      => :push_files,
+  # ["/file_list"]              => :file_list,
+  # ["/file_info"]              => :file_info,
+  # ["/resync", :get]           => :resync,
+  # ["/flashback", :post]       => :flashback,
+  # ["/gallery", :get]          => :gallery,
+  # ["/gallery/images", :get]   => :gallery_images,
 # }
 
 
@@ -27,18 +31,25 @@ module Boxlet
       Boxlet.log(:info, request.params)
 
       @format = :html
+      @status = 200
+      @headers = {}
     end
 
     def action(action)
       action_response = self.send(action)
       set_user if action =~ /push_files|file_list|file_info/
       
-      {format: @format, content: action_response}
+      {
+        format: @format,
+        content: action_response,
+        status: @status,
+        headers: @headers
+      }
     end
 
     # actions
     def index
-      '<html><body><form action="/push_files" method="post" enctype="multipart/form-data">UUID:<input type="text" name="uuid"><br><input type="file" name="file"><input type="submit"></form>'
+      Templates.index
     end
 
     # def auth
@@ -180,6 +191,28 @@ module Boxlet
       }).to_a)
     end
 
+    def gallery
+      @format = :html
+
+      authorized_request do
+        Templates.gallery
+      end
+    end
+
+    def gallery_images
+      @format = :json
+
+      authorized_request do
+        limit = (@params[:limit] || 50).to_i
+        skip = ((params[:page] || 1).to_i - 1) * limit
+        {
+          count: db.collection('assets').count(),
+          base_path: base_upload_path,
+          images: db.collection('assets').find().limit(limit).skip(skip).to_a
+        }
+      end
+    end
+
 
     private
 
@@ -192,24 +225,7 @@ module Boxlet
       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)
-
-        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
-
-          if File.symlink?(user_upload_dir_shortname)
-            user_upload_dir_shortname
-          else
-            user_upload_dir_name
-          end
-        else
-          user_upload_dir_name
-        end
+        Boxlet::Util.user_upload_dir(@params[:uuid])
       end
 
       def free_space?
@@ -217,11 +233,19 @@ module Boxlet
       end
 
       def base_upload_path
-        if Boxlet.config[:s3][:enabled]
-          "https://s3.amazonaws.com/#{Boxlet.config[:s3][:bucket]}/#{@params[:uuid]}"
-        else
-          "#{Boxlet.config[:public_url]}/#{Boxlet.config[:upload_dir]}/#{Digest::MD5.hexdigest(@params[:uuid])}".gsub('/./', '/')
+        Boxlet::Util.base_upload_path(@params[:uuid])
+      end
+
+      def authorized_request(&action)
+        auth = Boxlet::Handlers::Auth.new(
+          Boxlet.config[:gallery_username],
+          Boxlet.config[:gallery_password]
+        )
+        @status, @headers, content = auth.authorize(request) do
+          action.call
         end
+
+        content
       end
   end
 end

data/lib/boxlet/app/router.rb

@@ -23,7 +23,10 @@ module Boxlet
       if @method == :* || (request.get? && @method == :get) || (request.post? && @method == :post)
         Boxlet.log(:info, "INFO: Responding: #{@method.upcase} => #{@action}")
         action_response = controller.action(@action)
-        response.status = 200
+        response.status = action_response[:status]
+        action_response[:headers].each do |key, value|
+          response.header[key] = value
+        end
       else
         response.status = 404
         action_response = {format: :html, content: "404 not found"}

data/lib/boxlet/app/templates.rb

@@ -0,0 +1,12 @@
+module Boxlet
+  class Templates
+    def self.method_missing(method, *arguments, &block)
+      filename = "#{File.dirname(__FILE__)}/views/#{method}.html"
+      if File.exist?(filename)
+        File.open(filename).read
+      else
+        raise "Template file not found for #{method}"
+      end
+    end
+  end
+end

data/lib/boxlet/app/views/gallery.html

@@ -0,0 +1,114 @@
+<html>
+<head>
+  <style>
+    * {
+      margin: 0;
+      padding: 0;
+      box-sizing: border-box;
+    }
+
+    #gallery {
+      max-width: 100%;
+      margin: 1em auto;
+      padding: 1em;
+      box-shadow: 2px 2px 3px #fff;
+    }
+    .image-row {
+      display:block;
+      margin: 0.25em;
+    }
+    .image-row:after {
+      display: block;
+      content: " ";
+      clear: both;
+    }
+    .image-row li {
+      background-position: center center;
+      background-size: cover;
+      cursor: pointer;
+      float: left;
+      height: 5em;
+      list-style: none;
+      margin: 0.25em;
+      transition: opacity 300ms;
+      width: 5em;
+    }
+    .image-row li:hover {
+      opacity: 0.5;
+    }
+    .image-row li img {
+      width: 100%;
+    }
+
+    .hero-image {
+      display: block;
+      text-align: center;
+      height: 80%;
+    }
+    .hero-image img {
+      max-width: 100%;
+      max-height: 100%;
+    }
+  </style>
+
+  <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.4.9/angular.min.js"></script>
+  <script type="text/javascript">
+    angular.module("gallery", []);
+    angular.module("gallery").controller("GalleryController", function($scope, $location, $http) {
+      var basePath = '';
+          uuid = $location.search().uuid;
+
+      $scope.page = 1;
+      $scope.limit = 50;
+      $scope.images = [];
+      $scope.heroImage = null;
+      $scope.counter = function() {
+        var a = [],
+            pages = Math.ceil($scope.count / $scope.limit);
+        for (var i = 1; i <= pages; i++) {
+          a.push(i);
+        }
+        return a;
+      };
+
+      $scope.imageSource = function(image, size) {
+        console.log( basePath + "/" + image[size])
+        return basePath + "/" + image[size];
+      };
+
+      $scope.setHeroImage = function(image) {
+        $scope.heroImage = image;
+      };
+
+      $scope.fetchImages = function() {
+        var imagesUrl = "/gallery/images?page=" + $scope.page + "&limit=" + $scope.limit + "&uuid=" + uuid;
+        console.log(imagesUrl);
+
+        $http.get(imagesUrl).then(function(results) {
+          basePath = results.data.base_path;
+          $scope.basePath = basePath;
+          $scope.count = results.data.count;
+          $scope.images = results.data.images;
+          $scope.heroImage = $scope.images[0];
+        });
+      }
+
+      $scope.fetchImages();
+    });
+  </script>
+</head>
+<body ng-app="gallery">
+  <div ng-controller="GalleryController">
+    <div class="hero-image">
+      <img ng-src="{{basePath}}/{{heroImage.filename}}" />
+    </div>
+
+    <select ng-change="fetchImages()" ng-model="page" ng-options="page for page in counter() track by page">
+      <option ng-repeat="page in counter()" value="page">{{page}}</option>
+    </select>
+    <ul class="image-row">
+      <li ng-repeat="image in images" style="background-image: url({{imageSource(image, 'thumbnail')}})" ng-click="setHeroImage(image)"></li>
+    </ul>
+  </div>
+</body>
+</html>

data/lib/boxlet/app/views/index.html

@@ -0,0 +1,12 @@
+<html>
+<body>
+  <form action="/push_files" method="post" enctype="multipart/form-data">
+    UUID:<input type="text" name="uuid">
+    <br>
+    Asset Path:<input type="text" name="asset_path">
+    <br>
+    <input type="file" name="file">
+    <input type="submit">
+  </form>
+</body>
+</html>

data/lib/boxlet/util.rb

@@ -48,5 +48,35 @@ module Boxlet
       stat = Filesystem.stat(Boxlet.config[:file_system_root])
       (stat.block_size * stat.blocks).to_mb
     end
+
+    # Directory paths
+    def self.user_upload_dir(uuid)
+      dir_name = 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 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
+
+        if File.symlink?(user_upload_dir_shortname)
+          user_upload_dir_shortname
+        else
+          user_upload_dir_name
+        end
+      else
+        user_upload_dir_name
+      end
+    end
+
+    def self.base_upload_path(uuid)
+      if Boxlet.config[:s3][:enabled]
+        "https://s3.amazonaws.com/#{Boxlet.config[:s3][:bucket]}/#{uuid}"
+      else
+        "#{Boxlet.config[:public_url]}/#{Boxlet.config[:upload_dir]}/#{Digest::MD5.hexdigest(uuid)}".gsub('/./', '/')
+      end
+    end
   end
 end

data/lib/boxlet/version.rb

@@ -1,3 +1,3 @@
 module Boxlet
-  VERSION = "0.2.8"
+  VERSION = "1.0.2"
 end

data/lib/handlers/auth.rb

@@ -0,0 +1,98 @@
+module Boxlet
+  module Handlers
+    class Auth
+      def initialize(username, password)
+        @username = username
+        @password = password
+        @realm = "Boxlet"
+      end
+
+      def authorize(request)
+        @auth = Request.new(request.env)
+
+        return unauthorized unless @auth.provided?
+        return bad_request unless @auth.basic?
+
+        if valid?(@username, @password)
+          headers = {'REMOTE_USER' => @username}
+
+          [200, headers, yield]
+        else
+          unauthorized
+        end
+      end
+
+      private
+
+        def challenge
+          'Basic realm="%s"' % @realm
+        end
+
+        def valid?(username, password)
+          @auth.credentials[0] == username &&
+            @auth.credentials[1] == password
+        end
+
+        def unauthorized(www_authenticate = challenge)
+          content_hash = {
+            'CONTENT_TYPE' => 'text/plain',
+            'CONTENT_LENGTH' => '0',
+            'WWW-Authenticate' => www_authenticate.to_s
+          }
+          return [401, content_hash, []]
+        end
+
+        def bad_request
+          content_hash = {
+            'CONTENT_TYPE' => 'text/plain',
+            'CONTENT_LENGTH' => '0'
+          }
+          return [400, content_hash, []]
+        end
+
+
+        class Request
+          def initialize(env)
+            @env = env
+          end
+
+          def basic?
+            "basic" == scheme
+          end
+
+          def credentials
+            @credentials ||= params.unpack("m*").first.split(/:/, 2)
+          end
+
+          def username
+            credentials.first
+          end
+
+          def provided?
+            !authorization_key.nil?
+          end
+
+          def parts
+            @parts ||= @env[authorization_key].split(' ', 2)
+          end
+
+          def scheme
+            @scheme ||= parts.first && parts.first.downcase
+          end
+
+          def params
+            @params ||= parts.last
+          end
+
+
+          private
+
+            AUTHORIZATION_KEYS = ['HTTP_AUTHORIZATION', 'X-HTTP_AUTHORIZATION', 'X_HTTP_AUTHORIZATION']
+
+            def authorization_key
+              @authorization_key ||= AUTHORIZATION_KEYS.detect { |key| @env.has_key?(key) }
+            end
+        end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: boxlet
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 1.0.2
 platform: ruby
 authors:
 - arktisklada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-05 00:00:00.000000000 Z
+date: 2016-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -207,12 +207,16 @@ files:
 - lib/boxlet/app/controller.rb
 - lib/boxlet/app/models.rb
 - lib/boxlet/app/router.rb
+- lib/boxlet/app/templates.rb
+- lib/boxlet/app/views/gallery.html
+- lib/boxlet/app/views/index.html
 - lib/boxlet/config.rb
 - lib/boxlet/db.rb
 - lib/boxlet/log.rb
 - lib/boxlet/runner.rb
 - lib/boxlet/util.rb
 - lib/boxlet/version.rb
+- lib/handlers/auth.rb
 - lib/handlers/thin.rb
 - lib/rack/boxlet_url_builder.rb
 - lib/rack/boxlet_url_map.rb
@@ -237,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Upload pics from your phone