sdl-ng 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d1ec08b2a5a2c3e43249e9b10d3de36c4c3a98b
-  data.tar.gz: 1c0a4526564013c5a575a0067d0928222398d466
+  metadata.gz: 447f6a7793ea9f99d160325a4a71ee54ff54d878
+  data.tar.gz: a1482bec25b04b717351878c63898db60f1efafb
 SHA512:
-  metadata.gz: 4a7d602e5a4aea0d43a67ea9ccf6af365d71f81e18b89425787be450bbc84b0260e708f375c2c0443d537b2403fe068dc8e4aedcc2f0df2e9248dc3883eda962
-  data.tar.gz: 43a04fd9d23ddd0e0a8ef6bb9de7091f5d681cfef670bec02ea802512863706ffff9ffae953f2048a215cc8def1652e787ddc64df7b19bfc27ad98cee66539a6
+  metadata.gz: e4b903194f29bccd32b6c9dd32f44ae663d2c47c8f98793f284bfe609e3cdf3fb5366df412e20039509a1cb709b8c1d2924d39fc4e35c33ac7d0ca9c2cc90e70
+  data.tar.gz: 9b95ecff93b9ce9829fdd6d9b57bb13d23e9dba3d0d0ae994c91f1fa9426264c923bc0365bb50b9ae78fdc6f59f73ec4317a9a966a26e91a7a1350f340b1d4d5

data/examples/services/google_drive_for_business.service.rb

@@ -40,11 +40,14 @@ end
   "For drawings" => [:png, :jpeg, :svg, :pdf]
 }.each do |annotation, formats_list|
   formats_list.each do |f|
-    has_data_capability export, f, annotation: annotation
+    has_export_capability f, annotation: annotation
   end
 end
 
-headers = fetch_from_url 'http://www.google.com/enterprise/apps/business/products.html', 'div.apps-content-set:nth-child(3) div.maia-col-4 h3'
-headers.each do |header|
+# Fetch a list of features from the Google Apps page
+fetch_from_url('http://www.google.com/enterprise/apps/business/products.html', 'div.apps-content-set:nth-child(3) div.product-section-features h3').each do |header|
+  # Skip empty features (e.g. "more information...")
+  next if header.search('~p')[0].blank?
+
   has_feature header.content.strip, header.search('~p')[0]
 end

data/examples/services/salesforce_sales_cloud.service.rb

@@ -1,14 +1,14 @@
 name "Salesforce Sales Cloud"
 
-has_documentation url: 'http://www.salesforce.com/sales-cloud/overview/'
+has_documentation url: 'http://www.salesforce.com/sales-cloud/overview'
 
-has_add_on_repository 'https://appexchange.salesforce.com/' do
+has_add_on_repository 'https://appexchange.salesforce.com' do
   number_of_add_ons 2000
 end
 
 has_communication_protection https
 
-has_status_page 'http://trust.salesforce.com/trust/status/'
+has_status_page 'http://trust.salesforce.com/trust/status'
 
 has_public_service_level_agreement 'http://www.salesforce.com/assets/pdf/misc/salesforce_MSA.pdf'
 
@@ -19,7 +19,7 @@ has_offline_capability annotation: 'http://help.salesforce.com/apex/HTViewHelpDo
 maintenance_free
 
 has_future_roadmap 'http://www.sfdcstatic.com/assets/pdf/misc/summer13_ReleasePreview.pdf'
-has_past_release_notes 'http://www.salesforce.com/newfeatures/'
+has_past_release_notes 'http://www.salesforce.com/newfeatures'
 
 has_cloud_service_model saas
 
@@ -34,7 +34,7 @@ has_browser_interface do
   compatible_browser safari, '5', annotation: 'on Mac'
 end
 
-has_data_capability export, csv
+has_export_capability csv
 
 is_billed annually, in_advance
 
@@ -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 + *'
+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

@@ -4,13 +4,13 @@ en:
     fact:
       add_on_repository: Service add-on repo
       audit_option: Audit option
-      bill: Billing terms
+      bill: Billing & Payment
       charge_unit: Charge unit
       cloud_service_model: Cloud service model
       communication_protection: The communication with the service is protected
       continuous_service_improvement: The service has continuous service improvement
         means
-      data_capability: The service can carry out operations on a specific data format
+      data_capability: Supports operation
       data_deletion_policy: The service allows for complete deletion of user data
         after termination of contract
       data_encryption: The service applies encrpytion on user data
@@ -24,7 +24,7 @@ en:
       establishing_year: The establishing year of the service is known
       feature: A service feature
       interface: An interface to service functionality
-      interface_browser_interface: A regular browser-based interface
+      interface_browser_interface: Browser interface
       interface_rest_interface: The service has a RESTful interface
       interface_soap_interface: The service has a SOAP interface
       interface_xmlrpc_interface: The service has an XMLRPC interface
@@ -102,14 +102,14 @@ en:
         audit_option:
           audit_option: Audit option
         bill:
-          billing_term: Billing terms
-          payment_term: Payment terms
+          billing_term: Billing
+          payment_term: Payment
         charge_unit:
           charge_unit: Charge unit
         cloud_service_model:
           cloud_service_model: Cloud service model
         communication_protection:
-          communication_protection: Protection means
+          communication_protection: Protected by
         continuous_service_improvement:
           url: Link
         continuous_service_improvement_feedback_page:
@@ -118,9 +118,10 @@ en:
           url: Future roadmap
         continuous_service_improvement_past_release_notes:
           url: Past release notes
-        data_capability:
-          format: Format
-          operation: Operation
+        data_capability_export_capability:
+          format: Can export
+        data_capability_export_capability:
+          format: Can import
         data_encryption:
           key_control: Controlling party
         data_location:
@@ -154,13 +155,13 @@ en:
       type:
         browser:
           browser_name: The name of the browser
-          url: The browser homepage URL
+          url: Homepage
         browser_plugin:
           plugin_name: The name of the browser plugin
           url: The browser plugin URL
         compatible_browser:
-          compatible_browser: The compatible browser
-          min_version: The minimum version of the browser
+          compatible_browser: Browser
+          min_version: Min version
         data_format:
           mime_type: The mime type of the data format
         required_plugin:
@@ -177,7 +178,6 @@ en:
       charge_unit: The charge unit
       cloud_service_model: A cloud service model
       communication_protection: A communication protection means
-      compatible_browser: A compatible browser
       data_capability_operation: The data capability operation
       data_format: The data format
       key_control: One possibility of key control

data/examples/vocabulary/crf/portability.sdl.rb

@@ -3,8 +3,10 @@ type :data_capability_operation
 type :data_format
 
 fact :data_capability do
-  data_capability_operation :operation
   data_format :format
+
+  subfact :export_capability
+  subfact :import_capability
 end
 
 data_format :csv
@@ -19,7 +21,4 @@ data_format :odf
 data_format :pptx
 data_format :png
 data_format :jpeg
-data_format :svg
-
-data_capability_operation :export
-data_capability_operation :import
+data_format :svg

data/lib/sdl.rb

@@ -18,7 +18,7 @@ module SDL
   autoload :Exporters
   autoload :Receivers
   autoload :Types
+  autoload :NG, File.join(__dir__, 'sdl', 'ng', 'version.rb')
 
   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/service.rb

@@ -1,5 +1,5 @@
 class SDL::Base::Service
-  attr_accessor :facts, :symbolic_name
+  attr_accessor :facts, :symbolic_name, :compendium
 
   def initialize(symbolic_name)
     @symbolic_name = symbolic_name

data/lib/sdl/base/service_compendium.rb

@@ -65,6 +65,7 @@ class SDL::Base::ServiceCompendium
     receiver.instance_eval &service_definition if block_given?
     @services[sym] = receiver.service
     receiver.service.symbolic_name = sym.to_s
+    receiver.service.compendium = self
     receiver.service.extend ServiceMethods
     receiver.service
   end

data/lib/sdl/base/type.rb

@@ -1,8 +1,11 @@
 class SDL::Base::Type
   class << self
-    ## The namespace URL of this Fact class
+    # The namespace URL of this Type class
     attr_accessor :namespace
 
+    # If the Type is a list item type
+    attr_accessor :list_item
+
     ##
     # The local name of the type, e.g. "Name" or "ServiceInterface". Defaults to the name of the class.
     #
@@ -33,18 +36,26 @@ class SDL::Base::Type
       end
     end
 
-    def propertyless?(including_super = false)
+    def propertyless?(including_super = true)
       properties(including_super).count == 0
     end
 
-    def single_property?(including_super = false)
+    def single_property?(including_super = true)
       properties(including_super).count == 1
     end
 
+    def single_property(including_super = true)
+      properties(including_super).first
+    end
+
     def multi_property?(including_super = true)
       properties(including_super).count > 1
     end
 
+    def list_item?
+      @list_item == true
+    end
+
     def is_sub?
       not [SDL::Base::Type, SDL::Base::Fact].include? superclass
     end
@@ -52,8 +63,14 @@ class SDL::Base::Type
 
   ##
   # Gets the values of all properties
-  def property_values
-    Hash[self.class.properties(true).map{|p| [p, send(p.name)]}]
+  def property_values(include_empty = true)
+    pv = Hash[self.class.properties(true).map{|p| [p, send(p.name)]}]
+
+    unless include_empty
+      pv.reject! {|p, v| v.blank? }
+    end
+
+    pv
   end
 
   def to_s

data/lib/sdl/exporters.rb

@@ -5,9 +5,10 @@ module SDL::Exporters
   autoload :SchemaExporter
   autoload :ServiceExporter
   autoload :RDFExporter
-  autoload :RDFMapping
   autoload :MarkdownServiceExporter
-  autoload :XMLMapping
   autoload :XMLServiceExporter
   autoload :XSDSchemaExporter
+
+  ActiveSupport::Dependencies::Loadable.require_dependency File.join(__dir__, 'exporters', 'xml_mapping.rb')
+  ActiveSupport::Dependencies::Loadable.require_dependency File.join(__dir__, 'exporters', 'rdf_mapping.rb')
 end

data/lib/sdl/exporters/rdf_exporter.rb

@@ -1,7 +1,7 @@
 require 'rdf'
 require 'rdf/rdfxml'
 
-class SDL::Exporters::RDFExporter < ServiceExporter
+class SDL::Exporters::RDFExporter < SDL::Exporters::ServiceExporter
   @@s = RDF::Vocabulary.new('http://www.open-service-compendium.org/')
 
   def export_service(service)
@@ -27,4 +27,10 @@ class SDL::Exporters::RDFExporter < ServiceExporter
       end
     end
   end
+end
+
+class SDL::Base::Service
+  def to_rdf
+    SDL::Exporters::RDFExporter.new(@compendium).export_service(self)
+  end
 end

data/lib/sdl/exporters/rdf_mapping.rb

@@ -1,10 +1,8 @@
 require 'rdf'
 
-[String, Fixnum, Nokogiri::XML::Element].each do |klass|
-  klass.class_eval do
-    def rdf_object
-      RDF::Literal.new(self)
-    end
+SDL::Types::SDLSimpleType.class_eval do
+  def rdf_object
+    RDF::Literal.new(self)
   end
 end
 

data/lib/sdl/exporters/schema_exporter.rb

@@ -1,4 +1,4 @@
-class SDL::Exporters::SchemaExporter < Exporter
+class SDL::Exporters::SchemaExporter < SDL::Exporters::Exporter
   def export_schema_to_file(path)
     export_to_file path, export_schema
   end

data/lib/sdl/exporters/service_exporter.rb

@@ -1,4 +1,4 @@
-class SDL::Exporters::ServiceExporter < Exporter
+class SDL::Exporters::ServiceExporter < SDL::Exporters::Exporter
   def export_service_to_file(service, path)
     export_to_file path, export_service(service)
   end

data/lib/sdl/exporters/xml_service_exporter.rb

@@ -1,18 +1,22 @@
-class SDL::Exporters::XMLServiceExporter < ServiceExporter
+class SDL::Exporters::XMLServiceExporter < SDL::Exporters::ServiceExporter
   def export_service(service)
     builder = Nokogiri::XML::Builder.new do |xml|
-      xml.service('xmlns' => 'http://www.open-service-compendium.org') do
-        service.facts.each do |fact|
-          xml.send(fact.class.xsd_element_name + '_') do
-            serialize_type_instance fact, xml
-          end
-        end
-      end
+      build_service(service, xml)
     end
 
     builder.to_xml
   end
 
+  def build_service(service, xml)
+    xml.service('xmlns' => 'http://www.open-service-compendium.org') do
+      service.facts.each do |fact|
+        xml.send(fact.class.xsd_element_name + '_') do
+          serialize_type_instance fact, xml
+        end
+      end
+    end
+  end
+
   def serialize_type_instance(type_instance, xml)
     type_instance.property_values.each do |property, value|
       [value].flatten.each do |v|
@@ -30,4 +34,10 @@ class SDL::Exporters::XMLServiceExporter < ServiceExporter
       end
     end
   end
+end
+
+class SDL::Base::Service
+  def to_xml
+    SDL::Exporters::XMLServiceExporter.new(@compendium).export_service(self)
+  end
 end

data/lib/sdl/exporters/xsd_schema_exporter.rb

@@ -9,7 +9,7 @@ require 'nokogiri'
 #     service fact types.
 #   - The definition of service fact classes and SDL types
 #   - The definition of a type base, containing annotations and documentation
-class SDL::Exporters::XSDSchemaExporter < SchemaExporter
+class SDL::Exporters::XSDSchemaExporter < SDL::Exporters::SchemaExporter
   def export_schema
     export_schema_xml.to_xml
   end

data/lib/sdl/ng/version.rb

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

data/lib/sdl/receivers/receiver.rb

@@ -0,0 +1,21 @@
+module SDL::Receivers
+  class Receiver
+    attr :compendium
+
+    def initialize(compendium)
+      @compendium = compendium
+    end
+
+    def set_value(type_class, type_instance, *property_values)
+      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/type_receiver.rb

@@ -40,6 +40,9 @@ class SDL::Receivers::TypeReceiver < SDL::Receivers::Receiver
   def list(name, &block)
     list_type = @compendium.type name.to_s.singularize.to_sym, &block
 
+    # Designate as list type
+    list_type.list_item = true
+
     add_property name.to_sym, list_type, true
   end
 

data/lib/sdl/types/sdl_description.rb

@@ -7,7 +7,7 @@ class SDL::Types::SDLDescription < SDL::Types::SDLSimpleType
   codes :description
 
   def from_nil_class(nilvalue)
-    @value = ""
+    @value = ''
   end
 
   def from_nokogiri_xml_element(element)
@@ -15,9 +15,13 @@ class SDL::Types::SDLDescription < SDL::Types::SDLSimpleType
   end
 
   def to_html
-    case @raw_value.class
+    case @raw_value
       when Nokogiri::XML::Element
         @raw_value.to_s
+      when NilClass
+        ''
+      else
+        "Cannot convert #{@raw_value.class} to HTML. Please extend SDLDescription#to_html"
     end
   end
 end

data/lib/sdl/util/nokogiri.rb

@@ -4,11 +4,30 @@ require 'open-uri'
 module SDL
   module Util
     module NokogiriUtils
+      ##
+      # Fetches an Nokogiri::XML::NodeSet from the webpage at url by performing *search
+      #
+      # Additionally it converts all relative href URLs to absolute URLs and adds a 'target' attribute to all
+      # links, so that they open in a new browser window and not the current broker.
       def fetch_from_url(url, *search)
         begin
           doc = Nokogiri::HTML(open(url))
 
-          doc.search(*search)
+          result = doc.search(*search)
+
+          result.search('//body//@href').each do |attribute|
+            begin
+              attribute.content = URI.join(url, attribute.value.gsub(/\s/, '')).to_s
+            rescue URI::InvalidURIError
+              next
+            end
+
+            if attribute.parent.name.eql? 'a'
+              attribute.parent['target'] = '_new'
+            end
+          end
+
+          result
         rescue SocketError => e
           []
         end

data/sdl-ng.gemspec

@@ -1,13 +1,14 @@
 # coding: utf-8
 lib = File.expand_path('lib', __dir__)
 $:.unshift(lib) unless $:.include?(lib)
-require 'sdl/ng/version'
+
+require 'sdl'
 
 Gem::Specification.new do |spec|
-  spec.name          = "sdl-ng"
+  spec.name          = 'sdl-ng'
   spec.version       = SDL::NG::VERSION
-  spec.authors       = ["Mathias Slawik"]
-  spec.email         = ["mathias.slawik@tu-berlin.de"]
+  spec.authors       = ['Mathias Slawik']
+  spec.email         = ['mathias.slawik@tu-berlin.de']
   spec.description   = %q{Next Generation Service Description Language}
   spec.summary       = %q{Framework for building descriptions of business services.}
   spec.homepage      = 'https://github.com/TU-Berlin-SNET/sdl-ng'
@@ -16,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'activesupport', '>=4.0.0'
   spec.add_runtime_dependency 'nokogiri', '1.6.0'

data/spec/bin_spec.rb

@@ -0,0 +1,14 @@
+require_relative '../lib/sdl'
+require_relative 'spec_helper'
+
+require 'rspec'
+
+describe 'The process_service_descriptions binary script' do
+  it 'can be executed' do
+    Dir.chdir(File.join(__dir__, '..', 'examples')) do
+      `ruby #{File.join(__dir__, '..', 'bin', 'process_service_descriptions')}`
+
+      expect($?.exitstatus).to eq(0)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sdl-ng
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Mathias Slawik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -231,6 +231,7 @@ files:
 - lib/sdl/ng/version.rb
 - lib/sdl/receivers.rb
 - lib/sdl/receivers/fact_receiver.rb
+- lib/sdl/receivers/receiver.rb
 - lib/sdl/receivers/service_receiver.rb
 - lib/sdl/receivers/type_instance_receiver.rb
 - lib/sdl/receivers/type_receiver.rb
@@ -249,6 +250,7 @@ files:
 - lib/sdl/util/nokogiri.rb
 - lib/sdl/util/verbs.rb
 - sdl-ng.gemspec
+- spec/bin_spec.rb
 - spec/documentation_spec.rb
 - spec/fact_type_instance_definition_spec.rb
 - spec/property_definitions_spec.rb
@@ -281,6 +283,7 @@ signing_key:
 specification_version: 4
 summary: Framework for building descriptions of business services.
 test_files:
+- spec/bin_spec.rb
 - spec/documentation_spec.rb
 - spec/fact_type_instance_definition_spec.rb
 - spec/property_definitions_spec.rb