riddl 0.99.246 → 0.99.248

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d2c9d061ddbc2a8af946846e2dd0283b17436bd
-  data.tar.gz: 5dd79ed2204159227425adac82b287f51c18c634
+  metadata.gz: 07bbdf6d9c250da6c96d3fb77f616d46d7267a2f
+  data.tar.gz: 18b8083e4404293da2f50d984de1758db88c9e12
 SHA512:
-  metadata.gz: 592254242b6f4406e2648efe6c413fd08cdeaa039abe64c564d9b4914bd402658b3d4b6c13ca1ed87196b3c84b2fab0481614eec9eb5adc8182945d895cc5d2d
-  data.tar.gz: bba2eb519a581e3eb84fa8ea47d82ebac260e405320c356f1baffedf0fe4449fc08e74cadb518ab2239f9b56e2f548dadbc0952199ee7347af0dea3a82fc647d
+  metadata.gz: 1d0a734f35a3e05003a3acdf0e0d821a567c58ab6dc9db8c87e0d160842c1247692b60bbe237aaf74bcc83c54fe8ccb0ea192a437680c9b1e7a87841f4cbf887
+  data.tar.gz: 277ba24328b04283f2c2533e90f2efdfe43af1b8855549a39a950b7648b852fe509cf02b01fdad92bfdea981702420de213b432c8b179ecec9c791854aeff5a7

data/examples/declaration-server-distributed/properties.xml

@@ -0,0 +1 @@
+../../ns/common-patterns/properties/1.0/properties.xml

data/examples/declaration-server-distributed/xsls/test/properties.xsl

@@ -0,0 +1 @@
+../properties.xsl

data/examples/declaration-server-hybrid/properties.xml

@@ -0,0 +1 @@
+../../ns/common-patterns/properties/1.0/properties.xml

data/examples/declaration-server-local/properties.xml

@@ -0,0 +1 @@
+../../ns/common-patterns/properties/1.0/properties.xml

data/examples/downloadify/downloadify.xml

@@ -0,0 +1 @@
+../../lib/ruby/riddl/ns/common-patterns/downloadify/1.0/downloadify.xml

data/examples/flickr/Exif/riddl.jpg

@@ -0,0 +1 @@
+../../../contrib/riddl.jpg

data/examples/flickr/Flickr/riddl.png

@@ -0,0 +1 @@
+../../../contrib/riddl.png

data/examples/flickr/riddl.jpg

@@ -0,0 +1 @@
+../../contrib/riddl.jpg

data/examples/helloworld/declaration-definition_goal.xml

@@ -23,14 +23,10 @@
   <resource>
     <post in="hello"/>
     <post in="hello-form"/>
-    <get in="type-html"/>
     <get in="type-html" out="hello-list-html"/>
-    <get in="*"/>
     <get in="*" out="hello-form"/>
     <resource>
-      <put in="hello"/>
       <put in="hello" out="hello"/>
-      <get in="*"/>
       <get in="*" out="hello"/>
       <delete in="*"/>
       <resource relative="hello">

data/examples/notifications/producer.main.xml

@@ -0,0 +1 @@
+../../ns/common-patterns/notifications-producer/1.0/producer.xml

data/examples/properties/properties.xml

@@ -0,0 +1 @@
+../../ns/common-patterns/properties/1.0/properties.xml

data/examples/twitter/client.rb

@@ -15,27 +15,27 @@ file_token_secret = File.expand_path(File.dirname(__FILE__) + '/.twitter.token_s
 if !File.exists?(file_token) && !File.exists?(file_token_secret)
   ### go to request token resource and set necessary role options
   resource = twitter.resource("/oauth/request_token")
-  params = [ 
+  params = [
     Riddl::Option.new(:consumer_key,consumer_key),
     Riddl::Option.new(:consumer_secret,consumer_secret)
   ]
-  
+
   ### simulate request token
   # puts resource.simulate_post(params).read
-  
+
   ### get request token and save it to variables
   status, response, headers = resource.post params
   token = response.oauth_token
   token_secret = response.oauth_token_secret
-  
+
   ### send user away for authorization
   puts "Authorize at https://twitter.com/oauth/authorize?oauth_token=#{token}"
   print "Insert verifier here: "
   verifier = STDIN.gets.strip # wait for verifier
-  
+
   ### exchange the token for an access token and save the results
   resource = twitter.resource("/oauth/access_token")
-  status, response, headers = resource.post [ 
+  status, response, headers = resource.post [
     Riddl::Option.new(:consumer_key,consumer_key),
     Riddl::Option.new(:consumer_secret,consumer_secret),
     Riddl::Option.new(:token,token),
@@ -86,6 +86,6 @@ if ARGV.length >= 1
     Riddl::Option.new(:token_secret,token_secret)
   ]
   puts "something went wrong!" if status != 200
-else  
+else
   puts "Usage: #{__FILE__} [TWEET]"
 end

data/examples/xmpp/properties.xml

@@ -0,0 +1 @@
+../../ns/common-patterns/properties/1.0/properties.xml

data/lib/ruby/riddl/client.rb

@@ -1,11 +1,5 @@
-require 'rubygems'
-require 'net/https'
-require 'eventmachine'
-require 'em-websocket-client'
-require 'blather/client/client'
-require 'uri'
-require 'openssl'
-require 'digest/md5'
+gem 'blather', '=1.1.4'
+
 require File.expand_path(File.dirname(__FILE__) + '/wrapper')
 require File.expand_path(File.dirname(__FILE__) + '/error')
 require File.expand_path(File.dirname(__FILE__) + '/protocols/http/generator')
@@ -16,6 +10,14 @@ require File.expand_path(File.dirname(__FILE__) + '/protocols/utils')
 require File.expand_path(File.dirname(__FILE__) + '/header')
 require File.expand_path(File.dirname(__FILE__) + '/option')
 
+require 'net/https'
+require 'eventmachine'
+require 'em-websocket-client'
+require 'blather/client/client'
+require 'uri'
+require 'openssl'
+require 'digest/md5'
+
 class StringIO #{{{
   def continue_timeout; nil; end
 end #}}}

data/lib/ruby/riddl/roles/http%3A%2F%2Foauth.net%2F1.0/base.rb

@@ -5,7 +5,7 @@ require 'base64'
 module Riddl
   module Roles
     module OAuth
-      DIGEST = OpenSSL::Digest::Sha1.new
+      DIGEST = OpenSSL::Digest::SHA1.new
       VERSION_MAJOR = 1
       VERSION_MINOR = 0
 
@@ -61,7 +61,7 @@ module Riddl
         headers['Authorization'] = 'OAuth ' + oparams.map{|e|e[0]+'='+"\"#{e[1]}\""}.join(', ')
       end
 
-    end  
+    end
 
   end
 end

data/lib/ruby/riddl/server.rb

@@ -1,4 +1,5 @@
-#gem 'thin', '=1.5.1'
+gem 'blather', '=1.1.4'
+
 require File.expand_path(File.dirname(__FILE__) + '/constants')
 require File.expand_path(File.dirname(__FILE__) + '/implementation')
 require File.expand_path(File.dirname(__FILE__) + '/protocols/http/parser')

data/lib/ruby/riddl/wrapper.rb

@@ -34,12 +34,12 @@ module Riddl
         ret.sort!
         ret
         #}}}
-      end  
+      end
       protected :rpaths, :get_resource_deep
     end
-  end  
+  end
 end
-    
+
 require File.expand_path(File.dirname(__FILE__) + '/wrapper/description')
 require File.expand_path(File.dirname(__FILE__) + '/wrapper/declaration')
 require File.expand_path(File.dirname(__FILE__) + '/wrapper/messageparser')
@@ -73,7 +73,7 @@ module Riddl
       fpath = nil
       if name.is_a?(XML::Smart::Dom)
         @doc = name
-      else  
+      else
         if name.is_a?(String) && name =~ /^http:\/\/(www\.)?riddl\.org(\/ns\/common-patterns\/.*)/
           name = File.expand_path(File.dirname(__FILE__)) + $2
         end
@@ -88,8 +88,8 @@ module Riddl
           rescue
             raise SpecificationError, "#{name.inspect} is no RIDDL description or declaration (neither a file, url or string)."
           end
-        end  
-      end  
+        end
+      end
 
       @doc.register_namespace 'x', XINCLUDE
       @doc.find('//x:include/@href').each do |i|
@@ -115,10 +115,10 @@ module Riddl
         @doc.root.prepend rrds.find('/des:description/des:message')
         @doc.find("/des:description/des:resource").each do |r|
           r.prepend rds.find('/des:description/des:resource/*')
-        end  
+        end
         @doc.find("/des:description//des:resource").each do |r|
           r.prepend rrds.find('/des:description/des:resource/*')
-        end  
+        end
       end
       if @is_declaration  && get_description
         @doc.root.prepend("dec:interface",:name=>"riddldescription").add XML::Smart::open_unprotected(RIDDL_DESCRIPTION_SHOW).root
@@ -128,7 +128,7 @@ module Riddl
           x.append("apply-to","/")
           x.append("apply-to","/**/*")
         end
-      end  
+      end
 
       @declaration = @description = nil
       #}}}
@@ -170,7 +170,7 @@ module Riddl
       #{{{
       description
       declaration
-     
+
       req = @description.get_resource(path).access_methods if @is_description
       req = @declaration.get_resource(path).composition    if @is_declaration
 
@@ -194,7 +194,7 @@ module Riddl
           r.select{|o|o.class==Riddl::Wrapper::Description::WebSocket}.each do |o|
             return IOMessages.new(nil,nil,nil,nil)
           end
-        end  
+        end
         if @is_declaration
           r = req[operation]
           r.select{|o|o.result.class==Riddl::Wrapper::Description::RequestInOut}.each do |o|
@@ -213,8 +213,8 @@ module Riddl
           r.select{|o|o.result.class==Riddl::Wrapper::Description::WebSocket}.each do |o|
             return IOMessages.new(nil,nil,nil,o.result.interface)
           end
-        end  
-      end  
+        end
+      end
       return nil
       #}}}
     end
@@ -251,7 +251,7 @@ module Riddl
     def load_necessary_handlers!
       #{{{
       @doc.find("//des:parameter/@handler").map{|h|h.to_s}.uniq.each do |h|
-        if File.exists?(File.dirname(__FILE__) + '/handlers/' + File.basename(h) + ".rb")
+        if File.exist?(File.dirname(__FILE__) + '/handlers/' + File.basename(h) + ".rb")
           require File.expand_path(File.dirname(__FILE__) + '/handlers/' + File.basename(h))
         end
       end
@@ -274,7 +274,7 @@ module Riddl
       declaration
       tmp = []
 
-      tmp = @description.paths if @is_description 
+      tmp = @description.paths if @is_description
       tmp = @declaration.paths if @is_declaration
       tmp.map do |t|
         [t[0],Regexp.new("^" + t[1].gsub(/\{\}/,"[^/]+") + (t[2] ? '\/?' : '\/?$'))]
@@ -305,15 +305,15 @@ module Riddl
             elsif m.class == Riddl::Wrapper::Description::RequestPass
               Riddl::Wrapper::IOMessages.new(Riddl::Wrapper::Description::Star.new, Riddl::Wrapper::Description::Star.new,nil,m.interface)
             end
-          end    
+          end
         else
           [self]
-        end  
+        end
       end
       attr_reader :in, :out, :route, :interface
       #}}}
     end
-    
+
     def declaration?; @is_declaration; end
     def description?; @is_description; end
   end

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

@@ -6,14 +6,14 @@ require File.expand_path(File.dirname(__FILE__) + '/declaration/interface')
 module Riddl
   class Wrapper
     class Declaration < WrapperUtils
-        
+
       def get_resource(path)
         get_resource_deep(path,@facade.resource)
-      end  
+      end
       def paths
         rpaths(@facade.resource)
       end
-      
+
       def description_xml
         @facade.description_xml(@namespaces)
       end
@@ -69,8 +69,8 @@ module Riddl
         end
         riddl.find("/dec:declaration/dec:facade/dec:tile").each do |tile|
           @tiles << (til = Tile.new)
-          res = til.base_path(tile.attributes['path'] || '/')
-          # res.clean! # for overlapping tiles, each tile gets an empty path TODO
+          til.base_path(tile.attributes['path'] || '/')
+          # ^ above.clean! # for overlapping tiles, each tile gets an empty path TODO
           later = []
           tile.find("dec:layer").each_with_index do |layer,index|
             apply_to = layer.find("dec:apply-to")
@@ -88,25 +88,25 @@ module Riddl
                 t = at.to_s.sub(/^\/*/,'').split(/(?<!\*\*)\//)
                 if t.last == "**/*" || t.last == "*"
                   later << [des,desres,lname,lpath,at.to_s.strip,index,block,t.last == "**/*" ? :descendants : :children]
-                else  
+                else
                   int = Interface.new(lname,at.to_s,lpath,"/",des)
                   til.add_description(des,desres,at.to_s,index,int,block)
                 end
               end
             end
           end
-          paths = @tiles.map do |til| # extract all currently existing paths for all tiles
-            rpaths(til.resource).map{|a,b| a}
+          paths = @tiles.map do |ttil| # extract all currently existing paths for all tiles
+            rpaths(ttil.resource).map{|a,b| a}
           end.flatten.uniq
           later.each do |lat|
             mpath = lat[4].gsub(/\/\*\*\/\*$/,'').gsub(/\/\*$/,'')
             paths.each do |path|
               pbefore, pafter = path[0..mpath.length].chop, path[mpath.length+1..-1]
-              if mpath == pbefore 
+              if mpath == pbefore
                 if (lat[7] == :descendants && pafter != '') || (lat[7] == :children && !pafter.nil? && pafter != '' && pafter !~ /\//)
                   int = Interface.new(lat[2],path,lat[3],"/",lat[1])
                   til.add_description(lat[0],lat[1],path,lat[5],int,lat[6])
-                end  
+                end
               end
             end
           end

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

@@ -46,12 +46,11 @@ module Riddl
           res.resources.each do |k,v|
             description_xml_priv(result,messages,level+1,v)
           end
-          ""
           result << s + "</resource>\n"
           #}}}
         end
         private :description_xml_priv
-      
+
         def merge_tiles(res,fac=@resource)
           #{{{
           fac.custom = fac.custom + res.custom

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

@@ -48,11 +48,11 @@ module Riddl
           res = add_path(path,res,rec)
           res.add_access_methods(des,desres,index,interface)
           res.add_custom(desres)
-          desres.find("des:resource").each do |desres|
-            cpath = desres.attributes['relative'] || "{}"
-            rec = desres.attributes['recursive']
+          desres.find("des:resource").each do |tdesres|
+            cpath = tdesres.attributes['relative'] || "{}"
+            rec = tdesres.attributes['recursive']
             int = Interface.new_from_interface(interface,(interface.sub+"/"+cpath).gsub(/\/+/,'/'))
-            add_description(des,desres,cpath,index,int,block,rec,res)
+            add_description(des,tdesres,cpath,index,int,block,rec,res)
           end
           block.each do |bl|
             bpath = bl.to_s.gsub(/\/+/,'/').gsub(/\/$/,'')

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

@@ -11,8 +11,8 @@ module Riddl
       end
       def get_resource(path)
         get_resource_deep(path,@resource)
-      end  
-      
+      end
+
       def visualize(res=@resource,what='')
         #{{{
         what += res.path
@@ -45,10 +45,10 @@ module Riddl
         end
         res.add_access_methods(des,desres,0,nil)
         res.add_custom(desres)
-        desres.find("des:resource").each do |desres|
-          cpath = desres.attributes['relative'] || "{}"
-          rec = desres.attributes['recursive']
-          add_description(des,res,desres,cpath,rec)
+        desres.find("des:resource").each do |tdesres|
+          cpath = tdesres.attributes['relative'] || "{}"
+          rec = tdesres.attributes['recursive']
+          add_description(des,res,tdesres,cpath,rec)
         end
         nil
         #}}}

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

@@ -7,6 +7,7 @@ module Riddl
           @used = value
         end
         def used?
+          @used ||= nil
           @used || false
         end
         attr_reader :interface
@@ -41,9 +42,9 @@ module Riddl
           @interface = interface
           if des.nil?
             @trans = mtrans
-          else  
+          else
             @trans = Riddl::Wrapper::Description::Transformation.new(des,mtrans)
-          end  
+          end
           @out = nil
         end
         def self.new_from_transformation(mtrans1,mtrans2,custom)
@@ -75,7 +76,7 @@ module Riddl
             @out = mout
           else
             @out = mout.nil? ? nil : Riddl::Wrapper::Description::Message.new(des,mout)
-          end  
+          end
         end
         def self.new_from_message(mout,custom)
           RequestStarOut.new(nil,mout,nil,custom)
@@ -91,7 +92,7 @@ module Riddl
         def initialize(interface,custom=[])
           @custom = custom
           @interface = interface
-        end  
+        end
         def visualize; "pass *"; end
         def hash
           0
@@ -102,13 +103,13 @@ module Riddl
         def initialize(interface,custom=[])
           @custom = custom
           @interface = interface
-        end  
+        end
         def visualize; ""; end
         def hash
           0
         end
       end# }}}
-      
+
     end
   end
 end