vedeu 0.6.61 → 0.6.62

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

@@ -2,7 +2,7 @@ module Vedeu
 
   module Renderers
 
-    # Renders a {Vedeu::Terminal::Buffer} as a HTML snippet; a table
+    # Renders a {Vedeu::Buffers::Terminal} as a HTML snippet; a table
     # by default.
     #
     class HTML < Vedeu::Renderers::File

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

@@ -2,7 +2,7 @@ module Vedeu
 
   module Renderers
 
-    # Renders a {Vedeu::Terminal::Buffer} as JSON.
+    # Renders a {Vedeu::Buffers::Terminal} as JSON.
     #
     class JSON < Vedeu::Renderers::File
 

data/lib/vedeu/repositories/all.rb

@@ -8,6 +8,7 @@ module Vedeu
 
 end # Vedeu
 
+require 'vedeu/repositories/assemblage'
 require 'vedeu/repositories/collection'
 require 'vedeu/repositories/defaults'
 require 'vedeu/repositories/repositories'

data/lib/vedeu/repositories/assemblage.rb

@@ -0,0 +1,57 @@
+module Vedeu
+
+  module Repositories
+
+    # Provides collection related query/command methods.
+    #
+    # @api private
+    #
+    module Assemblage
+
+      include Enumerable
+
+      # Return an individual element or collection of elements (if
+      # the given index is a Range).
+      #
+      # @param index [Fixnum|Range]
+      # @return [void]
+      def [](index)
+        collection[index]
+      end
+
+      # Provides iteration over the collection.
+      #
+      # @param block [Proc]
+      # @return [Enumerator]
+      def each(&block)
+        collection.each(&block)
+      end
+
+      # Returns a boolean indicating whether the collection is empty.
+      #
+      # @return [Boolean]
+      def empty?
+        collection.empty?
+      end
+
+      # An object is equal when its values are the same.
+      #
+      # @param other [void]
+      # @return [Boolean]
+      def eql?(other)
+        self.class == other.class && collection == other.collection
+      end
+      alias_method :==, :eql?
+
+      # Return the size of the collection.
+      #
+      # @return [Fixnum]
+      def size
+        collection.size
+      end
+
+    end # Collection
+
+  end # Repositories
+
+end # Vedeu

data/lib/vedeu/repositories/collection.rb

@@ -9,7 +9,7 @@ module Vedeu
     #
     class Collection
 
-      include Enumerable
+      include Vedeu::Repositories::Assemblage
 
       # @!attribute [r] collection
       # @return [Array|Vedeu::Repositories::Collection]
@@ -50,14 +50,6 @@ module Vedeu
         @name       = name
       end
 
-      # Fetch an entry from the collection via index.
-      #
-      # @param value [Fixnum]
-      # @return [void]
-      def [](value)
-        collection[value]
-      end
-
       # Adds an entry to the collection.
       #
       # @param other [Vedeu::Repositories::Collection]
@@ -73,37 +65,6 @@ module Vedeu
       end
       alias_method :<<, :add
 
-      # Provides iteration over the collection.
-      #
-      # @param block [Proc]
-      # @return [Enumerator]
-      def each(&block)
-        collection.each(&block)
-      end
-
-      # Returns a boolean indicating whether the collection is empty.
-      #
-      # @return [Boolean]
-      def empty?
-        collection.empty?
-      end
-
-      # An object is equal when its values are the same.
-      #
-      # @param other [Vedeu::Repositories::Collection]
-      # @return [Boolean]
-      def eql?(other)
-        self.class == other.class && collection == other.collection
-      end
-      alias_method :==, :eql?
-
-      # Returns the size of the collection.
-      #
-      # @return [Fixnum]
-      def size
-        collection.size
-      end
-
       # Returns the collection as a String.
       #
       # @return [String]

data/lib/vedeu/repositories/model.rb

@@ -64,6 +64,23 @@ module Vedeu
           @repository = klass
         end
 
+        # Create and store a model with the given attributes.
+        #
+        # @param attributes [Hash] A collection of attributes specific
+        #   to the model.
+        # @param block [Proc] A block of code to be executing whilst
+        #   storing.
+        # @return [Object] An instance of the model.
+        def store(attributes = {}, &block)
+          if block_given?
+            new(attributes).store(&block)
+
+          else
+            new(attributes).store
+
+          end
+        end
+
         private
 
         # The default values for a new instance of this class.

data/lib/vedeu/runtime/launcher.rb

@@ -60,14 +60,16 @@ module Vedeu
       $stdout = @stdout
       $stderr = @stderr
 
-      optionally_profile { Vedeu::Runtime::Application.start(configuration) }
+      optionally_profile do
+        Vedeu::Runtime::Application.start(Vedeu::Configuration)
+      end
 
       @exit_code = 0
 
       terminate!
 
     rescue StandardError => uncaught_exception
-      output = if configuration.debug?
+      output = if Vedeu::Configuration.debug?
                  uncaught_exception.message + "\n" +
                  uncaught_exception.backtrace.join("\n".freeze)
                else
@@ -88,7 +90,7 @@ module Vedeu
 
     # @return [void]
     def optionally_profile
-      if configuration.profile?
+      if Vedeu::Configuration.profile?
         Vedeu.profile { yield }
 
       else
@@ -113,11 +115,6 @@ module Vedeu
     end
     # :nocov:
 
-    # @return [Vedeu::Configuration]
-    def configuration
-      Vedeu::Configuration
-    end
-
   end # Launcher
 
 end # Vedeu

data/lib/vedeu/terminal/all.rb

@@ -11,4 +11,3 @@ end # Vedeu
 
 require 'vedeu/terminal/mode'
 require 'vedeu/terminal/terminal'
-require 'vedeu/terminal/buffer'

data/lib/vedeu/version.rb

@@ -1,6 +1,6 @@
 module Vedeu
 
   # The current version of Vedeu.
-  VERSION = '0.6.61'.freeze
+  VERSION = '0.6.62'.freeze
 
 end

data/test/lib/vedeu/{terminal/buffer_test.rb → buffers/terminal_test.rb}

@@ -8,71 +8,45 @@ module Vedeu
     it { Vedeu.bound?(:_drb_store_output_).must_equal(true) }
   end
 
-  module Terminal
+  module Buffers
 
-    describe Buffer do
+    describe Terminal do
 
-      let(:described) { Vedeu::Terminal::Buffer }
+      let(:described) { Vedeu::Buffers::Terminal }
       let(:height)    { 2 }
       let(:width)     { 3 }
 
       before do
-        Vedeu.stubs(:ready?).returns(true)
         Vedeu.stubs(:height).returns(height)
         Vedeu.stubs(:width).returns(width)
-        Vedeu::Terminal::Buffer.reset!
+        Vedeu::Buffers::Terminal.reset!
       end
 
       describe '#clear' do
-        let(:ready) { false }
-
-        before do
-          Vedeu.stubs(:ready?).returns(ready)
-          Vedeu.renderers.stubs(:clear)
-        end
-
         subject { described.clear }
 
-        context 'when Vedeu is ready' do
-          let(:ready) { true }
-
-          it {
-            Vedeu.renderers.expects(:clear)
-            subject
-          }
-        end
-
-        context 'when Vedeu is not ready' do
-          # @todo Add more tests.
-        end
+        it {
+          Vedeu.renderers.expects(:clear)
+          subject
+        }
       end
 
       describe '#output' do
-        # @todo Add more tests.
+        subject { described.output }
+
+        it {
+          Vedeu::Models::Page.expects(:coerce)
+          subject
+        }
       end
 
       describe '#refresh' do
-        let(:ready)  { false }
-
-        before do
-          Vedeu.stubs(:ready?).returns(ready)
-          Vedeu.renderers.stubs(:render)
-        end
-
         subject { described.refresh }
 
-        context 'when Vedeu is not ready' do
-          it { subject.must_equal(nil) }
-        end
-
-        context 'when Vedeu is ready' do
-          let(:ready) { true }
-
-          it {
-            Vedeu.renderers.expects(:render)
-            subject
-          }
-        end
+        it {
+          Vedeu.renderers.expects(:render)
+          subject
+        }
       end
 
       describe '#reset!' do
@@ -81,18 +55,20 @@ module Vedeu
         it { subject.must_be_instance_of(Vedeu::Buffers::View) }
       end
 
-      describe '#write' do
+      describe '#update' do
         let(:_value) {}
 
-        subject { described.write(_value) }
+        subject { described.update(_value) }
 
         # @todo Add more tests.
       end
 
-      describe '#update' do
+      describe '#write' do
         let(:_value) {}
 
-        subject { described.update(_value) }
+        before { Vedeu.renderers.stubs(:render) }
+
+        subject { described.write(_value) }
 
         # @todo Add more tests.
       end
@@ -101,6 +77,4 @@ module Vedeu
 
   end # Terminal
 
-
-
 end # Vedeu

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

@@ -87,12 +87,6 @@ module Vedeu
         }
       end
 
-      describe '.store' do
-        subject { described.store(attributes) }
-
-        it { subject.must_equal(instance) }
-      end
-
       describe '#eql?' do
         let(:other) { instance }
 

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

@@ -0,0 +1,38 @@
+require 'test_helper'
+
+module Vedeu
+
+  module Editor
+
+    class CollectionTestClass
+
+      include Enumerable
+      include Vedeu::Editor::Collection
+
+      attr_accessor :collection
+
+      def initialize(collection)
+        @collection = collection
+      end
+
+    end # CollectionTestClass
+
+    describe Collection do
+
+      let(:described)  { Vedeu::Editor::Collection }
+      let(:instance)   { Vedeu::Editor::CollectionTestClass.new(collection) }
+      let(:collection) { 'Some text...'.chars }
+
+      describe '#by_index' do
+        let(:index) { 0 }
+
+        subject { instance.by_index(index) }
+
+        it { subject.must_be_instance_of(String) }
+      end
+
+    end # Collection
+
+  end # Editor
+
+end # Vedeu

data/test/lib/vedeu/editor/document_test.rb

@@ -49,22 +49,6 @@ module Vedeu
         }
       end
 
-      describe '.store' do
-        before { Vedeu.documents.reset! }
-
-        subject { described.store(attributes) }
-
-        it { subject.must_be_instance_of(described) }
-
-        it 'registers the instance with the repository' do
-          Vedeu.documents.registered?(_name).must_equal(false)
-
-          subject
-
-          Vedeu.documents.registered?(_name).must_equal(true)
-        end
-      end
-
       describe 'accessors' do
         it {
           instance.must_respond_to(:attributes)

data/test/lib/vedeu/editor/line_test.rb

@@ -6,24 +6,24 @@ module Vedeu
 
     describe Line do
 
-      let(:described) { Vedeu::Editor::Line }
-      let(:instance)  { described.new(line) }
-      let(:line)      { 'Some text...' }
+      let(:described)  { Vedeu::Editor::Line }
+      let(:instance)   { described.new(collection) }
+      let(:collection) { 'Some text...' }
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
-        it { instance.instance_variable_get('@line').must_equal(line) }
+        it { instance.instance_variable_get('@collection').must_equal(collection) }
 
         context 'when a line is not given' do
-          let(:line) {}
+          let(:collection) {}
 
-          it { instance.instance_variable_get('@line').must_equal('') }
+          it { instance.instance_variable_get('@collection').must_equal('') }
         end
       end
 
       describe 'accessors' do
-        it { instance.must_respond_to(:line) }
-        it { instance.must_respond_to(:line=) }
+        it { instance.must_respond_to(:collection) }
+        it { instance.must_respond_to(:collection=) }
       end
 
       describe '.coerce' do
@@ -34,38 +34,22 @@ module Vedeu
         it { subject.must_be_instance_of(Vedeu::Editor::Line) }
 
         context 'when the value is already a Vedeu::Editor::Line object' do
-          let(:_value) { Vedeu::Editor::Line.new(line) }
+          let(:_value) { Vedeu::Editor::Line.new(collection) }
 
           it { subject.must_equal(_value) }
-          it { subject.line.must_equal(line) }
+          it { subject.collection.must_equal(collection) }
         end
 
         context 'when the value is an empty String' do
           let(:_value) { '' }
 
-          it { subject.line.must_equal('') }
+          it { subject.collection.must_equal('') }
         end
 
         context 'when the value is an String' do
-          let(:_value) { line }
-
-          it { subject.line.must_equal(line) }
-        end
-      end
-
-      describe '#[]' do
-        subject { instance.[](index) }
-
-        context 'when index is a Fixnum' do
-          let(:index)    { 2 }
-
-          it { subject.must_equal('m') }
-        end
-
-        context 'when index is a Range' do
-          let(:index)    { (3..6) }
+          let(:_value) { collection }
 
-          it { subject.must_equal('e te') }
+          it { subject.collection.must_equal(collection) }
         end
       end
 
@@ -77,7 +61,7 @@ module Vedeu
         it { subject.must_be_instance_of(String) }
 
         context 'when the line is empty' do
-          let(:line) { '' }
+          let(:collection) { '' }
 
           context 'and an index is not given' do
             let(:index) {}
@@ -125,7 +109,7 @@ module Vedeu
         it { subject.must_be_instance_of(Vedeu::Editor::Line) }
 
         context 'when the line is empty' do
-          let(:line) { '' }
+          let(:collection) { '' }
 
           it { subject.line.must_equal('') }
 
@@ -167,34 +151,6 @@ module Vedeu
         end
       end
 
-      describe '#empty?' do
-        subject { instance.empty? }
-
-        context 'when the line is empty' do
-          let(:line) {}
-
-          it { subject.must_equal(true) }
-        end
-
-        context 'when the line is not empty' do
-          it { subject.must_equal(false) }
-        end
-      end
-
-      describe '#eql?' do
-        let(:other) { instance }
-
-        subject { instance.eql?(other) }
-
-        it { subject.must_equal(true) }
-
-        context 'when different to other' do
-          let(:other) { described.new('Other text...') }
-
-          it { subject.must_equal(false) }
-        end
-      end
-
       describe '#insert_character' do
         let(:character) { 'a' }
         let(:index)     { 5 }
@@ -204,7 +160,7 @@ module Vedeu
         it { subject.must_be_instance_of(Vedeu::Editor::Line) }
 
         context 'when the line is empty' do
-          let(:line) {}
+          let(:collection) {}
 
           it { subject.line.must_equal('a') }
 
@@ -268,25 +224,11 @@ module Vedeu
         end
       end
 
-      describe '#size' do
-        subject { instance.size }
-
-        context 'when the line is empty' do
-          let(:line) {}
-
-          it { subject.must_equal(0) }
-        end
-
-        context 'when the line is not empty' do
-          it { subject.must_equal(12) }
-        end
-      end
-
       describe '#to_s' do
         subject { instance.to_s }
 
         context 'when the line is empty' do
-          let(:line) {}
+          let(:collection) {}
 
           it { subject.must_equal('') }
         end