riddl 0.99.250 → 0.99.251

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52ad17085955e4db82cc7dd85550a6638ad05e04
-  data.tar.gz: 91c83c80020f80e5becd37e610b655d8a0371388
+  metadata.gz: 2f31b4c6dbd6943a80f4fe56b1bac9bbae589b4c
+  data.tar.gz: cb4df6a929ec0980612e1959448abb1cfe301d34
 SHA512:
-  metadata.gz: ba00c901896c793ffc941dd7ef13544f470434cfb81c08bd78e4a7a8df87a6484c33fe42f399432bb965c30a5dda99ca25420bf98e97147554cc5df710c32471
-  data.tar.gz: d75cca4d75dfdd7c7c3b35ee3904fc583552acffe45049f36e01f5a89f409572e0963348492ce4817a6f132b24c86ddc638bd74638c356f0baebf7574a203654
+  metadata.gz: 3d9921cd7ce15254b8833e747fe1b8c1aa97fb8f31c5ffa05171f70c69927f045c5830e415210aa0b9d8f07dccaf5b9ede623660551aac8894f500d043f53807
+  data.tar.gz: 14f58ca1b5a2fe31f109bfe83126b87e981fe896adb7295f14256e51413241782444ac62dd4e0a1ab437208b15ed9a86d407d0b9f350f37bbaaf5994072fa21e

data/lib/ruby/riddl/utils/notifications_producer.rb

@@ -3,8 +3,8 @@ module Riddl
     module Notifications
 
       module Producer
-      
-        def self::implementation(backend,handler=nil,details=:production) 
+
+        def self::implementation(backend,handler=nil,details=:production)
           unless handler.nil? || (handler.is_a? Riddl::Utils::Notifications::Producer::HandlerBase)
             raise "handler not a subclass of HandlerBase"
           end
@@ -26,10 +26,10 @@ module Riddl
                   end
                 end
               end
-            end  
+            end
           end
-        end  
-      
+        end
+
         class HandlerBase #{{{
           def initialize(data)
             @data = data
@@ -58,7 +58,7 @@ module Riddl
           class Sub #{{{
             def initialize(name)
               @name = name
-            end  
+            end
             def modify(&block)
               XML::Smart.modify(@name,"<subscription xmlns='http://riddl.org/ns/common-patterns/notifications-producer/1.0'/>") do |doc|
                 doc.register_namespace 'n', 'http://riddl.org/ns/common-patterns/notifications-producer/1.0'
@@ -75,7 +75,7 @@ module Riddl
               XML::Smart.open_unprotected(@name) do |doc|
                 doc.register_namespace 'n', 'http://riddl.org/ns/common-patterns/notifications-producer/1.0'
                 block.call doc
-              end  
+              end
             end
           end #}}}
 
@@ -88,7 +88,7 @@ module Riddl
               keys.each do |key|
                 f = @target + '/' + key + '/subscription.xml'
                 block.call Sub.new(f), key if File.exists? f
-              end  
+              end
             end
 
             def include?(key)
@@ -130,10 +130,15 @@ module Riddl
             end
           end #}}}
 
-          def initialize(topics,target)
+          def initialize(topics,target,init=nil)
             @target = target.gsub(/^\/+/,'/')
 
-            FileUtils::mkdir_p(@target) unless File.exists?(@target)
+
+            if init and not File.exists?(@target)
+              FileUtils::cp_r init, @target
+            else
+              FileUtils::mkdir_p(@target) unless File.exists?(@target)
+            end
 
             raise "topics file not found" unless File.exists?(topics)
             @topics = XML::Smart.open_unprotected(topics.gsub(/^\/+/,'/'))
@@ -146,7 +151,7 @@ module Riddl
                 end
               end
             end
-          end  
+          end
 
           def subscriptions
             Subs.new(@target)
@@ -154,7 +159,7 @@ module Riddl
 
         end #}}}
 
-        class Overview < Riddl::Implementation #{{{ 
+        class Overview < Riddl::Implementation #{{{
           def response
             Riddl::Parameter::Complex.new("overview","text/xml") do
               <<-END
@@ -167,7 +172,7 @@ module Riddl
 
           end
         end #}}}
-        
+
         class Topics < Riddl::Implementation #{{{
           def response
             backend = @a[0]
@@ -176,7 +181,7 @@ module Riddl
             end
           end
         end #}}}
-        
+
         class Subscriptions < Riddl::Implementation #{{{
           def response
             backend = @a[0]
@@ -189,7 +194,7 @@ module Riddl
                 sub.read do |doc|
                   if doc.root.attributes['url']
                     ret.root.add('subscription', :id => key, :url => doc.root.attributes['url'])
-                  else  
+                  else
                     ret.root.add('subscription', :id => key)
                   end
                 end
@@ -198,7 +203,7 @@ module Riddl
             end
           end
         end #}}}
-       
+
         class Subscription < Riddl::Implementation #{{{
           def response
             backend = @a[0]
@@ -211,7 +216,7 @@ module Riddl
             end
           end
         end #}}}
-        
+
         class CreateSubscription < Riddl::Implementation #{{{
           def response
             backend = @a[0]
@@ -237,14 +242,14 @@ module Riddl
                   t.add(type[0..-2], i)
                 end
               end
-            end  
+            end
 
             handler.key(key).topics(topics).create unless handler.nil?
             [
               Riddl::Parameter::Simple.new('key',key),
               Riddl::Parameter::Simple.new('producer-secret',producer_secret),
               Riddl::Parameter::Simple.new('consumer-secret',consumer_secret)
-            ]  
+            ]
           end
         end #}}}
 
@@ -259,7 +264,7 @@ module Riddl
             return
           end
         end #}}}
-        
+
         class UpdateSubscription < Riddl::Implementation #{{{
           def response
             backend = @a[0]
@@ -297,13 +302,13 @@ module Riddl
                   t.add(type[0..-2], i)
                 end
               end
-            end  
+            end
 
             handler.key(key).topics(topics).update unless handler.nil?
             nil
           end
         end #}}}
-                  
+
         class WS < Riddl::WebSocketImplementation #{{{
           def onopen
             @backend = @a[0]
@@ -320,8 +325,8 @@ module Riddl
             @handler.key(@key).ws_close() unless @handler.nil?
           end
         end #}}}
-        
-      end  
+
+      end
 
     end
   end

data/lib/ruby/riddl/utils/properties.rb

@@ -17,7 +17,7 @@ module Riddl
             run        Riddl::Utils::Properties::Schema,        backend          if get
             on resource 'rng' do
               run      Riddl::Utils::Properties::RngSchema,     backend          if get
-            end  
+            end
           end
           on resource 'values' do
             run        Riddl::Utils::Properties::Properties,    backend, handler if get
@@ -37,9 +37,9 @@ module Riddl
                 end
               end
             end
-          end  
+          end
         end
-      end  
+      end
 
       # Overloadable and Backends
       class HandlerBase #{{{
@@ -50,7 +50,7 @@ module Riddl
         def property(p)
           @property = p
           self
-        end  
+        end
         def create; end
         def read;   end
         def update; end
@@ -58,7 +58,7 @@ module Riddl
       end #}}}
 
       class Backend #{{{
-        attr_reader :schema, :data, :rng 
+        attr_reader :schema, :data, :rng
 
         def initialize(schema,target,init=nil)
           @target = target.gsub(/^\/+/,'/')
@@ -67,7 +67,7 @@ module Riddl
 
           if schema.is_a? Hash
             schema.each { |k,v| add_schema k, v }
-          elsif schema.is_a? String  
+          elsif schema.is_a? String
             add_schema 'default', schema
           end
           raise "no schemas provided" if @schemas.length == 0
@@ -99,7 +99,7 @@ module Riddl
           @schemas[key].register_namespace 'p', 'http://riddl.org/ns/common-patterns/properties/1.0'
           if !File::exists?(Riddl::Utils::Properties::PROPERTIES_SCHEMA_XSL_RNG)
             raise "properties schema transformation file not found"
-          end  
+          end
           @rngs[key] = @schemas[key].transform_with(XML::Smart.open_unprotected(Riddl::Utils::Properties::PROPERTIES_SCHEMA_XSL_RNG))
         end
         private :add_schema
@@ -133,7 +133,7 @@ module Riddl
             else
               false
             end
-          end  
+          end
         end
        end #}}}
 
@@ -159,7 +159,7 @@ module Riddl
           end
           return Riddl::Parameter::Complex.new("keys","text/xml",ret.to_s)
         end
-      end #}}} 
+      end #}}}
 
       class Query < Riddl::Implementation #{{{
         def response
@@ -215,7 +215,7 @@ module Riddl
             @status = 404
           end
         end
-        
+
         def extract_values(backend,property,minor=nil)
           case backend.property_type(property)
             when :complex
@@ -224,9 +224,9 @@ module Riddl
                 prop = XML::Smart::string("<value xmlns=\"http://riddl.org/ns/common-patterns/properties/1.0\"/>")
                 if res.length == 1
                   prop.root.add(res.first.children)
-                else  
+                else
                   prop.root.add(res)
-                end  
+                end
                 return Riddl::Parameter::Complex.new("value","text/xml",prop.to_s)
               else
                 prop = XML::Smart::string("<not-existing xmlns=\"http://riddl.org/ns/common-patterns/properties/1.0\"/>")
@@ -253,7 +253,7 @@ module Riddl
         private :extract_values
 
       end #}}}
-      
+
       # Modifiable
       class AddProperty < Riddl::Implementation #{{{
         def response
@@ -282,7 +282,7 @@ module Riddl
               @status = 404
               return # not a valid state from here on
             end
-          end  
+          end
 
           newstuff = value.nil? ? XML::Smart.string(content).root.children : value
           backend.modify do |doc|
@@ -291,17 +291,17 @@ module Riddl
               ele.add newstuff
             else
               ele.text = newstuff
-            end  
+            end
           end || begin
             @status = 400
             return # bad request
           end
-          
+
           EM.defer{handler.property(property).create} unless handler.nil?
           return
         end
       end #}}}
-      
+
       class AddProperties < Riddl::Implementation #{{{
         def response
           backend = @a[0]
@@ -330,24 +330,24 @@ module Riddl
                 @status = 404
                 return # not a valid state from here on
               end
-            end  
+            end
 
             newstuff = value.nil? ? XML::Smart.string(content).root.children : value
             backend.modify do |doc|
               nodes = doc.find(path)
               nods = nodes.map{|ele| ele.children.delete_all!; ele}
-              nods.each do |ele| 
+              nods.each do |ele|
                 if value.nil?
                   ele.add newstuff
                 else
                   ele.text = newstuff
-                end  
-              end  
+                end
+              end
             end || begin
               @status = 400
               return # bad request
             end
-            
+
           end
           EM.defer do
             0.upto(@p.length/2-1) do |i|
@@ -377,7 +377,7 @@ module Riddl
           if node.empty?
             @status = 404
             return # this property does not exist
-          end  
+          end
 
           newstuff = XML::Smart.string(value)
           backend.modify do |doc|
@@ -422,7 +422,7 @@ module Riddl
           EM.defer{handler.property(property).delete} unless handler.nil?
           return
         end
-      end #}}} 
+      end #}}}
 
       class UpdContent < Riddl::Implementation #{{{
         def response
@@ -451,24 +451,24 @@ module Riddl
               @status = 404
               return # not a valid state from here on
             end
-          end  
+          end
 
           newstuff = value.nil? ? XML::Smart.string(content).root.children : value
           backend.modify do |doc|
             nodes = doc.root.find(path)
             nods = nodes.map{|ele| ele.children.delete_all!; ele}
-            nods.each do |ele| 
+            nods.each do |ele|
               if value.nil?
                 ele.add newstuff
               else
                 ele.text = newstuff
               end
-            end  
+            end
           end || begin
             @status = 400
             return # bad request
           end
-          
+
           EM.defer{handler.property(property).update} unless handler.nil?
           return
         end

data/riddl.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "riddl"
-  s.version          = "0.99.250"
+  s.version          = "0.99.251"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "restful interface description and declaration language: tools and client/server libs"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riddl
 version: !ruby/object:Gem::Version
-  version: 0.99.250
+  version: 0.99.251
 platform: ruby
 authors:
 - Juergen 'eTM' Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2016-09-13 00:00:00.000000000 Z
+date: 2016-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-smart