riddl 0.99.177 → 0.99.178

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8343a1b6f969c89f3fa3a40eade71b942023d8fb
-  data.tar.gz: 65cbebd338a544099f98910236aa39b922f0b945
+  metadata.gz: 4a72951b4b67902e5c7c82d11ab2bf7322e2b73b
+  data.tar.gz: 0e2dca4f751cc010b30fb7ad68a8982938bd9f1d
 SHA512:
-  metadata.gz: b704fad1492e7231d3c022c5d0d4923b0ac7f1d6edba7ca29623f70f7ad96bfa9fd1e67e592b2146762a76465a22adddf178cc9e07de0fae4fa3f960b61bfdb5
-  data.tar.gz: c11ee29e65d7eef7196f6b8251758cd65c0cf322c8ed6faa3bc270f534cdf5b69cf0084fe79c8858b082a5f21d24aa81fdb1b662e255d3244676a1aaceff2d97
+  metadata.gz: 47b2d2176510be477e0536523f9132b4043a6f34c679183eba574fac9d9fc9493d8e5ca6d7088b3820edea7ee47fc2400d57fbd50460ea278ce4566b22d6ccb7
+  data.tar.gz: e451bbfe5f5b7b0887273ce83d02433dfdecc655ac6a1f4bb9d2471f2ea2339551c711f2f3f8a00edaedcddb47cbe764550d9a6e70dabd00dcb426db0b391955

data/examples/flickr/Flickr/find.rb

@@ -4,7 +4,7 @@ require '../../../lib/ruby/riddl/client'
 require 'pp'
 
 # no ready for use
-unless File.exists?('flickr.frob')
+unless File.exists?('.flickr.frob')
   puts "Check the README file and use authenticate.rb."
   exit
 end
@@ -20,13 +20,13 @@ puts "Get resources!!!"
 rest = flickr.resource("/rest")
 
 ### read application key/secret/frob
-key = File.read('flickr.key').strip
-secret = File.read('flickr.secret').strip
-frob = File.read('flickr.frob').strip
+key = File.read('.flickr.key').strip
+secret = File.read('.flickr.secret').strip
+frob = File.read('.flickr.frob').strip
 
 ### get 
-if File.exists?('flickr.token')
-  token = File.read('flickr.token').strip
+if File.exists?('.flickr.token')
+  token = File.read('.flickr.token').strip
 else 
   puts "hmm, there is no token...." 
   method = 'flickr.auth.getToken'
@@ -37,12 +37,12 @@ else
     Riddl::Parameter::Simple.new("frob",frob,:query),
     Riddl::Parameter::Simple.new("api_sig",sig,:query)
   ]
-  raise "frob no longer valid, delete flickr.frob then retry authenticate.rb" unless status == 200
+  raise "frob no longer valid, delete .flickr.frob then retry authenticate.rb" unless status == 200
   token = XML::Smart::string(res[0].value.read).find('string(/rsp/auth/token)')
 
   puts res[0].value.read
 
-  File.open('flickr.token','w'){|f|f.write(token)}
+  File.open('.flickr.token','w'){|f|f.write(token)}
 end
 
 # check token
@@ -54,7 +54,7 @@ status, res = rest.get [
   Riddl::Parameter::Simple.new("auth_token",token,:query),
   Riddl::Parameter::Simple.new("api_sig",sig,:query)
 ]
-raise "token no longer valid, delete flickr.token, flickr.frob then retry authenticate.rb, flickr.rb" unless status == 200
+raise "token no longer valid, delete .flickr.token, .flickr.frob then retry authenticate.rb, flickr.rb" unless status == 200
 
 method = 'flickr.people.findByEmail'
 email = 'mcsorex@yahoo.com'
@@ -64,6 +64,6 @@ status, res, headers = rest.get [
   Riddl::Parameter::Simple.new("api_key",key,:query),
   Riddl::Parameter::Simple.new("find_email",email,:query)
 ]
-raise "token no longer valid, delete flickr.token, flickr.frob then retry authenticate.rb, flickr.rb" unless status == 200
+raise "token no longer valid, delete .flickr.token, .flickr.frob then retry authenticate.rb, flickr.rb" unless status == 200
 
 puts "STATUS: #{status} RES:" + res[0].value.read + " HEADERS: #{headers}" 

data/examples/flickr/Flickr/flickr.rb

@@ -4,7 +4,7 @@ require '../../../lib/ruby/riddl/client'
 require 'pp'
 
 # no ready for use
-unless File.exists?('flickr.frob')
+unless File.exists?('.flickr.frob')
   puts "Check the README file and use authenticate.rb."
   exit
 end
@@ -25,13 +25,13 @@ rest = flickr.resource("/rest")
 upload = flickr.resource("/upload")
 
 ### read application key/secret/frob
-key = File.read('flickr.key').strip
-secret = File.read('flickr.secret').strip
-frob = File.read('flickr.frob').strip
+key = File.read('.flickr.key').strip
+secret = File.read('.flickr.secret').strip
+frob = File.read('.flickr.frob').strip
 
 ### get 
-if File.exists?('flickr.token')
-  token = File.read('flickr.token').strip
+if File.exists?('.flickr.token')
+  token = File.read('.flickr.token').strip
 else 
   puts "hmm, there is no token...." 
   method = 'flickr.auth.getToken'
@@ -42,12 +42,12 @@ else
     Riddl::Parameter::Simple.new("frob",frob,:query),
     Riddl::Parameter::Simple.new("api_sig",sig,:query)
   ]
-  raise "frob no longer valid, delete flickr.frob then retry authenticate.rb" unless status == 200
+  raise "frob no longer valid, delete .flickr.frob then retry authenticate.rb" unless status == 200
   token = XML::Smart::string(res[0].value.read).find('string(/rsp/auth/token)')
 
   puts res[0].value.read
 
-  File.open('flickr.token','w'){|f|f.write(token)}
+  File.open('.flickr.token','w'){|f|f.write(token)}
 end
 
 # check token
@@ -59,7 +59,7 @@ status, res = rest.get [
   Riddl::Parameter::Simple.new("auth_token",token,:query),
   Riddl::Parameter::Simple.new("api_sig",sig,:query)
 ]
-raise "token no longer valid, delete flickr.token, flickr.frob then retry authenticate.rb, flickr.rb" unless status == 200
+raise "token no longer valid, delete .flickr.token, .flickr.frob then retry authenticate.rb, flickr.rb" unless status == 200
 
 # upload image
 title = "RIDDL Logo"

data/examples/flickr/Flickr/public.rb

@@ -4,7 +4,7 @@ require '../../../lib/ruby/riddl/client'
 require 'pp'
 
 # no ready for use
-unless File.exists?('flickr.frob')
+unless File.exists?('.flickr.frob')
   puts "Check the README file and use authenticate.rb."
   exit
 end
@@ -25,13 +25,13 @@ rest = flickr.resource("/rest")
 upload = flickr.resource("/upload")
 
 ### read application key/secret/frob
-key = File.read('flickr.key').strip
-secret = File.read('flickr.secret').strip
-frob = File.read('flickr.frob').strip
+key = File.read('.flickr.key').strip
+secret = File.read('.flickr.secret').strip
+frob = File.read('.flickr.frob').strip
 
 ### get 
-if File.exists?('flickr.token')
-  token = File.read('flickr.token').strip
+if File.exists?('.flickr.token')
+  token = File.read('.flickr.token').strip
 else 
   puts "hmm, there is no token...." 
   method = 'flickr.auth.getToken'
@@ -42,12 +42,12 @@ else
     Riddl::Parameter::Simple.new("frob",frob,:query),
     Riddl::Parameter::Simple.new("api_sig",sig,:query)
   ]
-  raise "frob no longer valid, delete flickr.frob then retry authenticate.rb" unless status == 200
+  raise "frob no longer valid, delete .flickr.frob then retry authenticate.rb" unless status == 200
   token = XML::Smart::string(res[0].value.read).find('string(/rsp/auth/token)')
 
   puts res[0].value.read
 
-  File.open('flickr.token','w'){|f|f.write(token)}
+  File.open('.flickr.token','w'){|f|f.write(token)}
 end
 
 # check token
@@ -59,7 +59,7 @@ status, res = rest.get [
   Riddl::Parameter::Simple.new("auth_token",token,:query),
   Riddl::Parameter::Simple.new("api_sig",sig,:query)
 ]
-raise "token no longer valid, delete flickr.token, flickr.frob then retry authenticate.rb, flickr.rb" unless status == 200
+raise "token no longer valid, delete .flickr.token, .flickr.frob then retry authenticate.rb, flickr.rb" unless status == 200
 
 method = 'flickr.people.getPublicPhotos'
 nsid = '37474074@N08'
@@ -70,7 +70,7 @@ status, res = rest.get [
   Riddl::Parameter::Simple.new("api_key",key,:query),
   Riddl::Parameter::Simple.new("user_id",nsid,:query)
 ]
-raise "token no longer valid, delete flickr.token, flickr.frob then retry authenticate.rb, flickr.rb" unless status == 200
+raise "token no longer valid, delete .flickr.token, .flickr.frob then retry authenticate.rb, flickr.rb" unless status == 200
 
 
 puts "RES:" + res[0].value.read

data/examples/notifications/producer.fluff.xml

@@ -3,7 +3,7 @@
   <message name="html">
   	<parameter name="type" mimetype="text/html"/>
   </message>
-  <message name="xsl">
+  <message name="details">
     <parameter name="xsl" mimetype="application/xml"/>
   </message>
 
@@ -17,7 +17,7 @@
     </resource>
     <resource relative='xsls'>
       <resource>
-        <get in="*" out="xsl"/>
+        <get in="*" out="details"/>
       </resource>  
     </resource>
   </resource>

data/examples/notifications/producer.main.xml

@@ -145,7 +145,6 @@
   </message>
 
   <message name="details">
-    <parameter name="message-uid" type="string"/>
     <optional>
       <parameter name="url" type="string"/>
     </optional>  
@@ -160,7 +159,10 @@
         </parameter>
       </choice>
     </oneOrMore>
-    <parameter name="fingerprint-with-producer-secret" type="string"/>
+    <optional>
+      <parameter name="message-uid" type="string"/>
+      <parameter name="fingerprint-with-producer-secret" type="string"/>
+    </optional>  
   </message>
 
   <message name="overview">

data/examples/twitter/client.rb

@@ -5,11 +5,11 @@ require 'pp'
 twitter = Riddl::Client.interface("https://api.twitter.com/","twitter.xml")
 
 ### Base
-consumer_key      = File.read(File.expand_path(File.dirname(__FILE__) + '/twitter.consumer_key')).strip
-consumer_secret   = File.read(File.expand_path(File.dirname(__FILE__) + '/twitter.consumer_secret')).strip
-file_user_id      = File.expand_path(File.dirname(__FILE__) + '/twitter.user_id')
-file_token        = File.expand_path(File.dirname(__FILE__) + '/twitter.token')
-file_token_secret = File.expand_path(File.dirname(__FILE__) + '/twitter.token_secret')
+consumer_key      = File.read(File.expand_path(File.dirname(__FILE__) + '/.twitter.consumer_key')).strip
+consumer_secret   = File.read(File.expand_path(File.dirname(__FILE__) + '/.twitter.consumer_secret')).strip
+file_user_id      = File.expand_path(File.dirname(__FILE__) + '/.twitter.user_id')
+file_token        = File.expand_path(File.dirname(__FILE__) + '/.twitter.token')
+file_token_secret = File.expand_path(File.dirname(__FILE__) + '/.twitter.token_secret')
 
 ### When token and secret already saved, skip this part
 if !File.exists?(file_token) && !File.exists?(file_token_secret)

data/examples/zotero/client.rb

@@ -4,11 +4,11 @@ require 'xml/smart'
 require 'pp'
 
 ### Base
-consumer_key      = File.read(File.expand_path(File.dirname(__FILE__) + '/zotero.consumer_key')).strip
-consumer_secret   = File.read(File.expand_path(File.dirname(__FILE__) + '/zotero.consumer_secret')).strip
-file_user_id      = File.expand_path(File.dirname(__FILE__) + '/zotero.user_id')
-file_token        = File.expand_path(File.dirname(__FILE__) + '/zotero.token')
-file_token_secret = File.expand_path(File.dirname(__FILE__) + '/zotero.token_secret') #}}}
+consumer_key      = File.read(File.expand_path(File.dirname(__FILE__) + '/.zotero.consumer_key')).strip
+consumer_secret   = File.read(File.expand_path(File.dirname(__FILE__) + '/.zotero.consumer_secret')).strip
+file_user_id      = File.expand_path(File.dirname(__FILE__) + '/.zotero.user_id')
+file_token        = File.expand_path(File.dirname(__FILE__) + '/.zotero.token')
+file_token_secret = File.expand_path(File.dirname(__FILE__) + '/.zotero.token_secret') #}}}
 
 ### When token and secret already saved, skip this part #{{{
 if !File.exists?(file_token) && !File.exists?(file_token_secret)

data/lib/ruby/riddl/ns/common-patterns/notifications-producer/1.0/producer.xml

@@ -145,7 +145,6 @@
   </message>
 
   <message name="details">
-    <parameter name="message-uid" type="string"/>
     <optional>
       <parameter name="url" type="string"/>
     </optional>  
@@ -160,7 +159,10 @@
         </parameter>
       </choice>
     </oneOrMore>
-    <parameter name="fingerprint-with-producer-secret" type="string"/>
+    <optional>
+      <parameter name="message-uid" type="string"/>
+      <parameter name="fingerprint-with-producer-secret" type="string"/>
+    </optional>  
   </message>
 
   <message name="overview">

data/lib/ruby/riddl/server.rb

@@ -154,7 +154,7 @@ module Riddl
       puts "XMPP support (#{@riddl_xmpp_jid}) active" if @riddl_xmpp_jid && @riddl_xmpp_pass && !http_only
       Process.daemon unless verbose
       ::Kernel::at_exit do
-        @riddl_at_exit.call
+        @riddl_at_exit.call if @riddl_at_exit
       end  
       begin
         EM.run do

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

@@ -262,7 +262,6 @@ module Riddl
             handler = @a[1]
             key     = @r.last
 
-            muid = @p.shift.value
             url  = @p[0].name == 'url' ? @p.shift.value : nil
 
             # TODO check if message is valid (with producer secret)

data/lib/ruby/riddl/wrapper/declaration/facade.rb

@@ -21,15 +21,18 @@ module Riddl
           messages_result = ""
           description_result = ""
           description_xml_priv(result,messages,0)
+
+          result = XML::Smart.string("<resource>\n" + result + "  </resource>")
           messages.each do |hash,mess|
             t = mess.content.dup
             name = mess.name
             name += '_' while names.include?(name)
+            result.find("//@*[.=#{hash}]").each { |e| p e; e.value = name }
             names << name
             t.root.attributes['name'] = name
             messages_result << t.root.dump + "\n"
           end
-          XML::Smart.string("<description #{Riddl::Wrapper::COMMON} #{namespaces}>\n\n" + description_result + messages_result.gsub(/^/,'  ') + "\n" + result + "\n</description>").to_s
+          XML::Smart.string("<description #{Riddl::Wrapper::COMMON} #{namespaces}>\n\n" + description_result + messages_result.gsub(/^/,'  ') + "\n" + result.root.dump + "\n</description>").to_s
           #}}}
         end
         def description_xml_priv(result,messages,level,res=@resource)

data/lib/ruby/riddl/wrapper/description/resource.rb

@@ -243,23 +243,23 @@ module Riddl
           case m
             when Riddl::Wrapper::Description::RequestInOut
               messages[m.in.hash] ||= m.in
-              result << "in=\"#{messages[m.in.hash].name}\""
+              result << "in=\"#{m.in.hash}\""
               unless m.out.nil?
                 messages[m.out.hash] ||= m.out
-                result << " out=\"#{messages[m.out.hash].name}\""
+                result << " out=\"#{m.out.hash}\""
               end  
             when Riddl::Wrapper::Description::RequestStarOut
               result << "in=\"*\""
               unless m.out.nil?
                 messages[m.out.hash] ||= m.out
-                result << " out=\"#{messages[m.out.hash].name}\""
+                result << " out=\"#{m.out.hash}\""
               end  
             when Riddl::Wrapper::Description::RequestPass
               messages[m.pass.hash] ||= m.pass
-              result << "pass=\"#{messages[m.pass.hash].name}\""
+              result << "pass=\"#{m.pass.hash}\""
             when Riddl::Wrapper::Description::RequestTransformation
               messages[m.trans.hash] ||= m.trans
-              result << "transformation=\"#{messages[m.trans.hash].name}\""
+              result << "transformation=\"#{m.trans.hash}\""
           end
           if m.custom.length > 0
             result << ">\n"
@@ -326,17 +326,19 @@ module Riddl
           messages = {}
           messages_result = ''
           collect = description_xml_string(messages," " * 4) + description_xml_string_sub(messages," " * 4)
+          collect = XML::Smart.string("<resource>\n" + collect + "  </resource>")
 
           names = []
           messages.each do |hash,mess|
             t = mess.content.dup
             name = mess.name
             name += '_' while names.include?(name)
+            collect.find("//@*[.=#{hash}]").each { |e| p e; e.value = name }
             names << name
             t.root.attributes['name'] = name
             messages_result << t.root.dump + "\n"
           end
-          XML::Smart.string("<description #{Riddl::Wrapper::COMMON} #{namespaces}>\n\n" + messages_result.gsub(/^/,'  ') + "\n  <resource>\n" + collect + "  </resource>\n</description>").to_s
+          XML::Smart.string("<description #{Riddl::Wrapper::COMMON} #{namespaces}>\n\n" + messages_result.gsub(/^/,'  ') + "\n  " + collect.root.dump + "\n</description>").to_s
           #}}}
         end
 

data/ns/common-patterns/notifications-producer/1.0/producer.xml

@@ -145,7 +145,6 @@
   </message>
 
   <message name="details">
-    <parameter name="message-uid" type="string"/>
     <optional>
       <parameter name="url" type="string"/>
     </optional>  
@@ -160,7 +159,10 @@
         </parameter>
       </choice>
     </oneOrMore>
-    <parameter name="fingerprint-with-producer-secret" type="string"/>
+    <optional>
+      <parameter name="message-uid" type="string"/>
+      <parameter name="fingerprint-with-producer-secret" type="string"/>
+    </optional>  
   </message>
 
   <message name="overview">

data/riddl.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "riddl"
-  s.version          = "0.99.177"
+  s.version          = "0.99.178"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3"
   s.summary          = "restful interface description and declaration language: tools and client/server libs"
@@ -8,6 +8,7 @@ Gem::Specification.new do |s|
   s.description      = "rest service interface definition, mixing, and evolution. supports mixed http and xmpp servers."
 
   s.files            = Dir['{lib/ruby/riddl/ns/**/*,tools/**/*,ns/**/*,contrib/**/*,lib/ruby/riddl/**/*,examples/**/*}'] + %w(COPYING Rakefile riddl.gemspec README.rdoc TODO AUTHORS INSTALL)
+
   s.require_path     = 'lib/ruby'
   s.extra_rdoc_files = ['README.rdoc']
   s.bindir           = 'tools'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riddl
 version: !ruby/object:Gem::Version
-  version: 0.99.177
+  version: 0.99.178
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-smart
@@ -263,11 +263,7 @@ files:
 - examples/flickr/Exif/riddl.new.jpg
 - examples/flickr/Flickr/authenticate.rb
 - examples/flickr/Flickr/find.rb
-- examples/flickr/Flickr/flickr.frob
-- examples/flickr/Flickr/flickr.key
 - examples/flickr/Flickr/flickr.rb
-- examples/flickr/Flickr/flickr.secret
-- examples/flickr/Flickr/flickr.token
 - examples/flickr/Flickr/flickr.xml
 - examples/flickr/Flickr/public.rb
 - examples/flickr/Flickr/riddl.png
@@ -313,11 +309,6 @@ files:
 - examples/twitter/client.rb
 - examples/twitter/declaration.xml
 - examples/twitter/twitpic.xml
-- examples/twitter/twitter.consumer_key
-- examples/twitter/twitter.consumer_secret
-- examples/twitter/twitter.token
-- examples/twitter/twitter.token_secret
-- examples/twitter/twitter.user_id
 - examples/twitter/twitter.xml
 - examples/websocket/client.rb
 - examples/websocket/description.xml
@@ -336,11 +327,6 @@ files:
 - examples/zotero/README
 - examples/zotero/client.rb
 - examples/zotero/litlist.html
-- examples/zotero/zotero.consumer_key
-- examples/zotero/zotero.consumer_secret
-- examples/zotero/zotero.token
-- examples/zotero/zotero.token_secret
-- examples/zotero/zotero.user_id
 - examples/zotero/zotero.xml
 - lib/ruby/riddl/client.rb
 - lib/ruby/riddl/commonlogger.rb

data/examples/flickr/Flickr/flickr.frob

@@ -1 +0,0 @@
-72157622754311344-2420da30f5ba248b-204692

data/examples/flickr/Flickr/flickr.key

@@ -1 +0,0 @@
-ae99256c7589433e29b814ed34698bfa

data/examples/flickr/Flickr/flickr.secret

@@ -1 +0,0 @@
-c50c9bb73b23752b

data/examples/flickr/Flickr/flickr.token

@@ -1 +0,0 @@
-72157622749312846-cf81dadf0cc4b86d

data/examples/twitter/twitter.consumer_key

@@ -1 +0,0 @@
-JUGRfvAcSIjxpJ13g96Fw

data/examples/twitter/twitter.consumer_secret

@@ -1 +0,0 @@
-fTV93ULm4PtKGTZL2YGE22vvwuwidDl9RdBkZC15Y

data/examples/twitter/twitter.token

@@ -1 +0,0 @@
-10154142-aYtQ7NhZ3ZXPoBhhDsnxRsNGVtH5C4DSNUEvGlsHP

data/examples/twitter/twitter.token_secret

@@ -1 +0,0 @@
-ei7HiWcL5D4z0gHXnJhlLiwQ5wuTU0fX8K0nccuzH0g

data/examples/twitter/twitter.user_id

@@ -1 +0,0 @@
-10154142-aYtQ7NhZ3ZXPoBhhDsnxRsNGVtH5C4DSNUEvGlsHP

data/examples/zotero/zotero.consumer_key

@@ -1 +0,0 @@
-689f0248cc74473141b6

data/examples/zotero/zotero.consumer_secret

@@ -1 +0,0 @@
-5b542fd013944adf2b1a

data/examples/zotero/zotero.token

@@ -1 +0,0 @@
-xbkypbe6eVfLozz51pkqvXzJ

data/examples/zotero/zotero.token_secret

@@ -1 +0,0 @@
-xbkypbe6eVfLozz51pkqvXzJ

data/examples/zotero/zotero.user_id

@@ -1 +0,0 @@
-2491