vedeu 0.8.6 → 0.8.7

data/lib/vedeu/output/write.rb

@@ -59,7 +59,7 @@ module Vedeu
       # @!attribute [r] output
       # @return [String]
       attr_reader :output
-      alias_method :value, :output
+      alias value output
 
       private
 
@@ -75,7 +75,7 @@ module Vedeu
       def options
         defaults.merge!(@options)
       end
-      alias_method :attributes, :options
+      alias attributes options
 
       # @return [String]
       def output
@@ -102,7 +102,7 @@ module Vedeu
       def to_s
         @_to_s ||= super + Vedeu.esc.reset + position(position_end)
       end
-      alias_method :to_str, :to_s
+      alias to_str to_s
 
     end # Write
 

data/lib/vedeu/plugins/plugin.rb

@@ -21,7 +21,7 @@ module Vedeu
     # @!attribute [rw] enabled
     # @return [Boolean]
     attr_accessor :enabled
-    alias_method :enabled?, :enabled
+    alias enabled? enabled
 
     # Returns a new instance of Vedeu::Plugin.
     #

data/lib/vedeu/presentation/colour.rb

@@ -125,7 +125,7 @@ module Vedeu
 
       # @return [Boolean]
       def named_colour?
-        return false if self.is_a?(Vedeu::Interfaces::Interface)
+        return false if is_a?(Vedeu::Interfaces::Interface)
 
         present?(name) && Vedeu.interfaces.registered?(name)
       end

data/lib/vedeu/presentation/presentation.rb

@@ -16,7 +16,7 @@ module Vedeu
     def to_s
       render_position { render_colour { render_style { value } } }
     end
-    alias_method :to_str, :to_s
+    alias to_str to_s
 
     private
 

data/lib/vedeu/presentation/style.rb

@@ -62,7 +62,7 @@ module Vedeu
       # @return [Hash<Symbol => Array<String|Symbol>|String|Symbol>]
       def attributes
         {
-          style: value
+          style: value,
         }
       end
 
@@ -73,7 +73,7 @@ module Vedeu
       def eql?(other)
         self.class == other.class && value == other.value
       end
-      alias_method :==, :eql?
+      alias == eql?
 
       # @return [String]
       def to_ast
@@ -89,8 +89,8 @@ module Vedeu
 
         @sequences ||= Array(value).flat_map { |v| Vedeu.esc.string(v) }.join
       end
-      alias_method :escape_sequences, :to_s
-      alias_method :to_str, :to_s
+      alias escape_sequences to_s
+      alias to_str to_s
 
     end # Style
 

data/lib/vedeu/renderers/all.rb

@@ -8,6 +8,7 @@ module Vedeu
 
     extend Enumerable
     extend self
+    extend Vedeu::Repositories::Storage
 
     # Instructs each renderer registered with Vedeu to clear their
     # content.
@@ -56,15 +57,6 @@ module Vedeu
       output
     end
 
-    # @example
-    #   Vedeu.renderers.reset!
-    #
-    # @return [Set]
-    def reset!
-      @storage = in_memory
-    end
-    alias_method :reset, :reset!
-
     private
 
     # @return [Set]
@@ -91,11 +83,6 @@ module Vedeu
       @mutex ||= Mutex.new
     end
 
-    # @return [Set]
-    def storage
-      @storage ||= in_memory
-    end
-
     # @param block [Proc]
     # @return [void]
     def threaded(renderer, &block)

data/lib/vedeu/renderers/options.rb

@@ -44,7 +44,7 @@ module Vedeu
       # @param output [Vedeu::Models::Page]
       # @return [void]
       def render(output = '')
-        options.merge!(output: output)
+        options[:output] = output
 
         write
       end

data/lib/vedeu/repositories/all.rb

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

data/lib/vedeu/repositories/assemblage.rb

@@ -52,7 +52,7 @@ module Vedeu
       def eql?(other)
         self.class == other.class && collection == other.collection
       end
-      alias_method :==, :eql?
+      alias == eql?
 
       # Return the size of the collection.
       #

data/lib/vedeu/repositories/collection.rb

@@ -16,8 +16,8 @@ module Vedeu
       # @!attribute [r] collection
       # @return [Array|Vedeu::Repositories::Collection]
       attr_reader :collection
-      alias_method :all, :collection
-      alias_method :value, :collection
+      alias all collection
+      alias value collection
 
       # @!attribute [rw] parent
       # @return [Fixnum]
@@ -66,7 +66,7 @@ module Vedeu
 
         end
       end
-      alias_method :<<, :add
+      alias << add
 
       # Returns the collection as a String.
       #
@@ -74,7 +74,7 @@ module Vedeu
       def to_s
         collection.map(&:to_s).join
       end
-      alias_method :to_str, :to_s
+      alias to_str to_s
 
     end # Collection
 

data/lib/vedeu/repositories/registerable.rb

@@ -60,7 +60,7 @@ module Vedeu
         def reset!
           @models = register
         end
-        alias_method :reset, :reset!
+        alias reset reset!
 
       end # ClassMethods
 
@@ -72,7 +72,7 @@ module Vedeu
 
         # @return [Boolean]
         def null_model?
-          self.respond_to?(:null_model) && present?(:null_model)
+          respond_to?(:null_model) && present?(:null_model)
         end
 
       end # InstanceMethods

data/lib/vedeu/repositories/repositories.rb

@@ -46,7 +46,7 @@ module Vedeu
 
       true
     end
-    alias_method :reset, :reset!
+    alias reset reset!
 
     private
 

data/lib/vedeu/repositories/repository.rb

@@ -143,7 +143,7 @@ module Vedeu
         storage.delete(name)
         storage unless storage.is_a?(Set)
       end
-      alias_method :delete, :remove
+      alias delete remove
 
       # Stores the model instance by name in the repository of the
       # model.
@@ -164,8 +164,8 @@ module Vedeu
 
         model
       end
-      alias_method :register, :store
-      alias_method :add, :store
+      alias register store
+      alias add store
 
       private
 

data/lib/vedeu/repositories/storage.rb

@@ -0,0 +1,38 @@
+module Vedeu
+
+  module Repositories
+
+    # Provides behaviour for resetting and accessing the storage of
+    # various repositories.
+    #
+    # @api private
+    #
+    module Storage
+
+      extend self
+
+      # Remove all currently stored data for this repository.
+      #
+      # @return [void]
+      def reset!
+        Vedeu.log(type:    :reset,
+                  message: "Resetting repository '#{self.class.name}'")
+
+        @storage = in_memory
+      end
+      alias reset reset!
+
+      # Return whole repository; provides raw access to the storage
+      # for this repository.
+      #
+      # @return [void]
+      def storage
+        @storage ||= in_memory
+      end
+      alias all storage
+
+    end # Storage
+
+  end # Repositories
+
+end # Vedeu

data/lib/vedeu/repositories/store.rb

@@ -12,6 +12,10 @@ module Vedeu
 
       include Enumerable
       include Vedeu::Common
+      include Vedeu::Repositories::Storage
+
+      alias all storage
+      alias clear reset!
 
       # @param block [Proc]
       # @return [Enumerator]
@@ -36,7 +40,7 @@ module Vedeu
 
         storage.include?(name)
       end
-      alias_method :registered?, :exists?
+      alias registered? exists?
 
       # Returns a collection of the names of all the registered
       # entities.
@@ -50,18 +54,6 @@ module Vedeu
         storage
       end
 
-      # Remove all currently stored data.
-      #
-      # @return [Array|Hash|Set]
-      def reset!
-        Vedeu.log(type:    :reset,
-                  message: "(#{self.class.name}) #{registered.inspect}")
-
-        @storage = in_memory
-      end
-      alias_method :reset, :reset!
-      alias_method :clear, :reset
-
       # Return the number of entries stored.
       #
       # @return [Fixnum]
@@ -69,15 +61,6 @@ module Vedeu
         storage.size
       end
 
-      # Return whole repository; provides raw access to the storage
-      # for this repository.
-      #
-      # @return [Array|Hash|Set]
-      def storage
-        @storage ||= in_memory
-      end
-      alias_method :all, :storage
-
       # @return [Hash]
       def in_memory
         {}

data/lib/vedeu/runtime/application.rb

@@ -36,7 +36,7 @@ module Vedeu
 
           Vedeu::Runtime::MainLoop.stop!
         end
-        alias_method :exit, :stop
+        alias exit stop
 
       end # Eigenclass
 

data/lib/vedeu/runtime/flags.rb

@@ -30,7 +30,7 @@ module Vedeu
         def reset!
           instance.reset!
         end
-        alias_method :reset, :reset!
+        alias reset reset!
 
       end # Eigenclass
 
@@ -49,14 +49,14 @@ module Vedeu
       def reset!
         self.options = defaults
       end
-      alias_method :reset, :reset!
+      alias reset reset!
 
       private
 
       # @return [Hash]
       def defaults
         {
-          ready: false
+          ready: false,
         }
       end
 

data/lib/vedeu/runtime/router.rb

@@ -11,6 +11,7 @@ module Vedeu
 
       include Vedeu::Common
 
+      extend Vedeu::Repositories::Storage
       extend self
 
       # Registers a controller with the given controller name for the
@@ -30,7 +31,7 @@ module Vedeu
                   message: "Controller: ':#{controller}'")
 
         if registered?(controller)
-          storage[controller].merge!(klass: klass)
+          storage[controller][:klass] = klass
 
         else
           storage.store(controller, klass: klass, actions: [])
@@ -85,7 +86,7 @@ module Vedeu
 
         route(controller, action, args) if action_defined?(action, controller)
       end
-      alias_method :action, :goto
+      alias action goto
 
       # Returns a boolean indicating whether the given controller name
       # is already registered.
@@ -96,14 +97,6 @@ module Vedeu
         storage.key?(controller)
       end
 
-      # Removes all stored controllers with their respective actions.
-      #
-      # @return [Hash<void>]
-      def reset!
-        @storage = in_memory
-      end
-      alias_method :reset, :reset!
-
       private
 
       # Returns a boolean indicating whether the given action name is
@@ -163,14 +156,6 @@ module Vedeu
         present?(storage[controller][:klass])
       end
 
-      # Returns all the stored controllers and their respective
-      # actions.
-      #
-      # @return [Hash<Symbol => Hash<Symbol => String|Array<Symbol>>>]
-      def storage
-        @storage ||= in_memory
-      end
-
       # Returns an empty collection ready for the storing of client
       # application controllers and actions.
       #

data/lib/vedeu/templating/helpers.rb

@@ -17,7 +17,7 @@ module Vedeu
       def background(value, &block)
         define_stream(background: value, &block)
       end
-      alias_method :bg, :background
+      alias bg background
 
       # @param attributes [Hash]
       # @option attributes foreground [String] The HTML/CSS foreground
@@ -38,7 +38,7 @@ module Vedeu
       def foreground(value, &block)
         define_stream(foreground: value, &block)
       end
-      alias_method :fg, :foreground
+      alias fg foreground
 
       # @param value [Symbol]
       # @param block [Proc]
@@ -53,11 +53,13 @@ module Vedeu
       def define_stream(attributes = {}, &block)
         fail Vedeu::Error::RequiresBlock unless block_given?
 
+        value = yield
+
         encode(
           Vedeu::Views::Stream.build(
             colour: Vedeu::Colours::Colour.new(attributes),
             style:  Vedeu::Presentation::Style.new(attributes[:style]),
-            value:  block.call))
+            value:  value))
       end
 
       # @param data [String]