logster 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffac6b3153b63a23916214aa819293b81483ce41
-  data.tar.gz: 3750f61bc3cddfd46bf8069d6a35ac27349cd59c
+  metadata.gz: b21c5ac2f54261afd0a6b2b35bff091e19b8c585
+  data.tar.gz: 2f14a5000271e1017c380379cbcf377025747eda
 SHA512:
-  metadata.gz: a5099353cb310d52c6095703370c29538c20fae71855b9d4c840cfb0f445c97a7d7805a730eb185b88f92b1374cb48995b05233cb291ba2b8800d7bda5c28d53
-  data.tar.gz: 4b0f69413fa4fd45f1d328298aac52232d0578204332263c5b279d64c017c2d09bc9a1d6169095f1e69a5e6c311a0c41742a109e96766d9d44a4df05ee3c3a1e
+  metadata.gz: 423e3ed1d419725174e2593f237274821edcc0b904f7286d7e88f0afccc040a321de66a9d410b6e646b153060f0fd094a54fa46c6387e8f418b1c48a49c50994
+  data.tar.gz: 59143d70c2839be397e98025ae4d66fd4e987e3bc86d7d5c382f851cd4cafa19fc7fc79f7549a85096fa56b8a4ec08cec72221c2fb4857cd2aa5b2bd74eb4856

data/assets/javascript/app.js

@@ -59,12 +59,12 @@ App.Message = Ember.Object.extend({
   },
 
   protect: function() {
-    this.set('saved', true);
+    this.set('protected', true);
     return App.ajax("/protect/" + this.get('key'), { type: "PUT" });
   },
   unprotect: function() {
-    this.set('saved', false);
-    return App.ajax("/protect/" + this.get('key'), { type: "DELETE" });
+    this.set('protected', false);
+    return App.ajax("/unprotect/" + this.get('key'), { type: "DELETE" });
   },
 
   hasMore: function(){
@@ -78,6 +78,10 @@ App.Message = Ember.Object.extend({
     return Logger.rootPath + "/show/" + this.get('key');
   }.property("key"),
 
+  protectUrl: function() {
+    return Logger.rootPath + (this.get('protected') ? '/unprotect/' : '/protect/') + this.get('key');
+  }.property("key"),
+
   displayMessage: function(){
     var message = this.get("message");
     var expanded = this.get("expanded");
@@ -279,16 +283,6 @@ App.ShowRoute = Em.Route.extend({
         resolve(App.Message.create(json));
       }).error(reject);
     });
-  },
-
-  actions: {
-    protect: function(message) {
-      this.get('model').protect();
-    },
-
-    unprotect: function(message) {
-      this.get('model').unprotect();
-    }
   }
 });
 
@@ -370,6 +364,18 @@ App.IndexController = Em.Controller.extend({
   }
 });
 
+App.ShowController = Em.Controller.extend({
+  actions: {
+    protect: function(message) {
+      this.get('model').protect();
+    },
+
+    unprotect: function(message) {
+      this.get('model').unprotect();
+    }
+  }
+});
+
 App.IndexView = Em.View.extend({
   divideView: function(fromTop, win){
     var $win = win || $(window);

data/assets/javascript/components/message-info.handlebars

@@ -4,11 +4,13 @@
       <pre>{{currentMessage.message}}</pre>
       {{#if currentMessage}}
         <a {{bind-attr href=currentMessage.shareUrl}} class="share">Share</a>
-        {{#if currentMessage.saved}}
-            <a {{action unprotect currentMessage}} href class="save">Unprotect</a>
-        {{else}}
-            <a {{action protect currentMessage}} href class="save">Protect</a>
-        {{/if}}
+        <a {{bind-attr href=currentMessage.protectUrl}} class="save">
+          {{#if currentMessage.protected}}
+              Unprotect
+          {{else}}
+              Protect
+          {{/if}}
+        </a>
       {{/if}}
     {{/tab-contents}}
     {{#tab-contents name="backtrace" hint="show backtrace"}}<pre>{{currentMessage.backtrace}}</pre>{{/tab-contents}}

data/assets/javascript/templates/show.handlebars

@@ -1,5 +1,3 @@
-<div id='top-panel'></div>
-<div id="divider"></div>
-<div id="bottom-panel">
+<div id="bottom-panel" class="full">
     {{message-info currentMessage=model}}
 </div>

data/assets/stylesheets/app.css

@@ -100,6 +100,11 @@ tr.show-more {
   font-size: 12px;
 }
 
+#bottom-panel.full {
+    height: 90%;
+    border-top: 2px solid black;
+}
+
 .share {
     position: fixed;
     bottom: 70px;

data/lib/logster/message.rb

@@ -12,7 +12,7 @@ module Logster
       HTTP_X_REAL_IP
     }
 
-    attr_accessor :timestamp, :severity, :progname, :message, :key, :backtrace, :count, :env
+    attr_accessor :timestamp, :severity, :progname, :message, :key, :backtrace, :count, :env, :protected
 
     def initialize(severity, progname, message, timestamp = nil, key = nil)
       @timestamp = timestamp || get_timestamp
@@ -22,6 +22,7 @@ module Logster
       @key = key || SecureRandom.hex
       @backtrace = nil
       @count = 1
+      @protected = false
     end
 
     def to_h
@@ -33,7 +34,8 @@ module Logster
         key: @key,
         backtrace: @backtrace,
         count: @count,
-        env: @env
+        env: @env,
+        protected: @protected
       }
     end
 

data/lib/logster/middleware/viewer.rb

@@ -39,16 +39,27 @@ module Logster
             @fileserver.call(env)
           elsif resource.start_with?("/messages.json")
             serve_messages(Rack::Request.new(env))
-          elsif resource =~ /\/protect\/([0-9a-f]+)$/
-            key = $1
-            if env[REQUEST_METHOD] == "PUT"
-              Logster.store.protect(key)
-              return [200, {"Content-Type" => "text/plain; charset=utf-8"}, ["OK"]]
-            elsif env[REQUEST_METHOD] == "DELETE"
-              Logster.store.unprotect(key)
-              return [200, {"Content-Type" => "text/plain; charset=utf-8"}, ["OK"]]
+          elsif resource =~ /\/(un)?protect\/([0-9a-f]+)$/
+            off = $1 == "un"
+            key = $2
+
+            message = Logster.store.get(key)
+            unless message
+              return [404, {}, ["Message not found"]]
+            end
+
+            if off
+              if Logster.store.unprotect(key)
+                return [301, {"Location" => "#{@logs_path}/show/#{key}?protected=false"}, []]
+              else
+                return [500, {}, ["Failed"]]
+              end
             else
-              return [405, {}, ["Only PUT and DELETE are supported for this URL"]]
+              if Logster.store.protect(key)
+                return [301, {"Location" => "#{@logs_path}/show/#{key}?protected=true"}, []]
+              else
+                return [500, {}, ["Failed"]]
+              end
             end
           elsif resource =~ /\/show\/([0-9a-f]+)(\.json)?$/
             key = $1

data/lib/logster/redis_store.rb

@@ -122,15 +122,18 @@ module Logster
       json = @redis.hget(hash_key, message_key)
       return nil unless json
 
-      Message.from_json(json)
+      message = Message.from_json(json)
+      message.protected = @redis.sismember(protected_key, message_key)
+      message
     end
 
     def protect(message_key)
-      index = find_message(list_key, message_key)
-      # can't save something we already lost
-      return false unless index
+      json = @redis.hget(hash_key, message_key)
+      # Message already lost
+      return false unless json
 
       @redis.sadd(protected_key, message_key)
+
       true
     end
 

data/lib/logster/version.rb

@@ -1,3 +1,3 @@
 module Logster
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

data/test/logster/test_redis_store.rb

@@ -108,10 +108,12 @@ class TestRedisStore < Minitest::Test
 
     # Saved messages still accessible by key
     assert_equal("B", @store.get(b_message.key).message)
+    assert_equal(true, @store.get(b_message.key).protected)
 
     # Unsave does not delete message if still recent
     @store.unprotect c_message.key
     assert_equal("C", @store.get(c_message.key).message)
+    assert_equal(false, @store.get(c_message.key).protected)
 
     # Unsave *does* delete message if not recent
     @store.unprotect b_message.key

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logster
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - UI for viewing logs in Rack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-02 00:00:00.000000000 Z
+date: 2014-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler