vedeu 0.8.28 → 0.8.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd49dbbe4583758d2452063e9161fec5c9bc4d79
-  data.tar.gz: f4eeeda050db0fc5e52a03dae4bbcc2176073d23
+  metadata.gz: e96b8a38c77ce3d42eefe14913a99fc23c36550d
+  data.tar.gz: d36aef73dfaec573586bf73f12ae96e78173c0a0
 SHA512:
-  metadata.gz: cd89d6b6433e244b82c6333b25b308791c99668cb34af1bb26f559b36e41db0b0ac1409048fa4a1f97914f7f46b05d60171a610cf109e9a963003ea15db91a96
-  data.tar.gz: 33269aa82e2aaf0759c7eb75795e5dd2ed1185fc14c61d14b4aea61eafe52f3b0a92507c0f41ac1bc465967b5ca67cce880e5e068328e346ac11f719b8bfb5ea
+  metadata.gz: d95ae5335653b81832224141bcf2033bee706970da29d1be8f4994f582d9e1674f4fce54c1c80285fca50ab21561aa1e3e0074ddc27f78c2e5e003f125f3775a
+  data.tar.gz: a4aa26a5b71ed54b661920472111a377c1ce47c3bb2df1a84901c1e208699f11b164366a1e19aa5a908b098577a040e00e25ea06a7341a1d68286205ff4b0d1c

data/.travis.yml

@@ -1,7 +1,6 @@
 language: ruby
 rvm:
-  - 2.3.0
+  - 2.3.1
 cache: bundler
 script: 'bundle exec rake'
 sudo: false
-

data/.yardopts

@@ -12,6 +12,7 @@ docs/colours_styles.md
 docs/configuration.md
 docs/cursors.md
 docs/dsl.md
+docs/dsl_elements.md
 docs/events.md
 docs/geometry.md
 docs/getting_started.md
@@ -25,13 +26,13 @@ docs/output.md
 docs/streams.md
 docs/template.md
 docs/view.md
-docs/events/application.md
-docs/events/document.md
-docs/events/drb.md
-docs/events/focus.md
-docs/events/menu.md
-docs/events/movement.md
-docs/events/refresh.md
-docs/events/system.md
-docs/events/view.md
-docs/events/visibility.md
+docs/applications/*.md
+docs/cli/*.md
+docs/configuration/*.md
+docs/dsl/by_method/geometry/*.md
+docs/dsl/by_method/keymap/*.md
+docs/dsl/by_method/view/*.md
+docs/dsl/*.md
+docs/events/by_name/aliases/*.md
+docs/events/by_name/*.md
+docs/events/*.md

data/examples/dsl_horizontal_alignment.rb

@@ -33,7 +33,10 @@ class HorizontalAlignmentApp
             line ""
             line "The 'h', 'j', 'k' and 'l' keys will"
             line "move this view left, down, up, and"
-            line "right respectively."
+            line "right respectively. The coordinates"
+            line "will not change in this example"
+            line "because they have not been"
+            line "instructed to do so."
           end
         end
       end
@@ -145,22 +148,7 @@ class HorizontalAlignmentApp
       end
     end
 
-    view(:centre_interface) do
-      lines do
-        line "x:#{gc.x}, xn:#{gc.xn} (w:#{gc.width})"
-        line "y:#{gc.y}, yn:#{gc.yn} (h:#{gc.height})"
-        line ""
-        line "bx:#{gc.bx}, bxn:#{gc.bxn} (bw:#{gc.width})"
-        line "by:#{gc.by}, byn:#{gc.byn} (bh:#{gc.height})"
-        line ""
-        line "The 'h', 'j', 'k' and 'l' keys will"
-        line "move this view left, down, up, and"
-        line "right respectively. The coordinates"
-        line "will not change in this example"
-        line "because they have not been"
-        line "instructed to do so."
-      end
-    end
+    HorizontalAlignmentApp::CentreHorizontalAlignmentView.new.render
 
     view(:right_interface) do
       lines do

data/examples/dsl_vertical_alignment.rb

@@ -33,7 +33,10 @@ class VerticalAlignmentApp
             line ""
             line "The 'h', 'j', 'k' and 'l' keys will"
             line "move this view left, down, up, and"
-            line "right respectively."
+            line "right respectively. The coordinates"
+            line "will not change in this example"
+            line "because they have not been"
+            line "instructed to do so."
           end
         end
       end
@@ -157,22 +160,7 @@ class VerticalAlignmentApp
       end
     end
 
-    view(:middle_interface) do
-      lines do
-        line "x:#{gc.x}, xn:#{gc.xn} (w:#{gc.width})"
-        line "y:#{gc.y}, yn:#{gc.yn} (h:#{gc.height})"
-        line ""
-        line "bx:#{gc.bx}, bxn:#{gc.bxn} (bw:#{gc.width})"
-        line "by:#{gc.by}, byn:#{gc.byn} (bh:#{gc.height})"
-        line ""
-        line "The 'h', 'j', 'k' and 'l' keys will"
-        line "move this view left, down, up, and"
-        line "right respectively. The coordinates"
-        line "will not change in this example"
-        line "because they have not been"
-        line "instructed to do so."
-      end
-    end
+    VerticalAlignmentApp::CentreVerticalAlignmentView.new.render
 
     view(:bottom_interface) do
       lines do

data/lib/vedeu/dsl/elements.rb

@@ -67,24 +67,22 @@ module Vedeu
         requires_block!(&block)
         requires_model!
 
-        attrs = Vedeu::DSL::Attributes.build(self, model, nil, opts, &block)
-        line  = build_line(attrs, &block)
-        view  = build_view(attrs, &block)
+        attrs = build_attributes(nil, opts, &block)
 
         if view_model?
           if model.lines?
-            model.add(line)
+            model.add(build_line(attrs, &block))
 
           else
-            model.value = view.value
+            model.value = build_view(attrs, &block).value
 
           end
 
         elsif line_model?
-          model.value = line.value
+          model.value = build_line(attrs, &block).value
 
         else
-          model.value = view.value
+          model.value = build_view(attrs, &block).value
 
         end
       end
@@ -116,15 +114,13 @@ module Vedeu
       def line(value = '', opts = {}, &block)
         requires_model!
 
-        attrs = Vedeu::DSL::Attributes.build(self, model, value, opts, &block)
+        attrs = build_attributes(value, opts, &block)
 
         l = if block_given?
               build_line(attrs, &block)
 
             else
-              stream  = new_stream(attrs)
-              streams = Vedeu::Views::Streams.coerce([stream])
-              Vedeu::Views::Line.new(attrs.merge!(value: streams))
+              new_line(attrs)
 
             end
 
@@ -151,9 +147,9 @@ module Vedeu
       def stream(value = '', opts = {}, &block)
         requires_model!
 
-        attrs = Vedeu::DSL::Attributes.build(self, model, value, opts, &block)
+        attrs = build_attributes(value, opts, &block)
 
-        l = if block_given?
+        m = if block_given?
               if view_model?
                 build_line(attrs, &block)
 
@@ -163,14 +159,12 @@ module Vedeu
               end
 
             else
-              stream  = new_stream(attrs)
-              streams = Vedeu::Views::Streams.coerce([stream])
-              Vedeu::Views::Line.new(attrs.merge!(value: streams))
+              new_line(attrs)
 
             end
 
         if view_model? || line_model? || stream_model?
-          model.add(l)
+          model.add(m)
 
         else
           raise Vedeu::Error::Fatal,
@@ -241,19 +235,16 @@ module Vedeu
       def text(value = '', opts = {})
         requires_model!
 
-        attrs   = Vedeu::DSL::Attributes.build(self, model, value, opts)
-        stream  = new_stream(attrs)
-        streams = Vedeu::Views::Streams.coerce([stream])
-        line    = Vedeu::Views::Line.new(attrs.merge!(value: streams))
+        attrs = build_attributes(value, opts)
 
         if view_model?
-          model.add(line)
+          model.add(new_line(attrs))
 
         elsif line_model?
-          model.add(stream)
+          model.add(new_stream(attrs))
 
         elsif stream_model?
-          model.add(stream.value)
+          model.add(new_stream(attrs).value)
 
         else
           raise Vedeu::Error::Fatal,
@@ -265,30 +256,33 @@ module Vedeu
       # @param (see #text)
       # @return (see #text)
       def centre(value = '', opts = {})
-        opts[:align] = :centre
-
-        text(value, opts)
+        text(value, opts.merge(align: :centre))
       end
       alias center centre
 
       # @param (see #text)
       # @return (see #text)
       def left(value = '', opts = {})
-        opts[:align] = :left
-
-        text(value, opts)
+        text(value, opts.merge(align: :left))
       end
 
       # @param (see #text)
       # @return (see #text)
       def right(value = '', opts = {})
-        opts[:align] = :right
-
-        text(value, opts)
+        text(value, opts.merge(align: :right))
       end
 
       private
 
+      # @param value [String] The value for the stream.
+      # @param opts [Hash]
+      # @option opts ... [void]
+      # @macro param_block
+      # @return [Vedeu::DSL::Attributes]
+      def build_attributes(value = '', opts = {}, &block)
+        Vedeu::DSL::Attributes.build(self, model, value, opts, &block)
+      end
+
       # @param attrs [Vedeu::DSL::Attributes]
       # @macro param_block
       # @return [Vedeu::Views::Line]
@@ -310,12 +304,24 @@ module Vedeu
         Vedeu::Views::View.build(attrs, &block)
       end
 
+      # @param attrs [Vedeu::DSL::Attributes]
+      # @return [Vedeu::Views::Line]
+      def new_line(attrs)
+        Vedeu::Views::Line.new(attrs.merge(value: new_streams(attrs)))
+      end
+
       # @param attrs [Vedeu::DSL::Attributes]
       # @return [Vedeu::Views::Stream]
       def new_stream(attrs)
         Vedeu::Views::Stream.new(attrs)
       end
 
+      # @param attrs [Vedeu::DSL::Attributes]
+      # @return [Vedeu::Views::Streams]
+      def new_streams(attrs)
+        Vedeu::Views::Streams.coerce([new_stream(attrs)])
+      end
+
       # @macro param_block
       # @macro raise_requires_block
       # @return [NilClass]

data/lib/vedeu/editor/cropper.rb

@@ -48,7 +48,8 @@ module Vedeu
             out << Vedeu::Cells::Char.new(
               name:     name,
               position: Vedeu::Geometries::Position.new((by + iy), (bx + ix)),
-              value:    char)
+              value:    char
+            )
           end
         end
 

data/lib/vedeu/editor/lines.rb

@@ -85,7 +85,8 @@ module Vedeu
           Vedeu::Editor::Insert.into(collection,
                                      Vedeu::Editor::Line.new,
                                      index,
-                                     size))
+                                     size)
+        )
       end
 
       # Returns the line at the given index.

data/lib/vedeu/interfaces/dsl.rb

@@ -111,8 +111,6 @@ module Vedeu
           eval('self', block.binding) if block_given?
         end
 
-        private
-
         # @macro param_name
         # @return [Boolean]
         def keymap?(name)

data/lib/vedeu/renderers/support/options.rb

@@ -102,7 +102,7 @@ module Vedeu
 
       # @return [String]
       def default_template
-        ::File.dirname(__FILE__) + '/./templates/html_renderer.vedeu'
+        ::File.dirname(__FILE__) + '/../templates/html_renderer.vedeu'
       end
 
       # @return [String]

data/lib/vedeu/templating/helpers.rb

@@ -59,7 +59,9 @@ module Vedeu
           Vedeu::Views::Stream.build(
             colour: Vedeu::Colours::Colour.new(attributes),
             style:  Vedeu::Presentation::Style.new(attributes[:style]),
-            value:  value))
+            value:  value
+          )
+        )
       end
 
       # @param data [String]

data/lib/vedeu/version.rb

@@ -3,6 +3,6 @@
 module Vedeu
 
   # The current version of Vedeu.
-  VERSION = '0.8.28'
+  VERSION = '0.8.29'
 
 end # Vedeu

data/test/support/ttyrec.rb

@@ -2,11 +2,26 @@
 
 # frozen_string_literal: true
 
+# Install 'ttyrec':
+#   sudo apt install ttyrec
 #
-#     ttyrec -a -e ./material_colours_app.rb /tmp/ttyrecord
+# Run 'ttyrec' against an example:
+#   ttyrec -a -e ./examples/material_colours_app.rb /tmp/ttyrecord
 #
+# Parse the recording:
+#   ./ttyrec.rb
+#
+# View the decoded recording:
+#   less /tmp/ttyrecord_decoded
+#
+# or
+#   cat /tmp/ttyrecord_decoded
+#
+
+require 'tmpdir'
 
-ttyrecord = File.binread(Dir.tmpdir + '/ttyrecord')
+tmpdir    = Dir.tmpdir
+ttyrecord = File.binread(tmpdir + '/ttyrecord')
 ttyrecord.force_encoding('BINARY') if ttyrecord.respond_to?(:force_encoding)
 
 offset = 0
@@ -30,7 +45,7 @@ while offset < ttyrecord.size
   offset = data_start + data_length
 end
 
-File.open(Dir.tmpdir + '/ttyrecord_decoded', 'w') do |file|
+File.open(tmpdir + '/ttyrecord_decoded', 'w') do |file|
   chunks.each do |chunk|
     file.write("---\n" + chunk[:data] + "\n")
   end

data/test/support/who.rb

@@ -2,20 +2,28 @@
 
 # frozen_string_literal: true
 
-require 'net/http'
 require 'json'
+require 'net/http'
+require 'uri'
 
 # Find out which projects are currently using Vedeu:
 # (from: http://www.schneems.com/blogs/2015-09-30-reverse-rubygems/)
 
-gem_name = "vedeu"
+gem_name = 'vedeu'
+
+def rubygems_get(gem_name: '', endpoint: '')
+  path = File.join('/api/v1/gems/', gem_name, endpoint).chomp('/') + '.json'
+  uri  = URI('https://rubygems.org' + path)
+  opts = { use_ssl: true }
 
-def rubygems_get(gem_name: "", endpoint: "")
-  path = File.join("/api/v1/gems/", gem_name, endpoint).chomp("/") + ".json"
-  JSON.parse(Net::HTTP.get("rubygems.org", path))
+  response = Net::HTTP.start(uri.host, uri.port, opts) do |http|
+    http.request(Net::HTTP::Get.new(uri))
+  end
+
+  JSON.parse(response.body)
 end
 
-results = rubygems_get(gem_name: gem_name, endpoint: "reverse_dependencies")
+results = rubygems_get(gem_name: gem_name, endpoint: 'reverse_dependencies')
 
 weighted_results = {}
 results.each do |name|
@@ -26,6 +34,5 @@ results.each do |name|
   end
 end
 
-weighted_results.sort {|(k1, v1), (k2, v2)| v2 <=> v1 }.first(50).each_with_index do |(k, v), i|
-  puts "#{i}) #{k}: #{v}"
-end
+weighted_results.sort { |(k1, v1), (k2, v2)| v2 <=> v1 }.first(50).
+  each_with_index { |(k, v), i| puts "#{i}) #{k}: #{v}" }

data/vedeu.gemspec

@@ -21,13 +21,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'guard',              '2.13.0'
+  spec.add_development_dependency 'guard',              '2.14.0'
   spec.add_development_dependency 'guard-minitest',     '2.4.4'
   spec.add_development_dependency 'guard-rubocop',      '1.2.0'
-  spec.add_development_dependency 'minitest',           '5.8.4'
+  spec.add_development_dependency 'minitest',           '5.9.0'
   spec.add_development_dependency 'minitest-reporters', '1.1.9'
   spec.add_development_dependency 'mocha',              '1.1.0'
-  spec.add_development_dependency 'rubocop',            '0.39.0'
+  spec.add_development_dependency 'rubocop',            '0.40.0'
   spec.add_development_dependency 'simplecov',          '0.11.2'
   spec.add_development_dependency 'simplecov-console',  '0.3.0'
   spec.add_development_dependency 'yard',               '0.8.7.6'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.8.28
+  version: 0.8.29
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2016-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.8.4
+        version: 5.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.8.4
+        version: 5.9.0
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.39.0
+        version: 0.40.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.39.0
+        version: 0.40.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement