sdl-ng 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63c012a4a880107aa2abc578cd5d6e31586685f4
-  data.tar.gz: 9f48ce28d5770a44db409a24e851ec417dea2566
+  metadata.gz: 7d1ec08b2a5a2c3e43249e9b10d3de36c4c3a98b
+  data.tar.gz: 1c0a4526564013c5a575a0067d0928222398d466
 SHA512:
-  metadata.gz: ff01a182a62dd8a80e8f4c417382fe1b376e4938c8fd8ba7864fed886d549d1afb04099ac58d74794ac2ee03160e4171d5c024b63e6a7df881795101a8c14027
-  data.tar.gz: 18875548fa81bf0b0e4b48a5c0313eb031aebc8e93194583624f92cb42848c7aac79cbf087796766596adb7f1f329fc6f11b965755d1d36d38c1f8ee9b838ee8
+  metadata.gz: 4a7d602e5a4aea0d43a67ea9ccf6af365d71f81e18b89425787be450bbc84b0260e708f375c2c0443d537b2403fe068dc8e4aedcc2f0df2e9248dc3883eda962
+  data.tar.gz: 43a04fd9d23ddd0e0a8ef6bb9de7091f5d681cfef670bec02ea802512863706ffff9ffae953f2048a215cc8def1652e787ddc64df7b19bfc27ad98cee66539a6

data/examples/services/salesforce_sales_cloud.service.rb

@@ -42,7 +42,7 @@ has_payment_option credit_card
 has_payment_option cheque
 has_payment_option invoice
 
-features = fetch_from_url 'http://www.salesforce.com/sales-cloud/overview/', '.slide h3 + p'
+features = fetch_from_url 'http://www.salesforce.com/sales-cloud/overview/', '.slide h3 + *'
 
 has_feature 'Mobile', features[0]
 has_feature 'Contact Management', features[1]

data/examples/translations/en.yml

@@ -10,10 +10,6 @@ en:
       communication_protection: The communication with the service is protected
       continuous_service_improvement: The service has continuous service improvement
         means
-      continuous_service_improvement_feedback_page: The service has a feedback page
-      continuous_service_improvement_future_roadmap: The service has a future roadmap
-      continuous_service_improvement_past_release_notes: The service has past release
-        notes
       data_capability: The service can carry out operations on a specific data format
       data_deletion_policy: The service allows for complete deletion of user data
         after termination of contract
@@ -116,6 +112,12 @@ en:
           communication_protection: Protection means
         continuous_service_improvement:
           url: Link
+        continuous_service_improvement_feedback_page:
+          url: Feedback page
+        continuous_service_improvement_future_roadmap:
+          url: Future roadmap
+        continuous_service_improvement_past_release_notes:
+          url: Past release notes
         data_capability:
           format: Format
           operation: Operation

data/lib/sdl.rb

@@ -5,8 +5,7 @@ require 'active_support/dependencies'
 require 'active_support/inflector'
 
 require 'i18n'
-
-ActiveSupport::Dependencies.autoload_paths += ['sdl']
+require 'verbs'
 
 ##
 #
@@ -18,11 +17,8 @@ module SDL
   autoload :Base
   autoload :Exporters
   autoload :Receivers
+  autoload :Types
 
-  eager_autoload do
-    autoload :Types
-  end
-
-  require_relative 'sdl/util'
-  require_relative 'sdl/ng/version'
+  ActiveSupport::Dependencies::Loadable.require_dependency File.join(__dir__, 'sdl', 'util.rb')
+  ActiveSupport::Dependencies::Loadable.require_dependency File.join(__dir__, 'sdl', 'ng', 'version.rb')
 end

data/lib/sdl/base/property.rb

@@ -10,9 +10,12 @@ class SDL::Base::Property
   # Is this Property multi-valued
   attr :multi
 
-  # The parent type, where this property belongs to
+  # The type, for which the property is defined
   attr :parent
 
+  # The type, which currently holds this property
+  attr_accessor :holder
+
   # Is this Property single-valued
   def single?
     !@multi

data/lib/sdl/base/service_compendium.rb

@@ -111,7 +111,7 @@ class SDL::Base::ServiceCompendium
     ##
     # Registers all default types
     def register_default_types
-      SDL::Types::SDLSimpleType.sdl_types.each do |type|
+      SDL::Types::SDLSimpleType.descendants.each do |type|
         register_sdltype_codes type
       end
     end

data/lib/sdl/base/type.rb

@@ -23,9 +23,13 @@ class SDL::Base::Type
 
     def properties(including_super = false)
       if including_super && is_sub?
-        self.properties + superclass.properties(true)
+        retrieved_properties = self.properties + superclass.properties(true)
       else
-        @properties ||= []
+        retrieved_properties = @properties ||= []
+      end
+
+      retrieved_properties.each do |p|
+        p.holder = self
       end
     end
 

data/lib/sdl/ng/version.rb

@@ -1,5 +1,5 @@
 module SDL
   module NG
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/lib/sdl/receivers.rb

@@ -2,22 +2,10 @@ module SDL
   module Receivers
     extend ActiveSupport::Autoload
 
+    autoload :Receiver
     autoload :FactReceiver
     autoload :ServiceReceiver
     autoload :TypeReceiver
     autoload :TypeInstanceReceiver
-
-    #
-    def self.set_value(type_class, type_instance, *property_values, compendium)
-      property_values.zip(type_class.properties(true)).each do |value, property|
-        if(value.is_a?(Hash))
-          TypeInstanceReceiver.new(type_instance, compendium).send(value.keys.first.to_s, value.values.first)
-        else
-          raise "Specified value '#{value}' for non-existing property." unless property
-
-          TypeInstanceReceiver.new(type_instance, compendium).send(property.name, value)
-        end
-      end
-    end
   end
 end

data/lib/sdl/receivers/service_receiver.rb

@@ -1,14 +1,14 @@
 require 'verbs'
 
-class SDL::Receivers::ServiceReceiver
+class SDL::Receivers::ServiceReceiver < SDL::Receivers::Receiver
   include ActiveSupport::Inflector
 
   attr :service
-  attr :compendium
 
   def initialize(sym, compendium)
+    super(compendium)
+
     @service = SDL::Base::Service.new(sym.to_s)
-    @compendium = compendium
 
     compendium.fact_classes.each do |fact_class|
       define_singleton_method("is_#{fact_class.local_name.underscore.verb.conjugate(:tense => :past, :person => :third, :plurality => :singular, :aspect => :perfective)}") do |*args, &block|
@@ -30,7 +30,7 @@ class SDL::Receivers::ServiceReceiver
       fact_instance = fact_class.new
       fact_instance.service = @service
 
-      SDL::Receivers.set_value(fact_class, fact_instance, *property_values, @compendium)
+      set_value(fact_class, fact_instance, *property_values)
 
       if block_given?
         SDL::Receivers::TypeInstanceReceiver.new(fact_instance, @compendium).instance_eval &block

data/lib/sdl/receivers/type_instance_receiver.rb

@@ -1,16 +1,15 @@
 ##
 # Receiver for setting the properties of Type instances
-class SDL::Receivers::TypeInstanceReceiver
+class SDL::Receivers::TypeInstanceReceiver < SDL::Receivers::Receiver
   attr_accessor :instance
 
-  attr_accessor :compendium
-
   ##
   # When initialized for a fact or type instance, the receiver creates singleton methods on itself for all
   # properties.
   def initialize(instance, compendium)
+    super(compendium)
+
     @instance = instance
-    @compendium = compendium
 
     instance.class.properties(true).each do |property|
       if property.single?
@@ -48,7 +47,7 @@ class SDL::Receivers::TypeInstanceReceiver
             else
               new_list_item = property.type.new
 
-              SDL::Receivers.set_value(property.type, new_list_item, *property_values, @compendium)
+              set_value(property.type, new_list_item, *property_values)
 
               self.class.new(new_list_item, @compendium).instance_exec(&block) unless block.nil?
 

data/lib/sdl/receivers/type_receiver.rb

@@ -1,12 +1,12 @@
-class SDL::Receivers::TypeReceiver
+class SDL::Receivers::TypeReceiver < SDL::Receivers::Receiver
   include ActiveSupport::Inflector
 
   attr :klass
   attr :subclasses
-  attr :compendium
 
   def initialize(sym, compendium, superklass = nil)
-    @compendium = compendium
+    super(compendium)
+
     @klass = Class.new(superklass || base_class)
     @klass.local_name = sym.to_s.camelize
 

data/lib/sdl/types.rb

@@ -9,17 +9,16 @@ module SDL
     extend ActiveSupport::Autoload
 
     # Required, as these types register Receiver methods for their usage in property definitions.
-    eager_autoload do
-      autoload :SDLType
-      autoload :SDLSimpleType
-      autoload :SDLDatetime
-      autoload :SDLDescription
-      autoload :SDLDuration
-      autoload :SDLNumber
-      autoload :SDLString
-      autoload :SDLUrl
+    autoload :SDLType
+    autoload :SDLSimpleType
+
+    %w[datetime description duration number string url].each do |typefile|
+      ActiveSupport::Dependencies::Loadable.require_dependency File.join(__dir__, 'types', "sdl_#{typefile}.rb")
     end
 
-    eager_load!
+    autoload :SDLDescription
+    autoload :SDLDuration
+    autoload :SDLNumber
+    autoload :SDLUrl
   end
 end

data/lib/sdl/types/sdl_description.rb

@@ -1,10 +1,23 @@
+##
+# Description values are extended string values with additional conversion functions.
 class SDL::Types::SDLDescription < SDL::Types::SDLSimpleType
   include SDL::Types::SDLType
 
   wraps String
   codes :description
 
-  def from_nilclass(nilvalue)
+  def from_nil_class(nilvalue)
     @value = ""
   end
+
+  def from_nokogiri_xml_element(element)
+    @value = element.content.squish
+  end
+
+  def to_html
+    case @raw_value.class
+      when Nokogiri::XML::Element
+        @raw_value.to_s
+    end
+  end
 end

data/lib/sdl/types/sdl_simple_type.rb

@@ -5,19 +5,6 @@
 class SDL::Types::SDLSimpleType
   include SDL::Types::SDLType
 
-  ##
-  # Array of all SDLSimpleTypes. Used by the ServiceCompendium.
-  def self.sdl_types
-    @@sdl_types ||= []
-  end
-
-  ##
-  # Every descendant of SDLSimpleType registers it with this class, so that all ServiceCompendiums
-  # recognize the codes of descendants.
-  def self.inherited(subclass)
-    sdl_types << subclass
-  end
-
   # The SDL value type value, possibly converted to the wrapped ruby type, e.g., an URI object created from an
   # "http://" String
   attr_reader :value
@@ -59,6 +46,6 @@ class SDL::Types::SDLSimpleType
 
   private
     def conversion_method_name(value)
-      value.class.name.demodulize.camelize.downcase
+      'from_' + value.class.name.underscore.gsub('/', '_')
     end
 end

data/lib/sdl/types/sdl_url.rb

@@ -8,7 +8,7 @@ class SDL::Types::SDLUrl < SDL::Types::SDLSimpleType
 
   def from_string(string_value)
     begin
-      URI.parse string_value
+      @value = URI.parse string_value
     rescue URI::InvalidURIError
       throw "Invalid URI: #{string_value}"
     end

data/lib/sdl/util.rb

@@ -1,5 +1,5 @@
-require_relative 'util/nokogiri'
-require_relative 'util/documentation'
-require_relative 'util/verbs'
+ActiveSupport::Dependencies.load_file File.join(__dir__, 'util', 'nokogiri.rb')
+ActiveSupport::Dependencies.load_file File.join(__dir__, 'util', 'documentation.rb')
+ActiveSupport::Dependencies.load_file File.join(__dir__, 'util', 'verbs.rb')
 
 I18n.load_path << File.join(__dir__, 'translations', 'en.yml')

data/lib/sdl/util/documentation.rb

@@ -1,15 +1,15 @@
 require 'active_support/inflector'
 
+I18n.config.enforce_available_locales = true
+
 module I18n
   class MissingTranslation
     module Base
-      alias :old_message :message
+      alias :old_message :message unless method_defined?(:old_message)
 
       def message
         puts old_message
 
-        puts @key
-
         I18n.backend.store_translations I18n.locale, to_deep_hash({@key => 'Translate'})
 
         old_message
@@ -59,28 +59,41 @@ module SDL
 
         klass_key
       end
-
-      [SDL::Base::Type, SDL::Base::Fact, SDL::Base::Property].each do |m| m.class_eval do include SDL::Util::Documentation end end
     end
   end
-end
 
-module SDL
   module Base
-    class Type
-      def self.documentation_key
-        "sdl.#{SDL::Util::Documentation.walk_the_class_name(self)}"
-      end
+    [Type, Fact, Property].each do |m| m.class_eval do include SDL::Util::Documentation end end
+  end
+end
 
-      def documentation_key
-        "sdl.instance.#{SDL::Util::Documentation.walk_the_class_name(self.class)}.#{@identifier}"
-      end
+module SDL::Base
+  class Type
+    def self.documentation_key
+      "sdl.#{SDL::Util::Documentation.walk_the_class_name(self)}"
+    end
+
+    def documentation_key
+      "sdl.instance.#{SDL::Util::Documentation.walk_the_class_name(self.class)}.#{@identifier}"
     end
+  end
 
-    class Property
-      def documentation_key
-        "sdl.property.#{SDL::Util::Documentation.walk_the_class_name(@parent)}.#{@name}"
+  class Property
+    ##
+    # As properties are inherited, the documentation could either be defined by the current type, or any subtypes, which
+    # also define or inherit this key. This method finds the first defined key.
+    def documentation_key
+      # Search class and ancestors, if any defines a documentation key
+      @holder.ancestors.each do |ancestor|
+        break if ancestor.eql? SDL::Base::Type
+
+        key = "sdl.property.#{SDL::Util::Documentation.walk_the_class_name(ancestor)}.#{@name}"
+
+        return key if I18n.exists? key
       end
+
+      # Return default key
+      return "sdl.property.#{SDL::Util::Documentation.walk_the_class_name(@parent)}.#{@name}"
     end
   end
 end

data/lib/sdl/util/nokogiri.rb

@@ -17,12 +17,6 @@ module SDL
   end
 end
 
-module SDL
-  module Receivers
-    [FactReceiver, ServiceReceiver, TypeInstanceReceiver, TypeReceiver].each do |r|
-      r.class_eval do
-        include(SDL::Util::NokogiriUtils)
-      end
-    end
-  end
+SDL::Receivers::Receiver.class_eval do
+  include(SDL::Util::NokogiriUtils)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sdl-ng
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Mathias Slawik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2014-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport