infrataster 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ddec9ea2e17c599e93bde43dfcb46d4b4e3eec4
-  data.tar.gz: 542174438bfd08460623954456dabbd72a2d7c01
+  metadata.gz: d3ee864e2b8c987050047a121e5393e5e2675064
+  data.tar.gz: a08c6f86e0631d0d6446eb7392b72bae06e460c6
 SHA512:
-  metadata.gz: ee75a9a51c1da1b37268399e2e444612d934d4f0858299a7b70cbadd5e8d8dc8edad7644a190ab7f343805e6ad91180750982949e6f5b17a3e49fb55ee31e2bb
-  data.tar.gz: 18323691afd689f840ca58b604edd14913dd25cf6668357dd36936d931f7298130c840926a847cf8f78a14286c42c7291bf2aabd0edf8d10acab0a24a9cd5bc5
+  metadata.gz: 7e0dfa862fed932ee874e9a8280df0aac2f22c5c35d6edc67e21c5aedd730f7364e4cdfceab5ea0300d8f53e09c29717c6ab890478eaa7094671aead90f81019
+  data.tar.gz: 0e51bd096323609e8b8551b1f0c3794fe9f612131cbec563d1d64a5a860e308a8a6db51de6516ed0156ea021617e4d4ced11164e6ecddd618e6025109572b53d

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Infrataster Changelog
 
+## v0.2.6
+
+* [Inflate response body by gzip if inflate_gzip of http resource is true.]
+
 ## v0.2.5
 
 * [body option of http resource](https://github.com/ryotarai/infrataster/pull/57)

data/README.md

@@ -34,11 +34,11 @@ Vagrant.configure("2") do |config|
 
   config.vm.define :proxy do |c|
     c.vm.network "private_network", ip: "192.168.33.10"
-    c.vm.network "private_network", ip: "171.16.33.10", virtualbox__intnet: "infrataster-example"
+    c.vm.network "private_network", ip: "172.16.33.10", virtualbox__intnet: "infrataster-example"
   end
 
   config.vm.define :app do |c|
-    c.vm.network "private_network", ip: "171.16.33.11", virtualbox__intnet: "infrataster-example"
+    c.vm.network "private_network", ip: "172.16.33.11", virtualbox__intnet: "infrataster-example"
   end
 end
 ```
@@ -175,6 +175,7 @@ Infrataster::Server.define(
   :app,
   # find IP address matching 172.16.0.0 ~ 172.16.255.255
   '172.16.0.0/16',
+)
 ```
 
 Of course, you can set fully-specified IP address too.
@@ -185,6 +186,7 @@ Infrataster::Server.define(
   '172.16.11.22',
   # or
   '172.16.11.22/32',
+)
 ```
 
 ### #ssh_exec
@@ -271,10 +273,28 @@ end
 
 ### `dns` resource
 
-`dns` resource send query to DNS server.
+`dns` resource sends a query to DNS server.
 
 `dns` is provided by [infrataster-plugin-dns](https://github.com/otahi/infrataster-plugin-dns) by [@otahi](https://github.com/otahi).
 
+### `memcached` resource
+
+`memcached` resource sends a query to memcached server.
+
+`memcached` is provided by [infrataster-plugin-memecached](https://github.com/rahulkhengare/infrataster-plugin-memcached) by [@rahulkhengare](https://github.com/rahulkhengare).
+
+### `redis` resource
+
+`redis` resource sends a query to redis server.
+
+`redis` is provided by [infrataster-plugin-redis](https://github.com/rahulkhengare/infrataster-plugin-redis) by [@rahulkhengare](https://github.com/rahulkhengare).
+
+### `firewall` resource
+
+`firewall` resource tests your firewalls.
+
+`firewall` is provided by [infrataster-plugin-firewall](https://github.com/otahi/infrataster-plugin-firewall) by [@otahi](https://github.com/otahi).
+
 ## Example
 
 * [example](example)

data/lib/infrataster.rb

@@ -3,6 +3,7 @@ require "infrataster/resources"
 require "infrataster/server"
 require "infrataster/helpers"
 require "infrataster/contexts"
+require "infrataster/faraday_middleware"
 require 'logger'
 
 module Infrataster

data/lib/infrataster/contexts/http_context.rb

@@ -15,6 +15,9 @@ module Infrataster
           conn = Faraday.new(options) do |faraday|
             faraday.request  :url_encoded
             faraday.response :logger, Logger
+            if resource.inflate_gzip?
+              faraday.use      Infrataster::FaradayMiddleware::Gzip
+            end
             faraday.adapter  Faraday.default_adapter
             faraday.basic_auth(*resource.basic_auth) if resource.basic_auth
           end

data/lib/infrataster/faraday_middleware.rb

@@ -0,0 +1,6 @@
+require 'infrataster/faraday_middleware/gzip'
+
+module Infrataster
+  module FaradayMiddleware
+  end
+end

data/lib/infrataster/faraday_middleware/gzip.rb

@@ -0,0 +1,68 @@
+# This module is ported from faraday_middleware:
+# https://github.com/lostisland/faraday_middleware/blob/138766e3d1cfd58b01d1c3ccb453bb8bc7c1633a/lib/faraday_middleware/gzip.rb
+#
+# Copyright (c) 2011 Erik Michaels-Ober, Wynn Netherland, et al.
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'faraday'
+
+module Infrataster
+  module FaradayMiddleware
+    # Middleware to automatically decompress response bodies. If the
+    # "Accept-Encoding" header wasn't set in the request, this sets it to
+    # "gzip,deflate" and appropriately handles the compressed response from the
+    # server. This resembles what Ruby 1.9+ does internally in Net::HTTP#get.
+    #
+    # This middleware is NOT necessary when these adapters are used:
+    # - net_http on Ruby 1.9+
+    # - net_http_persistent on Ruby 2.0+
+    # - em_http
+    class Gzip < Faraday::Middleware
+      dependency 'zlib'
+
+      ACCEPT_ENCODING = 'Accept-Encoding'.freeze
+      CONTENT_ENCODING = 'Content-Encoding'.freeze
+      CONTENT_LENGTH = 'Content-Length'.freeze
+      SUPPORTED_ENCODINGS = 'gzip,deflate'.freeze
+      RUBY_ENCODING = '1.9'.respond_to?(:force_encoding)
+
+      def call(env)
+        env[:request_headers][ACCEPT_ENCODING] ||= SUPPORTED_ENCODINGS
+        @app.call(env).on_complete do |response_env|
+          case response_env[:response_headers][CONTENT_ENCODING]
+          when 'gzip'
+            reset_body(response_env, &method(:uncompress_gzip))
+          when 'deflate'
+            reset_body(response_env, &method(:inflate))
+          end
+        end
+      end
+
+      def reset_body(env)
+        env[:body] = yield(env[:body])
+        env[:response_headers].delete(CONTENT_ENCODING)
+        env[:response_headers][CONTENT_LENGTH] = env[:body].length
+      end
+
+      def uncompress_gzip(body)
+        io = StringIO.new(body)
+        gzip_reader = if RUBY_ENCODING
+          Zlib::GzipReader.new(io, :encoding => 'ASCII-8BIT')
+        else
+          Zlib::GzipReader.new(io)
+        end
+        gzip_reader.read
+      end
+
+      def inflate(body)
+        Zlib::Inflate.inflate(body)
+      end
+    end
+  end
+end
+

data/lib/infrataster/resources/http_resource.rb

@@ -52,6 +52,10 @@ module Infrataster
       def basic_auth
         @options[:basic_auth]
       end
+
+      def inflate_gzip?
+        !!@options[:inflate_gzip]
+      end
     end
   end
 end

data/lib/infrataster/server.rb

@@ -47,6 +47,7 @@ module Infrataster
     def initialize(name, address, options = {})
       @name, @options = name, options
       @address = determine_address(address)
+      @gateway = nil
     end
 
     def from

data/lib/infrataster/version.rb

@@ -1,3 +1,3 @@
 module Infrataster
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/spec/integration/http_spec.rb

@@ -14,15 +14,19 @@ describe server(:proxy) do
     end
   end
 
-  # If accept-encoding is not specified explicitly,
-  # Net::HTTP (faraday's default adapter) sends request with accept-encoding=gzip
-  # and inflate response as gzip automaticallly
   describe http('http://static.example.com', headers: {"Accept-Encoding" => "gzip"}) do
     it "gets response compressed by gzip" do
       expect(response.headers['content-encoding']).to eq('gzip')
     end
   end
 
+  describe http('http://static.example.com', headers: {"Accept-Encoding" => "gzip"}, inflate_gzip: true) do
+    it "gets response inflated by gzip" do
+      expect(response.headers['content-encoding']).to be_nil
+      expect(response.body).to eq("This is static site.\n")
+    end
+  end
+
   describe http('http://static.example.com/auth') do
     it "sends GET request without basic auth" do
       expect(response.status).to eq 401

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infrataster
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -180,6 +180,8 @@ files:
 - lib/infrataster/contexts/capybara_context.rb
 - lib/infrataster/contexts/http_context.rb
 - lib/infrataster/contexts/no_resource_context.rb
+- lib/infrataster/faraday_middleware.rb
+- lib/infrataster/faraday_middleware/gzip.rb
 - lib/infrataster/fixtures/Gemfile.erb
 - lib/infrataster/fixtures/Rakefile.erb
 - lib/infrataster/fixtures/Vagrantfile.erb
@@ -240,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Infrastructure Behavior Testing Framework