rest-builder 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5a80d7a9fd8f641f920acfeace75de0ab11e7e9
-  data.tar.gz: 34decd03355b243e14286515bcfa91613d407081
+  metadata.gz: da0d685dc9b0f4d31788b61f599ef824e980f71f
+  data.tar.gz: 4408874a7b33bedb2192d39985b9a03ce0193edc
 SHA512:
-  metadata.gz: 3afab745cc747df73b61bba504f5e95ac1e61bbb32175164b70d430308c3bcb85ec783906c24183cdffa45ce96c9f15c2f646fc4f1e8c6c4966d9b5b1e1c384a
-  data.tar.gz: ae7afa259339c3d5376df6f2226f10f773161c33c692316de06130becc0f2c6e5496babac08ef4696a8821cdf343aa933a19164a22b8e5bf23ae1665154fc598
+  metadata.gz: 79b87403cf20b25ac437b57b7a2e96d1130dded6db3420451c41adc6ede32aa3b9ac0c84dad8004fb5e15a8945129c5f2d5c619b9cec96ae0152ac063c38688c
+  data.tar.gz: d85d3fbcd9b34b2d9357e9f4d029f4de104a8a1030d281dfa08900600d77c50841aeb1a5cac56d9b345630542cc573ab2e5a86e00c2b2e2279ae21a84502f12a

data/.travis.yml

@@ -1,10 +1,5 @@
 sudo: false
 language: ruby
-rvm:
-  - 2.2
-  - 2.3.0
-  - rbx
-  - jruby-9
 
 before_install:
   - rvm get head
@@ -12,3 +7,15 @@ before_install:
   - rvm use --install $TRAVIS_RUBY_VERSION --binary --latest
 install: 'gem install bundler; bundle install --retry=3'
 script: 'ruby -vr bundler/setup -S rake test'
+
+matrix:
+  include:
+    - rvm: 2.2.5
+    - rvm: 2.3.2
+    - rvm: 2.4.1
+    - rvm: jruby-9
+      env: JRUBY_OPTS=--debug
+    - rvm: rbx
+
+  allow_failures:
+  - rvm: rbx

data/CHANGES.md

@@ -1,5 +1,10 @@
 # CHANGES
 
+## rest-builder 0.9.2 -- 2017-08-05
+
+* Attach payload for DELETE request as well. See:
+  [A payload within a DELETE request is ignored resulting "Invalid request data" from web services](https://github.com/godfat/rest-core/issues/25)
+
 ## rest-builder 0.9.1 -- 2016-03-04
 
 * `Promise.set_backtrace` for errors from `event_source`.

data/README.md

@@ -1,4 +1,4 @@
-# rest-builder [![Build Status](https://secure.travis-ci.org/godfat/rest-builder.png?branch=master)](http://travis-ci.org/godfat/rest-builder) [![Coverage Status](https://coveralls.io/repos/godfat/rest-builder/badge.png)](https://coveralls.io/r/godfat/rest-builder) [![Join the chat at https://gitter.im/godfat/rest-builder](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/godfat/rest-builder)
+# rest-builder [![Build Status](https://secure.travis-ci.org/godfat/rest-builder.png?branch=master)](http://travis-ci.org/godfat/rest-builder) [![Coverage Status](https://coveralls.io/repos/github/godfat/rest-builder/badge.png)](https://coveralls.io/github/godfat/rest-builder) [![Join the chat at https://gitter.im/godfat/rest-builder](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/godfat/rest-builder)
 
 by Lin Jen-Shin ([godfat](http://godfat.org))
 
@@ -7,6 +7,7 @@ by Lin Jen-Shin ([godfat](http://godfat.org))
 * [github](https://github.com/godfat/rest-builder)
 * [rubygems](https://rubygems.org/gems/rest-builder)
 * [rdoc](http://rdoc.info/projects/godfat/rest-builder)
+* [issues](https://github.com/godfat/rest-builder/issues) (feel free to ask for support)
 
 ## DESCRIPTION:
 
@@ -560,9 +561,9 @@ the priority here is:
 
 ## LICENSE:
 
-Apache License 2.0
+Apache License 2.0 (Apache-2.0)
 
-Copyright (c) 2016, Lin Jen-Shin (godfat)
+Copyright (c) 2016-2017, Lin Jen-Shin (godfat)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/Rakefile

@@ -1,21 +1,16 @@
 
 begin
-  require "#{dir = File.dirname(__FILE__)}/task/gemgem"
+  require "#{__dir__}/task/gemgem"
 rescue LoadError
   sh 'git submodule update --init --recursive'
   exec Gem.ruby, '-S', $PROGRAM_NAME, *ARGV
 end
 
-$LOAD_PATH.unshift(File.expand_path("#{dir}/promise_pool/lib"))
-
-Gemgem.init(dir) do |s|
+Gemgem.init(__dir__, :submodules => %w[promise_pool]) do |s|
   require 'rest-builder/version'
   s.name    = 'rest-builder'
   s.version = RestBuilder::VERSION
-  %w[promise_pool httpclient mime-types].each do |g|
-    s.add_runtime_dependency(g)
-  end
 
-  # exclude promise_pool
-  s.files.reject!{ |f| f.start_with?('promise_pool/') }
+  %w[promise_pool httpclient mime-types].
+    each(&s.method(:add_runtime_dependency))
 end

data/lib/rest-builder/middleware.rb

@@ -1,7 +1,7 @@
 
 module RestBuilder
   module Middleware
-    METHODS_WITH_PAYLOAD = [:post, :put, :patch]
+    METHODS_WITH_PAYLOAD = [:post, :put, :patch, :delete]
 
     def self.included mod
       mod.send(:attr_reader, :app)

data/lib/rest-builder/test.rb

@@ -5,10 +5,11 @@ require 'pork/auto'
 require 'muack'
 require 'webmock'
 
+WebMock.enable!
 WebMock.disable_net_connect!(:allow_localhost => true)
-Pork::Executor.include(Muack::API, WebMock::API)
+Pork::Suite.include(Muack::API, WebMock::API)
 
-class Pork::Executor
+class Pork::Suite
   def with_img
     f = Tempfile.new(['img', '.jpg'])
     n = File.basename(f.path)

data/lib/rest-builder/version.rb

@@ -1,4 +1,4 @@
 
 module RestBuilder
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'
 end

data/rest-builder.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: rest-builder 0.9.1 ruby lib
+# stub: rest-builder 0.9.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rest-builder".freeze
-  s.version = "0.9.1"
+  s.version = "0.9.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Lin Jen-Shin (godfat)".freeze]
-  s.date = "2016-03-04"
+  s.date = "2017-08-05"
   s.description = "Modular Ruby clients interface for REST APIs.\n\nBuild your own API clients for less dependencies, less codes, less memory,\nless conflicts, and run faster. Checkout [rest-core][] for pre-built\nmiddleware and [rest-more][] for pre-built clients.\n\n[rest-core]: https://github.com/godfat/rest-core\n[rest-more]: https://github.com/godfat/rest-more".freeze
   s.email = ["godfat (XD) godfat.org".freeze]
   s.files = [
@@ -42,8 +42,8 @@ Gem::Specification.new do |s|
   "test/test_httpclient.rb".freeze,
   "test/test_payload.rb".freeze]
   s.homepage = "https://github.com/godfat/rest-builder".freeze
-  s.licenses = ["Apache License 2.0".freeze]
-  s.rubygems_version = "2.6.1".freeze
+  s.licenses = ["Apache-2.0".freeze]
+  s.rubygems_version = "2.6.12".freeze
   s.summary = "Modular Ruby clients interface for REST APIs.".freeze
   s.test_files = [
   "test/test_builder.rb".freeze,

data/task/README.md

@@ -4,16 +4,16 @@
 
 Provided tasks:
 
-    rake clean        # Remove ignored files
+    rake clean        # Trash ignored files
     rake gem:build    # Build gem
     rake gem:install  # Install gem
     rake gem:release  # Release gem
     rake gem:spec     # Generate gemspec
-    rake test         # Run tests in memory
+    rake test         # Run tests
 
 ## REQUIREMENTS:
 
-* Tested with MRI (official CRuby) 1.9.3, 2.0.0, Rubinius and JRuby.
+* Tested with MRI (official CRuby), Rubinius and JRuby.
 
 ## INSTALLATION:
 
@@ -23,13 +23,13 @@ And in Rakefile:
 
 ``` ruby
 begin
-  require "#{dir = File.dirname(__FILE__)}/task/gemgem"
+  require "#{__dir__}/task/gemgem"
 rescue LoadError
-  sh 'git submodule update --init'
+  sh 'git submodule update --init --recursive'
   exec Gem.ruby, '-S', $PROGRAM_NAME, *ARGV
 end
 
-Gemgem.init(dir) do |s|
+Gemgem.init(__dir__, :submodules => %w[your-dep]) do |s|
   s.name    = 'your-gem'
   s.version = '0.1.0'
 end
@@ -37,9 +37,9 @@ end
 
 ## LICENSE:
 
-Apache License 2.0
+Apache License 2.0 (Apache-2.0)
 
-Copyright (c) 2011-2013, Lin Jen-Shin (godfat)
+Copyright (c) 2011-2017, Lin Jen-Shin (godfat)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/task/gemgem.rb

@@ -1,7 +1,7 @@
 
 module Gemgem
   class << self
-    attr_accessor :dir, :spec, :spec_create
+    attr_accessor :dir, :spec, :submodules, :spec_create
   end
 
   module_function
@@ -11,12 +11,14 @@ module Gemgem
   def pkg_dir    ; "#{dir}/pkg"                       ; end
   def escaped_dir; @escaped_dir ||= Regexp.escape(dir); end
 
-  def init dir, &block
+  def init dir, options={}, &block
     self.dir = dir
-    $LOAD_PATH.unshift("#{dir}/lib")
     ENV['RUBYLIB'] = "#{dir}/lib:#{ENV['RUBYLIB']}"
     ENV['PATH']    = "#{dir}/bin:#{ENV['PATH']}"
+    self.submodules  = options[:submodules] || []
     self.spec_create = block
+
+    $LOAD_PATH.unshift("#{dir}/lib", *submodules_libs)
   end
 
   def create
@@ -26,7 +28,7 @@ module Gemgem
 
       s.description = description.join
       s.summary     = description.first
-      s.license     = readme['LICENSE'].sub(/.+\n\n/, '').lines.first.strip
+      s.license     = license
 
       s.date        = Time.now.strftime('%Y-%m-%d')
       s.files       = gem_files
@@ -115,6 +117,7 @@ module Gemgem
       SimpleCov.start do
         add_filter('test/')
         add_filter('test.rb')
+        submodules_libs.each(&method(:add_filter))
       end
     end
 
@@ -159,11 +162,15 @@ module Gemgem
   end
 
   def strip_home_path path
-    path.sub(ENV['HOME'], '~')
+    path.sub(/\A#{Regexp.escape(ENV['HOME'])}\//, '~/')
   end
 
   def strip_cwd_path path
-    path.sub(Dir.pwd, '.')
+    path.sub(/\A#{Regexp.escape(Dir.pwd)}\//, '')
+  end
+
+  def submodules_libs
+    submodules.map{ |path| "#{dir}/#{path}/lib" }
   end
 
   def git *args
@@ -201,6 +208,11 @@ module Gemgem
     @description ||= (readme['DESCRIPTION']||'').sub(/.+\n\n/, '').lines.to_a
   end
 
+  def license
+    readme['LICENSE'].sub(/.+\n\n/, '').lines.first.
+      split(/[()]/).map(&:strip).reject(&:empty?).last
+  end
+
   def all_files
     @all_files ||= fold_files(glob).sort
   end
@@ -221,7 +233,8 @@ module Gemgem
 
   def gem_files
     @gem_files ||= all_files.reject{ |f|
-      f =~ ignored_pattern && !git_files.include?(f)
+      f =~ submodules_pattern ||
+        (f =~ ignored_pattern && !git_files.include?(f))
     }
   end
 
@@ -253,6 +266,15 @@ module Gemgem
                          end
   end
 
+  def submodules_pattern
+    @submodules_pattern ||= if submodules.empty?
+                              /^$/
+                            else
+                              Regexp.new(submodules.map{ |path|
+                                "^#{Regexp.escape(path)}/" }.join('|'))
+                            end
+  end
+
   def expand_patterns pathes
     # http://git-scm.com/docs/gitignore
     pathes.flat_map{ |path|

data/test/test_client.rb

@@ -179,34 +179,32 @@ describe RestBuilder::Client do
     error.should.kind_of?(Errno::ECONNREFUSED)
   end
 
-  path = 'http://example.com/'
-
   would 'give RESPONSE_BODY' do
-    stub_request(:get, path).to_return(:body => 'OK')
-    simple.new.get(path).should.eq 'OK'
+    stub_request(:get, url).to_return(:body => 'OK')
+    simple.new.get(url).should.eq 'OK'
   end
 
   would 'give RESPONSE_HEADERS' do
-    stub_request(:head, path).to_return(:headers => {'A' => 'B'})
-    simple.new.head(path).should.eq 'A' => 'B'
+    stub_request(:head, url).to_return(:headers => {'A' => 'B'})
+    simple.new.head(url).should.eq 'A' => 'B'
   end
 
   would 'give RESPONSE_HEADERS' do
-    stub_request(:get, path).to_return(:status => 199)
-    simple.new.get(path, {},
+    stub_request(:get, url).to_return(:status => 199)
+    simple.new.get(url, {},
       RestBuilder::RESPONSE_KEY => RestBuilder::RESPONSE_STATUS).should.eq 199
   end
 
   would 'give RESPONSE_SOCKET' do
-    stub_request(:get, path).to_return(:body => 'OK')
-    simple.new.get(path, {}, RestBuilder::HIJACK => true).read.should.eq 'OK'
+    stub_request(:get, url).to_return(:body => 'OK')
+    simple.new.get(url, {}, RestBuilder::HIJACK => true).read.should.eq 'OK'
   end
 
   would 'give REQUEST_URI' do
-    stub_request(:get, "#{path}?a=b").to_return(:body => 'OK')
-    simple.new.get(path, {:a => 'b'},
+    stub_request(:get, "#{url}?a=b").to_return(:body => 'OK')
+    simple.new.get(url, {:a => 'b'},
       RestBuilder::RESPONSE_KEY => RestBuilder::REQUEST_URI).
-      should.eq "#{path}?a=b"
+      should.eq "#{url}?a=b"
     simple.wait
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-builder
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-04 00:00:00.000000000 Z
+date: 2017-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: promise_pool
@@ -98,7 +98,7 @@ files:
 - test/test_payload.rb
 homepage: https://github.com/godfat/rest-builder
 licenses:
-- Apache License 2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Modular Ruby clients interface for REST APIs.