vedeu 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09870ba45d07181770a6a5ce2cb4d76791e4407c
-  data.tar.gz: a8fc2634c87ee748a2ef2088f9ec1e0ffa9bf4a8
+  metadata.gz: adbde558d3cfb0668d3d05c5e21effc821b92ab4
+  data.tar.gz: 1bef10fb655bcbc83cee7796ba12269a114321f9
 SHA512:
-  metadata.gz: f1fa1db173f45c407e2430aa91b34a2ba4e01e7153add82561928c7369fbd16b11ac23f8f21264407f7ea1fd2ff89986a11a1174911e9e85950440286549d93f
-  data.tar.gz: d6520ef6b775f1d5413271fba57b2c28394428fc41af772742c1b92aad2beed4b4c8c72dd939687a3b845465ddb3353e20910fe6cdb22a995ea110f45a7bbefa
+  metadata.gz: 24481b866de7f7aa5042a7575aa0e67bf99dd7230bb1085c22c2334a796309bd5a94095539e54b26d7e1c8bcb9450891d015b4eac65597b630038e619dad54a0
+  data.tar.gz: a8423cfe4e0c26e88e5a3ef60d0ed4f8b5dde4725b4a89492285dad0b1c3dfe0096d9f1a736f9ac7f81491b01d1f7b734cad345a747154e5017a9be4ca8ee56e

data/lib/vedeu/application/controller.rb

@@ -29,7 +29,7 @@ module Vedeu
       def controller(controller_name = nil)
         @controller_name = controller_name
 
-        Vedeu::Router.add_controller(controller_name, ancestors.first.to_s)
+        Vedeu::Router.add_controller(controller_name, ancestors[0].to_s)
       end
       alias_method :controller_name, :controller
 
@@ -72,7 +72,7 @@ module Vedeu
     # @param klass [Class]
     # @return [void]
     def self.included(klass)
-      klass.send :extend, ClassMethods
+      klass.send(:extend, ClassMethods)
     end
 
   end # Controller

data/lib/vedeu/cursor/refresh_cursor.rb

@@ -56,7 +56,7 @@ module Vedeu
 
     # @return [Vedeu::Cursor]
     def new_cursor
-      @new_cursor ||= Vedeu::Cursor.new(cursor.attributes.merge(position))
+      @new_cursor ||= Vedeu::Cursor.new(cursor.attributes.merge!(position))
     end
 
     # @return [Hash<Symbol => Fixnum>]

data/lib/vedeu/dsl/presentation.rb

@@ -56,7 +56,7 @@ module Vedeu
       #   defined colour for a particular interface, line or stream overrides
       #   previously defined entries in the same block.
       #
-      # @param attributes [Hash] See {Vedeu::Colour}
+      # @param attrs [Hash] See {Vedeu::Colour}
       #
       # @example
       #   interface 'my_interface' do
@@ -75,8 +75,8 @@ module Vedeu
       #   end
       #
       # @return [Vedeu::Colour]
-      def colour(attributes = {})
-        model.colour = Vedeu::Colour.coerce(colour_attributes.merge(attributes))
+      def colour(attrs = {})
+        model.colour = Vedeu::Colour.coerce(colour_attributes.merge!(attrs))
       end
 
       # Define a style or styles for an interface, line or a stream.

data/lib/vedeu/dsl/use.rb

@@ -6,40 +6,6 @@ module Vedeu
     #
     module Use
 
-      # Duplicate a stored model.
-      #
-      # This DSL method copies the attributes of a stored model, changes the
-      # name to that of the current model, and stores the duplicate as a new
-      # model in model's repository.
-      #
-      # @example
-      #   # Here the attributes of 'my_geometry' are used to create the
-      #   # new model 'my_other_geometry'.
-      #   Vedeu.geometry 'my_other_geometry' do
-      #     duplicate('my_geometry')
-      #   end
-      #
-      # @note
-      #   - Only models of the same repository can be used in this way.
-      #   - If the stored model cannot be found, the duplicate may not have
-      #     the values you required.
-      #   - Values defined before will be overwritten by the new values from
-      #     the stored model.
-      #   - Values defined after will overwrite the values of the new
-      #     duplicate model.
-      #
-      # @param name [String] The name of the model to duplicate.
-      # @return [void] The new model based on the original.
-      def duplicate(name)
-        original = use(name)
-
-        unless original.respond_to?(:null?)
-          duplicated      = original.dup
-          duplicated.name = model.name
-          duplicated.store
-        end
-      end
-
       # Use the attribute of stored model.
       #
       # This DSL method provides access to a stored model by name. You can

data/lib/vedeu/events/event.rb

@@ -80,7 +80,7 @@ module Vedeu
       def bind(name, options = {}, &block)
         Vedeu.log(type: :event, message: "Binding: '#{name.inspect}'")
 
-        new(name, options, block).bind
+        new(name, block, options).bind
       end
       alias_method :event, :bind
       alias_method :register, :bind
@@ -125,7 +125,7 @@ module Vedeu
     #
     # @param (see Vedeu::Event.bind)
     # @return [Vedeu::Event]
-    def initialize(name, options = {}, closure)
+    def initialize(name, closure, options = {})
       @name         = name
       @options      = options
       @closure      = closure

data/lib/vedeu/events/trigger.rb

@@ -33,7 +33,7 @@ module Vedeu
     # @return [Array]
     def trigger
       if results.one?
-        results.first
+        results[0]
 
       else
         results

data/lib/vedeu/geometry/area.rb

@@ -49,7 +49,7 @@ module Vedeu
                                    maximised: attributes[:maximised],
                                    centred:   attributes[:centred])
 
-      new(y: y_yn.first, yn: y_yn.last, x: x_xn.first, xn: x_xn.last)
+      new(y: y_yn[0], yn: y_yn[-1], x: x_xn[0], xn: x_xn[-1])
     end
 
     # Returns a new instance of Vedeu::Area.

data/lib/vedeu/geometry/dimension.rb

@@ -29,14 +29,14 @@ module Vedeu
     #
     # @return [Fixnum]
     def d1
-      dimension.first < 1 ? 1 : dimension.first
+      dimension[0] < 1 ? 1 : dimension[0]
     end
 
     # Fetch the ending coordinate.
     #
     # @return [Fixnum]
     def d2
-      dimension.last
+      dimension[-1]
     end
 
     # Fetch the coordinates.

data/lib/vedeu/input/input.rb

@@ -113,7 +113,7 @@ module Vedeu
         "\u0024"  => :ctrl_x,
         "\u0025"  => :ctrl_y,
         "\u0026"  => :ctrl_z,
-      }.merge(f_keys)
+      }.merge!(f_keys)
     end
 
     # @return [Hash<String => Symbol]

data/lib/vedeu/log/log.rb

@@ -52,7 +52,9 @@ module Vedeu
 
       # @return [void]
       def close
-        @dev.close rescue nil
+        @dev.close
+      rescue
+        nil
       end
 
       private
@@ -168,7 +170,7 @@ module Vedeu
       # @param body [String] The log message itself.
       # @return [String]
       def message_body(type, body)
-        Vedeu::Esc.send(message_types.fetch(type, :default).last) do
+        Vedeu::Esc.send(message_types.fetch(type, :default)[-1]) do
           body
         end
       end
@@ -179,7 +181,7 @@ module Vedeu
       # @param type [Symbol] The type of log message.
       # @return [String]
       def message_type(type)
-        Vedeu::Esc.send(message_types.fetch(type, :default).first) do
+        Vedeu::Esc.send(message_types.fetch(type, :default)[0]) do
           "[#{type}]".ljust(9)
         end
       end

data/lib/vedeu/models/focus.rb

@@ -70,7 +70,7 @@ module Vedeu
     #
     # @return [String]
     def current
-      storage.first
+      storage[0]
     end
     alias_method :focus, :current
 

data/lib/vedeu/models/interfaces.rb

@@ -21,7 +21,7 @@ module Vedeu
     # @return [Array<Vedeu::Interface>]
     # @see Vedeu::DSL::Interface#zindex
     def zindexed
-      all.sort { |a, b| a.zindex <=> b.zindex }
+      all.sort_by(&:zindex)
     end
 
   end # Interfaces

data/lib/vedeu/models/toggleable.rb

@@ -53,7 +53,7 @@ module Vedeu
       # @param name [String]
       # @return [void]
       def hide(name = nil)
-        model_by_name(name, repository).hide
+        model_by_name(repository, name).hide
       end
       alias_method :hide_cursor,    :hide
       alias_method :hide_group,     :hide
@@ -64,7 +64,7 @@ module Vedeu
       # @param name [String]
       # @return [void]
       def show(name = nil)
-        model_by_name(name, repository).show
+        model_by_name(repository, name).show
       end
       alias_method :show_cursor,    :show
       alias_method :show_group,     :show
@@ -75,7 +75,7 @@ module Vedeu
       # @param name [String]
       # @return [void]
       def toggle(name = nil)
-        model_by_name(name, repository).toggle
+        model_by_name(repository, name).toggle
       end
       alias_method :toggle_cursor,    :toggle
       alias_method :toggle_group,     :toggle
@@ -88,7 +88,7 @@ module Vedeu
       # @param name [String]
       # @param klass [void] The repository of the model.
       # @return [void]
-      def model_by_name(name = nil, klass)
+      def model_by_name(klass, name = nil)
         klass.by_name(name || Vedeu.focus)
       end
 
@@ -100,7 +100,7 @@ module Vedeu
     # @param klass [Class]
     # @return [void]
     def self.included(klass)
-      klass.send :extend, ClassMethods
+      klass.send(:extend, ClassMethods)
     end
 
   end # Toggleable

data/lib/vedeu/null/interface.rb

@@ -31,7 +31,7 @@ module Vedeu
       def initialize(attributes = {})
         @attributes = attributes
         @name       = @attributes[:name]
-        @visible    = @attributes[:visible]
+        @visible    = false
       end
 
       # @return [NilClass]
@@ -56,13 +56,6 @@ module Vedeu
         self
       end
 
-      # The null interface should not be visible.
-      #
-      # @return [FalseClass]
-      def visible?
-        false
-      end
-
     end # Interface
 
   end # Null

data/lib/vedeu/null/view.rb

@@ -31,7 +31,7 @@ module Vedeu
       def initialize(attributes = {})
         @attributes = attributes
         @name       = @attributes[:name]
-        @visible    = @attributes[:visible]
+        @visible    = false
       end
 
       # @return [NilClass]
@@ -53,13 +53,6 @@ module Vedeu
         self
       end
 
-      # The null interface should not be visible.
-      #
-      # @return [FalseClass]
-      def visible?
-        false
-      end
-
     end # View
 
   end # Null

data/lib/vedeu/output/refresh_group.rb

@@ -33,7 +33,7 @@ module Vedeu
 
     # @return [Array<String>]
     def zindexed
-      interfaces.sort { |a, b| a.zindex <=> b.zindex }.map(&:name)
+      interfaces.sort_by(&:zindex).map(&:name)
     end
 
     # @return [Array<Vedeu::Interface>]

data/lib/vedeu/output/renderers/json.rb

@@ -39,7 +39,7 @@ module Vedeu
       # @param output [Array<Array<Vedeu::Views::Char>>]
       # @return [Array]
       def sorted(output)
-        Array(output).flatten.sort { |a, b| a.position <=> b.position }
+        Array(output).flatten.sort_by(&:position)
       end
 
     end # JSON

data/lib/vedeu/repositories/model.rb

@@ -82,7 +82,7 @@ module Vedeu
     # @param klass [Class]
     # @return [void]
     def self.included(klass)
-      klass.send :extend, ClassMethods
+      klass.send(:extend, ClassMethods)
     end
 
     # Returns a DSL instance responsible for defining the DSL methods of this

data/lib/vedeu/repositories/registerable.rb

@@ -63,7 +63,7 @@ module Vedeu
     # @param klass [Class]
     # @return [void]
     def self.included(klass)
-      klass.send :extend, ClassMethods
+      klass.send(:extend, ClassMethods)
     end
 
   end # Registerable

data/lib/vedeu/templating/view_template.rb

@@ -50,7 +50,7 @@ module Vedeu
 
       # @return [Vedeu::Colour|Hash<Symbol => Symbol>]
       def default_colour
-        if interface?
+        if options[:name]
           interface.colour
 
         else
@@ -64,7 +64,7 @@ module Vedeu
 
       # @return [Symbol]
       def default_style
-        if interface?
+        if options[:name]
           interface.style
 
         else
@@ -75,7 +75,7 @@ module Vedeu
 
       # @return [Vedeu::Interface]
       def interface
-        Vedeu.interfaces.by_name(options[:name]) if options[:name]
+        Vedeu.interfaces.by_name(options[:name])
       end
       alias_method :interface?, :interface
 

data/lib/vedeu/terminal.rb

@@ -135,7 +135,7 @@ module Vedeu
     #
     # @return [Fixnum]
     def centre_y
-      centre.first
+      centre[0]
     end
 
     # Returns the `x` (column/character) component of the coodinate tuple
@@ -143,7 +143,7 @@ module Vedeu
     #
     # @return [Fixnum]
     def centre_x
-      centre.last
+      centre[-1]
     end
 
     # Returns 1. This 1 is either the top-most or left-most coordinate of the
@@ -168,7 +168,7 @@ module Vedeu
     def width
       return Vedeu::Configuration.drb_width if Vedeu::Configuration.drb?
 
-      size.last
+      size[-1]
     end
     alias_method :xn, :width
     alias_method :txn, :width

data/lib/vedeu/version.rb

@@ -1,6 +1,6 @@
 module Vedeu
 
   # The current version of Vedeu.
-  VERSION = '0.5.6'
+  VERSION = '0.5.7'
 
 end

data/test/lib/vedeu/bindings_test.rb

@@ -7,14 +7,14 @@ module Vedeu
     let(:described) { Vedeu::Bindings }
 
     describe '.setup!' do
-      before {
+      before do
         Vedeu::Bindings::Application.stubs(:setup!)
         Vedeu::Bindings::Visibility.stubs(:setup!)
         Vedeu::Bindings::Movement.stubs(:setup!)
         Vedeu::Bindings::Menus.stubs(:setup!)
         Vedeu::Bindings::DRB.stubs(:setup!)
         Vedeu::Bindings::System.stubs(:setup!)
-      }
+      end
 
       subject { described.setup! }
 

data/test/lib/vedeu/borders/border_test.rb

@@ -29,9 +29,7 @@ module Vedeu
     }
     let(:geometry) {}
 
-    before {
-      Vedeu.geometries.stubs(:by_name).returns(geometry)
-    }
+    before { Vedeu.geometries.stubs(:by_name).returns(geometry) }
 
     describe '.build' do
       subject {
@@ -422,9 +420,7 @@ module Vedeu
       }
       let(:interface) { Vedeu::Interface.new(visible: visibility) }
 
-      before {
-        Vedeu.interfaces.stubs(:by_name).returns(interface)
-      }
+      before { Vedeu.interfaces.stubs(:by_name).returns(interface) }
 
       subject { instance.render }