vedeu 0.0.27 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e590fa41d87fd5be6367a2895240ddc3ea8b624d
-  data.tar.gz: 872c9d6dd4aa0c150609d528405c9db36a863bf1
+  metadata.gz: 94dacb4855864e050d993abf5c15d94f6333635e
+  data.tar.gz: 2fd4c3435718f164c6629482e64ee20fb74b4b82
 SHA512:
-  metadata.gz: 9b30dbfb6dadb583d08726d1f6d4eca4fb82023216a52c69e10bc05d4af66572ce62291fc618863210ce4888e408032afa8b4ebd0f1a7a41f6a29364cd73c7a9
-  data.tar.gz: d8354d2b6a0dd7bfc6a5965a159fe7642b51bb0520affa5ca1f328cea82b258b12ae5e25f0d051478c0337147f3931e6ddb3306fca38e137b21686fed3eb6c6a
+  metadata.gz: 7ba8636d8fafa852231a6ea633353debd9d8a18476b145ab2d26122590d8984f4b4107ec1ac9bad4de0102d67a61eb8423acda8611d650a6aabd1db4a3ebee20
+  data.tar.gz: e9a3952b9df0521f4eb21cc457da2c2cfd4d3fe8e1c143ba32f1d2ec07505a0f6d647a2e0a5a576e20deecdd3a788903126b035067bec848c55b98db1616b392

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 2.1.1
+cache: bundler
+script: 'bundle exec rake'
+

data/README.md

@@ -1,4 +1,5 @@
 [![Code Climate](https://codeclimate.com/github/gavinlaking/vedeu.png)](https://codeclimate.com/github/gavinlaking/vedeu)
+[![Build Status](https://travis-ci.org/gavinlaking/vedeu.svg?branch=master)](https://travis-ci.org/gavinlaking/vedeu)
 
 # Vedeu
 

data/lib/vedeu/output/text_adaptor.rb

@@ -0,0 +1,31 @@
+require_relative '../models/line'
+
+module Vedeu
+  class TextAdaptor
+    def self.adapt(text)
+      new(text).adapt
+    end
+
+    def initialize(text)
+      @text = text
+    end
+
+    def adapt
+      return [] if no_content?
+
+      lines.map { |line| Line.new({ streams: { text: line } }) }
+    end
+
+    private
+
+    attr_reader :text
+
+    def lines
+      text.split(/\n/)
+    end
+
+    def no_content?
+      text.nil? || text.empty?
+    end
+  end
+end

data/lib/vedeu/process/process.rb

@@ -11,17 +11,21 @@ module Vedeu
     def initialize; end
 
     def evaluate
-      fail StopIteration if no_result?
+      return false if input.nil? || input.empty?
 
-      parsed_data = Parser.parse(result)
+      fail StopIteration if stop_requested?
 
-      Composition.enqueue(parsed_data)
+      Parser.parse(result) unless no_result?
     end
 
     private
 
+    def stop_requested?
+      result == :stop
+    end
+
     def no_result?
-      result.nil? || result.empty? || result == :stop
+      result.nil? || result.empty?
     end
 
     def result

data/lib/vedeu/support/parser.rb

@@ -1,27 +1,50 @@
-require 'oj'
-
 require_relative '../models/composition'
+require_relative 'parsing/hash_parser'
+require_relative 'parsing/json_parser'
 
 module Vedeu
+  class ParseError < StandardError; end
+
   class Parser
     def self.parse(output)
       new(output).parse
     end
 
-    def initialize(output)
-      @output = output || ''
+    def initialize(output = {})
+      @output = output
     end
 
     def parse
-      Composition.new(as_hash)
+      return nil if empty?
+
+      Composition.new(parsed_output) #.enqueue
     end
 
     private
 
     attr_reader :output
 
-    def as_hash
-      Oj.load(output, symbol_keys: true)
+    def parsed_output
+      @parsed ||= parser.parse(output)
+    end
+
+    def parser
+      return JSONParser if json?
+      return HashParser if hash?
+
+      fail ParseError, 'Cannot process output from command.'
+    end
+
+    def hash?
+      output.is_a?(Hash)
+    end
+
+    def json?
+      output.is_a?(String)
+    end
+
+    def empty?
+      output.nil? || output.empty?
     end
   end
 end

data/lib/vedeu/support/parsing/hash_parser.rb

@@ -0,0 +1,34 @@
+require_relative '../../output/text_adaptor'
+
+module Vedeu
+  class HashParser
+    def self.parse(output = {})
+      new(output).parse
+    end
+
+    def initialize(output = {})
+      @output = output
+    end
+
+    def parse
+      { interfaces: interfaces }
+    end
+
+    private
+
+    attr_reader :output
+
+    def interfaces
+      stringified_keys.map do |name, content|
+        {
+          name:  name,
+          lines: TextAdaptor.adapt(content)
+        }
+      end
+    end
+
+    def stringified_keys
+      output.inject({}) { |a, (k, v)| a[k.to_s] = v; a }
+    end
+  end
+end

data/lib/vedeu/support/parsing/json_parser.rb

@@ -0,0 +1,13 @@
+require 'oj'
+
+module Vedeu
+  module JSONParser
+    extend self
+
+    def parse(output)
+      Oj.load(output, symbol_keys: true)
+    rescue Oj::ParseError
+      {}
+    end
+  end
+end

data/lib/vedeu/version.rb

@@ -1,3 +1,3 @@
 module Vedeu
-  VERSION = '0.0.27'
+  VERSION = '0.0.28'
 end

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

@@ -0,0 +1,60 @@
+require_relative '../../../test_helper'
+require_relative '../../../../lib/vedeu/output/text_adaptor'
+
+module Vedeu
+  describe TextAdaptor do
+    let(:described_class) { TextAdaptor }
+    let(:text)            { '' }
+
+    describe '#initialize' do
+      let(:subject) { described_class.new(text) }
+
+      it 'returns an TextAdaptor instance' do
+        subject.must_be_instance_of(TextAdaptor)
+      end
+
+      it 'sets an instance variable' do
+        subject.instance_variable_get('@text').must_equal(text)
+      end
+    end
+
+    describe '.adapt' do
+      let(:subject) { described_class.adapt(text) }
+
+      it 'returns an Array' do
+        subject.must_be_instance_of(Array)
+      end
+
+      context 'when processing an empty string' do
+        let(:text) { '' }
+
+        it 'returns an empty collection' do
+          subject.must_be_empty
+        end
+      end
+
+      context 'when processing a single line' do
+        let(:text) { "This is a single line of text.\n" }
+
+        it 'returns a collection of Line objects' do
+          subject.first.must_be_instance_of(Line)
+
+          subject.size.must_equal(1)
+        end
+      end
+
+      context 'when processing multiple lines' do
+        let(:text) {
+          "Lorem ipsum dolor sit amet,\nConseactetur adipiscing.\n" \
+          "Curabitur aliquet, turpis id dui.\n\nConditum elemum.\n"
+        }
+
+        it 'returns a collection of Line objects' do
+          subject.first.must_be_instance_of(Line)
+
+          subject.size.must_equal(5)
+        end
+      end
+    end
+  end
+end

data/test/lib/vedeu/process/process_test.rb

@@ -1,66 +1,69 @@
 require_relative '../../../test_helper'
 require_relative '../../../../lib/vedeu/process/process'
-require_relative '../../../../lib/vedeu/repository/interface_repository'
+# require_relative '../../../../lib/vedeu/repository/interface_repository'
+require_relative '../../../support/dummy_command'
+require_relative '../../../../lib/vedeu/repository/command_repository'
 
 module Vedeu
-  describe Process do
-    let(:described_class) { Process }
-    let(:input)           { nil }
-    let(:result)          {}
-
-    describe '#initialize' do
-      let(:subject) { described_class.new }
+  class QuitCommand
+    def self.dispatch(*args)
+      :stop
+    end
+  end
 
-      it 'returns a Process instance' do
-        subject.must_be_instance_of(Process)
-      end
+  class TestCommand
+    def self.dispatch(*args)
+      :test
     end
+  end
+
+  describe Process do
+    let(:described_class) { Process }
 
     describe '.evaluate' do
       let(:subject) { described_class.evaluate }
-      let(:command) { Command.new }
-      let(:json)    { {} }
 
       before do
-        InterfaceRepository.create({
-          name: 'dummy',
-          width: 15,
-          height: 2
+        CommandRepository.create({
+          'name' =>     'quit',
+          entity:   QuitCommand,
+          keypress: 'q'
+        })
+        CommandRepository.create({
+          name:     'test',
+          entity:   TestCommand,
+          keypress: 't'
         })
         Queue.stubs(:dequeue).returns(input)
-        CommandRepository.stubs(:by_input).returns(command)
-        command.stubs(:execute).returns(result)
-        Parser.stubs(:parse).returns(json)
-        Composition.stubs(:enqueue).returns([])
+        Parser.stubs(:parse).returns(Composition.new)
       end
 
       after do
-        InterfaceRepository.reset
-        Queue.clear
+        CommandRepository.reset
       end
 
       context 'when there is no input' do
-        it 'raises an exception' do
-          proc { subject }.must_raise(StopIteration)
+        let(:input) { '' }
+
+        it 'returns a FalseClass' do
+          subject.must_be_instance_of(FalseClass)
         end
       end
 
       context 'when there is input' do
-        let(:input) { "q" }
+        context 'and the result is :stop' do
+          let(:input) { 'q' }
 
-        context 'and there is a result' do
-          let(:result) { { 'dummy' => [['output...']] } }
-
-          it 'returns an Array' do
-            subject.must_be_instance_of(Array)
+          it 'raises an exception' do
+            proc { subject }.must_raise(StopIteration)
           end
         end
 
-        context 'or there is no result or the result is :stop' do
-          let(:result) { :stop }
+        context 'and there is a result' do
+          let(:input) { 't' }
 
-          it 'raises an exception' do
-            proc { subject }.must_raise(StopIteration)
+          it 'returns an Composition' do
+            subject.must_be_instance_of(Composition)
           end
         end
       end

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

@@ -19,10 +19,10 @@ module Vedeu
       end
 
       context 'when the instance variable is nil' do
-        let(:output) {}
+        let(:subject) { described_class.new }
 
-        it 'set the instance variable to empty string' do
-          subject.instance_variable_get("@output").must_equal('')
+        it 'set an instance variable' do
+          subject.instance_variable_get("@output").must_equal({})
         end
       end
     end
@@ -30,8 +30,40 @@ module Vedeu
     describe '#parse' do
       let(:subject) { described_class.parse(output) }
 
-      it 'returns a Composition' do
-        subject.must_be_instance_of(Composition)
+      context 'when the output is empty' do
+        let(:output) {}
+
+        it 'returns a NilClass' do
+          subject.must_be_instance_of(NilClass)
+        end
+      end
+
+      context 'when the output is JSON' do
+        let(:output)  { "{\"some\": \"JSON\"}" }
+
+        it 'returns a Composition' do
+          subject.must_be_instance_of(Composition)
+        end
+      end
+
+      context 'when the output is a Hash' do
+        let(:output) {
+          {
+            dummy: 'Some text...'
+          }
+        }
+
+        it 'returns a Composition' do
+          subject.must_be_instance_of(Composition)
+        end
+      end
+
+      context 'when the output is anything else' do
+        let(:output) { [:invalid] }
+
+        it 'raises an exception' do
+          proc { subject }.must_raise(ParseError)
+        end
       end
     end
   end

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

@@ -0,0 +1,45 @@
+require_relative '../../../../test_helper'
+require_relative '../../../../../lib/vedeu/support/parsing/hash_parser'
+
+module Vedeu
+  describe HashParser do
+    let(:described_module) { HashParser }
+    let(:output)           { {} }
+
+    describe '.parse' do
+      let(:subject) { described_module.parse(output) }
+      let(:lines)   { mock }
+
+      before { TextAdaptor.stubs(:adapt).returns(lines) }
+
+      it 'returns a Hash' do
+        subject.must_be_instance_of(Hash)
+      end
+
+      context 'when the output is content for a collection of interfaces' do
+        let(:output) {
+          {
+            test: 'Some content...',
+            dummy: 'More content...'
+          }
+        }
+
+        it 'returns a Hash' do
+          subject.must_equal({ interfaces: [{ name: 'test', lines: lines }, { name: 'dummy', lines: lines }] })
+        end
+      end
+
+      context 'when the output is content for a single interface' do
+        let(:output) {
+          {
+            dummy: 'Some content...'
+          }
+        }
+
+        it 'returns a Hash' do
+          subject.must_equal({ interfaces: [{ name: 'dummy', lines: lines }] })
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+require_relative '../../../../test_helper'
+require_relative '../../../../../lib/vedeu/support/parsing/json_parser'
+
+module Vedeu
+  describe JSONParser do
+    let(:described_module) { JSONParser }
+    let(:output)           { "{}" }
+
+    describe '.parse' do
+      let(:subject) { described_module.parse(output) }
+
+      it 'returns a Hash' do
+        subject.must_be_instance_of(Hash)
+      end
+
+      context 'when the JSON is valid' do
+        let(:output) { File.read('test/support/json/int1_lin1_str1.json')}
+
+        it 'returns a Hash' do
+          subject.must_be_instance_of(Hash)
+        end
+      end
+
+      context 'when the JSON is invalid' do
+        let(:output) { "{}" }
+
+        before { Oj.stubs(:load).raises(Oj::ParseError) }
+
+        it 'returns a Hash' do
+          subject.must_be_instance_of(Hash)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.28
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-06 00:00:00.000000000 Z
+date: 2014-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -189,6 +189,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -218,6 +219,7 @@ files:
 - lib/vedeu/models/style_collection.rb
 - lib/vedeu/output/interface_renderer.rb
 - lib/vedeu/output/output.rb
+- lib/vedeu/output/text_adaptor.rb
 - lib/vedeu/process/process.rb
 - lib/vedeu/repository/command_repository.rb
 - lib/vedeu/repository/interface_repository.rb
@@ -229,6 +231,8 @@ files:
 - lib/vedeu/support/exit.rb
 - lib/vedeu/support/geometry.rb
 - lib/vedeu/support/parser.rb
+- lib/vedeu/support/parsing/hash_parser.rb
+- lib/vedeu/support/parsing/json_parser.rb
 - lib/vedeu/support/queue.rb
 - lib/vedeu/support/terminal.rb
 - lib/vedeu/support/translator.rb
@@ -254,6 +258,7 @@ files:
 - test/lib/vedeu/models/style_collection_test.rb
 - test/lib/vedeu/output/interface_renderer_test.rb
 - test/lib/vedeu/output/output_test.rb
+- test/lib/vedeu/output/text_adaptor_test.rb
 - test/lib/vedeu/process/process_test.rb
 - test/lib/vedeu/repository/command_repository_test.rb
 - test/lib/vedeu/repository/interface_repository_test.rb
@@ -265,6 +270,8 @@ files:
 - test/lib/vedeu/support/exit_test.rb
 - test/lib/vedeu/support/geometry_test.rb
 - test/lib/vedeu/support/parser_test.rb
+- test/lib/vedeu/support/parsing/hash_parser_test.rb
+- test/lib/vedeu/support/parsing/json_parser_test.rb
 - test/lib/vedeu/support/queue_test.rb
 - test/lib/vedeu/support/terminal_test.rb
 - test/lib/vedeu/support/translator_test.rb
@@ -334,6 +341,7 @@ test_files:
 - test/lib/vedeu/models/style_collection_test.rb
 - test/lib/vedeu/output/interface_renderer_test.rb
 - test/lib/vedeu/output/output_test.rb
+- test/lib/vedeu/output/text_adaptor_test.rb
 - test/lib/vedeu/process/process_test.rb
 - test/lib/vedeu/repository/command_repository_test.rb
 - test/lib/vedeu/repository/interface_repository_test.rb
@@ -345,6 +353,8 @@ test_files:
 - test/lib/vedeu/support/exit_test.rb
 - test/lib/vedeu/support/geometry_test.rb
 - test/lib/vedeu/support/parser_test.rb
+- test/lib/vedeu/support/parsing/hash_parser_test.rb
+- test/lib/vedeu/support/parsing/json_parser_test.rb
 - test/lib/vedeu/support/queue_test.rb
 - test/lib/vedeu/support/terminal_test.rb
 - test/lib/vedeu/support/translator_test.rb