mdv 0.4.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9ea415d5cb925df17d9d4d5b08159c216db759c5649acf495d1193c735f8b3a
-  data.tar.gz: 9102fc4355708e379ba96f00e4630ddcc653d2d32baaf7ee89b01479f8ead804
+  metadata.gz: 157742d804cd8625c8c157dba743e9ccaf5e3c22035c44ade34b4cc5f078ab5b
+  data.tar.gz: dc93ca82813f53fff68b46f659c2338250e5703eca326a777da2732c23372b61
 SHA512:
-  metadata.gz: cd6419ac5e176c461df1284208f147a61bb289a28927aa6342ba2ee3a1bf5df984695a306d22476ad1ae4cd3fa4f3944831451be6814e4641dba01a7c29fc907
-  data.tar.gz: 8b12ad0377ddebd0fffe0c2bd82991ef981e27ced5b5d5be5dbd927dd8ba6cac89fe1a1ef88cd06878341e8b125d408c3b9d5d48338a8ba4e99fcad04b0fb390
+  metadata.gz: 88e22ead99dc73e67273d52a6be5b134d36472dfee546bf1812465faf0c56045a9d5af1f4aecd084dcb969a632d70e0baf24e1391a34a5548b9cd0c3cd1a96b1
+  data.tar.gz: 6dcf7e0c5f1b9ddb3a7e61eaed787dd7b5932c84187648c9124cbcd84eb5b224935932e2e39a993e5a79c095d756518c587159183ba06040e60d1c0e373ea853

data/Changelog.md

@@ -1,5 +1,27 @@
 # Change log
 
+## 0.7.0 / 2022-02-11
+
+* Drop support for Ruby 2.5
+* Support Ruby 3.1
+* Update dependencies to allow github-markup version 4.0
+
+## 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
+  loading
+
+## 0.5.0 / 2019-10-20
+
+* Drop support for Ruby 2.3 and lower
+* Port to GirFFI-Gtk
+
 ## 0.4.1 / 2018-12-09
 
 * Update dependencies

data/README.md

@@ -15,7 +15,15 @@ links open in default browser.
 
 ## Dependencies
 
-MDV depends on the wekit2-gtk gem.
+MDV depends on the `gir_ffi-gtk` gem. Additionally, you need to install the
+Webkit2Gtk library and its gobject-introspection information. On Debian and
+Ubuntu, the following should work:
+
+    sudo apt-get install gir1.2-webkit2-4.0
+
+On Ubuntu, you may also have to install two additional packages:
+
+    sudo apt-get install libwebkit2gtk-4.0-dev libjavascriptcoregtk-4.0-dev
 
 ## Contributing
 
@@ -24,5 +32,5 @@ on GitHub.
 
 ## License
 
-Copyright © 2012–2018 [Matijs van Zuijlen](http://www.matijs.net).
+Copyright © 2012–2019 [Matijs van Zuijlen](http://www.matijs.net).
 See LICENSE for details.

data/bin/mdv

@@ -1,15 +1,58 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'mdv'
+require "mdv"
 
-Gtk.init
+myapp = Gtk::Application.new("net.matijs.mdv", handles_open: true)
 
-WebKit2Gtk::WebContext.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/document.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'github/markup'
+require "github/markup"
 
 module MDV
   # Markdown document class

data/lib/mdv/markdown_viewer.rb

@@ -1,72 +1,57 @@
 # frozen_string_literal: true
 
-require 'webkit2-gtk'
-require 'mdv/document'
+require "gir_ffi-gtk3"
+require "mdv/document"
+
+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|
+      web_view.signal_connect("context-menu") { true }
+      web_view.signal_connect("decide-policy") do |_wv, decision, decision_type|
         handle_decide_policy(decision, decision_type)
       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.nick
-      when 'navigation-action'
+      case decision_type
+      when :navigation_action
         action = decision.navigation_action
-        if action.user_gesture?
+        if action.is_user_gesture
           Gtk.show_uri_on_window(@win, action.request.uri, 0)
           true
         end
-      when 'new-window-action'
+      when :new_window_action
         true
       end
     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
@@ -76,7 +61,7 @@ module MDV
     end
 
     def web_view
-      @web_view ||= WebKit2Gtk::WebView.new
+      @web_view ||= WebKit2::WebView.new
     end
 
     def reload

data/lib/mdv/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module MDV
+  VERSION = "0.7.0"
+end

data/lib/mdv.rb

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
 
-require_relative 'mdv/markdown_viewer'
+require_relative "mdv/markdown_viewer"
+require_relative "mdv/version"

metadata

@@ -1,144 +1,264 @@
 --- !ruby/object:Gem::Specification
 name: mdv
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Matijs van Zuijlen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-09 00:00:00.000000000 Z
+date: 2022-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: github-markdown
+  name: gir_ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.15.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.15.7
 - !ruby/object:Gem::Dependency
-  name: github-markup
+  name: gir_ffi-gtk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
-  name: webkit2-gtk
+  name: github-markdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 0.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
-  name: gnome_app_driver
+  name: github-markup
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: atspi_app_driver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.7.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.5'
+        version: '5.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !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.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.5'
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
-description: Quickly view markdown files on GNOME
+        version: '13.0'
+- !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.25.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.25.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.0
+- !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.13.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.13.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
+- lib/mdv/version.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
+  rubygems_mfa_required: 'true'
+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.3.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.3.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,33 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../test_helper'
-require 'gnome_app_driver'
-
-# Test driver for the MDV application.
-class MDVDriver < GnomeAppDriver
-  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
-    @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'