mdv 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d8ae58018911dd37af67935880a3a18abbb7ffc4
-  data.tar.gz: ddfab34f27ce6af584c4990a06f51e0888906317
+SHA256:
+  metadata.gz: ddd8a0a7b01d6bda74b737a721de8c669ae9e0c98b3013de38eeadf1a5e7f218
+  data.tar.gz: a235ba63ea1d337f543ebe72676104c31ad06949ec73a7a54f73647cfd498aec
 SHA512:
-  metadata.gz: 07b27b674063ce928eceedac586b67c278f4d1ae2f1a937a79490a3e6322fc89f44626c589afb36d76f2212ff98430ff0905608f08c8eaf5c080b58db3fa7a65
-  data.tar.gz: 8e0ca22c3025613ec2e9baf39ef503a0c02cda169541e095a94c544bb7166e1694ec23304dfd21bdabeda1dcfb590b07650a77e1bba1b2160c3c1e79b0bd3756
+  metadata.gz: c74b43702a9884a5ed3cb9d96b40b70c4ddcb32961e47cf0e69cd72e7bf0275605ccbd94648869cbe4d44527d8db4e2bdc6a0313a4bd1fd8acb155c43ba81a94
+  data.tar.gz: 64e4fb4e4abe3b02cd4f51ec7599cd6d3e5401546821d087430a78bf618ece8fea216a7504f75c70314778201ed6d38cef8032bae9a1250578d63c0986b03f43

data/Changelog.md

@@ -1,8 +1,15 @@
 # Change log
 
+## 0.4.0 / 2018-09-12
+
+* Drop support for Ruby 2.2 and lower
+* Update dependencies
+* Hide context menus to prevent unwanted actions
+* Open links in default browser instead of in mdv itself
+
 ## 0.3.1 / 2017-11-11
 
-* Port to Ruby-GNOME2
+* Update dependencies
 
 ## 0.3.0 / 2017-04-25
 
@@ -24,7 +31,7 @@
 
 * Update dependency on GirFFI
 * Update code to use GirFFI's new bitmasks
-* Use updated atspi_app_driver to fix tests
+* Use updated `atspi_app_driver` to fix tests
 
 ## 0.1.6 / 2015-10-17
 
@@ -35,7 +42,7 @@
 
 * Ensure all relevant files are released in the gem
 * Code restructuring
-* Tested end-to-end using atspi_app_driver
+* Tested end-to-end using `atspi_app_driver`
 * Updated dependencies
 
 ## 0.1.4 / 2014-05-27

data/Gemfile

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

data/README.md

@@ -6,7 +6,8 @@ Simple Markdown Viewer for GNOME 3.
 
     mdv README.md
 
-Press Ctrl-R to reload, Ctrl-Q to quit.
+Press Ctrl-R to reload, Ctrl-Q to quit, Ctrl-C to copy selected text. Clicked
+links open in default browser.
 
 ## Install
 
@@ -14,30 +15,14 @@ Press Ctrl-R to reload, Ctrl-Q to quit.
 
 ## Dependencies
 
-MDV needs some additional software installed in order to work.
-
-### Debian
-
-The following should work:
-
-    sudo apt-get install libgirepository1.0-dev gobject-introspection
-    sudo apt-get install libwebkit2gtk-4.0-dev
-
-### Other OS
-
-To be determined. Please contribute back your experience in getting MDV running
-on your favorite operation system.
+MDV depends on the wekit2-gtk gem.
 
 ## Contributing
 
 Contributions are welcome! Please feel free to create issues or pull requests
 on GitHub.
 
-If you want to run the tests, you may need to install additional packages:
-
-    sudo apt-get install gir1.2-atspi-2.0 libatk-adaptor
-
 ## License
 
-Copyright © 2012–2016 [Matijs van Zuijlen](http://www.matijs.net).
+Copyright © 2012–2018 [Matijs van Zuijlen](http://www.matijs.net).
 See LICENSE for details.

data/Rakefile

@@ -1,15 +1,23 @@
+# 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: [:end_to_end]
+  task all: [:unit, :end_to_end]
 end
 
 task test: 'test:all'

data/bin/mdv

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
-require 'github/markup'
+# frozen_string_literal: true
+
 require 'mdv'
 
 Gtk.init

data/lib/mdv.rb

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

data/lib/mdv/document.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'github/markup'
+
+module MDV
+  # Markdown document class
+  class Document
+    def initialize(file)
+      @file = file
+    end
+
+    def base_uri
+      @base_uri ||= "file://#{fullpath}"
+    end
+
+    def html
+      GitHub::Markup.render(fullpath, File.read(fullpath))
+    end
+
+    private
+
+    def fullpath
+      @fullpath ||= File.expand_path(@file, Dir.pwd)
+    end
+  end
+end

data/lib/mdv/markdown_viewer.rb

@@ -1,12 +1,13 @@
+# frozen_string_literal: true
+
 require 'webkit2-gtk'
+require 'mdv/document'
 
 module MDV
   # Markdown viewer window class
   class MarkdownViewer
-    attr_reader :file
-
     def initialize(file)
-      @file = file
+      @document = Document.new(file)
       setup_gui
       reload
       connect_signals
@@ -18,6 +19,7 @@ module MDV
     def connect_signals
       connect_key_press_event_signal
       connect_destroy_signal
+      connect_web_view_signals
     end
 
     def connect_destroy_signal
@@ -31,6 +33,13 @@ module MDV
       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|
+        handle_decide_policy(decision, decision_type)
+      end
+    end
+
     def handle_key(evt)
       case evt.keyval
       when 'q'.ord
@@ -40,6 +49,19 @@ module MDV
       end
     end
 
+    def handle_decide_policy(decision, decision_type)
+      case decision_type.nick
+      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'
+        true
+      end
+    end
+
     def setup_gui
       @win = Gtk::Window.new :toplevel
       @win.set_default_geometry 700, 500
@@ -48,29 +70,17 @@ module MDV
     end
 
     def scrolled_window
-      @scr ||= Gtk::ScrolledWindow.new(nil, nil).tap do |it|
+      @scrolled_window ||= Gtk::ScrolledWindow.new(nil, nil).tap do |it|
         it.add web_view
       end
     end
 
     def web_view
-      @wv ||= WebKit2Gtk::WebView.new
-    end
-
-    def fullpath
-      @fullpath ||= File.expand_path(file, Dir.pwd)
-    end
-
-    def base_uri
-      @base_uri ||= "file://#{fullpath}"
-    end
-
-    def html
-      GitHub::Markup.render(fullpath)
+      @web_view ||= WebKit2Gtk::WebView.new
     end
 
     def reload
-      web_view.load_html html, base_uri
+      web_view.load_html @document.html, @document.base_uri
     end
   end
 end

data/test/end_to_end/basic_run_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../test_helper'
 require 'gnome_app_driver'
 

data/test/mdv/document_test.rb

@@ -0,0 +1,16 @@
+# 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 +1,3 @@
+# frozen_string_literal: true
+
 require 'minitest/autorun'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mdv
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-11 00:00:00.000000000 Z
+date: 2018-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-markdown
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: webkit2-gtk
   requirement: !ruby/object:Gem::Requirement
@@ -109,8 +109,10 @@ files:
 - 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:
@@ -124,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -132,10 +134,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 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