kimurai-dashboard 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d45c04e24e2f570510b38e3027958d190e39cb8cc3991f03925691acc5c0a4cf
-  data.tar.gz: 8833f523ebc1f303d48a5ad9107c0ecc1e33f36d0e0aa987206f13f30508e26a
+  metadata.gz: 4076735ad425281574a5bf8352235ef4afe94be5a9457af82cce178c16baa15d
+  data.tar.gz: c6a6536f7e7e5e2a6e5e73fb02fc3f6d049c0f917a4e7cfe09062b6bbd2d054b
 SHA512:
-  metadata.gz: e12f971ce5e9c6dab110cae9e6975f4ace11ffac1c1a607d855e5d32b2662bdb3619fd08a4921b0f58f90dc30634a18ade29ead57273bcbc8b525c9786e6fc13
-  data.tar.gz: ff659649fb65ab2c7953e9544dc6ea3bc3a0196bd150d812316fb3f9ca8652a667c31c37e6d6a5643ff8804d5f29d3dbd57bc63b13ebc7eb5a05df2401f78833
+  metadata.gz: 245e2444dd1ddf1db5f969a29e57f741a086527f6c511952b16d74dfbf35b8e1f52bc68e7e2cbba3c281bb50bbe4aa37d4be8651db57dd2edb6f49cfbb805255
+  data.tar.gz: 5f3b06c071f15a45f1833f8f11cb603f0c24a12847850d5dbd6a7e6e1159b06ee457616d428e807b812cc6b61bf4a9b91be9753a890f9e4643c103e5ba6f6c18

data/kimurai-dashboard.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = ">= 2.5.0"
 
-  spec.add_dependency "kimurai", "~> 1.2.0"
+  spec.add_dependency "kimurai", ">= 1.3.0"
   spec.add_dependency "sequel"
   spec.add_dependency "sinatra-contrib"
   spec.add_dependency "pagy"

data/lib/kimurai/dashboard.rb

@@ -11,35 +11,35 @@ module Kimurai
 
     DB.create_table?(:sessions) do
       primary_key :id, type: :integer, auto_increment: false
-      string :status
-      datetime :start_time, empty: false
-      datetime :stop_time
-      string :environment
-      integer :concurrent_jobs
-      text :spiders
-      text :error
+      String :status
+      Time :start_time, empty: false
+      Time :stop_time
+      String :environment
+      Integer :concurrent_jobs
+      String :spiders, text: true
+      String :error, text: true
     end
 
-    DB.create_table?(:runs) do
+    DB.create_table?(:spiders) do
       primary_key :id
-      string :spider_name, empty: false
-      string :status
-      string :environment
-      datetime :start_time, empty: false
-      datetime :stop_time
-      float :running_time
-      foreign_key :session_id, :sessions
-      foreign_key :spider_id, :spiders
-      text :visits
-      text :items
-      text :events
-      text :error
-      text :server
+      String :name, empty: false, unique: true
     end
 
-    DB.create_table?(:spiders) do
+    DB.create_table?(:runs) do
       primary_key :id
-      string :name, empty: false, unique: true
+      String :spider_name, empty: false
+      String :status
+      String :environment
+      Time :start_time, empty: false
+      Time :stop_time
+      Float :running_time
+      foreign_key :session_id, :sessions
+      foreign_key :spider_id, :spiders
+      String :visits, text: true
+      String :items, text: true
+      String :events, text: true
+      String :error, text: true
+      String :server, text: true
     end
   end
 end

data/lib/kimurai/dashboard/app.rb

@@ -118,13 +118,7 @@ module Kimurai
         end
 
         get "/:id_or_name" do
-          @spider =
-            if params[:id_or_name].match?(/^(\d)+$/)
-              Spider.find(id: params[:id_or_name].to_i)
-            else
-              Spider.find(name: params[:id_or_name])
-            end
-
+          find_spider
           halt "Error, can't find spider!" unless @spider
 
           @spider_runs = @spider.runs_dataset.reverse_order(:id)
@@ -134,10 +128,32 @@ module Kimurai
             f.html { erb :'spiders/show' }
           end
         end
+
+        get "/:id_or_name/log" do
+          find_spider
+          halt "Error, can't find spider!" unless @spider
+
+          log_name = "./log/#{@spider.name}.log"
+          if File.exists?(log_name)
+            content_type 'text/event-stream'
+            File.readlines(log_name)
+          else
+            halt "There is not log file for this spider yet"
+          end
+        end
       end
 
       private
 
+      def find_spider
+        @spider =
+          if params[:id_or_name].match?(/^(\d)+$/)
+            Spider.find(id: params[:id_or_name].to_i)
+          else
+            Spider.find(name: params[:id_or_name])
+          end
+      end
+
       def pagy_get_vars(collection, vars)
         {
           count: collection.count,

data/lib/kimurai/dashboard/models/session.rb

@@ -23,15 +23,15 @@ module Kimurai::Dashboard
     end
 
     def running_runs
-      runs_dataset.where(status: "running").all
+      runs_dataset.where(status: "running").order(:id).all
     end
 
     def failed_runs
-      runs_dataset.where(status: "failed").all
+      runs_dataset.where(status: "failed").order(:id).all
     end
 
     def completed_runs
-      runs_dataset.where(status: "completed").all
+      runs_dataset.where(status: "completed").order(:id).all
     end
   end
 end

data/lib/kimurai/dashboard/models/spider.rb

@@ -16,5 +16,13 @@ module Kimurai::Dashboard
     def current_state
       running? ? "running" : "stopped"
     end
+
+    def latest_run
+      runs_dataset.last
+    end
+
+    def latest_log
+      #
+    end
   end
 end

data/lib/kimurai/dashboard/version.rb

@@ -1,5 +1,5 @@
 module Kimurai
   module Dashboard
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/lib/kimurai/dashboard/views/spiders/show.erb

@@ -25,12 +25,7 @@
         <tr>
           <th>Latest log</th>
           <td>
-            <% if latest = @spider.runs_dataset.last %>
-              <a target="_blank" href="/runs/<%= latest.id %>/log"><%= latest.spider_name %>.log</a>
-              (run <a href="/runs/<%= latest.id %>">#<%= latest.id %></a>)
-            <% else %>
-              Not available
-            <% end %>
+            <a target="_blank" href="/spiders/<%= @spider.id %>/log"><%= @spider.name %>.log</a>
           </td>
         </tr>
       </tbody>

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: kimurai-dashboard
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Victor Afanasev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-20 00:00:00.000000000 Z
+date: 2018-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kimurai
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement