wadl 0.1.8 → 0.2.0

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to wadl version 0.1.8
+This documentation refers to wadl version 0.2.0
 
 
 == DESCRIPTION

data/TODO

@@ -1 +1,2 @@
 * WADL formatters (plain text, HTML?)
+* Caching of downloaded WADL file

data/bin/wadl

@@ -28,4 +28,8 @@
 
 require 'wadl/cli'
 
-WADL::CLI.execute(ARGV, STDIN, STDOUT, STDERR)
+begin
+  WADL::CLI.execute(ARGV, STDIN, STDOUT, STDERR)
+rescue ArgumentError => err
+  abort err
+end

data/lib/wadl/cheap_schema.rb

@@ -294,39 +294,92 @@ module WADL
       index_key == name
     end
 
-    def to_s(indent = 0)
+    def each_attribute
+      [self.class.required_attributes, self.class.attributes].each { |list|
+        list.each { |attr|
+          val = attributes[attr.to_s]
+          yield attr, val if val
+        }
+      }
+    end
+
+    def each_member
+      self.class.members.each_value { |member_class|
+        member = send(member_class.names[:member])
+        yield member if member
+      }
+    end
+
+    def each_collection
+      self.class.collections.each_value { |collection_class|
+        collection = send(collection_class.names[:collection])
+        yield collection if collection && !collection.empty?
+      }
+    end
+
+    def paths(level = default = 0)
+      klass, paths = self.class, []
+      return paths if klass.may_be_reference? && attributes['href']
+
+      if klass == Resource
+        path = attributes['path']
+        paths << [level, path] if path
+      elsif klass == HTTPMethod
+        paths << [level]
+      end
+
+      each_member { |member|
+        paths.concat(member.paths(level))
+      }
+
+      each_collection { |collection|
+        collection.each { |member| paths.concat(member.paths(level + 1)) }
+      }
+
+      if default
+        memo = []
+
+        paths.map { |level, path|
+          if path
+            memo.slice!(level..-1)
+            memo[level] = path
+
+            nil  # ignore
+          else
+            memo.join('/')
+          end
+        }.compact
+      else
+        paths
+      end
+    end
+
+    def to_s(indent = 0, collection = false)
       klass = self.class
 
-      i = ' ' * indent
-      s = "#{i}#{klass.name}\n"
+      a = '  '
+      i = a * indent
+      s = "#{collection ? a * (indent - 1) + '- ' : i}#{klass.name}\n"
 
       if klass.may_be_reference? and href = attributes['href']
-        s << "#{i} href=#{href}\n"
+        s << "#{i}= href=#{href}\n"
       else
-        [klass.required_attributes, klass.attributes].each { |list|
-          list.each { |attr|
-            val = attributes[attr.to_s]
-            s << "#{i} #{attr}=#{val}\n" if val
-          }
+        each_attribute { |attr, val|
+          s << "#{i}* #{attr}=#{val}\n"
         }
 
-        klass.members.each_value { |member_class|
-          o = send(member_class.names[:member])
-          s << o.to_s(indent + 1) if o
+        each_member { |member|
+          s << member.to_s(indent + 1)
         }
 
-        klass.collections.each_value { |collection_class|
-          c = send(collection_class.names[:collection])
-
-          if c && !c.empty?
-            s << "#{i} Collection of #{c.size} #{collection_class.name}(s)\n"
-            c.each { |o| s << o.to_s(indent + 2) }
-          end
+        each_collection { |collection|
+          s << "#{i}> Collection of #{collection.size} #{collection.class}(s)\n"
+          collection.each { |member| s << member.to_s(indent + 2, true) }
         }
 
         if @contents && !@contents.empty?
           sep = '-' * 80
-          s << "#{sep}\n#{@contents.join(' ')}\n#{sep}\n"
+          s << "#{sep}\n#{@contents.join(' ').strip}\n#{sep}\n"
         end
       end
 

data/lib/wadl/cli.rb

@@ -82,9 +82,16 @@ module WADL
       parse_arguments(arguments)
       abort USAGE if resource_path.empty?
 
-      abort 'WADL required' unless options[:wadl]
+      abort "WADL location is required! (Specify with '--wadl' or see '--help')" unless options[:wadl]
       options[:wadl] %= options[:base_url] if options[:base_url]
 
+      if debug = options[:debug]
+        debug = 1 unless debug.is_a?(Integer)
+
+        stderr.puts api.paths if debug >= 1
+        stderr.puts api       if debug >= 2
+      end
+
       response = auth_resource.send(options[:method].downcase, :query => opts)
 
       stderr.puts response.code.join(' ')
@@ -97,19 +104,16 @@ module WADL
 
     def resource
       @resource ||= begin
-        path = [options[:api_base], *resource_path].compact.join(' ')
-        path.split(RESOURCE_PATH_RE).inject(api) { |m, n| m.send(n) }
+        path = [options[:api_base], *resource_path].compact.join('/')
+        path.split(RESOURCE_PATH_RE).inject(api) { |m, n| m.send(:find_resource_by_path, n) }
       end
     end
 
     def auth_resource
-      @auth_resource ||= if options[:basic]
-        basic_auth_resource
-      elsif options[:oauth]
-        oauth_resource
-      else
-        resource
-      end
+      @auth_resource ||= options[:skip_auth] ? resource            :
+                         options[:oauth]     ? oauth_resource      :
+                         options[:basic]     ? basic_auth_resource :
+                                               resource
     end
 
     def reset(stdin = STDIN, stdout = STDOUT, stderr = STDERR)
@@ -232,7 +236,7 @@ module WADL
 
         opts.separator ''
 
-        opts.on('-w', '--wadl FILE_OR_URL', "Path or URL to WADL file") { |wadl|
+        opts.on('-w', '--wadl FILE_OR_URL', "Path or URL to WADL file [Required]") { |wadl|
           options[:wadl] = wadl
         }
 
@@ -245,9 +249,15 @@ module WADL
         }
 
         opts.separator ''
-        opts.separator 'Basic auth options:'
 
-        opts.on('-B', '--basic', "Perform Basic auth") {
+        opts.on('--skip-auth', "Skip any authentication") {
+          options[:skip_auth] = true
+        }
+
+        opts.separator ''
+        opts.separator 'Basic Auth options:'
+
+        opts.on('-B', '--basic', "Perform Basic Auth") {
           options[:basic] = true
         }
 
@@ -317,9 +327,16 @@ module WADL
           abort "#{File.basename($0)} v#{WADL::VERSION}"
         }
 
+        opts.on('-d', '--debug [LEVEL]', Integer, "Enable debugging output") { |level|
+          options[:debug] = level || true
+        }
+
         opts.on('-D', '--dump-config', "Dump config and exit") {
           options[:dump_config] = true
         }
+
+        opts.separator ''
+        opts.separator "PATH may be separated by any of #{RESOURCE_PATH_RE.source}."
       }
     end
 

data/lib/wadl/request_format.rb

@@ -56,7 +56,7 @@ module WADL
           value = query_values[name] || query_values[name.to_sym]
           value = param.format(value, nil, 'query')
 
-          uri.query << value if value
+          uri.query << value if value && !value.empty?
         end
       }
 

data/lib/wadl/version.rb

@@ -3,8 +3,8 @@ module WADL
   module Version
 
     MAJOR = 0
-    MINOR = 1
-    TINY  = 8
+    MINOR = 2
+    TINY  = 0
 
     class << self
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wadl
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 8
-  version: 0.1.8
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Leonard Richardson
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-10 00:00:00 +02:00
+date: 2010-08-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency