vedeu 0.0.32 → 0.0.33

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

@@ -60,10 +60,10 @@ module Vedeu
       it 'returns a tuple when the current has changed' do
         menu.next.items.must_equal(
           [
-            [false, false, "hydrogen"],
-            [false, true,  "carbon"],
-            [false, false, "nitrogen"],
-            [false, false, "oxygen"]
+            [false, false, 'hydrogen'],
+            [false, true,  'carbon'],
+            [false, false, 'nitrogen'],
+            [false, false, 'oxygen']
           ]
         )
       end
@@ -72,10 +72,10 @@ module Vedeu
         menu.next.select
         menu.items.must_equal(
           [
-            [false, false, "hydrogen"],
-            [true,  true,  "carbon"],
-            [false, false, "nitrogen"],
-            [false, false, "oxygen"]
+            [false, false, 'hydrogen'],
+            [true,  true,  'carbon'],
+            [false, false, 'nitrogen'],
+            [false, false, 'oxygen']
           ]
         )
       end
@@ -86,10 +86,10 @@ module Vedeu
         menu.next.next
         menu.items.must_equal(
           [
-            [false, false, "hydrogen"],
-            [true,  false, "carbon"],
-            [false, false, "nitrogen"],
-            [false, true,  "oxygen"]
+            [false, false, 'hydrogen'],
+            [true,  false, 'carbon'],
+            [false, false, 'nitrogen'],
+            [false, true,  'oxygen']
           ]
         )
       end
@@ -98,20 +98,20 @@ module Vedeu
     describe '#render' do
       it 'returns a tuple' do
         menu.render.must_equal(
-          [" > hydrogen", "   carbon", "   nitrogen", "   oxygen"]
+          [' > hydrogen', '   carbon', '   nitrogen', '   oxygen']
         )
       end
 
       it 'returns a tuple when the current has changed' do
         menu.next.render.must_equal(
-          ["   hydrogen", " > carbon", "   nitrogen", "   oxygen"]
+          ['   hydrogen', ' > carbon', '   nitrogen', '   oxygen']
         )
       end
 
       it 'returns a tuple when an item is selected' do
         menu.next.select
         menu.render.must_equal(
-          ["   hydrogen", "*> carbon", "   nitrogen", "   oxygen"]
+          ['   hydrogen', '*> carbon', '   nitrogen', '   oxygen']
         )
       end
 
@@ -120,7 +120,7 @@ module Vedeu
         menu.next.select
         menu.next.next
         menu.render.must_equal(
-          ["   hydrogen", "*  carbon", "   nitrogen", " > oxygen"]
+          ['   hydrogen', '*  carbon', '   nitrogen', ' > oxygen']
         )
       end
     end

data/test/lib/vedeu/support/parsing/hash_parser_test.rb

@@ -6,14 +6,14 @@ module Vedeu
     describe '.parse' do
       it 'returns a Hash when the output is content for multiple interfaces' do
         HashParser.parse({
-          test: 'Some content...',
+          test:  'Some content...',
           dummy: 'More content...'
         }).must_equal({
           interfaces: [
-            { name: "test", lines:  [
-              { streams: { text: "Some content..." } }] },
-            { name: "dummy", lines: [
-              { streams: { text: "More content..." } }] }
+            { name: 'test', lines:  [
+              { streams: { text: 'Some content...' } }] },
+            { name: 'dummy', lines: [
+              { streams: { text: 'More content...' } }] }
           ]
         })
       end
@@ -23,8 +23,8 @@ module Vedeu
           dummy: 'Some content...'
         }).must_equal({
           interfaces: [
-            { name: "dummy", lines: [
-              { streams: { text: "Some content..." } }] }
+            { name: 'dummy', lines: [
+              { streams: { text: 'Some content...' } }] }
           ]
         })
       end

data/test/lib/vedeu/support/parsing/json_parser_test.rb

@@ -10,7 +10,7 @@ module Vedeu
       end
 
       it 'returns an empty hash when the JSON is invalid' do
-        JSONParser.parse("{ invalid JSON }").must_be_instance_of(Hash)
+        JSONParser.parse('{ invalid JSON }').must_be_instance_of(Hash)
       end
     end
   end

data/test/lib/vedeu/support/terminal_test.rb

@@ -54,13 +54,6 @@ module Vedeu
       end
     end
 
-    describe '.open' do
-      it 'returns a NilClass' do
-        skip
-        Terminal.open.must_be_instance_of(NilClass)
-      end
-    end
-
     describe '.console' do
       it 'returns the console' do
         console = IO.console

data/test/lib/vedeu_test.rb

@@ -2,9 +2,4 @@ require_relative '../test_helper'
 require_relative '../../lib/vedeu'
 
 describe Vedeu do
-  describe '.logger' do
-    it 'needs a spec, please write one.' do
-      skip
-    end
-  end
 end

data/test/test_helper.rb

@@ -1,4 +1,5 @@
 require 'simplecov'
+require 'pry'
 require 'minitest/autorun'
 require 'minitest/pride'
 require 'minitest/hell'

data/vedeu.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'vedeu'
-  spec.version       = '0.0.32'
+  spec.version       = '0.0.33'
   spec.authors       = ['Gavin Laking']
   spec.email         = ['gavinlaking@gmail.com']
   spec.summary       = %q{A terminal case of wonderland.}
@@ -24,8 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry',                '0.10.0'
   spec.add_development_dependency 'rake',               '10.3.2'
   spec.add_development_dependency 'ruby-prof',          '0.15.1'
-  spec.add_development_dependency 'simplecov',          '0.8.2'
+  spec.add_development_dependency 'simplecov',          '0.9.0'
 
-  spec.add_dependency 'oj',     '2.9.9'
   spec.add_dependency 'virtus', '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.33
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,28 +128,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.2
-- !ruby/object:Gem::Dependency
-  name: oj
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.9.9
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.9.9
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement
@@ -197,7 +183,7 @@ files:
 - lib/vedeu/models/presentation.rb
 - lib/vedeu/models/stream.rb
 - lib/vedeu/models/stream_collection.rb
-- lib/vedeu/models/style_collection.rb
+- lib/vedeu/models/style.rb
 - lib/vedeu/output/interface_renderer.rb
 - lib/vedeu/output/output.rb
 - lib/vedeu/output/template.rb
@@ -211,7 +197,6 @@ files:
 - lib/vedeu/support/coordinate.rb
 - lib/vedeu/support/esc.rb
 - lib/vedeu/support/exit.rb
-- lib/vedeu/support/geometry.rb
 - lib/vedeu/support/menu.rb
 - lib/vedeu/support/parser.rb
 - lib/vedeu/support/parsing/hash_parser.rb
@@ -238,7 +223,7 @@ files:
 - test/lib/vedeu/models/presentation_test.rb
 - test/lib/vedeu/models/stream_collection_test.rb
 - test/lib/vedeu/models/stream_test.rb
-- test/lib/vedeu/models/style_collection_test.rb
+- test/lib/vedeu/models/style_test.rb
 - test/lib/vedeu/output/interface_renderer_test.rb
 - test/lib/vedeu/output/output_test.rb
 - test/lib/vedeu/output/template.rb
@@ -252,7 +237,6 @@ files:
 - test/lib/vedeu/support/esc_test.rb
 - test/lib/vedeu/support/event_repository_test.rb
 - test/lib/vedeu/support/exit_test.rb
-- test/lib/vedeu/support/geometry_test.rb
 - test/lib/vedeu/support/menu_test.rb
 - test/lib/vedeu/support/parser_test.rb
 - test/lib/vedeu/support/parsing/hash_parser_test.rb
@@ -320,7 +304,7 @@ test_files:
 - test/lib/vedeu/models/presentation_test.rb
 - test/lib/vedeu/models/stream_collection_test.rb
 - test/lib/vedeu/models/stream_test.rb
-- test/lib/vedeu/models/style_collection_test.rb
+- test/lib/vedeu/models/style_test.rb
 - test/lib/vedeu/output/interface_renderer_test.rb
 - test/lib/vedeu/output/output_test.rb
 - test/lib/vedeu/output/template.rb
@@ -334,7 +318,6 @@ test_files:
 - test/lib/vedeu/support/esc_test.rb
 - test/lib/vedeu/support/event_repository_test.rb
 - test/lib/vedeu/support/exit_test.rb
-- test/lib/vedeu/support/geometry_test.rb
 - test/lib/vedeu/support/menu_test.rb
 - test/lib/vedeu/support/parser_test.rb
 - test/lib/vedeu/support/parsing/hash_parser_test.rb
@@ -359,4 +342,3 @@ test_files:
 - test/support/json/int2_lin2_str3_styles.json
 - test/support/template.erb
 - test/test_helper.rb
-has_rdoc: 

data/lib/vedeu/models/style_collection.rb

@@ -1,19 +0,0 @@
-require 'virtus'
-
-require_relative '../support/esc'
-
-module Vedeu
-  class StyleCollection < Virtus::Attribute
-    def coerce(values)
-      return '' if values.nil? || values.empty?
-
-      if values.is_a?(::Array)
-        values.map { |value| Esc.string(value) }.join
-
-      elsif values.is_a?(::String)
-        Esc.string(values)
-
-      end
-    end
-  end
-end

data/lib/vedeu/support/geometry.rb

@@ -1,62 +0,0 @@
-require_relative 'esc'
-require_relative 'terminal'
-
-module Vedeu
-  class Geometry
-    def initialize(interface)
-      @interface = interface
-    end
-
-    def origin(index = 0)
-      Esc.set_position(virtual_y(index), virtual_x)
-    end
-
-    private
-
-    attr_reader :interface
-
-    def virtual_x(index = 0)
-      ((x..max_x).to_a)[index]
-    end
-
-    def virtual_y(index = 0)
-      ((y..max_y).to_a)[index]
-    end
-
-    def max_y
-      if (y + height) > Terminal.height
-        Terminal.height
-
-      else
-        (y + height)
-
-      end
-    end
-
-    def max_x
-      if (x + width) > Terminal.width
-        Terminal.width
-
-      else
-        (x + width)
-
-      end
-    end
-
-    def height
-      interface.height
-    end
-
-    def width
-      interface.width
-    end
-
-    def x
-      interface.x
-    end
-
-    def y
-      interface.y
-    end
-  end
-end

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

@@ -1,13 +0,0 @@
-require_relative '../../../test_helper'
-require_relative '../../../../lib/vedeu/models/style_collection'
-require_relative '../../../../lib/vedeu/models/stream'
-
-module Vedeu
-  describe StyleCollection do
-    describe '#coerce' do
-      it 'returns an empty string' do
-        Stream.new({ style: {} }).style.must_equal('')
-      end
-    end
-  end
-end

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

@@ -1,107 +0,0 @@
-require_relative '../../../test_helper'
-require_relative '../../../../lib/vedeu/support/geometry'
-require_relative '../../../../lib/vedeu/models/interface'
-
-module Vedeu
-  describe Geometry do
-    describe '#origin' do
-      it 'returns the origin for the interface' do
-        interface = Interface.new({
-          name:   'dummy',
-          width:  5,
-          height: 5,
-          x:      1,
-          y:      1,
-          z:      1
-        })
-        Geometry.new(interface).origin.must_equal("\e[1;1H")
-      end
-
-      it 'returns the line position relative to the origin' do
-        interface = Interface.new({
-          name:   'dummy',
-          width:  5,
-          height: 5,
-          x:      1,
-          y:      1,
-          z:      1
-        })
-        Geometry.new(interface).origin(3).must_equal("\e[4;1H")
-      end
-
-      it 'returns the origin for the interface when the interface is at a custom position' do
-        interface = Interface.new({
-          name:   'dummy',
-          width:  5,
-          height: 5,
-          x:      3,
-          y:      6,
-          z:      1
-        })
-        Geometry.new(interface).origin.must_equal("\e[6;3H")
-      end
-
-      it 'returns the line position relative to the origin when the interface is at a custom position' do
-        interface = Interface.new({
-          name:   'dummy',
-          width:  5,
-          height: 5,
-          x:      3,
-          y:      6,
-          z:      1
-        })
-        Geometry.new(interface).origin(3).must_equal("\e[9;3H")
-      end
-
-      it 'clips the maximum height to the terminal height when the height is more than the terminal height' do
-        skip
-        interface = Interface.new({
-          name:   'dummy',
-          width:  5,
-          height: 6,
-          x:      1,
-          y:      20,
-          z:      1
-        })
-        Geometry.new(interface).origin.must_equal("\e[1;1H")
-      end
-
-      it 'returns the value when the height is less than the terminal height' do
-        skip
-        interface = Interface.new({
-          name:   'dummy',
-          width:  5,
-          height: 2,
-          x:      1,
-          y:      20,
-          z:      1
-        })
-        Geometry.new(interface).origin.must_equal("\e[1;1H")
-      end
-
-      it 'clips the maximum width to the terminal width when the width is more than the terminal width' do
-        interface = Interface.new({
-          name:   'dummy',
-          width:  20,
-          height: 5,
-          x:      30,
-          y:      1,
-          z:      1
-        })
-        Geometry.new(interface).origin.must_equal("\e[1;30H")
-      end
-
-      it 'returns the value when the width is less than the terminal width' do
-        interface = Interface.new({
-          name:   'dummy',
-          width:  20,
-          height: 5,
-          x:      15,
-          y:      1,
-          z:      1
-        })
-        Geometry.new(interface).origin.must_equal("\e[1;15H")
-      end
-    end
-  end
-end