sdl-ng 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed2ffb4ec0dbbbcb9215c77af53ea65ff29697f4
-  data.tar.gz: 123f3cf6588274e6605708bc2fc27c71004702c4
+  metadata.gz: 63c012a4a880107aa2abc578cd5d6e31586685f4
+  data.tar.gz: 9f48ce28d5770a44db409a24e851ec417dea2566
 SHA512:
-  metadata.gz: e13f8fb585f8339390a6f82d339ce0daf8b3057467aa67ead071905af9bc125802746b8a984b10198b918cecc57b90e45f07f11099606e2dfd175289a87c0246
-  data.tar.gz: acc087d16fbf6ceb3380e80b6f118d24270c31beb2a0d1a7f757f087e32e07e4c637d3c4da562926d57944fc8daa9f7ec65b7ee3e998503a248a8352e93e96bd
+  metadata.gz: ff01a182a62dd8a80e8f4c417382fe1b376e4938c8fd8ba7864fed886d549d1afb04099ac58d74794ac2ee03160e4171d5c024b63e6a7df881795101a8c14027
+  data.tar.gz: 18875548fa81bf0b0e4b48a5c0313eb031aebc8e93194583624f92cb42848c7aac79cbf087796766596adb7f1f329fc6f11b965755d1d36d38c1f8ee9b838ee8

data/lib/sdl.rb

@@ -1,17 +1,28 @@
 #:include: ../README.md
 
-require_relative 'sdl/base'
-require_relative 'sdl/receivers'
-require_relative 'sdl/types'
-require_relative 'sdl/exporters'
-require_relative 'sdl/util'
-require_relative 'sdl/ng/version'
+require 'active_support'
+require 'active_support/dependencies'
+require 'active_support/inflector'
+
+require 'i18n'
+
+ActiveSupport::Dependencies.autoload_paths += ['sdl']
 
 ##
 #
-#
 # Author::  Mathias Slawik (mailto:mathias.slawik@tu-berlin.de)
 # License:: Apache License 2.0
 module SDL
+  extend ActiveSupport::Autoload
+
+  autoload :Base
+  autoload :Exporters
+  autoload :Receivers
+
+  eager_autoload do
+    autoload :Types
+  end
 
+  require_relative 'sdl/util'
+  require_relative 'sdl/ng/version'
 end

data/lib/sdl/base.rb

@@ -1,9 +1,3 @@
-require_relative 'base/type'
-require_relative 'base/fact'
-require_relative 'base/property'
-require_relative 'base/service'
-require_relative 'base/service_compendium'
-
 module SDL
   ##
   # This module contains the base classes of the \SDL Framework.
@@ -16,5 +10,12 @@ module SDL
   #
   # The ServiceCompendium is used for easy definition of new facts, services, types and properties.
   module Base
+    extend ActiveSupport::Autoload
+
+    autoload :Fact
+    autoload :Property
+    autoload :Service
+    autoload :ServiceCompendium
+    autoload :Type
   end
 end

data/lib/sdl/base/fact.rb

@@ -1,11 +1,7 @@
-module SDL
-  module Base
-    ##
-    # A fact, which is known about a service.
-    #
-    # Facts are defined by using a ServiceCompendium.
-    class Fact < Type
-      attr_accessor :service
-    end
-  end
-end
+##
+# A fact, which is known about a service.
+#
+# Facts are defined by using a ServiceCompendium.
+class SDL::Base::Fact < SDL::Base::Type
+  attr_accessor :service
+end

data/lib/sdl/base/property.rb

@@ -1,34 +1,30 @@
-module SDL
-  module Base
-    ##
-    # A property of a Fact or Type. It has a #name and an associated Type.
-    class Property
-      # The Property name
-      attr :name
+##
+# A property of a Fact or Type. It has a #name and an associated Type.
+class SDL::Base::Property
+  # The Property name
+  attr :name
 
-      # The Property Type
-      attr :type
+  # The Property Type
+  attr :type
 
-      # Is this Property multi-valued
-      attr :multi
+  # Is this Property multi-valued
+  attr :multi
 
-      # The parent type, where this property belongs to
-      attr :parent
+  # The parent type, where this property belongs to
+  attr :parent
 
-      # Is this Property single-valued
-      def single?
-        !@multi
-      end
+  # Is this Property single-valued
+  def single?
+    !@multi
+  end
 
-      # Is this Property multi-valued
-      def multi?
-        @multi
-      end
+  # Is this Property multi-valued
+  def multi?
+    @multi
+  end
 
-      # Define a property by its name and type
-      def initialize(name, type, parent, multi = false)
-        @name, @type, @parent, @multi = name.to_s, type, parent, multi
-      end
-    end
+  # Define a property by its name and type
+  def initialize(name, type, parent, multi = false)
+    @name, @type, @parent, @multi = name.to_s, type, parent, multi
   end
 end

data/lib/sdl/base/service.rb

@@ -1,17 +1,13 @@
-module SDL
-  module Base
-    class Service
-      attr_accessor :facts, :symbolic_name
+class SDL::Base::Service
+  attr_accessor :facts, :symbolic_name
 
-      def initialize(symbolic_name)
-        @symbolic_name = symbolic_name
+  def initialize(symbolic_name)
+    @symbolic_name = symbolic_name
 
-        @facts, @facades = [], []
-      end
+    @facts, @facades = [], []
+  end
 
-      def fact_class_facts_map
-        facts.group_by &:class
-      end
-    end
+  def fact_class_facts_map
+    facts.group_by &:class
   end
 end

data/lib/sdl/base/service_compendium.rb

@@ -1,130 +1,118 @@
-require 'active_support/inflector'
-
-module SDL
-  module Base
-    ##
-    # A service compendium allows the definition of service facts, types and services.
-    class ServiceCompendium
-      class << self
-        def default_sdltypes
-          @default_sdltypes ||= []
-        end
-      end
+##
+# A service compendium allows the definition of service facts, types and services.
+class SDL::Base::ServiceCompendium
+  attr :fact_classes
+  attr :types
+  attr :sdltype_codes
+  attr :type_instances
+  attr :services
+
+  def initialize
+    @fact_classes, @types, @services = [], [], {}
+    @type_instances, @sdltype_codes = {}, {}
+
+    register_default_types
+  end
 
-      attr :fact_classes
-      attr :types
-      attr :sdltype_codes
-      attr :type_instances
-      attr :services
+  def facts_definition(&facts_definitions)
+    self.instance_eval &facts_definitions
+  end
 
-      def initialize
-        @fact_classes, @types, @services = [], [], {}
-        @type_instances, @sdltype_codes = {}, {}
+  def type_instances_definition(&type_instances_definition)
+    self.instance_eval &type_instances_definition
+  end
 
-        register_default_types
-      end
+  # Defines a new class of service facts
+  def fact(sym, &fact_definition)
+    receiver = SDL::Receivers::FactReceiver.new(sym, self)
+    receiver.instance_eval &fact_definition if block_given?
+    receiver.subclasses.each do |fact_class|
+      @fact_classes << fact_class
 
-      def facts_definition(&facts_definitions)
-        self.instance_eval &facts_definitions
-      end
+      # Refer to the symbolic name of the current class, which can be a subclass of
+      sym = fact_class.local_name.underscore.to_sym
 
-      def type_instances_definition(&type_instances_definition)
-        self.instance_eval &type_instances_definition
-      end
+      ServiceMethods.class_eval do
+        unless SDL::Base::Service.instance_methods.include? sym
+          define_method sym do
+            @facts.find {|fact| fact.is_a? fact_class}
+          end
+        end
 
-      # Defines a new class of service facts
-      def fact(sym, &fact_definition)
-        receiver = SDL::Receivers::FactReceiver.new(sym, self)
-        receiver.instance_eval &fact_definition if block_given?
-        receiver.subclasses.each do |fact_class|
-          @fact_classes << fact_class
-
-          # Refer to the symbolic name of the current class, which can be a subclass of
-          sym = fact_class.local_name.underscore.to_sym
-
-          ServiceMethods.class_eval do
-            unless Service.instance_methods.include? sym
-              define_method sym do
-                @facts.find {|fact| fact.is_a? fact_class}
-              end
-            end
-
-            unless Service.instance_methods.include? sym.to_s.pluralize.to_sym
-              define_method sym.to_s.pluralize do
-                @facts.find_all {|fact| fact.is_a? fact_class}
-              end
-            end
+        unless SDL::Base::Service.instance_methods.include? sym.to_s.pluralize.to_sym
+          define_method sym.to_s.pluralize do
+            @facts.find_all {|fact| fact.is_a? fact_class}
           end
         end
       end
+    end
+  end
 
-      # Defines a new type and returns it
-      def type(sym, &type_definition)
-        receiver = SDL::Receivers::TypeReceiver.new(sym, self)
-        receiver.instance_eval &type_definition if block_given?
-        register_sdltype_codes(receiver.klass)
-        register_sdltype(receiver.klass)
-        @types << receiver.klass
-        @type_instances[receiver.klass] = {}
-        receiver.klass
-      end
+  # Defines a new type and returns it
+  def type(sym, &type_definition)
+    receiver = SDL::Receivers::TypeReceiver.new(sym, self)
+    receiver.instance_eval &type_definition if block_given?
+    register_sdltype_codes(receiver.klass)
+    register_sdltype(receiver.klass)
+    @types << receiver.klass
+    @type_instances[receiver.klass] = {}
+    receiver.klass
+  end
 
-      # Defines a new service, adds all service methods, and returns it
-      def service(sym, &service_definition)
-        receiver = SDL::Receivers::ServiceReceiver.new(sym, self)
-        receiver.instance_eval &service_definition if block_given?
-        @services[sym] = receiver.service
-        receiver.service.symbolic_name = sym.to_s
-        receiver.service.extend ServiceMethods
-        receiver.service
-      end
+  # Defines a new service, adds all service methods, and returns it
+  def service(sym, &service_definition)
+    receiver = SDL::Receivers::ServiceReceiver.new(sym, self)
+    receiver.instance_eval &service_definition if block_given?
+    @services[sym] = receiver.service
+    receiver.service.symbolic_name = sym.to_s
+    receiver.service.extend ServiceMethods
+    receiver.service
+  end
 
-      ##
-      # Registers the type under its codes
-      def register_sdltype_codes(type)
-        type.instance_variable_get(:@codes).each do |code|
-          @sdltype_codes[code] = type
-        end
-      end
+  ##
+  # Registers the type under its codes
+  def register_sdltype_codes(type)
+    type.instance_variable_get(:@codes).each do |code|
+      @sdltype_codes[code] = type
+    end
+  end
 
-      ##
-      # Allows this compendium to be used for adding new type instances
-      def register_sdltype(type)
-        # Define a method, which adds the type instance defined in the block to this compendium and adds it as a
-        # constant the the type class
-        self.class.send(:define_method, type.local_name.underscore) do |identifier, &block|
-          receiver = SDL::Receivers::TypeInstanceReceiver.new(type.new, self)
+  ##
+  # Allows this compendium to be used for adding new type instances
+  def register_sdltype(type)
+    # Define a method, which adds the type instance defined in the block to this compendium and adds it as a
+    # constant the the type class
+    self.class.send(:define_method, type.local_name.underscore) do |identifier, &block|
+      receiver = SDL::Receivers::TypeInstanceReceiver.new(type.new, self)
 
-          receiver.instance_eval &block if block != nil
+      receiver.instance_eval &block if block != nil
 
-          receiver.instance.identifier = identifier
-          @type_instances[type][identifier] = receiver.instance
-        end
-      end
+      receiver.instance.identifier = identifier
+      @type_instances[type][identifier] = receiver.instance
+    end
+  end
 
-      ##
-      # Registers all classes by their #local_name to be used in all scopes
-      def register_classes_globally
-        (@fact_classes + @types).each do |defined_class|
-          Object.send(:remove_const, defined_class.local_name) if Object.const_defined? defined_class.local_name.to_sym
-          Object.const_set defined_class.local_name, defined_class
-        end
-      end
+  ##
+  # Registers all classes by their #local_name to be used in all scopes
+  def register_classes_globally
+    (@fact_classes + @types).each do |defined_class|
+      Object.send(:remove_const, defined_class.local_name) if Object.const_defined? defined_class.local_name.to_sym
+      Object.const_set defined_class.local_name, defined_class
+    end
+  end
 
-      # This module is included in every service defined by this compendium and contains methods to easily retreive
-      # certain fact instances by their name.
-      module ServiceMethods
+  # This module is included in every service defined by this compendium and contains methods to easily retreive
+  # certain fact instances by their name.
+  module ServiceMethods
 
-      end
+  end
 
-      private
-        ##
-        # Registers all default types
-        def register_default_types
-          self.class.default_sdltypes.each do |type|
-            register_sdltype_codes type
-          end
-        end
+  private
+    ##
+    # Registers all default types
+    def register_default_types
+      SDL::Types::SDLSimpleType.sdl_types.each do |type|
+        register_sdltype_codes type
+      end
     end
-  end
 end

data/lib/sdl/base/type.rb

@@ -1,82 +1,76 @@
-require 'i18n'
-
-module SDL
-  module Base
-    class Type
-      class << self
-        ## The namespace URL of this Fact class
-        attr_accessor :namespace
-
-        ##
-        # The local name of the type, e.g. "Name" or "ServiceInterface". Defaults to the name of the class.
-        #
-        # The ServiceCompendium#register_classes_globally method makes this class accessible by a constant of this name
-        @local_name
-
-        def local_name
-          @local_name || name.demodulize
-        end
-
-        def local_name=(name)
-          @local_name = name
-        end
+class SDL::Base::Type
+  class << self
+    ## The namespace URL of this Fact class
+    attr_accessor :namespace
+
+    ##
+    # The local name of the type, e.g. "Name" or "ServiceInterface". Defaults to the name of the class.
+    #
+    # The ServiceCompendium#register_classes_globally method makes this class accessible by a constant of this name
+    @local_name
+
+    def local_name
+      @local_name || name.demodulize
+    end
 
-        def to_s
-          @local_name || name
-        end
+    def local_name=(name)
+      @local_name = name
+    end
 
-        def properties(including_super = false)
-          if including_super && is_sub?
-            self.properties + superclass.properties(true)
-          else
-            @properties ||= []
-          end
-        end
+    def to_s
+      @local_name || name
+    end
 
-        def propertyless?(including_super = false)
-          properties(including_super).count == 0
-        end
+    def properties(including_super = false)
+      if including_super && is_sub?
+        self.properties + superclass.properties(true)
+      else
+        @properties ||= []
+      end
+    end
 
-        def single_property?(including_super = false)
-          properties(including_super).count == 1
-        end
+    def propertyless?(including_super = false)
+      properties(including_super).count == 0
+    end
 
-        def multi_property?(including_super = true)
-          properties(including_super).count > 1
-        end
+    def single_property?(including_super = false)
+      properties(including_super).count == 1
+    end
 
-        def is_sub?
-          not [SDL::Base::Type, SDL::Base::Fact].include? superclass
-        end
-      end
+    def multi_property?(including_super = true)
+      properties(including_super).count > 1
+    end
 
-      ##
-      # Gets the values of all properties
-      def property_values
-        Hash[self.class.properties(true).map{|p| [p, send(p.name)]}]
-      end
+    def is_sub?
+      not [SDL::Base::Type, SDL::Base::Fact].include? superclass
+    end
+  end
 
-      def to_s
-        # If there is a property with the same name, than the type, return its to_s, return the name of the class
-        naming_property = self.class.properties(true).find {|p| p.name.eql?(self.class.to_s.underscore) }
+  ##
+  # Gets the values of all properties
+  def property_values
+    Hash[self.class.properties(true).map{|p| [p, send(p.name)]}]
+  end
 
-        if(naming_property)
-          instance_variable_get("@#{naming_property.name.to_sym}").to_s
-        else
-          self.class.to_s
-        end
-      end
+  def to_s
+    # If there is a property with the same name, than the type, return its to_s, return the name of the class
+    naming_property = self.class.properties(true).find {|p| p.name.eql?(self.class.to_s.underscore) }
 
-      def annotated?
-        ! @annotations.blank?
-      end
+    if(naming_property)
+      instance_variable_get("@#{naming_property.name.to_sym}").to_s
+    else
+      self.class.to_s
+    end
+  end
 
-      def annotations
-        @annotations ||= []
-      end
+  def annotated?
+    ! @annotations.blank?
+  end
 
-      # An identifier for type instances
-      attr_accessor :identifier
-    end
+  def annotations
+    @annotations ||= []
   end
+
+  # An identifier for type instances
+  attr_accessor :identifier
 end