nesta-plugin-drop 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28b8b250262d052770af11a3ca45e9b6ee8581e8
-  data.tar.gz: 4d37bc6bc62d72e617638724c9f813a594913b6c
+  metadata.gz: 1e8b7961a0cddf63a2411dbc964ffff5e1dcc8dd
+  data.tar.gz: d40d0f0e380e50c23439d0262175aba35a39ca55
 SHA512:
-  metadata.gz: 1eecf269ffcbbb9ad4c45884066f61de628e05cf1ee65062649975b75e9f9984628a0522897fd19ab5e2de8774d1b3ed1937a616da8e9b42be7b51672e705f0a
-  data.tar.gz: d15b735c83a39188ab0ed5f74214c049fa7e6b45dd962075424ef65f8a24404c11127436d0f5e4b7e6d60cf6a74c5996ff4cc5f290e15815736663334b92a223
+  metadata.gz: 02a6c1bd54d946dfce9c14add2a76358c77dc39c486fe3aaa5681cac417ddac9a2cfe838fdc3a35ccbdc2ea7ae3ef54f24cd5f9dff87a487c28b6e4d9eda227b
+  data.tar.gz: 35f5e85fc3dc396c3b381bc3341d1bc7ec00c952661a00e15dbfa6dd947a5d675711b7aa7ce20b8f7054ed430342816da23542a3100525181eb126c2b79dba51

data/lib/nesta-plugin-drop/app.rb

@@ -1,3 +1,4 @@
+require "redcarpet"
 require "nesta-plugin-drop/client"
 require "nesta-plugin-drop/helpers"
 require "nesta-plugin-drop/routes"

data/lib/nesta-plugin-drop/client.rb

@@ -1,6 +1,7 @@
 require 'fileutils'
 require 'rest_client'
 require 'yajl'
+require 'nesta-plugin-drop/logger'
 module Nesta
   module Plugin
     module Drop
@@ -19,6 +20,7 @@ module Nesta
 
         def self.confirm_synced!
           return true if nestadrop_synced?
+          Nesta::Plugin::Drop.logger.debug "NESTADROP: Syncing with Dropbox filesystem."
           File.open("/tmp/.nestadropped", "w+") do |f|
             f.write "synced"
           end
@@ -36,6 +38,7 @@ module Nesta
 
         def self.nestadrop_configured?
           return true if nestadrop_synced?
+          Nesta::Plugin::Drop.logger.debug "NESTADROP: Checking if account is linked to Dropbox."
           json = RestClient.get "#{host}account", {
             accept: :json, x_nestadrop_version: Nesta::Plugin::Drop::VERSION }
           account = Yajl::Parser.parse json
@@ -44,12 +47,13 @@ module Nesta
 
         def self.bounce_server!
           return if syncing?
-          puts "Restarting server..."
+          Nesta::Plugin::Drop.logger.info "NESTADROP: Restarting server..."
           system("bundle exec pumactl -S /tmp/.app_state phased-restart")
         end
 
         def self.files
           lock.synchronize do
+            Nesta::Plugin::Drop.logger.debug "NESTADROP: Retrieving file list..."
             @files ||= Yajl::Parser.parse(RestClient.get "#{host}files", {
               accept: :json, x_nestadrop_version: Nesta::Plugin::Drop::VERSION })
           end
@@ -72,12 +76,13 @@ module Nesta
         def self.cache_file(file)
           confirm_synced!
           local_path = [Nesta::App.root, file].join("/")
-          puts "Caching: #{local_path}"
+          Nesta::Plugin::Drop.logger.debug "NESTADROP: Caching '#{file}' to local filesystem at '#{local_path}'..."
           FileUtils.mkdir_p(File.dirname(local_path))
           file_contents = RestClient.get "#{host}file?file=#{URI.encode(file)}"
           File.open(local_path, 'w') do |fo|
             fo.write file_contents
           end
+          Nesta::Plugin::Drop.logger.debug "NESTADROP: Cached '#{local_path}'."
           bounce_server!
         rescue RuntimeError => ex
           puts ex
@@ -90,12 +95,14 @@ module Nesta
           threads = []
           5.times do
             threads << Thread.new do
+             Nesta::Plugin::Drop.logger.debug "NESTADROP: Creating worker thread to cache files..."
               file = nil
               lock.synchronize do
                 file = self.uncached_files.pop
               end
               cache_file(file) if file
             end
+            Nesta::Plugin::Drop.logger.debug "NESTADROP: Worker thread complete."
           end
           threads.each(&:join)
           @syncing = false
@@ -104,11 +111,13 @@ module Nesta
 
         def self.remove_file(file)
           local_path = [Nesta::App.root, file].join("/")
+          Nesta::Plugin::Drop.logger.debug "NESTADROP: Removing locally cached file at '#{local_path}'."
           FileUtils.rm_r(File.dirname(local_path), secure: true)
           bounce_server!
         end
 
         def self.bootstrap!
+          Nesta::Plugin::Drop.logger.debug "NESTADROP: Bootstrapping local instance..."
           unless nestadrop_synced?
             cache_files
           end

data/lib/nesta-plugin-drop/helpers.rb

@@ -1,3 +1,4 @@
+require 'nesta-plugin-drop/logger'
 module Nesta
   module Plugin
     module Drop
@@ -7,6 +8,7 @@ module Nesta
         end
 
         def setup_nestadrop
+          Nesta::Plugin::Drop.logger.debug "NESTADROP: Redirecting to nestadrop.io to complete account setup."
           redirect to("#{Nesta::Plugin::Drop::Client.host}account/setup?domain=#{request.host}")
         end
 
@@ -16,11 +18,14 @@ module Nesta
         end
 
         def nestadrop_request?
+          Nesta::Plugin::Drop.logger.debug "NESTADROP: Authenticating Dropbox webhook request..."
           expected_user, expected_pass = Client.userinfo
           auth = Rack::Auth::Basic::Request.new(request.env)
           if auth.provided? && auth.basic? && auth.credentials == [expected_user, expected_pass]
+            Nesta::Plugin::Drop.logger.debug "NESTADROP: Authenticated."
             return true
           else
+            Nesta::Plugin::Drop.logger.debug "NESTADROP: Authentication failed."
             return false
           end
         end

data/lib/nesta-plugin-drop/logger.rb

@@ -0,0 +1,21 @@
+require 'logger'
+module Nesta
+  module Plugin
+    module Drop
+      def self.logger
+        return @logger if @logger
+        @logger = Logger.new(STDOUT)
+        @logger.level = Logger::WARN
+        if level = ENV["NESTADROP_LOG_LEVEL"]
+          levels = ["FATAL", "ERROR", "WARN", "INFO", "DEBUG"]
+          if levels.include? level.upcase
+            @logger.level = Logger.const_get(level.upcase.to_sym)
+          else
+            @logger.warn "Log level '#{level.upcase}' is unknown. Supported levels are: #{levels.join(", ")}."
+          end
+        end
+        @logger
+      end
+    end
+  end
+end

data/lib/nesta-plugin-drop/version.rb

@@ -1,7 +1,7 @@
 module Nesta
   module Plugin
     module Drop
-      VERSION = "0.0.2"
+      VERSION = "0.0.3"
     end
   end
 end

data/nesta-plugin-drop.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_runtime_dependency 'nesta', '>= 0.10.0'
+  spec.add_runtime_dependency 'redcarpet', '~> 3.2.2'
   spec.add_runtime_dependency 'rest-client'
   spec.add_runtime_dependency 'yajl-ruby'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nesta-plugin-drop
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Glenn Gillen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.0
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.2
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -97,6 +111,7 @@ files:
 - lib/nesta-plugin-drop/client.rb
 - lib/nesta-plugin-drop/helpers.rb
 - lib/nesta-plugin-drop/init.rb
+- lib/nesta-plugin-drop/logger.rb
 - lib/nesta-plugin-drop/openuri_monkeypatch.rb
 - lib/nesta-plugin-drop/routes.rb
 - lib/nesta-plugin-drop/version.rb