omnifiles 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e77c0d22099ad90e4c8b8b911bf02f75772b8863
-  data.tar.gz: a8b8677804088a48c6074f85e648b221db58396a
+  metadata.gz: 61daf02bef5c9ccee10e457e697b86c126032990
+  data.tar.gz: 05366a0ad9cce4edb2fe36cc98255327282d9767
 SHA512:
-  metadata.gz: 725524c2140e85489a1f67b12a92576e560e106af6cebc447a4a35984dbd2bdb5565f37f11dfbb6fd4c85c5c8e3dcb0bcf5f23fb93d902d29d4a0acea7a3499b
-  data.tar.gz: 8bfe2cd8971e47799f2bc6d4d556c34916039fd5518cf0328bb0d9542d8672ca8d8da9957040403618416458e6bc445efc61f712517aabca2dc568b407e7975c
+  metadata.gz: e0d20083542daa12cd7be3d7a34b38707619e28d09922bc35e1de6f86aa4e82f1864eb8460ba6926989e13b69afe44fbc923e9d162653ef09039c3da96a2e555
+  data.tar.gz: a3a05d6339b2b6e49d465f91c6daba16a267f809b6d79a405cea74c68451b4caf3ca3d2cea624670da25a3188f3af753c171884b74421e41e5f5e652db35121b

data/README.md

@@ -6,7 +6,7 @@
 
 File storage and shortener server.
 
-OmniFiles is built with Sinatra and Rack and uses an sqlite database to store shortened
+OmniFiles is built with Sinatra and Rack and uses an Mongo database to store shortened
 urls and statistics.
 
 ## Installation

data/config/settings.yaml.example

@@ -1,5 +1,8 @@
 development:
   storage_dir: storage
-  db: omnifiles.sqlite3
+  db:
+    host: localhost
+    port: 27017
+    name: omnifiles
   auth_opaque: alongopaquekey
-  auth_password: secret
+  auth_password: secret

data/lib/omnifiles/protectedapp.rb

@@ -34,6 +34,14 @@ module OmniFiles
       store_file
     end
 
+    def format_time_str time
+      if time
+        time.localtime.to_s
+      else
+        '<i>Not yet</i>'
+      end
+    end
+
     get '/stat/:name' do |name|
       logger.info "Route GET stat #{name}"
 
@@ -48,7 +56,9 @@ module OmniFiles
       else
         @original_filename = "<i>Not provided</i>"
       end
-      @access_count = data['accessed']
+      @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
 
@@ -117,4 +127,4 @@ module OmniFiles
 
   end
 
-end
+end

data/lib/omnifiles/publicapp.rb

@@ -17,7 +17,7 @@ module OmniFiles
 
       halt 500, "Wrong URL" if name != BaseApp.sanitize(name)
 
-      data = @storage.get_file name
+      data = @storage.get_file_and_bump name
       logger.info "Data #{data}"
       halt 404, "File not found" unless data
 
@@ -28,7 +28,7 @@ module OmniFiles
       mime = data['mime']
       mime = 'application/octet-stream' unless mime && mime != ''
 
-      logger.info "Data #{data}, file #{path}, was at #{filename}"
+      logger.info "File '#{path}' was named '#{filename}'"
 
       if filename && !filename.empty?
         headers 'X-Original-Filename' => filename
@@ -38,4 +38,4 @@ module OmniFiles
 
   end
 
-end
+end

data/lib/omnifiles/server.rb

@@ -16,8 +16,7 @@ module OmniFiles
     before do
       logger.info "Fired " + self.class.to_s
       FileUtils.mkdir_p(Settings.storage_dir)
-      FileUtils.mkdir_p(File.dirname(Settings.db))
-      @storage = Storage.new Settings.db, logger
+      @storage = Storage.new Settings.db.host, Settings.db.port, Settings.db.name, logger
     end
 
     def self.sanitize s
@@ -25,4 +24,4 @@ module OmniFiles
     end
   end
 
-end
+end

data/lib/omnifiles/storage.rb

@@ -2,19 +2,23 @@
 
 require 'rubygems'
 require 'digest/md5'
-require 'sqlite3'
+require 'bson'
+require 'mongo'
 
 module OmniFiles
 
-  class Storage
+class Storage
+    def initialize mongo_host, mongo_port, mongo_name, logger
+        @logger = logger
+        client = Mongo::MongoClient.new(mongo_host, mongo_port)
+        raise 'No mongo found' unless client
+        db = client.db(mongo_name)
+        raise 'No mongo db found' unless db
+        @logger.info "Mongo collections " + db.collection_names.join(',')
+        @coll = db.collection('files')
+        raise 'Cannot use collection' unless @coll
 
-    def initialize db_filename, logger
-      @logger = logger
-      @db = SQLite3::Database.new(db_filename, :results_as_hash => true)
-      if (@db.table_info('files') or []) == []
-        Storage.create_schema @db
-      end
-      @shortener = UrlShortener.new(SecureRandom.hex(8))
+        @shortener = UrlShortener.new(SecureRandom.hex(8))
     end
 
     # returns shortened url
@@ -26,37 +30,35 @@ module OmniFiles
         @logger.info "Hashing value " + hashing
         shortened = @shortener.shorten hashing
         counter += 1
-        unique_id = @db.get_first_row("SELECT COUNT(shortened) FROM files WHERE shortened = ?", [shortened])[0] == 0
-      end until unique_id
+        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
     end
 
     def put_file shortened, filename, mime
-      @db.execute("INSERT INTO files (original_filename, shortened, mime, accessed)"+
-        "VALUES ( ?, ?, ?, 0 )",
-        [filename, shortened, mime])
+        doc = { original_filename: filename, shortened: shortened, mime: mime,
+                accessed: { count: 0 }, created: { time: Time.now.utc } }
+        res = @coll.insert(doc)
+        @logger.info "mongo put result: #{res}"
     end
 
     # returns full url
     def get_file shortened
-      data = @db.get_first_row("SELECT * FROM files WHERE shortened = ?", [shortened])
-      if data
-        @db.execute("UPDATE files SET accessed = accessed + 1 WHERE shortened = ?", [shortened])
-      end
-      data
+        @coll.find_one({shortened: shortened})
     end
 
-  private
-    def self.create_schema db
-      db.execute <<-SQL
-      CREATE TABLE files (
-        shortened TEXT NOT NULL,
-        original_filename TEXT,
-        mime TEXT,
-        accessed INTEGER);
-      CREATE INDEX shortened_INDEX ON files (shortened);
-      SQL
+    # returns full url and update statistics
+    def get_file_and_bump shortened
+        data = @coll.find_one({shortened: shortened})
+        return nil unless data
+        @coll.update({ _id: data["_id"]}, {
+            "$inc" =>  { "accessed.count" => 1 },
+            "$set" => { "accessed.time" => Time.now.utc } })
+        @coll.find_one({ _id: data["_id"]})
     end
-  end
 
-end
+end
+
+end

data/lib/omnifiles/version.rb

@@ -1,3 +1,3 @@
 module OmniFiles
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/lib/omnifiles/views/stat.haml

@@ -10,10 +10,14 @@
         %p URL:
         %p Original name:
         %p Access count:
+        %p Accessed at:
+        %p Created at:
         %p MIME:
       .right
         %p
           %a(href=@url) #{@url}
         %p=@original_filename
         %p=@access_count
-        %p=@mime
+        %p=@access_time
+        %p=@created_time
+        %p=@mime

data/omnifiles.gemspec

@@ -23,7 +23,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "sinatra", "~> 1.4.5"
   spec.add_runtime_dependency "sinatra-assetpack", "~> 0.3.3"
   spec.add_runtime_dependency "ruby-filemagic", "~> 0.6.0"
-  spec.add_runtime_dependency "sqlite3", "~> 1.3.10"
+  spec.add_runtime_dependency "mongo", "~> 1.12.0"
+  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 "thin", "~> 1.6.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omnifiles
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - theirix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,19 +81,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.6.0
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: mongo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.10
+        version: 1.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.10
+        version: 1.12.0
+- !ruby/object:Gem::Dependency
+  name: bson_ext
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.12.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement