omnifiles 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4ba409941d3f9b2cfcd8514723a1e0631afe42b
-  data.tar.gz: ce8cf3dd318b202eac04940ad6f6f4c434a269ad
+  metadata.gz: 3cdc7404e8fb3bf594a9c686e40dec5a1bcff348
+  data.tar.gz: 7afd2f9c25f9a4c372e99dc82203974a795712ab
 SHA512:
-  metadata.gz: d4bed8c5632f8f05a46f567b4f142aa4cfdfe7149481ab4235c0d8bfd7501d9682b3ed410b9d591f89ecc0256b0bbcbfb4e7e60e067a2531af33499ba0df4d5c
-  data.tar.gz: 798149e7e66db1daa3a84fde24b4c6a0b107f91435d0a02db1a3fcd2da69031c80e3a06c3e623f4e2edcd88dd8a6b8b7f127d0a61c9003b1b857a0d962a08f38
+  metadata.gz: 0ca79679d327f92bfcdba960a2c3cda44222d3daad86aa933f31a7bfc2dd999b7783ff7469a960cc65609295633dc31ad8782dd8632b62119b2c44b5ee051776
+  data.tar.gz: 3f9b7eed3669d4f685962f6147ac4a8eb9c8060faa2dc70956565d4f8b5d4183c4a3d78d909e1c0f4a3307dd36bee2ead667d04099cbe69dc5c0ff31eb3127c0

data/config/settings.yaml.example

@@ -6,3 +6,4 @@ development:
     name: omnifiles
   auth_opaque: alongopaquekey
   auth_password: secret
+  session_secret: SECRET

data/lib/omnifiles/protectedapp.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'sinatra'
+require 'sinatra/flash'
 require 'filemagic'
 require 'uri'
 require 'tempfile'
@@ -17,6 +18,11 @@ module OmniFiles
       Settings.auth_password
     end
 
+    enable :sessions
+    set :session_secret, Settings.session_secret
+
+    register Sinatra::Flash
+
     # POST a file
     post '/store/' do
       store_file
@@ -26,6 +32,10 @@ module OmniFiles
       store_file
     end
 
+    def make_visible_filename filename
+        filename ? URI.unescape(filename) : "<i>Not provided</i>"
+    end
+
     def format_time_str time
       if time
         time.localtime.to_s
@@ -34,6 +44,19 @@ module OmniFiles
       end
     end
 
+    def make_haml_data_from_doc doc
+      {
+        shortened: doc['shortened'],
+        url: url('/f/' + doc['shortened']),
+        original_filename: make_visible_filename(doc['original_filename']),
+        mime: doc['mime'],
+        access_time: format_time_str(doc['accessed']['time']),
+        created_time: format_time_str(doc['created']['time']),
+        access_count: doc['accessed']['count']
+      }
+    end
+
+    # GET stat of file
     get '/stat/:name' do |name|
       logger.info "Route GET stat #{name}"
 
@@ -42,19 +65,43 @@ module OmniFiles
       data = @storage.get_file name
       halt 404, "File not found" unless data
 
-      @url = url('/f/'+name)
-      if data['original_filename']
-        @original_filename = URI.unescape data['original_filename']
+      @hdata = make_haml_data_from_doc data
+      logger.info @hdata.inspect
+
+      haml :stat
+    end
+
+    # POST to delete file
+    # cannot remap methods
+    post '/delete/:name' do |name|
+      logger.info "Route POST to delete file #{name}"
+
+      target_path = File.join(Settings.storage_dir, name)
+
+      if @storage.delete_file(name)
+        if File.file?(target_path)
+          FileUtils.rm target_path
+          flash[:notice] = "Successfully deleted file #{name}"
+        else
+          flash[:error] = "Cannot delete file #{name} from disk"
+        end
       else
-        @original_filename = "<i>Not provided</i>"
+        flash[:error] = "Cannot delete file #{name} from mongo"
       end
-      @access_count = data['accessed']['count']
-      @access_time = format_time_str data['accessed']['time']
-      @created_time = format_time_str data['created']['time']
-      @mime = data['mime']
-      @shortened = name
 
-      haml :stat
+      redirect to('/')
+    end
+
+    # GET index
+    get '/' do
+        logger.info "Route GET index"
+
+        @hdata = []
+        @storage.enumerate_docs do |doc|
+            @hdata << make_haml_data_from_doc(doc)
+        end
+
+        haml :index
     end
 
     # POST handler with form/body handling

data/lib/omnifiles/settings.rb

@@ -1,3 +1,4 @@
+require 'psych'
 require 'settingslogic'
 
 module OmniFiles
@@ -9,4 +10,4 @@ module OmniFiles
     namespace ENV['RACK_ENV'] || 'development'
     load!
   end
-end
+end

data/lib/omnifiles/shortener.rb

@@ -6,7 +6,7 @@ require 'digest/md5'
 module OmniFiles
 
   class UrlShortener
-    def initialize salt, bytes_used=1
+    def initialize salt, bytes_used
       @salt = salt
       @bytes_used = bytes_used
       # base62
@@ -33,4 +33,4 @@ module OmniFiles
     end
   end
 
-end
+end

data/lib/omnifiles/storage.rb

@@ -18,7 +18,7 @@ class Storage
         @coll = db.collection('files')
         raise 'Cannot use collection' unless @coll
 
-        @shortener = UrlShortener.new(SecureRandom.hex(8))
+        @shortener = UrlShortener.new(SecureRandom.hex(8), 1)
     end
 
     # returns shortened url
@@ -30,8 +30,8 @@ class Storage
         @logger.info "Hashing value " + hashing
         shortened = @shortener.shorten hashing
         counter += 1
+        next if shortened.size < 5
         same_shortened = @coll.find_one({shortened: shortened}, :fields => [ "_id" ])
-        @logger.info same_shortened
         raise 'Something goes wrong' if counter > 100
       end while same_shortened
       shortened
@@ -59,6 +59,15 @@ class Storage
         @coll.find_one({ _id: data["_id"]})
     end
 
+    def delete_file shortened
+        resp = @coll.remove({shortened: shortened})
+        resp['ok'] && resp['n'] > 0
+    end
+
+    def enumerate_docs
+        @coll.find.each { |doc| yield doc }
+    end
+
 end
 
 end

data/lib/omnifiles/version.rb

@@ -1,3 +1,3 @@
 module OmniFiles
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/omnifiles/views/index.haml

@@ -0,0 +1,123 @@
+!!!
+%html
+  %head
+    %title OmniFiles files
+    :css
+      body {
+        padding: 5px;
+        font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+      }
+
+      /* From http://purecss.io */
+      .pure-table {
+        /* Remove spacing between table cells (from Normalize.css) */
+          border-collapse: collapse;
+          border-spacing: 0;
+          empty-cells: show;
+          border: 1px solid #cbcbcb;
+      }
+
+      .pure-table caption {
+        color: #000;
+          font: italic 85%/1 arial, sans-serif;
+          padding: 1em 0;
+          text-align: center;
+      }
+
+      .pure-table td, .pure-table th {
+          border-left: 1px solid #cbcbcb;/*  inner column border */
+          border-width: 0 0 0 1px;
+          font-size: inherit;
+          margin: 0;
+          overflow: visible; /*to make ths where the title is really long work*/
+          padding: 0.5em 0.5em; /* cell padding */
+      }
+
+      /* Consider removing this next declaration block, as it causes problems when
+      there's a rowspan on the first cell. Case added to the tests. issue#432 */
+      .pure-table td:first-child, .pure-table th:first-child {
+          border-left-width: 0;
+      }
+
+      .pure-table thead {
+        background-color: #e0e0e0;
+          color: #000;
+          text-align: left;
+          vertical-align: bottom;
+      }
+
+      .pure-table td {
+        background-color: transparent;
+      }
+
+      /* BORDERED TABLES */
+      .pure-table-bordered td {
+        border-bottom: 1px solid #cbcbcb;
+      }
+      .pure-table-bordered tbody > tr:last-child > td {
+        border-bottom-width: 0;
+      }
+
+      .wide
+      {
+        width: 100%;
+      }
+
+      .delete
+      {
+        color: #ff0000;
+        text-align: center;
+        font-weight: bold;
+        text-decoration: none;
+        border: none;
+        background: none;
+        cursor: pointer;
+      }
+
+      .flash {
+        position: relative;
+        margin-bottom: 5px;
+        border-radius: 3px;
+        padding: 8px 20px 8px 20px;
+      }
+
+      .flash.notice {
+        color: rgb(70, 136, 71);
+        background-color: rgba(223, 240, 216, 0.9);
+      }
+
+      .flash.error {
+        color: rgb(185, 74, 72);
+        background-color: rgba(242, 222, 222, 0.9);
+      }
+
+  %body
+    %h1 Files
+    %table.pure-table.pure-table-bordered.wide
+      %thead
+        %tr
+          %th #
+          %th URL
+          %th Filename
+          %th Accessed
+          %th Accessed at
+          %th Created at
+          %th MIME
+          %th
+        %tbody
+          -@hdata.each_with_index do |doc, i|
+            %tr
+              %td=i
+              %td
+                %a{href: doc[:url]} #{doc[:url]}
+              %td=doc[:original_filename]
+              %td=doc[:access_count]
+              %td=doc[:access_time]
+              %td=doc[:created_time]
+              %td=doc[:mime]
+              %td
+                %form{ :action => "/delete/#{doc[:shortened]}", :method => 'post' }
+                  %button.delete{ :type => 'submit'}Delete
+
+    %p
+      =styled_flash

data/lib/omnifiles/views/stat.haml

@@ -3,10 +3,17 @@
   %head
     %title OmniFiles statistics
     :css
-        .left { width: 20%; float: left; }
-        .right { overflow: auto; }
+      body {
+        padding: 5px;
+        font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+      }
+
+      .left { width: 20%; float: left; }
+
+      .right { overflow: auto; }
+
   %body
-    %h1 Statistics for #{@shortened}
+    %h1 Statistics for #{@hdata[:shortened]}
     #container
       .left
         %p URL:
@@ -17,9 +24,12 @@
         %p MIME:
       .right
         %p
-          %a(href=@url) #{@url}
-        %p=@original_filename
-        %p=@access_count
-        %p=@access_time
-        %p=@created_time
-        %p=@mime
+          %a{href: @hdata[:url]} #{@hdata[:url]}
+        %p=@hdata[:original_filename]
+        %p=@hdata[:access_count]
+        %p=@hdata[:access_time]
+        %p=@hdata[:created_time]
+        %p=@hdata[:mime]
+
+    %p
+      =styled_flash

data/omnifiles.gemspec

@@ -26,5 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "bson_ext", "~> 1.12.0"
   spec.add_runtime_dependency "haml", "~> 4.0.0"
   spec.add_runtime_dependency "settingslogic", "~> 2.0.0"
+  spec.add_runtime_dependency "psych", "~> 2.0.0"
   spec.add_runtime_dependency "thin", "~> 1.6.0"
+  spec.add_runtime_dependency "sinatra-flash", "~> 0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omnifiles
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - theirix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-22 00:00:00.000000000 Z
+date: 2015-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
+- !ruby/object:Gem::Dependency
+  name: sinatra-flash
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 description: File storage and URL shortener.
 email:
 - theirix@gmail.com
@@ -160,6 +188,7 @@ files:
 - lib/omnifiles/shortener.rb
 - lib/omnifiles/storage.rb
 - lib/omnifiles/version.rb
+- lib/omnifiles/views/index.haml
 - lib/omnifiles/views/stat.haml
 - omnifiles.gemspec
 homepage: ''