vedeu 0.4.39 → 0.4.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3d34a0019ef70ca1ee81a8bf5176d18783c8853
-  data.tar.gz: 1e0080a183723d3dbf646e5b85017dc097c4725f
+  metadata.gz: f097662b914c6da5ad5928cf49ed800854dc0062
+  data.tar.gz: ee5e7fc8f279cc4613ae8f1b7df48dd4fb8515bd
 SHA512:
-  metadata.gz: cfef5bc83a89b03ee28dc0fd45ed56fdc271d772eb8656f991a2f4859890dbe64fca1c5b21fac4bd275c05a0b78aef1e3c36a32d82d23e39b1d478ea39279774
-  data.tar.gz: 2209ded0225a88a1a71ef126a89362e6d99ec781d1b97ef662d6e4765a6758ae4445f5ffb95f127e0ace5eea7ce4b7c93a84e93a06b87c9faaa653aa3a826e37
+  metadata.gz: c6faaf146d5888abee75910a14b5c3dd1846a738c7d77b19efe2b4d17b4cdf3747ac2f4db03cd48a0bd7b9131516efe5b135487d6be569f132bcdfba0f7107a6
+  data.tar.gz: 522fd6ec674864207e9244bb8bbb48c9b35fb8c9db218391b195b7481476e7f4d0b32f14cbf0585a7c469db303249ab5b7f1581e9069889782ed5168093d2b66

data/docs/applications.md

@@ -4,26 +4,39 @@ Vedeu has basic tools to generate client application scaffolding, in a similar
 way to Ruby on Rails. Although not nearly as advanced as the Rails equivalent,
 hopefully these generators will get you off the ground.
 
-### Application Structure
+### Generating a new application
 
 |
 |- app_name/
 |   |
     |- app/
-    |   |- controllers
-    |   |- helpers
-    |   |- models
-    |   |    |- keymaps
-    |   |- views
-    |        |- interfaces
-    |        |- templates
+    |   |- controllers/
+    |   |   |- application_controller.rb
+    |   |
+    |   |- helpers/
+    |   |   |- application_helper.rb
+    |   |
+    |   |- models/
+    |   |   |- keymaps/
+    |   |       |- _global_.rb
+    |   |       |- _system_.rb
+    |   |
+    |   |- views/
+    |       |- interfaces/
+    |       |- templates/
     |
-    |- bin
-    |- config
-    |- lib
-    |- test
-    |- vendor
+    |- bin/
+    |   |- app_name
     |
+    |- config/
+    |   |- add_name
+    |   |- configuration.rb
+    |
+    |- lib/
+    |- test/
+    |- vendor/
+    |- application.rb
+    |- Gemfile
 
 To create the application structure as shown above:
 
@@ -101,3 +114,39 @@ in the way you expect.
 This is for third-party code which your application might want to ship with.
 Usually you will include various Ruby gems to provide functionality, but you
 might want to do something special.
+
+
+### Generating a new view
+
+Vedeu also provides a generator to create the files needed for a view. To run
+this, use the following from within the root of the application directory:
+
+    vedeu view view_name
+
+Let's talk about the files it will create and populate:
+
+|
+|- app_name/
+|   |
+    |- app/
+    |   |- controllers/
+    |   |   |- view_name_controller.rb
+    |   |
+    |   |- helpers/
+    |   |   |- view_name_helper.rb
+    |   |
+    |   |- models/
+    |   |   |- keymaps/
+    |   |       |- view_name.rb
+    |   |
+    |   |- views/
+    |       |- interfaces/
+    |       |   |- view_name.rb
+    |       |
+    |       |- templates/
+    |       |   |- view_name.erb
+    |       |
+    |       |- view_name.rb
+    |...
+
+####

data/lib/vedeu/cursor/cursor.rb

@@ -61,13 +61,7 @@ module Vedeu
 
       @attributes = defaults.merge!(attributes)
 
-      @name       = @attributes.fetch(:name)
-      @ox         = @attributes.fetch(:ox)
-      @oy         = @attributes.fetch(:oy)
-      @repository = @attributes.fetch(:repository)
-      @visible    = @attributes.fetch(:visible)
-      @x          = @attributes.fetch(:x)
-      @y          = @attributes.fetch(:y)
+      @attributes.each { |key, value| instance_variable_set("@#{key}", value) }
 
       @position   = Vedeu::Position.new(@y, @x)
     end

data/lib/vedeu/cursor/reposition.rb

@@ -25,7 +25,7 @@ module Vedeu
 
     # @return [Vedeu::Cursor]
     def to
-      result = @entity.new(name: name,
+      result = entity.new(name: name,
                            y:    y_position,
                            x:    x_position,
                            oy:   y,
@@ -63,21 +63,6 @@ module Vedeu
       @coordinate ||= Vedeu::Coordinate.new(name)
     end
 
-    # @return [Vedeu::Cursor]
-    def entity
-      @_entity ||= @entity.new
-    end
-
-    # @return [Vedeu::Cursor]
-    def model
-      @model ||= repository.by_name(name)
-    end
-
-    # @return [Vedeu::Cursors]
-    def repository
-      entity.repository
-    end
-
     # Returns the cursors x position based on the desired x position.
     #
     # @return [Fixnum]

data/lib/vedeu/distributed/subprocess.rb

@@ -48,9 +48,9 @@ module Vedeu
     # @return [Vedeu::TestApplication]
     attr_reader :application
 
-    # @!attribute [rw] pid
+    # @!attribute [r] pid
     # @return [Fixnum]
-    attr_accessor :pid
+    attr_reader :pid
 
     private
 

data/lib/vedeu/events/event.rb

@@ -162,14 +162,6 @@ module Vedeu
     # @return [String]
     attr_reader :name
 
-    # @!attribute [rw] deadline
-    # @return [String]
-    attr_accessor :deadline
-
-    # @!attribute [rw] executed_at
-    # @return [String]
-    attr_accessor :executed_at
-
     private
 
     # Execute the code stored in the event closure.

data/lib/vedeu/generator/templates/application/app/models/keymaps/_global_.rb

@@ -1,2 +1,3 @@
 Vedeu.keymap('_global_') do
+  # see http://www.rubydoc.info/gems/vedeu/Vedeu/DSL/Keymap
 end

data/lib/vedeu/generator/templates/application/app/models/keymaps/_system_.rb

@@ -1,4 +1,5 @@
 Vedeu.keymap('_system_') do
+  # see http://www.rubydoc.info/gems/vedeu/Vedeu/DSL/Keymap
   key('e')        { Vedeu.trigger(:_exit_) }
   key(:esc)       { Vedeu.trigger(:_mode_switch_) }
   key(:shift_tab) { Vedeu.trigger(:_focus_previous_) }

data/lib/vedeu/generator/templates/application/app/models/keymaps/name.erb

@@ -0,0 +1,3 @@
+Vedeu.keymap('<%= object.name %>') do
+  # see http://www.rubydoc.info/gems/vedeu/Vedeu/DSL/Keymap
+end

data/lib/vedeu/generator/view.rb

@@ -34,6 +34,8 @@ module Vedeu
 
         make_helper_file
 
+        make_keymap_file
+
         make_interface_file
 
         make_template_file
@@ -55,6 +57,12 @@ module Vedeu
                   '.' + "/app/helpers/#{name}_helper.rb")
       end
 
+      # @return [void]
+      def make_keymap_file
+        make_file(source + '/app/models/keymaps/name.erb',
+                  '.' + "/app/models/keymaps/#{name}.rb")
+      end
+
       # @return [void]
       def make_interface_file
         make_file(source + '/app/views/interfaces/name.erb',

data/lib/vedeu/geometry/position.rb

@@ -8,12 +8,11 @@ module Vedeu
     # @!attribute [r] y
     # @return [Fixnum]
     attr_reader :y
+    alias_method :first, :y
 
     # @!attribute [r] x
     # @return [Fixnum]
     attr_reader :x
-
-    alias_method :first, :y
     alias_method :last, :x
 
     # Convenience constructor for Vedeu::Position.
@@ -42,12 +41,24 @@ module Vedeu
     #
     # @param y [Fixnum] The row/line position.
     # @param x [Fixnum] The column/character position.
-    # @return [Position]
+    # @return [Vedeu::Position]
     def initialize(y = 1, x = 1)
       @y = (y.nil? || y < 1) ? 1 : y
       @x = (x.nil? || x < 1) ? 1 : x
     end
 
+    # @param other [Vedeu::Position]
+    # @return [Fixnum]
+    def <=>(other)
+      if y == other.y
+        x <=> other.x
+
+      else
+        y <=> other.y
+
+      end
+    end
+
     # An object is equal when its values are the same.
     #
     # @param other [Vedeu::Position]

data/lib/vedeu/input/keymap.rb

@@ -26,9 +26,7 @@ module Vedeu
     def initialize(attributes = {})
       @attributes = defaults.merge!(attributes)
 
-      @attributes.each do |key, value|
-        instance_variable_set("@#{key}", value)
-      end
+      @attributes.each { |key, value| instance_variable_set("@#{key}", value) }
     end
 
     # Add a key to the keymap.

data/lib/vedeu/models/cell.rb

@@ -36,11 +36,9 @@ module Vedeu
     # @option attributes y [NilClass|Fixnum]
     # @return [Vedeu::Cell]
     def initialize(attributes = {})
-      @colour = attributes[:colour]
-      @style  = attributes[:style]
-      @value  = attributes[:value]
-      @x      = attributes[:x]
-      @y      = attributes[:y]
+      @attributes = defaults.merge!(attributes)
+
+      @attributes.each { |key, value| instance_variable_set("@#{key}", value) }
     end
 
     # An object is equal when its values are the same.
@@ -54,6 +52,19 @@ module Vedeu
     end
     alias_method :==, :eql?
 
+    private
+
+    # @return [Hash<Symbol => void>]
+    def defaults
+      {
+        colour: nil,
+        style:  nil,
+        value:  nil,
+        x:      nil,
+        y:      nil,
+      }
+    end
+
   end # Cell
 
 end # Vedeu

data/lib/vedeu/models/char.rb

@@ -14,6 +14,7 @@ module Vedeu
   # @api private
   class Char
 
+    include Comparable
     include Vedeu::Presentation
 
     # @!attribute [rw] border
@@ -137,11 +138,6 @@ module Vedeu
       @to_html ||= Vedeu::HTMLChar.render(self)
     end
 
-    # @return [String]
-    def to_json
-      @to_json ||= JSON.generate(to_hash)
-    end
-
     private
 
     # @return [Hash]

data/lib/vedeu/models/menu.rb

@@ -67,9 +67,7 @@ module Vedeu
     def initialize(attributes = {})
       @attributes = defaults.merge!(attributes)
 
-      @attributes.each do |key, value|
-        instance_variable_set("@#{key}", value)
-      end
+      @attributes.each { |key, value| instance_variable_set("@#{key}", value) }
     end
 
     # Returns the item from the collection which shares the same index as the

data/lib/vedeu/output/border.rb

@@ -115,9 +115,7 @@ module Vedeu
     def initialize(attributes = {})
       @attributes   = defaults.merge!(attributes)
 
-      @attributes.each do |key, value|
-        instance_variable_set("@#{key}", value)
-      end
+      @attributes.each { |key, value| instance_variable_set("@#{key}", value) }
     end
 
     # @return [Fixnum]
@@ -213,13 +211,18 @@ module Vedeu
 
     # Renders the top border for the interface.
     #
+    # @note
+    #   If a title has been specified, then the top border will include this
+    #   title unless the size of the interface is smaller than the padded title
+    #   length.
+    #
     # @return [String]
     def top
       return [] unless top?
 
       out = []
       out << border(top_left, :top_left, *[y, x]) if left?
-      if title?
+      if title? && width > title_characters.size
         out << titlebar
 
       else
@@ -326,7 +329,7 @@ module Vedeu
 
     # @return [Vedeu::Interface]
     def interface
-      @interface ||= Vedeu.interfaces.find(name)
+      @interface ||= Vedeu.interfaces.by_name(name)
     end
 
     # The default values for a new instance of this class.

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

@@ -38,6 +38,7 @@ module Vedeu
       # @!attribute [r] output
       # @return [Array<Array<Vedeu::Char>>]
       attr_reader :output
+      alias_method :parsed, :output
 
       private
 
@@ -57,11 +58,6 @@ module Vedeu
         end
       end
 
-      # @return [String]
-      def parsed
-        @parsed ||= Vedeu::Compressor.render(output)
-      end
-
       # @return [Float]
       def timestamp
         @timestamp ||= Time.now.to_f

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

@@ -5,50 +5,21 @@ module Vedeu
     # Renders a {Vedeu::VirtualBuffer} or {Vedeu::Output} as JSON.
     #
     # @api private
-    class JSON
+    class JSON < Vedeu::Renderers::File
 
-      # @param output [Array<Array<Vedeu::Char>>]
-      # @return [String]
-      def self.render(output)
-        new(output).render
-      end
+      private
 
-      # @param output [Array<Array<Vedeu::Char>>]
-      # @param path [String]
       # @return [String]
-      # def self.to_file(output, path = nil)
-      #   new(output).to_file(path)
-      # end
-
-      # Returns a new instance of Vedeu::Renderers::JSON.
-      #
-      # @param output [Array<Array<Vedeu::Char>>]
-      # @return [Vedeu::Renderers::JSON]
-      def initialize(output)
-        @output = output
-      end
-
-      # @return [String]
-      def render
+      def parsed
         return '' if output.nil? || output.empty?
 
-        out = ''
-        Array(output).each do |line|
-          out << ''
-          line.each do |char|
-            out << char.to_json
-            out << "\n"
-          end
-          out << "\n"
-        end
-        out
+        ::JSON.pretty_generate(sorted)
       end
 
-      protected
-
-      # @!attribute [r] output
-      # @return [Array<Array<Vedeu::Char>>]
-      attr_reader :output
+      # @return [Array]
+      def sorted
+        Array(output).flatten.sort { |a, b| a.position <=> b.position }.map { |char| char.to_hash }
+      end
 
     end # JSON
 

data/lib/vedeu/version.rb

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

data/test/lib/vedeu/buffers/buffer_test.rb

@@ -37,31 +37,13 @@ module Vedeu
       end
     end
 
-    describe '#back' do
+    describe 'accessors' do
       it { instance.must_respond_to(:back) }
-    end
-
-    describe '#back=' do
       it { instance.must_respond_to(:back=) }
-    end
-
-    describe '#front' do
       it { instance.must_respond_to(:front) }
-    end
-
-    describe '#front=' do
       it { instance.must_respond_to(:front=) }
-    end
-
-    describe '#previous' do
       it { instance.must_respond_to(:previous) }
-    end
-
-    describe '#previous=' do
       it { instance.must_respond_to(:previous=) }
-    end
-
-    describe '#name' do
       it { instance.must_respond_to(:name) }
     end
 
@@ -163,11 +145,20 @@ module Vedeu
       subject { instance.hide }
 
       context 'when the interface is visible' do
+        # before do
+        #   Vedeu::Visibility.stubs(:hide)
+        #   instance.stubs(:clear)
+        # end
+        # after do
+        #   Vedeu.interfaces.reset
+        # end
+
         # let(:_name) { 'Buffer#hide' }
-        # let(:interface) { Vedeu.interface('Buffer#hide') {} }
+        # let(:interface) { Vedeu.interface('Buffer') {} }
 
         # it {
         #   Vedeu::Visibility.expects(:hide).with(interface)
+        #   instance.expects(:clear)
         #   subject
         # }
       end
@@ -186,11 +177,22 @@ module Vedeu
       end
 
       context 'when the interface is not visible' do
+        # it { skip }
+
+        # before do
+        #   Vedeu::Visibility.stubs(:show)
+        #   instance.stubs(:render)
+        # end
+        # after do
+        #   Vedeu.interfaces.reset
+        # end
+
         # let(:_name) { 'Buffer#show' }
         # let(:interface) { Vedeu.interface('Buffer#show') {} }
 
         # it {
         #   Vedeu::Visibility.expects(:show).with(interface)
+        #   instance.expects(:render)
         #   subject
         # }
       end

data/test/lib/vedeu/cursor/cursor_test.rb

@@ -39,52 +39,19 @@ module Vedeu
       it { subject.instance_variable_get('@y').must_equal(8) }
     end
 
-    describe '#attributes' do
+    describe 'accessors' do
       it { instance.must_respond_to(:attributes) }
-    end
-
-    describe '#name' do
       it { instance.must_respond_to(:name) }
-    end
-
-    describe '#ox' do
       it { instance.must_respond_to(:ox) }
-    end
-
-    describe '#ox=' do
       it { instance.must_respond_to(:ox=) }
-    end
-
-    describe '#oy' do
       it { instance.must_respond_to(:oy) }
-    end
-
-    describe '#oy=' do
       it { instance.must_respond_to(:oy=) }
-    end
-
-    describe '#state' do
       it { instance.must_respond_to(:state) }
-    end
-
-    describe '#visible' do
       it { instance.must_respond_to(:visible) }
       it { instance.must_respond_to(:visible?) }
-    end
-
-    describe '#x' do
       it { instance.must_respond_to(:x) }
-    end
-
-    describe '#x=' do
       it { instance.must_respond_to(:x=) }
-    end
-
-    describe '#y' do
       it { instance.must_respond_to(:y) }
-    end
-
-    describe '#y=' do
       it { instance.must_respond_to(:y=) }
     end
 

data/test/lib/vedeu/geometry/area_test.rb

@@ -12,7 +12,7 @@ module Vedeu
     let(:xn)        { 21 }
     let(:offset)    { 1 }
 
-    describe 'accessors and aliases' do
+    describe 'accessors' do
       it { instance.must_respond_to(:y) }
       it { instance.must_respond_to(:yn) }
       it { instance.must_respond_to(:x) }

data/test/lib/vedeu/geometry/geometry_test.rb

@@ -51,56 +51,20 @@ module Vedeu
       end
     end
 
-    describe '#centred' do
+    describe 'accessors' do
       it { instance.must_respond_to(:centred) }
-    end
-
-    describe '#centred=' do
       it { instance.must_respond_to(:centred=) }
-    end
-
-    describe '#attributes' do
       it { instance.must_respond_to(:attributes) }
-    end
-
-    describe '#name' do
       it { instance.must_respond_to(:name) }
-    end
-
-    describe '#name=' do
       it { instance.must_respond_to(:name=) }
-    end
-
-    describe '#height=' do
       it { instance.must_respond_to(:height=) }
-    end
-
-    describe '#maximised' do
       it { instance.must_respond_to(:maximised) }
       it { instance.must_respond_to(:maximised?) }
-    end
-
-    describe '#maximised=' do
       it { instance.must_respond_to(:maximised=) }
-    end
-
-    describe '#width=' do
       it { instance.must_respond_to(:width=) }
-    end
-
-    describe '#x=' do
       it { instance.must_respond_to(:x=) }
-    end
-
-    describe '#xn=' do
       it { instance.must_respond_to(:xn=) }
-    end
-
-    describe '#y=' do
       it { instance.must_respond_to(:y=) }
-    end
-
-    describe '#yn=' do
       it { instance.must_respond_to(:yn=) }
     end
 

data/test/lib/vedeu/geometry/index_position_test.rb

@@ -11,11 +11,6 @@ module Vedeu
     let(:oy)        { 3 }
     let(:ox)        { 5 }
 
-    describe 'alias methods' do
-      it { instance.must_respond_to(:first) }
-      it { instance.must_respond_to(:last) }
-    end
-
     describe '#initialize' do
       it { instance.must_be_instance_of(described) }
       it { instance.instance_variable_get('@oy').must_equal(3) }
@@ -55,6 +50,8 @@ module Vedeu
     describe '#y' do
       subject { instance.y }
 
+      it { instance.must_respond_to(:first) }
+
       context 'when iy is <= 0' do
         let(:iy) { -2 }
 
@@ -91,6 +88,8 @@ module Vedeu
     describe '#x' do
       subject { instance.x }
 
+      it { instance.must_respond_to(:last) }
+
       context 'when ix is <= 0' do
         let(:ix) { -2 }
 

data/test/lib/vedeu/geometry/position_test.rb

@@ -9,8 +9,10 @@ module Vedeu
     let(:y)         { 12 }
     let(:x)         { 19 }
 
-    describe 'alias methods' do
+    describe 'accessors' do
+      it { instance.must_respond_to(:y) }
       it { instance.must_respond_to(:first) }
+      it { instance.must_respond_to(:x) }
       it { instance.must_respond_to(:last) }
     end
 
@@ -26,6 +28,14 @@ module Vedeu
       it { instance.must_be_instance_of(described) }
     end
 
+    describe '#<=>' do
+      let(:other) {}
+
+      subject { instance.<=>(other) }
+
+      # it { skip }
+    end
+
     describe '.coerce' do
       let(:_value) {}
 

data/test/lib/vedeu/models/char_test.rb

@@ -42,27 +42,12 @@ module Vedeu
       it { instance.must_respond_to(:value) }
     end
 
-    describe '#border' do
+    describe 'accessors' do
       it { instance.must_respond_to(:border) }
-    end
-
-    describe '#border=' do
       it { instance.must_respond_to(:border=) }
-    end
-
-    describe '#parent' do
       it { instance.must_respond_to(:parent) }
-    end
-
-    describe '#parent=' do
       it { instance.must_respond_to(:parent=) }
-    end
-
-    describe '#attributes' do
       it { instance.must_respond_to(:attributes) }
-    end
-
-    describe '#value=' do
       it { instance.must_respond_to(:value=) }
     end
 
@@ -137,12 +122,6 @@ module Vedeu
       it { subject.must_be_instance_of(String) }
     end
 
-    describe '#to_json' do
-      subject { instance.to_json }
-
-      it { subject.must_be_instance_of(String) }
-    end
-
     describe '#to_s' do
       subject { instance.to_s }
 

data/test/lib/vedeu/models/interface_test.rb

@@ -47,68 +47,23 @@ module Vedeu
       it { subject.instance_variable_get('@zindex').must_equal(zindex) }
     end
 
-    describe '#client' do
+    describe 'accessors' do
       it { instance.must_respond_to(:client) }
-    end
-
-    describe '#client=' do
       it { instance.must_respond_to(:client=) }
-    end
-
-    describe '#delay' do
       it { instance.must_respond_to(:delay) }
-    end
-
-    describe '#delay=' do
       it { instance.must_respond_to(:delay=) }
-    end
-
-    describe '#group' do
       it { instance.must_respond_to(:group) }
-    end
-
-    describe '#group=' do
       it { instance.must_respond_to(:group=) }
-    end
-
-    describe '#name' do
       it { instance.must_respond_to(:name) }
-    end
-
-    describe '#name=' do
       it { instance.must_respond_to(:name=) }
-    end
-
-    describe '#parent' do
       it { instance.must_respond_to(:parent) }
-    end
-
-    describe '#parent=' do
       it { instance.must_respond_to(:parent=) }
-    end
-
-    describe '#zindex' do
       it { instance.must_respond_to(:zindex) }
-    end
-
-    describe '#zindex=' do
       it { instance.must_respond_to(:zindex=) }
-    end
-
-    describe '#visible' do
       it { instance.must_respond_to(:visible) }
       it { instance.must_respond_to(:visible?) }
-    end
-
-    describe '#visible=' do
       it { instance.must_respond_to(:visible=) }
-    end
-
-    describe '#attributes' do
       it { instance.must_respond_to(:attributes) }
-    end
-
-    describe '#lines=' do
       it { instance.must_respond_to(:lines=) }
     end
 

data/test/lib/vedeu/models/menu_test.rb

@@ -50,23 +50,11 @@ module Vedeu
       end
     end
 
-    describe '#collection' do
+    describe 'accessors' do
       it { instance.must_respond_to(:collection) }
-    end
-
-    describe '#collection=' do
       it { instance.must_respond_to(:collection=) }
-    end
-
-    describe '#current=' do
       it { instance.must_respond_to(:current=) }
-    end
-
-    describe '#name' do
       it { instance.must_respond_to(:name) }
-    end
-
-    describe '#name=' do
       it { instance.must_respond_to(:name=) }
     end
 

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

@@ -77,111 +77,36 @@ module Vedeu
       end
     end
 
-    describe '#attributes' do
+    describe 'accessors' do
       it { instance.must_respond_to(:attributes) }
-    end
-
-    describe '#attributes=' do
       it { instance.must_respond_to(:attributes=) }
-    end
-
-    describe '#bottom_left' do
       it { instance.must_respond_to(:bottom_left) }
-    end
-
-    describe '#bottom_left=' do
       it { instance.must_respond_to(:bottom_left=) }
-    end
-
-    describe '#bottom_right' do
       it { instance.must_respond_to(:bottom_right) }
-    end
-
-    describe '#bottom_right=' do
       it { instance.must_respond_to(:bottom_right=) }
-    end
-
-    describe '#horizontal' do
       it { instance.must_respond_to(:horizontal) }
-    end
-
-    describe '#horizontal=' do
       it { instance.must_respond_to(:horizontal=) }
-    end
-
-    describe '#show_bottom' do
       it { instance.must_respond_to(:show_bottom) }
       it { instance.must_respond_to(:bottom?) }
-    end
-
-    describe '#show_bottom=' do
       it { instance.must_respond_to(:show_bottom=) }
-    end
-
-    describe '#show_left' do
       it { instance.must_respond_to(:show_left) }
       it { instance.must_respond_to(:left?) }
-    end
-
-    describe '#show_left=' do
       it { instance.must_respond_to(:show_left=) }
-    end
-
-    describe '#show_right' do
       it { instance.must_respond_to(:show_right) }
       it { instance.must_respond_to(:right?) }
-    end
-
-    describe '#show_right=' do
       it { instance.must_respond_to(:show_right=) }
-    end
-
-    describe '#show_top' do
       it { instance.must_respond_to(:show_top) }
       it { instance.must_respond_to(:top?) }
-    end
-
-    describe '#show_top=' do
       it { instance.must_respond_to(:show_top=) }
-    end
-
-    describe '#title' do
       it { instance.must_respond_to(:title) }
-    end
-
-    describe '#title=' do
       it { instance.must_respond_to(:title=) }
-    end
-
-    describe '#top_left' do
       it { instance.must_respond_to(:top_left) }
-    end
-
-    describe '#top_left=' do
       it { instance.must_respond_to(:top_left=) }
-    end
-
-    describe '#top_right' do
       it { instance.must_respond_to(:top_right) }
-    end
-
-    describe '#top_right=' do
       it { instance.must_respond_to(:top_right=) }
-    end
-
-    describe '#vertical' do
       it { instance.must_respond_to(:vertical) }
-    end
-
-    describe '#vertical=' do
       it { instance.must_respond_to(:vertical=) }
-    end
-
-    describe '#name' do
       it { instance.must_respond_to(:name) }
-    end
-
-    describe '#enabled' do
       it { instance.must_respond_to(:enabled) }
       it { instance.must_respond_to(:enabled?) }
     end

data/test/lib/vedeu/output/clear_test.rb

@@ -33,9 +33,15 @@ module Vedeu
     end
 
     describe '.by_group' do
+      let(:group) {}
+
       subject { described.by_group(group) }
 
       it { described.must_respond_to(:by_group) }
+
+      context 'when no group is given' do
+        it { subject.must_equal(nil) }
+      end
     end
 
     describe '.by_name' do

data/test/lib/vedeu/output/renderers/json_test.rb

@@ -7,16 +7,18 @@ module Vedeu
     describe JSON do
 
       let(:described) { Vedeu::Renderers::JSON }
-      let(:instance)  { described.new(output) }
+      let(:instance)  { described.new(output, options) }
       let(:output)    {}
+      let(:options)   { {} }
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
         it { instance.instance_variable_get('@output').must_equal(output) }
+        it { instance.instance_variable_get('@options').must_equal(options) }
       end
 
       describe '.render' do
-        subject { described.render(output) }
+        subject { described.render(output, options) }
 
         it { subject.must_be_instance_of(String) }
 
@@ -37,15 +39,32 @@ module Vedeu
               ]
             ]
           }
-          it { subject.must_equal(
-            "{\"border\":\"\",\"colour\":{\""                        \
-            "background\":\"\\u001b[48;2;255;255;255m\","            \
-            "\"foreground\":\"\\u001b[38;2;255;0;0m\"},"             \
-            "\"parent\":{\""                                         \
-            "background\":\"\",\"foreground\":\"\",\"style\":\"\"}," \
-            "\"position\":{\"y\":5,\"x\":3},\"style\":\"\","         \
-            "\"value\":\"a\"}\n\n"
-          ) }
+          let(:expected) {
+            <<-eos
+[
+  {
+    \"border\": \"\",
+    \"colour\": {
+      \"background\": \"\\u001b[48;2;255;255;255m\",
+      \"foreground\": \"\\u001b[38;2;255;0;0m\"
+    },
+    \"parent\": {
+      \"background\": \"\",
+      \"foreground\": \"\",
+      \"style\": \"\"
+    },
+    \"position\": {
+      \"y\": 5,
+      \"x\": 3
+    },
+    \"style\": \"\",
+    \"value\": \"a\"
+  }
+]
+            eos
+          }
+
+          it { subject.must_equal(expected.chomp) }
         end
       end
 

data/test/lib/vedeu/output/style_test.rb

@@ -17,11 +17,8 @@ module Vedeu
       it { instance.instance_variable_get('@value').must_equal('bold') }
     end
 
-    describe '#value' do
+    describe 'accessors' do
       it { instance.must_respond_to(:value) }
-    end
-
-    describe '#value=' do
       it { instance.must_respond_to(:value=) }
     end
 

data/test/lib/vedeu/repositories/collection_test.rb

@@ -17,24 +17,12 @@ module Vedeu
       it { instance.instance_variable_get('@parent').must_equal(parent) }
     end
 
-    describe '#collection' do
+    describe 'accessors' do
       it { instance.must_respond_to(:collection) }
       it { instance.must_respond_to(:all) }
-    end
-
-    describe '#parent' do
       it { instance.must_respond_to(:parent) }
-    end
-
-    describe '#parent=' do
       it { instance.must_respond_to(:parent=) }
-    end
-
-    describe '#name' do
       it { instance.must_respond_to(:name) }
-    end
-
-    describe '#name=' do
       it { instance.must_respond_to(:name=) }
     end
 

data/test/support/helpers/model_test_class.rb

@@ -35,19 +35,17 @@ module Vedeu
     def initialize(attributes = {})
       @attributes = defaults.merge!(attributes)
 
-      @colour = @attributes[:colour]
-      @name       = @attributes[:name]
-      @style      = @attributes[:style]
-      @repository = Vedeu::RepositoryTestModule
+      @attributes.each { |key, value| instance_variable_set("@#{key}", value) }
     end
 
     private
 
     def defaults
       {
-        colour: {},
-        name:   '',
-        style:  [],
+        colour:     {},
+        name:       '',
+        repository: Vedeu::RepositoryTestModule,
+        style:      [],
       }
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.4.39
+  version: 0.4.40
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
+date: 2015-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
@@ -385,6 +385,7 @@ files:
 - lib/vedeu/generator/templates/application/app/helpers/name.erb
 - lib/vedeu/generator/templates/application/app/models/keymaps/_global_.rb
 - lib/vedeu/generator/templates/application/app/models/keymaps/_system_.rb
+- lib/vedeu/generator/templates/application/app/models/keymaps/name.erb
 - lib/vedeu/generator/templates/application/app/views/interfaces/name.erb
 - lib/vedeu/generator/templates/application/app/views/name.erb
 - lib/vedeu/generator/templates/application/app/views/templates/name.erb