mdv 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9ea415d5cb925df17d9d4d5b08159c216db759c5649acf495d1193c735f8b3a
-  data.tar.gz: 9102fc4355708e379ba96f00e4630ddcc653d2d32baaf7ee89b01479f8ead804
+  metadata.gz: bec671164b80fa13809af1842d4ea302a388e81a3b51b899e5bd8b34bdd924aa
+  data.tar.gz: c7db8b4304851526efd75310c4a3e4b8c5753da4c6a424569a06a48f424dc3a6
 SHA512:
-  metadata.gz: cd6419ac5e176c461df1284208f147a61bb289a28927aa6342ba2ee3a1bf5df984695a306d22476ad1ae4cd3fa4f3944831451be6814e4641dba01a7c29fc907
-  data.tar.gz: 8b12ad0377ddebd0fffe0c2bd82991ef981e27ced5b5d5be5dbd927dd8ba6cac89fe1a1ef88cd06878341e8b125d408c3b9d5d48338a8ba4e99fcad04b0fb390
+  metadata.gz: 0a119b041b46a789e42402aa6025e77516adfca358c21225b95b1ff6364fd0a212fcddb07387439f4ffd03e2a6c046f3a6e3e76a3cae9ae08c59711273aeb541
+  data.tar.gz: b0852942ed1e080b07742cfe4dc76cc8e5fc49357aac5a17804e02e3debaf113583e3c6d7bef25620a84d042192ec9058f5ad9415f01a3150f72599393ca37c6

data/Changelog.md

@@ -1,5 +1,10 @@
 # Change log
 
+## 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/Gemfile

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

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/Rakefile

@@ -1,25 +1,25 @@
 # frozen_string_literal: true
 
-require 'rake/clean'
-require 'bundler/gem_tasks'
-require 'rake/testtask'
+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.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.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 test: "test:all"
 
-task default: 'test'
+task default: "test"

data/bin/mdv

@@ -1,14 +1,14 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'mdv'
+require "mdv"
 
 Gtk.init
 
-WebKit2Gtk::WebContext.default.set_cache_model :document_viewer
+WebKit2::WebContext.get_default.set_cache_model :document_viewer
 
 file = ARGV[0]
-raise 'Need file' unless file
+raise "Need file" unless file
 
 MDV::MarkdownViewer.new file
 

data/lib/mdv.rb

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

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,7 +1,9 @@
 # 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
@@ -23,41 +25,41 @@ module MDV
     end
 
     def connect_destroy_signal
-      @win.signal_connect('destroy') { Gtk.main_quit }
+      @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?
+      @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
+      when "q".ord
         @win.destroy
-      when 'r'.ord
+      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?
           Gtk.show_uri_on_window(@win, action.request.uri, 0)
           true
         end
-      when 'new-window-action'
+      when :new_window_action
         true
       end
     end
@@ -76,7 +78,7 @@ module MDV
     end
 
     def web_view
-      @web_view ||= WebKit2Gtk::WebView.new
+      @web_view ||= WebKit2::WebView.new
     end
 
     def reload

data/test/end_to_end/basic_run_test.rb

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

data/test/mdv/document_test.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-require_relative '../test_helper'
+require_relative "../test_helper"
 
-require 'mdv/document'
+require "mdv/document"
 
 describe MDV::Document do
-  let(:document) { MDV::Document.new('test/fixtures/test.md') }
+  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"
+  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 +1,3 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require "minitest/autorun"

metadata

@@ -1,99 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: mdv
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-09 00:00:00.000000000 Z
+date: 2019-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: github-markdown
+  name: gir_ffi-gtk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
-  name: github-markup
+  name: github-markdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
-  name: webkit2-gtk
+  name: github-markup
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: gnome_app_driver
+  name: atspi_app_driver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.6.0
 - !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.5'
+        version: '5.12'
 - !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'
+        version: '13.0'
 description: Quickly view markdown files on GNOME
 email:
 - matijs@matijs.net
@@ -126,15 +126,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Simple Markdown Viewer