junkie 0.0.8 → 0.0.9

data/junkie.gemspec

@@ -18,14 +18,17 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.required_ruby_version = '>= 1.9.0'
-  gem.add_runtime_dependency(%q<eventmachine>, [">= 1.0"])
-  gem.add_runtime_dependency(%q<em-http-request>, [">= 1.0"])
-  gem.add_runtime_dependency(%q<yajl-ruby>, ["~> 1.1.0"])
-  gem.add_runtime_dependency(%q<nokogiri>, [">= 1.5"])
-  gem.add_runtime_dependency(%q<hashconfig>, [">= 0.0.2"])
-  gem.add_runtime_dependency(%q<serienrenamer>, [">= 0.0.1"])
-  gem.add_runtime_dependency(%q<sjunkieex>, [">= 0.0.1"])
-  gem.add_runtime_dependency(%q<sindex>, [">= 0.0.1"])
-  gem.add_runtime_dependency(%q<logging>, ["~> 1.8.0"])
-  gem.add_runtime_dependency(%q<twitter>, ["~> 4.4.0"])
+  gem.add_runtime_dependency('eventmachine', [">= 1.0"])
+  gem.add_runtime_dependency('em-http-request', [">= 1.0"])
+  gem.add_runtime_dependency('yajl-ruby', ["~> 1.1.0"])
+  gem.add_runtime_dependency('nokogiri', [">= 1.5"])
+  gem.add_runtime_dependency('hashconfig', [">= 0.0.2"])
+  gem.add_runtime_dependency('serienrenamer', [">= 0.0.1"])
+  gem.add_runtime_dependency('sjunkieex', [">= 0.0.1"])
+  gem.add_runtime_dependency('sindex', [">= 0.0.1"])
+  gem.add_runtime_dependency('logging', ["~> 1.8.0"])
+  gem.add_runtime_dependency('twitter', ["~> 4.4.0"])
+  gem.add_runtime_dependency('thin')
+  gem.add_runtime_dependency('sinatra')
+  gem.add_runtime_dependency('sinatra-websocket')
 end

data/lib/junkie/config.rb

@@ -49,7 +49,10 @@ module Junkie
           default_config.merge_with_serialized(Junkie::CONFIG_FILE)
       end
 
-      return @comlete_config[source.class.to_s]
+      class_name = source.class.to_s
+      (class_name = source.to_s) if source.is_a? Class
+
+      return @comlete_config[class_name]
     end
 
 

data/lib/junkie/reactor.rb

@@ -8,6 +8,7 @@ require 'junkie'
 require 'junkie/pyload/api'
 require 'junkie/pyload/observer'
 require 'junkie/errors'
+require 'junkie/webinterface/interface'
 
 module Junkie
 
@@ -27,12 +28,10 @@ module Junkie
 
       log.info("Starting Junkie #{Junkie::VERSION}")
 
-      episode_channel = EM::Channel.new
-      notification_channel = EM::Channel.new
-
       @channels = {
-          episodes: episode_channel,
-          notifications: notification_channel
+          episodes: EM::Channel.new,
+          notifications: EM::Channel.new,
+          info: EM::Channel.new,
       }
 
       @pyload_observer = Junkie::Pyload::Observer.new(@channels)
@@ -96,6 +95,8 @@ module Junkie
           end
         end
 
+        # start the web interface
+        Junkie::Webinterface::Interface.setup(@channels)
       end
     end
   end

data/lib/junkie/version.rb

@@ -1,3 +1,3 @@
 module Junkie
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/junkie/webinterface/interface.rb

@@ -0,0 +1,70 @@
+require 'sinatra/base'
+require 'sinatra-websocket'
+require 'thin'
+
+module Junkie
+  module Webinterface
+
+    # Class that represents the web interface for junkie. It is based on
+    # WebSockets, so that updates are sent to the connected clients.
+    #
+    class Interface < Sinatra::Base
+      include Log, Config
+
+      DEFAULT_CONFIG = {
+        port: 8080,
+      }
+
+      set :server, 'thin'
+
+      def self.setup(channels)
+        @@channels = channels
+        @@config = Config.get_config(self)
+
+        set :port, @@config[:port]
+
+        @@stats = Hash.new
+
+        # every connected client connects to the following channel, so infos
+        # pushed to this channel are transmitted to the clients
+        @@ws_channel = EM::Channel.new
+
+        # subscribe to the channel that holds the stats from various parts of
+        # junkie
+        @@channels[:info].subscribe do |info|
+          @@stats[info[:key]] = info
+          @@ws_channel.push(info)
+        end
+
+        run!
+      end
+
+      get '/' do
+        if !request.websocket?
+          @junkie_version = Junkie::VERSION
+          @server = request.host_with_port
+          erb :index
+        else
+
+          request.websocket do |ws|
+            ws.onopen do
+              log.debug("Opened WebSocket from #{ request.ip }")
+
+              # send all cached stats to the client
+              @@stats.values.each { |s| ws.send(s.to_json) }
+
+              @@ws_channel.subscribe do |info|
+                ws.send(info.to_json)
+              end
+            end
+
+            ws.onclose do
+              log.debug("Closed WebSocket from #{ request.ip }")
+              # TODO unsubscribe from @@ws_channel
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/junkie/webinterface/views/index.erb

@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <title>
+        </title>
+        <link rel="stylesheet" href="https://ajax.aspnetcdn.com/ajax/jquery.mobile/1.2.0/jquery.mobile-1.2.0.min.css" />
+        <style>
+            .bigger {
+                font-size: 100% !important;
+            }
+        </style>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js">
+        </script>
+        <script src="https://ajax.aspnetcdn.com/ajax/jquery.mobile/1.2.0/jquery.mobile-1.2.0.min.js">
+        </script>
+    </head>
+    <body>
+        <!-- Home -->
+        <div data-role="page" id="page1">
+            <div data-theme="a" data-role="header">
+                <h3 id="header_title">
+                    Junkie Webapp (<%= @junkie_version %>)
+                </h3>
+            </div>
+            <div data-role="content">
+                <ul data-role="listview" id="data">
+                    <li data-role="list-divider" id="stats">Stats</li>
+
+                    <li data-role="list-divider">About</li>
+                    <li>Stats Last Updated At<span class="ui-li-count bigger" id="last_update"></span></li>
+                    <li>Junkie Host<span class="ui-li-count bigger" id="last_update"><%= @server %></span></li>
+                </ul>
+            </div>
+        </div>
+    </body>
+
+    <script type="text/javascript">
+
+        function format_stat(stat) {
+            return '<li data-key="' + stat.key +
+                   '"><span class="ui-li-heading">' + stat.key +
+                   '</span><span class="ui-li-desc">' + stat.desc +
+                   '</span><span class="ui-li-count bigger">' + stat.value +
+                   '</span></li>';
+        }
+
+        function addOrUpdateStat(stat) {
+            var statHtml = format_stat(stat);
+            $('li[data-key="' + stat.key + '"]').remove();
+            $(statHtml).insertAfter('#stats');
+            $('#data').listview('refresh');
+        }
+
+        function updateUpdatedAt() {
+            var time = new Date().toTimeString().replace(/.*(\d{2}:\d{2}:\d{2}).*/, "$1");
+            $("#last_update").text(time);
+        }
+
+        $(function () {
+            var ws       = new WebSocket('ws://' + window.location.host + window.location.pathname);
+            ws.onopen    = function()  { console.log('websocket opened'); };
+            ws.onclose   = function()  { console.log('websocket closed'); };
+            ws.onmessage = function(m) {
+                updateUpdatedAt();
+                var obj = $.parseJSON(m.data);
+                addOrUpdateStat(obj);
+            };
+        });
+  </script>
+</html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: junkie
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-19 00:00:00.000000000 Z
+date: 2012-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -171,6 +171,54 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 4.4.0
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra-websocket
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: TV series management application
 email:
 - philipp-boehm@live.de
@@ -200,6 +248,8 @@ files:
 - lib/junkie/pyload/observer.rb
 - lib/junkie/reactor.rb
 - lib/junkie/version.rb
+- lib/junkie/webinterface/interface.rb
+- lib/junkie/webinterface/views/index.erb
 - spec/config_spec.rb
 - spec/environment_spec.rb
 - spec/fixtures/pyload_queue_data.rb