twurl 0.8.2 → 0.8.3

data/lib/twurl/cli.rb

@@ -3,14 +3,21 @@ module Twurl
     SUPPORTED_COMMANDS     = %w(authorize accounts alias set)
     DEFAULT_COMMAND        = 'request'
     PATH_PATTERN           = /^\/\w+/
+    PROTOCOL_PATTERN       = /^\w+:\/\//
     README                 = File.dirname(__FILE__) + '/../../README'
     @output              ||= STDOUT
+    class NoPathFound < Exception
+    end
 
     class << self
       attr_accessor :output
 
       def run(args)
-        options = parse_options(args)
+        begin
+          options = parse_options(args)
+        rescue NoPathFound => e
+          exit
+        end
         dispatch(options)
       end
 
@@ -81,6 +88,12 @@ Supported Commands: #{SUPPORTED_COMMANDS.sort.join(', ')}
         arguments                 = option_parser.parse!(args)
         Twurl.options.command     = extract_command!(arguments)
         Twurl.options.path        = extract_path!(arguments)
+
+        if Twurl.options.command == DEFAULT_COMMAND and Twurl.options.path.nil?
+          CLI.puts option_parser
+          raise NoPathFound, "No path found"
+        end
+
         Twurl.options.subcommands = arguments
         Twurl.options
       end
@@ -128,12 +141,24 @@ Supported Commands: #{SUPPORTED_COMMANDS.sort.join(', ')}
           path = nil
           arguments.each_with_index do |argument, index|
             if argument[PATH_PATTERN]
-              path = arguments.slice!(index)
+              path_with_params = arguments.slice!(index)
+              path, params = path_with_params.split("?", 2)
+              if params
+                path += "?" + escape_params(params)
+              end
               break
             end
           end
           path
         end
+
+        def escape_params(params)
+          split_params = params.split("&").map do |param|
+            key, value = param.split('=', 2)
+            CGI::escape(key) + '=' + CGI::escape(value)
+          end
+          split_params.join("&")
+        end
     end
 
     module AvailableOptions
@@ -215,7 +240,12 @@ Supported Commands: #{SUPPORTED_COMMANDS.sort.join(', ')}
 
       def host
         on('-H', '--host [host]', 'Specify host to make requests to (default: api.twitter.com)') do |host|
-          options.host = host
+          if host[PROTOCOL_PATTERN]
+            protocol, protocolless_host = host.split(PROTOCOL_PATTERN, 2)
+            options.host = protocolless_host
+          else
+            options.host = host
+          end
         end
       end
 

data/lib/twurl/version.rb

@@ -2,7 +2,7 @@ module Twurl
   class Version
     MAJOR = 0 unless defined? Twurl::Version::MAJOR
     MINOR = 8 unless defined? Twurl::Version::MINOR
-    PATCH = 2 unless defined? Twurl::Version::PATCH
+    PATCH = 3 unless defined? Twurl::Version::PATCH
     BETA = nil unless defined? Twurl::Version::BETA # Time.now.to_i.to_s
 
     class << self

data/test/cli_test.rb

@@ -1,9 +1,11 @@
 require File.dirname(__FILE__) + '/test_helper'
 
 class Twurl::CLI::OptionParsingTest < Minitest::Test
+  TEST_PATH = '/1.1/url/does/not/matter.json'
+
   module CommandParsingTests
     def test_no_command_specified_falls_to_default_command
-      options = Twurl::CLI.parse_options(['/1.1/url/does/not/matter.json'])
+      options = Twurl::CLI.parse_options([TEST_PATH])
       assert_equal Twurl::CLI::DEFAULT_COMMAND, options.command
     end
 
@@ -15,24 +17,38 @@ class Twurl::CLI::OptionParsingTest < Minitest::Test
 
     def test_unsupported_command_specified_sets_default_command
       unsupported_command = 'unsupported'
-      options = Twurl::CLI.parse_options([unsupported_command])
+      options = Twurl::CLI.parse_options([TEST_PATH, unsupported_command])
       assert_equal Twurl::CLI::DEFAULT_COMMAND, options.command
     end
   end
   include CommandParsingTests
 
+  module PathParsingTests
+    def test_missing_path_throws_no_path_found
+      stub(Twurl::CLI).puts
+      assert_raises Twurl::CLI::NoPathFound do
+        Twurl::CLI.parse_options([])
+      end
+    end
+
+    def test_uri_params_are_encoded
+      options = Twurl::CLI.parse_options(["/1.1/url?baz=bamf:rofl"])
+      assert_equal options.path, "/1.1/url?baz=bamf%3Arofl"
+    end
+  end
+  include PathParsingTests
+
   module RequestMethodParsingTests
     def test_request_method_is_default_if_unspecified
-      options = Twurl::CLI.parse_options(['/1.1/url/does/not/matter.json'])
+      options = Twurl::CLI.parse_options([TEST_PATH])
       assert_equal Twurl::Options::DEFAULT_REQUEST_METHOD, options.request_method
     end
 
     def test_specifying_a_request_method_extracts_and_normalizes_request_method
       variations = [%w[-X put], %w[-X PUT], %w[--request-method PUT], %w[--request-method put]]
       variations.each do |option_variation|
-        path = '/1.1/url/does/not/matter.json'
-        order_variant_1 = [option_variation, path].flatten
-        order_variant_2 = [path, option_variation].flatten
+        order_variant_1 = [option_variation, TEST_PATH].flatten
+        order_variant_2 = [TEST_PATH, option_variation].flatten
         [order_variant_1, order_variant_2].each do |args|
           options = Twurl::CLI.parse_options(args)
           assert_equal 'put', options.request_method
@@ -41,7 +57,7 @@ class Twurl::CLI::OptionParsingTest < Minitest::Test
     end
 
     def test_specifying_unsupported_request_method_returns_an_error
-      Twurl::CLI.parse_options(['-X', 'UNSUPPORTED'])
+      Twurl::CLI.parse_options([TEST_PATH, '-X', 'UNSUPPORTED'])
     end
   end
   include RequestMethodParsingTests
@@ -50,13 +66,13 @@ class Twurl::CLI::OptionParsingTest < Minitest::Test
     def test_extracting_the_consumer_key
       mock(Twurl::CLI).prompt_for('Consumer key').never
 
-      options = Twurl::CLI.parse_options(['-c', 'the-key'])
+      options = Twurl::CLI.parse_options([TEST_PATH, '-c', 'the-key'])
       assert_equal 'the-key', options.consumer_key
     end
 
     def test_consumer_key_option_with_no_value_prompts_user_for_value
       mock(Twurl::CLI).prompt_for('Consumer key').times(1) { 'inputted-key'}
-      options = Twurl::CLI.parse_options(['-c'])
+      options = Twurl::CLI.parse_options([TEST_PATH, '-c'])
       assert_equal 'inputted-key', options.consumer_key
     end
   end
@@ -64,39 +80,39 @@ class Twurl::CLI::OptionParsingTest < Minitest::Test
 
   module DataParsingTests
     def test_extracting_a_single_key_value_pair
-      options = Twurl::CLI.parse_options(['-d', 'key=value'])
+      options = Twurl::CLI.parse_options([TEST_PATH, '-d', 'key=value'])
       assert_equal({'key' => 'value'}, options.data)
 
-      options = Twurl::CLI.parse_options(['--data', 'key=value'])
+      options = Twurl::CLI.parse_options([TEST_PATH, '--data', 'key=value'])
       assert_equal({'key' => 'value'}, options.data)
     end
 
     def test_passing_data_and_no_explicit_request_method_defaults_request_method_to_post
-      options = Twurl::CLI.parse_options(['-d', 'key=value'])
+      options = Twurl::CLI.parse_options([TEST_PATH, '-d', 'key=value'])
       assert_equal 'post', options.request_method
     end
 
     def test_passing_data_and_an_explicit_request_method_uses_the_specified_method
-      options = Twurl::CLI.parse_options(['-d', 'key=value', '-X', 'DELETE'])
+      options = Twurl::CLI.parse_options([TEST_PATH, '-d', 'key=value', '-X', 'DELETE'])
       assert_equal({'key' => 'value'}, options.data)
       assert_equal 'delete', options.request_method
     end
 
     def test_multiple_pairs_when_option_is_specified_multiple_times_on_command_line_collects_all
-      options = Twurl::CLI.parse_options(['-d', 'key=value', '-d', 'another=pair'])
+      options = Twurl::CLI.parse_options([TEST_PATH, '-d', 'key=value', '-d', 'another=pair'])
       assert_equal({'key' => 'value', 'another' => 'pair'}, options.data)
     end
 
     def test_multiple_pairs_separated_by_ampersand_are_all_captured
-      options = Twurl::CLI.parse_options(['-d', 'key=value&another=pair'])
+      options = Twurl::CLI.parse_options([TEST_PATH, '-d', 'key=value&another=pair'])
       assert_equal({'key' => 'value', 'another' => 'pair'}, options.data)
     end
 
     def test_extracting_an_empty_key_value_pair
-      options = Twurl::CLI.parse_options(['-d', 'key='])
+      options = Twurl::CLI.parse_options([TEST_PATH, '-d', 'key='])
       assert_equal({'key' => ''}, options.data)
 
-      options = Twurl::CLI.parse_options(['--data', 'key='])
+      options = Twurl::CLI.parse_options([TEST_PATH, '--data', 'key='])
       assert_equal({'key' => ''}, options.data)
     end
   end
@@ -104,15 +120,15 @@ class Twurl::CLI::OptionParsingTest < Minitest::Test
 
   module HeaderParsingTests
     def test_extracting_a_single_header
-      options = Twurl::CLI.parse_options(['-A', 'Key: Value'])
+      options = Twurl::CLI.parse_options([TEST_PATH, '-A', 'Key: Value'])
       assert_equal({'Key' => 'Value'}, options.headers)
 
-      options = Twurl::CLI.parse_options(['--header', 'Key: Value'])
+      options = Twurl::CLI.parse_options([TEST_PATH, '--header', 'Key: Value'])
       assert_equal({'Key' => 'Value'}, options.headers)
     end
 
     def test_multiple_headers_when_option_is_specified_multiple_times_on_command_line_collects_all
-      options = Twurl::CLI.parse_options(['-A', 'Key: Value', '-A', 'Another: Pair'])
+      options = Twurl::CLI.parse_options([TEST_PATH, '-A', 'Key: Value', '-A', 'Another: Pair'])
       assert_equal({'Key' => 'Value', 'Another' => 'Pair'}, options.headers)
     end
   end
@@ -120,13 +136,13 @@ class Twurl::CLI::OptionParsingTest < Minitest::Test
 
   module SSLDisablingTests
     def test_ssl_is_on_by_default
-      options = Twurl::CLI.parse_options([])
+      options = Twurl::CLI.parse_options([TEST_PATH])
       assert options.ssl?
     end
 
     def test_passing_no_ssl_option_disables_ssl
       ['-U', '--no-ssl'].each do |switch|
-        options = Twurl::CLI.parse_options([switch])
+        options = Twurl::CLI.parse_options([TEST_PATH, switch])
         assert !options.ssl?
       end
     end
@@ -135,7 +151,7 @@ class Twurl::CLI::OptionParsingTest < Minitest::Test
 
   module HostOptionTests
     def test_not_specifying_host_sets_it_to_the_default
-      options = Twurl::CLI.parse_options([])
+      options = Twurl::CLI.parse_options([TEST_PATH])
       assert_equal Twurl::Options::DEFAULT_HOST, options.host
     end
 
@@ -143,24 +159,30 @@ class Twurl::CLI::OptionParsingTest < Minitest::Test
       custom_host = 'localhost:3000'
       assert Twurl::Options::DEFAULT_HOST != custom_host
 
-      [['-H', custom_host], ['--host', custom_host]].each do |option_combination|
+      [[TEST_PATH, '-H', custom_host], [TEST_PATH, '--host', custom_host]].each do |option_combination|
         options = Twurl::CLI.parse_options(option_combination)
         assert_equal custom_host, options.host
       end
     end
+
+    def test_protocol_is_stripped_from_host
+      custom_host = 'localhost:3000'
+      options = Twurl::CLI.parse_options([TEST_PATH, '-H', "https://"+custom_host])
+      assert_equal custom_host, options.host
+    end
   end
   include HostOptionTests
 
   module ProxyOptionTests
     def test_not_specifying_proxy_sets_it_to_nil
-      options = Twurl::CLI.parse_options([])
+      options = Twurl::CLI.parse_options([TEST_PATH])
       assert_equal nil, options.proxy
     end
 
     def test_setting_proxy_updates_to_requested_value
       custom_proxy = 'localhost:80'
 
-      [['-P', custom_proxy], ['--proxy', custom_proxy]].each do |option_combination|
+      [[TEST_PATH, '-P', custom_proxy], [TEST_PATH, '--proxy', custom_proxy]].each do |option_combination|
         options = Twurl::CLI.parse_options(option_combination)
         assert_equal custom_proxy, options.proxy
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twurl
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth