wadl 0.2.1 → 0.2.2

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to wadl version 0.2.1
+This documentation refers to wadl version 0.2.2
 
 
 == DESCRIPTION

data/Rakefile

@@ -1,4 +1,4 @@
-require %q{lib/wadl/version}
+require File.expand_path(%q{../lib/wadl/version}, __FILE__)
 
 begin
   require 'hen'
@@ -10,14 +10,10 @@ begin
       :summary      => %q{Ruby client for the Web Application Description Language.},
       :authors      => ['Leonard Richardson', 'Jens Wille'],
       :email        => ['leonardr@segfault.org', 'jens.wille@uni-koeln.de'],
-      :homepage     => 'http://github.com/blackwinter/wadl',
-      :files        => FileList['lib/**/*.rb'].to_a,
-      :extra_files  => FileList['[A-Z]*', 'examples/*', 'test/**/*.rb', 'bin/*'].to_a,
+      :homepage     => :blackwinter,
       :dependencies => %w[rest-open-uri mime-types]
     }
   }}
-rescue LoadError
-  abort "Please install the 'hen' gem first."
+rescue LoadError => err
+  warn "Please install the `hen' gem. (#{err})"
 end
-
-### Place your custom Rake tasks here.

data/lib/wadl/cli.rb

@@ -3,7 +3,7 @@
 #                                                                             #
 # A component of wadl, the super cheap Ruby WADL client.                      #
 #                                                                             #
-# Copyright (C) 2010 Jens Wille                                               #
+# Copyright (C) 2010-2011 Jens Wille                                          #
 #                                                                             #
 # Authors:                                                                    #
 #     Jens Wille <jens.wille@uni-koeln.de>                                    #
@@ -34,7 +34,7 @@ require 'wadl'
 begin
   require 'oauth/cli'
 rescue LoadError
-  warn "For OAuth support, install the 'oauth' library."
+  warn "For OAuth support, install the `oauth' library."
 end
 
 module WADL
@@ -52,8 +52,11 @@ module WADL
       :authorize_url     => '%s/oauth/authorize'
     }
 
-    OPTION_RE = %r{\A--?(.+?)(?:=(.+))?\z}
-    RESOURCE_PATH_RE = %r{[. /]}
+    OPTION_RE          = %r{\A--?(.+?)(?:=(.+))?\z}
+    RESOURCE_PATH_RE   = %r{[. /]}
+    QUERY_SEPARATOR_RE = %r{[&;]}n
+    ARRAY_SUFFIX_RE    = %r{\[\]\z}
+    HASH_SUFFIX_RE     = %r{\[(.+)\]\z}
 
     def self.execute(*args)
       new.execute(*args)
@@ -155,18 +158,52 @@ module WADL
 
         if arg =~ OPTION_RE
           key, value, next_arg = $1, $2, arguments[index + 1]
-          opts[key] = value || if next_arg =~ OPTION_RE
+
+          add_param(opts, key, value || if next_arg =~ OPTION_RE
             '1'  # "true"
           else
             skip_next = true
             next_arg
-          end
+          end)
         else
           resource_path << arg
         end
       }
     end
 
+    def parse_query(query)
+      params = {}
+
+      query.split(QUERY_SEPARATOR_RE).each { |pair|
+        add_param(params, *pair.split('=', 2).map { |v| CGI.unescape(v) })
+      }
+
+      params
+    end
+
+    def add_param(params, key, value)
+      case key
+        when HASH_SUFFIX_RE
+          sub = $1
+
+          if (param = params[key]).is_a?(Hash)
+            param[sub] = value
+            return
+          else
+            value = { sub => value }
+          end
+        when ARRAY_SUFFIX_RE
+          if (param = params[key]).is_a?(Array)
+            param << value
+            return
+          else
+            value = [value]
+          end
+      end
+
+      params[key] = value
+    end
+
     def basic_auth_resource
       user, pass = options.values_at(:user, :password)
       pass ||= ask("Password for user #{user}: ") { |q| q.echo = false }
@@ -252,9 +289,7 @@ module WADL
         }
 
         opts.on('-q', '--query QUERY', "Query string to pass to request") { |query|
-          options[:query] = CGI.parse(query).inject({}) { |params, (key, values)|
-            params[key] = values.last; params
-          }
+          options[:query] = parse_query(query)
         }
 
         opts.separator ''

data/lib/wadl/version.rb

@@ -4,7 +4,7 @@ module WADL
 
     MAJOR = 0
     MINOR = 2
-    TINY  = 1
+    TINY  = 2
 
     class << self
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wadl
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Leonard Richardson
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-11 00:00:00 +02:00
-default_executable: 
+date: 2011-04-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-open-uri
@@ -56,9 +55,9 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
+- README
 - COPYING
 - ChangeLog
-- README
 files: 
 - lib/wadl.rb
 - lib/wadl/resource_and_address.rb
@@ -86,37 +85,35 @@ files:
 - lib/wadl/response_format.rb
 - lib/wadl/cheap_schema.rb
 - lib/wadl/resources.rb
+- bin/wadl
 - README
 - ChangeLog
 - Rakefile
 - TODO
 - COPYING
-- examples/yahoo.wadl
-- examples/README
-- examples/YahooSearch.rb
-- examples/crummy.rb
-- examples/yahoo.rb
-- examples/crummy.wadl
-- examples/delicious.wadl
-- examples/config.yaml
-- examples/YahooSearch.wadl
-- examples/delicious.rb
-- test/test_wadl.rb
-- bin/wadl
-has_rdoc: true
+- example/yahoo.wadl
+- example/README
+- example/YahooSearch.rb
+- example/crummy.rb
+- example/yahoo.rb
+- example/crummy.wadl
+- example/delicious.wadl
+- example/config.yaml
+- example/YahooSearch.wadl
+- example/delicious.rb
+- test/wadl_test.rb
 homepage: http://github.com/blackwinter/wadl
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --line-numbers
-- --main
-- README
-- --inline-source
 - --charset
 - UTF-8
 - --title
-- wadl Application documentation
+- wadl Application documentation (v0.2.2)
+- --main
+- README
+- --line-numbers
 - --all
 require_paths: 
 - lib
@@ -141,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Ruby client for the Web Application Description Language.