mdv 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a2cec14c5185dae382cc61022bbdc30b8621644586dbbdba96f825ef9a66215
-  data.tar.gz: 365112da6ecc882062830f5aecd5c4bbd1723f7753a98d3e0ea133ff9010b0e6
+  metadata.gz: cb3eb712bbc1f685d269a4e97421efb66ff9416700159a90ec4cf5d1f24c2d72
+  data.tar.gz: 666ab4a8cc091d8bbe702385e43c6d96017a718a35efe19a131372abf1515b70
 SHA512:
-  metadata.gz: 197d4648bcdb8ae24f038f972cfdb8e57a67e65d44112b3ec8a570ab1f06de2bfbb592e72e8c0618f89ff71a442ff8cc6c61a571849e8b6298d0d7afdbc2f783
-  data.tar.gz: 86acd0e5e657abec6c8f523169e80cee1a642dc42c31dfbb4126180e0cc3b5f60983b8b1140d12cf0cd8bb365c9b642d8881302914bc13fa208c64166207ab97
+  metadata.gz: 6c6cd510080c885c528a62684a1b5571e3798da209bde4bedac13ea780aa0af2c2b37c5bd87a8e38b3770fbcefae7ba79f3731139973a837684e3bcbe85789aa
+  data.tar.gz: c584ebcbd56777548042385e80949bfc4dcd25062ceb8ac57feac63c05d23ba69b9ea8bceae71df47b12857f2356ed7f4c402a2eefd2dd5435ee1a8d60ee9eaf

data/Changelog.md

@@ -1,5 +1,11 @@
 # Change log
 
+## 0.6.0 / 2021-01-17
+
+* Drop support for Ruby 2.4
+* Support Ruby 2.7 and 3.0
+* Implement as a Gtk::Application
+
 ## 0.5.1 / 2019-11-03
 
 * Fix navigation signal handler that would cause program to abort just after

data/bin/mdv

@@ -3,13 +3,57 @@
 
 require "mdv"
 
-Gtk.init
+myapp = Gtk::Application.new("net.matijs.mdv",
+                             { handles_open: true })
 
-WebKit2::WebContext.get_default.set_cache_model :document_viewer
+def make_window(app)
+  win = Gtk::ApplicationWindow.new app
+  close_action = Gio::SimpleAction.new("close", nil)
+  close_action.signal_connect("activate") { win.destroy }
+  win.add_action close_action
+  win
+end
 
-file = ARGV[0]
-raise "Need file" unless file
+myapp.signal_connect "startup" do |app|
+  WebKit2::WebContext.get_default.set_cache_model :document_viewer
 
-MDV::MarkdownViewer.new file
+  action = Gio::SimpleAction.new("quit", nil)
+  action.signal_connect("activate") { app.quit }
+  myapp.add_action action
 
-Gtk.main
+  myapp.set_accels_for_action "app.quit", ["<Ctrl>Q"]
+  myapp.set_accels_for_action "win.close", ["<Ctrl>W"]
+  myapp.set_accels_for_action "win.reload", ["<Ctrl>R"]
+
+  # Add menu so Atspi has a way to access the actions
+  menu = Gio::Menu.new
+  file_menu = Gio::Menu.new
+  file_menu.append "Close Window", "win.close"
+  file_menu.append "Quit", "app.quit"
+  menu.append_submenu "File", file_menu
+  view_menu = Gio::Menu.new
+  view_menu.append "Reload", "win.reload"
+  menu.append_submenu "View", view_menu
+
+  myapp.menubar = menu
+end
+
+myapp.signal_connect "activate" do |app, _user_data|
+  win = make_window(app)
+  win.show_all
+  win.children.first.visible = false
+end
+
+myapp.signal_connect "open" do |app, files, _hint, _user_data|
+  files.each do |file|
+    filename = file.path
+    win = make_window(app)
+    MDV::MarkdownViewer.new win, filename
+    win.show_all
+
+    # This hides the menubar but keeps it available for Atspi
+    win.children.first.visible = false
+  end
+end
+
+exit(myapp.run([$PROGRAM_NAME] + ARGV))

data/lib/mdv/markdown_viewer.rb

@@ -8,33 +8,21 @@ GirFFI.setup :WebKit2, "4.0"
 module MDV
   # Markdown viewer window class
   class MarkdownViewer
-    def initialize(file)
+    def initialize(win, file)
+      @win = win
       @document = Document.new(file)
       setup_gui
+      connect_actions
       reload
       connect_signals
-      @win.show_all
     end
 
     private
 
     def connect_signals
-      connect_key_press_event_signal
-      connect_destroy_signal
       connect_web_view_signals
     end
 
-    def connect_destroy_signal
-      @win.signal_connect("destroy") { Gtk.main_quit }
-    end
-
-    def connect_key_press_event_signal
-      @win.signal_connect "key-press-event" do |_wdg, evt, _ud|
-        handle_key(evt) if evt.state[:control_mask]
-        false
-      end
-    end
-
     def connect_web_view_signals
       web_view.signal_connect("context-menu") { true }
       web_view.signal_connect("decide-policy") do |_wv, decision, decision_type|
@@ -42,15 +30,6 @@ module MDV
       end
     end
 
-    def handle_key(evt)
-      case evt.keyval
-      when "q".ord
-        @win.destroy
-      when "r".ord
-        reload
-      end
-    end
-
     def handle_decide_policy(decision, decision_type)
       case decision_type
       when :navigation_action
@@ -65,10 +44,14 @@ module MDV
     end
 
     def setup_gui
-      @win = Gtk::Window.new :toplevel
-      @win.set_default_geometry 700, 500
-
       @win.add scrolled_window
+      @win.set_default_size 700, 500
+    end
+
+    def connect_actions
+      reload_action = Gio::SimpleAction.new("reload", nil)
+      reload_action.signal_connect("activate") { reload }
+      @win.add_action reload_action
     end
 
     def scrolled_window

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: mdv
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Matijs van Zuijlen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-03 00:00:00.000000000 Z
+date: 2021-01-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: gir_ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.15.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.15.7
 - !ruby/object:Gem::Dependency
   name: gir_ffi-gtk
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.12'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -94,50 +122,135 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
-description: Quickly view markdown files on GNOME
+- !ruby/object:Gem::Dependency
+  name: rake-manifest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.1
+- !ruby/object:Gem::Dependency
+  name: rubocop-packaging
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.9.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.9.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.21.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.21.0
+description: 'Quickly view markdown files on GNOME
+
+  '
 email:
 - matijs@matijs.net
 executables:
 - mdv
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- Changelog.md
+- README.md
 files:
 - Changelog.md
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
 - bin/mdv
 - lib/mdv.rb
 - lib/mdv/document.rb
 - lib/mdv/markdown_viewer.rb
-- test/end_to_end/basic_run_test.rb
-- test/mdv/document_test.rb
-- test/test_helper.rb
 homepage: http://www.github.com/mvz/mdv
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
-rdoc_options: []
+metadata:
+  homepage_uri: http://www.github.com/mvz/mdv
+  source_code_uri: https://github.com/mvz/mdv
+  changelog_uri: https://github.com/mvz/mdv/blob/master/Changelog.md
+post_install_message:
+rdoc_options:
+- "--main"
+- README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Simple Markdown Viewer
-test_files:
-- test/mdv/document_test.rb
-- test/test_helper.rb
-- test/end_to_end/basic_run_test.rb
+test_files: []

data/Gemfile

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-source "https://rubygems.org"
-
-gemspec

data/Rakefile

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require "rake/clean"
-require "bundler/gem_tasks"
-require "rake/testtask"
-
-namespace :test do
-  Rake::TestTask.new(:unit) do |t|
-    t.libs = ["lib"]
-    t.test_files = FileList["test/mdv/*_test.rb"]
-    t.warning = true
-  end
-
-  Rake::TestTask.new(:end_to_end) do |t|
-    t.libs = ["lib"]
-    t.test_files = FileList["test/end_to_end/*_test.rb"]
-    t.warning = true
-  end
-
-  task all: [:unit, :end_to_end]
-end
-
-task test: "test:all"
-
-task default: "test"

data/test/end_to_end/basic_run_test.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "../test_helper"
-require "atspi_app_driver"
-
-# Test driver for the MDV application.
-class MDVDriver < AtspiAppDriver
-  def initialize
-    super "mdv"
-  end
-
-  def boot(filename)
-    super arguments: [filename]
-  end
-end
-
-describe "The MDV application" do
-  before do
-    @driver = MDVDriver.new
-    @driver.boot("README.md")
-  end
-
-  it "starts and can be quit with Ctrl-q" do
-    sleep 1
-    @driver.press_ctrl_q
-
-    status = @driver.cleanup
-    _(status.exitstatus).must_equal 0
-  end
-
-  after do
-    @driver.cleanup
-  end
-end

data/test/mdv/document_test.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "../test_helper"
-
-require "mdv/document"
-
-describe MDV::Document do
-  let(:document) { MDV::Document.new("test/fixtures/test.md") }
-
-  describe "#html" do
-    it "renders the correct html" do
-      _(document.html)
-        .must_equal "<h1>Test</h1>\n\n<p>This is a test document.</p>\n"
-    end
-  end
-end

data/test/test_helper.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-require "minitest/autorun"