vedeu 0.6.36 → 0.6.37

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

@@ -47,7 +47,6 @@ module Vedeu
             x_xn:                 x_xn,
             x_default:            x_default,
             maximised:            maximised,
-            centred:              centred,
             horizontal_alignment: horizontal_alignment,
             vertical_alignment:   vertical_alignment,
           }
@@ -61,7 +60,6 @@ module Vedeu
         let(:x_xn)                 {}
         let(:x_default)            {}
         let(:maximised)            {}
-        let(:centred)              {}
         let(:horizontal_alignment) {}
         let(:vertical_alignment)   {}
 

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

@@ -10,24 +10,20 @@ module Vedeu
       let(:instance)   { described.new(attributes) }
       let(:attributes) {
         {
-          d:                    d,
-          dn:                   dn,
-          d_dn:                 d_dn,
-          default:              default,
-          maximised:            maximised,
-          centred:              centred,
-          horizontal_alignment: horizontal_alignment,
-          vertical_alignment:   vertical_alignment,
+          d:         d,
+          dn:        dn,
+          d_dn:      d_dn,
+          default:   default,
+          maximised: maximised,
+          alignment: alignment,
         }
       }
-      let(:d)                    {}
-      let(:dn)                   {}
-      let(:d_dn)                 {}
-      let(:default)              {}
-      let(:maximised)            {}
-      let(:centred)              {}
-      let(:horizontal_alignment) {}
-      let(:vertical_alignment)   {}
+      let(:d)         {}
+      let(:dn)        {}
+      let(:d_dn)      {}
+      let(:default)   {}
+      let(:maximised) {}
+      let(:alignment) {}
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
@@ -36,9 +32,7 @@ module Vedeu
         it { instance.instance_variable_get('@d_dn').must_equal(d_dn) }
         it { instance.instance_variable_get('@default').must_equal(default) }
         it { instance.instance_variable_get('@maximised').must_equal(maximised) }
-        it { instance.instance_variable_get('@centred').must_equal(centred) }
-        it { instance.instance_variable_get('@horizontal_alignment').must_equal(horizontal_alignment) }
-        it { instance.instance_variable_get('@vertical_alignment').must_equal(vertical_alignment) }
+        it { instance.instance_variable_get('@alignment').must_equal(alignment) }
       end
 
       # describe '.pair' do

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

@@ -89,8 +89,8 @@ module Vedeu
 
           context 'when the height is given' do
             it { subject.must_be_instance_of(Vedeu::Geometry::Geometry) }
-            it { subject.vertical_alignment.must_equal(:top) }
-            it { subject.horizontal_alignment.must_equal(:left) }
+            it { subject.vertical_alignment.must_be_instance_of(Vedeu::Geometry::VerticalAlignment) }
+            it { subject.horizontal_alignment.must_be_instance_of(Vedeu::Geometry::HorizontalAlignment) }
             it { subject.height.must_equal(20) }
             it { subject.width.must_equal(20) }
           end
@@ -115,8 +115,8 @@ module Vedeu
 
           context 'when the width is given' do
             it { subject.must_be_instance_of(Vedeu::Geometry::Geometry) }
-            it { subject.vertical_alignment.must_equal(:top) }
-            it { subject.horizontal_alignment.must_equal(:left) }
+            it { subject.vertical_alignment.must_be_instance_of(Vedeu::Geometry::VerticalAlignment) }
+            it { subject.horizontal_alignment.must_be_instance_of(Vedeu::Geometry::HorizontalAlignment) }
             it { subject.height.must_equal(20) }
             it { subject.width.must_equal(20) }
           end
@@ -277,41 +277,6 @@ module Vedeu
         end
       end
 
-      describe '#centred' do
-        subject { instance.centred(true) }
-
-        it { instance.must_respond_to(:centred!) }
-        it { instance.must_respond_to(:centred=) }
-
-        it 'sets the attribute to the value' do
-          subject.must_equal(true)
-        end
-
-        context 'DSL #centred' do
-          subject {
-            Vedeu.geometry 'geometry' do
-              centred false
-            end
-          }
-
-          it { subject.must_be_instance_of(Vedeu::Geometry::Geometry) }
-
-          it 'allows the use of centred within geometry' do
-            subject.centred.must_equal(false)
-          end
-
-          context 'when no value is given' do
-            subject {
-              Vedeu.geometry 'geometry' do
-                centred
-              end
-            }
-
-            it { subject.centred.must_equal(true) }
-          end
-        end
-      end
-
       describe '#columns' do
         before { Vedeu::Terminal.stubs(:size).returns([25, 80]) }
 

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

@@ -10,7 +10,6 @@ module Vedeu
       let(:instance)   { described.new(attributes) }
       let(:attributes) {
         {
-          centred:              centred,
           client:               client,
           height:               height,
           horizontal_alignment: horizontal_alignment,
@@ -25,7 +24,6 @@ module Vedeu
           yn:                   yn,
         }
       }
-      let(:centred)              { false }
       let(:client)               {}
       let(:height)               {}
       let(:horizontal_alignment) {}
@@ -42,7 +40,6 @@ module Vedeu
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
-        it { instance.instance_variable_get('@centred').must_equal(centred) }
         it { instance.instance_variable_get('@client').must_equal(client) }
         it { instance.instance_variable_get('@height').must_equal(height) }
         it { instance.instance_variable_get('@horizontal_alignment').must_equal(horizontal_alignment) }
@@ -62,8 +59,6 @@ module Vedeu
 
       describe 'accessors' do
         it {
-          instance.must_respond_to(:centred)
-          instance.must_respond_to(:centred=)
           instance.must_respond_to(:name)
           instance.must_respond_to(:name=)
           instance.must_respond_to(:height=)
@@ -259,69 +254,6 @@ module Vedeu
       end
 
       describe '#top, #right, #bottom, #left' do
-        context 'maximised is true' do
-          let(:attributes) { { maximised: true } }
-
-          it { instance.top.must_equal(1) }
-          it { instance.right.must_equal(40) }
-          it { instance.bottom.must_equal(12) }
-          it { instance.left.must_equal(1) }
-        end
-
-        context 'centred is true' do
-          let(:attributes) { { height: 6, width: 18, centred: true } }
-
-          it { instance.top.must_equal(3) }
-          it { instance.right.must_equal(29) }
-          it { instance.bottom.must_equal(9) }
-          it { instance.left.must_equal(11) }
-        end
-
-        context 'centred is true and y is set, y is ignored' do
-          let(:attributes) { { height: 6, width: 18, centred: true, y: 4 } }
-
-          it { instance.top.must_equal(3) }
-          it { instance.right.must_equal(29) }
-          it { instance.bottom.must_equal(9) }
-          it { instance.left.must_equal(11) }
-        end
-
-        context 'centred is true and x is set, x is ignored' do
-          let(:attributes) { { height: 6, width: 18, centred: true, x: 4 } }
-
-          it { instance.top.must_equal(3) }
-          it { instance.right.must_equal(29) }
-          it { instance.bottom.must_equal(9) }
-          it { instance.left.must_equal(11) }
-        end
-
-        context 'centred is false' do
-          let(:attributes) { { height: 6, width: 18 } }
-
-          it { instance.top.must_equal(1) }
-          it { instance.right.must_equal(18) }
-          it { instance.bottom.must_equal(6) }
-          it { instance.left.must_equal(1) }
-        end
-
-        context 'centred is false and y is set' do
-          let(:attributes) { { height: 6, width: 18, y: 4 } }
-
-          it { instance.top.must_equal(4) }
-          it { instance.right.must_equal(18) }
-          it { instance.bottom.must_equal(9) }
-          it { instance.left.must_equal(1) }
-        end
-
-        context 'centred is false and x is set' do
-          let(:attributes) { { height: 6, width: 18, x: 4 } }
-
-          it { instance.top.must_equal(1) }
-          it { instance.right.must_equal(21) }
-          it { instance.bottom.must_equal(6) }
-          it { instance.left.must_equal(4) }
-        end
-
         context 'maximised' do
           let(:attributes) { { maximised: true } }
 

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

@@ -13,6 +13,12 @@ module Vedeu
       describe '.align' do
         subject { described.align(_value) }
 
+        context 'when the value is :none' do
+          let(:_value) { :none }
+
+          it { subject.must_equal(:none) }
+        end
+
         context 'when the value is nil' do
           it { subject.must_equal(:none) }
         end

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

@@ -13,6 +13,12 @@ module Vedeu
       describe '.align' do
         subject { described.align(_value) }
 
+        context 'when the value is :none' do
+          let(:_value) { :none }
+
+          it { subject.must_equal(:none) }
+        end
+
         context 'when the value is nil' do
           it { subject.must_equal(:none) }
         end

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

@@ -15,7 +15,6 @@ module Vedeu
           d_dn:                 d_dn,
           default:              default,
           maximised:            maximised,
-          centred:              centred,
           horizontal_alignment: horizontal_alignment,
           vertical_alignment:   vertical_alignment,
         }
@@ -25,7 +24,6 @@ module Vedeu
       let(:d_dn)                 {}
       let(:default)              { Vedeu.width }
       let(:maximised)            {}
-      let(:centred)              {}
       let(:horizontal_alignment) {}
       let(:vertical_alignment)   {}
 

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

@@ -15,7 +15,6 @@ module Vedeu
           d_dn:                 d_dn,
           default:              default,
           maximised:            maximised,
-          centred:              centred,
           horizontal_alignment: horizontal_alignment,
           vertical_alignment:   vertical_alignment,
         }
@@ -25,7 +24,6 @@ module Vedeu
       let(:d_dn)                 {}
       let(:default)              { Vedeu.height }
       let(:maximised)            {}
-      let(:centred)              {}
       let(:horizontal_alignment) {}
       let(:vertical_alignment)   {}
 

data/test/lib/vedeu/null/generic_test.rb

@@ -43,7 +43,6 @@ module Vedeu
 
         it { subject.must_be_instance_of(FalseClass) }
 
-        it { instance.must_respond_to(:centred) }
         it { instance.must_respond_to(:maximise) }
         it { instance.must_respond_to(:maximised?) }
         it { instance.must_respond_to(:unmaximise) }

data/test/support/examples/drb_app.rb

@@ -67,7 +67,6 @@ class VedeuTestApplication
   end
 
   Vedeu.geometry 'test_interface' do
-    # centred!
     height 6
     width  26
     x      4

data/test/support/examples/hello_world.rb

@@ -25,9 +25,7 @@ class HelloWorldApp
     background '#000000'
     foreground '#00ff00'
     geometry do
-      centred!
-      height   5
-      width    20
+      align(:middle, :centre, 20, 5)
     end
     keymap do
       key('q') { Vedeu.exit }

data/test/support/examples/view_templates_app/view_templates_app.rb

@@ -53,9 +53,7 @@ class VedeuViewTemplateApp
   end
 
   Vedeu.geometry('prune') do
-    centred!
-    height 6
-    width  25
+    align(:middle, :centre, 25, 6)
   end
 
   Vedeu.geometry 'default' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.6.36
+  version: 0.6.37
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-21 00:00:00.000000000 Z
+date: 2015-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -265,6 +265,9 @@ files:
 - docs/api.md
 - docs/borders.md
 - docs/buffer.md
+- docs/cell.md
+- docs/chars.md
+- docs/colours_styles.md
 - docs/configuration.md
 - docs/cursors.md
 - docs/dsl.md
@@ -282,9 +285,14 @@ files:
 - docs/geometry.md
 - docs/getting_started.md
 - docs/group.md
+- docs/input.md
 - docs/interfaces.md
 - docs/keymaps.md
+- docs/lines.md
 - docs/object_graph.md
+- docs/output.md
+- docs/streams.md
+- docs/template.md
 - docs/view.md
 - examples/dsl_alignment.rb
 - examples/dsl_demo_groups.rb