heroku-platform-api 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZTQ3NDk4YzM0YjRjNGYwZmM5NmZkYTkzMjBmYTI2NjU5M2FkYTY2ZQ==
-  data.tar.gz: !binary |-
-    NGVhZmFmYjZlOWExNDNiNDRhOGY5Y2I5ZDI2N2I5NWRmMjdhMTNiNA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    OTY5YWYxOWQ5Y2RiYmMwOWEzMDZkM2FjYmZjY2JhMWY1N2NhNjA1NTg5NmRl
-    OWIxNDJmMTY0ZDIxYWJkOGNmZjRmNzBlMmFhOWQ5MWUxODc0NjBlNmQ0NjQw
-    OWZhMmM4YWZiY2RmMDg4NWQ3NGU3OTRjZjc0YWNkYTAwY2U1OTA=
-  data.tar.gz: !binary |-
-    YTUyYjg1NTY5NWM2YTM2M2YzYzAyNGNkMDY1OGI5YzZjMjc1NTM5YWI4MGE5
-    YWUzY2RkNDc2MjdkMjU4YzE1OWMwZWQ3NTE4NjI3NDhhYzYxNGQwMjBlNGUz
-    YTJhNjNlZjY0NDljYzQ0OTQ5NDE0M2U5ZGY3MDYzNzU0ZThhY2Y=
+SHA1:
+  metadata.gz: c7f7e4cbb482c412c1002594b40754d94ba3cf06
+  data.tar.gz: f67cf4b4890a7b814431265766a93d2f5daa190f
+SHA512:
+  metadata.gz: 38cff0d17794488c35465a1a72a5fdbdfcc6a8fe6b2c4550f55f85e95261a14c2c9242d289de6bbbb9f9ea65983c69134f12ad13b1c8bfd1ef003c5c00fddd38
+  data.tar.gz: 58ea6ce9f9a2d497c1aeaafcc5fdd24265cf040b60424f57cd9be080867363bb7f603b32849237e7a9cd2dc12ca4c2a8ec8783ae9e39e54939897ebea193c9f7

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 1.9.3
+script:
+  - bundle install
+  - CODECLIMATE_REPO_TOKEN=9e979646269338662e0e529e8d8f0ca1a50ba26ca18c1f18caaa29344b76badf bundle exec rspec
+addons:
+    code_climate:
+        repo_token: 9e979646269338662e0e529e8d8f0ca1a50ba26ca18c1f18caaa29344b76badf  

data/heroku.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "git"
+  spec.add_dependency "git", "~> 1.2"
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rake", "~> 10.3"
+  spec.add_development_dependency "rspec", "~> 3"
 end

data/lib/heroku/conn.rb

@@ -38,7 +38,7 @@ module Heroku
            Net::HTTPCreated
         cache.put(
           r_type, res["ETag"],
-          JSON.parse(res.body)
+          parse_body(res)
         )
       when Net::HTTPPartialContent
         cache.put(
@@ -46,7 +46,7 @@ module Heroku
           gather_partial_content(api_req, res)
         )
       when Net::HTTPNotModified then cache.fetch(r_type, res["ETag"])
-      when Net::HTTPSuccess     then [res["ETag"], JSON.parse(res.body)]
+      when Net::HTTPSuccess     then [res["ETag"], parse_body(res)]
       else                           raise_exception(res)
       end
     end
@@ -54,7 +54,7 @@ module Heroku
     def gather_partial_content(api_req, res)
       Heroku::Properties.logger.info("[Conn] Gathering Partial Content.")
 
-      list_head = JSON.parse(res.body)
+      list_head = parse_body(res)
       etag, list_tail =
         self.send(
           api_req.method,
@@ -66,6 +66,7 @@ module Heroku
     end
 
     def self.raise_exception(res)
+      Heroku::Properties.logger.error("[Conn response] #{res.body.inspect}")
       Heroku::Properties.logger.error("[Conn] Uh oh, something went wrong with request #{res["Request-Id"]}.")
       raise res.class::EXCEPTION_TYPE.new(status(res.code), nil)
     end
@@ -79,7 +80,7 @@ module Heroku
     def self.headers(opts = {})
       {
         "Accept"        => 'application/vnd.heroku+json; version=3',
-        "Content-Type"  => 'application/json',
+        "Content-Type"  => 'application/json;charset=utf-8',
         "Authorization" => Heroku::Properties.auth_token,
         "User-Agent"    => Heroku::Properties::USER_AGENT
       }.merge({}.tap do |header|
@@ -87,5 +88,23 @@ module Heroku
         header["Range"]         = opts[:range] if opts[:range]
       end)
     end
+
+    def self.parse_body(res)
+      JSON.parse(decompress(res))
+    end
+
+    def self.decompress(res)
+      case res["content-encoding"]
+      when 'gzip'
+        Zlib::GzipReader.new(
+          StringIO.new(res.body),
+          encoding: "ASCII-8BIT"
+        ).read
+      when 'deflate'
+        Zlib::Inflate.inflate(res.body)
+      else
+        res.body
+      end
+    end
   end
 end

data/lib/heroku/version.rb

@@ -1,3 +1,3 @@
 module Heroku
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/heroku/conn_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Heroku::Conn do
-
   describe ".check_response" do
     context "when the response is unsuccessful" do
       let(:unsuccessful_response) { Net::HTTPClientError.new() }
@@ -11,4 +10,76 @@ describe Heroku::Conn do
       end
     end
   end
+
+  describe "Parsing" do
+    let(:hash) { {"lorem" => "ipsum dolor sit amet"} }
+    let(:body) { hash.to_json }
+    let(:res)  { double(:res) }
+
+    def set_body(res, body)
+      allow(res).to receive(:body).and_return(body)
+    end
+
+    def set_encoding(res, enc)
+      allow(res).to receive(:[])
+        .with("content-encoding")
+        .and_return(enc)
+    end
+
+    describe ".parse_body" do
+      before do
+        set_encoding(res, nil)
+        set_body(res, body)
+      end
+
+      it "attempts to decompress the body" do
+        expect(described_class).to receive(:decompress)
+          .with(res)
+          .and_call_original
+        described_class.send(:parse_body, res)
+      end
+
+      it "converts the body to json" do
+        expect(described_class.send(:parse_body, res)).to eq(hash)
+      end
+    end
+
+    describe ".decompress" do
+      def self.it_returns_the_body
+        it "returns the body" do
+          expect(described_class.send(:decompress, res)).to eq(body)
+        end
+      end
+
+      context "when the body is not encoded" do
+        before do
+          set_encoding(res, "identity")
+          set_body(res, body)
+        end
+
+        it_returns_the_body
+      end
+
+      context "when the body is deflated" do
+        before do
+          set_encoding(res, "deflate")
+          set_body(res, Zlib::Deflate.deflate(body))
+        end
+
+        it_returns_the_body
+      end
+
+      context "when the body is gzipped" do
+        before do
+          set_encoding(res, "gzip")
+
+          strio = StringIO.new
+          Zlib::GzipWriter.wrap(strio) { |gz| gz.write(body) }
+          set_body(res, strio.string)
+        end
+
+        it_returns_the_body
+      end
+    end
+  end
 end

data/spec/heroku/model/model_helper_spec.rb

@@ -53,18 +53,33 @@ describe Heroku::Model::ModelHelper do
 
   describe "#identifier" do
     context "when there are no identifiable parameters" do
-      before { subject.should_receive(:identifiable).and_return({}) }
-      its(:identifier) { should == "" }
+      before do
+        expect(subject).to receive(:identifiable).and_return({})
+      end
+
+      it "should return an empty identifier" do
+        expect(subject.identifier).to be_empty
+      end
     end
 
     context "when the identifier is one parameter" do
-      before { subject.should_receive(:identifiable).and_return({ a: 1 }) }
-      its(:identifier) { should == "a=1" }
+      before do
+        expect(subject).to receive(:identifiable).and_return({ a: 1 })
+      end
+
+      it "should appear in the identifier" do
+        expect(subject.identifier).to eq "a=1"
+      end
     end
 
     context "when the identifier contains multiple parameters" do
-      before { subject.should_receive(:identifiable).and_return({ a: 1, b: 2}) }
-      its(:identifier) { should == "a=1, b=2" }
+      before do
+        expect(subject).to receive(:identifiable).and_return({ a: 1, b: 2})
+      end
+
+      it "should return a comma separated list" do
+        expect(subject.identifier).to eq "a=1, b=2"
+      end
     end
   end
 end

data/spec/heroku/properties/null_logger_spec.rb

@@ -14,7 +14,7 @@ describe Heroku::Properties::NullLogger do
 
     it { should respond_to(:tagged).with(1).argument }
     it "calls the block provided to it" do
-      block_check.should_receive(:call).once
+      expect(block_check).to receive(:call).once
 
       subject.tagged("tag") do
         block_check.call

data/spec/spec_helper.rb

@@ -3,7 +3,6 @@ Bundler.setup
 require 'heroku_api'
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku-platform-api
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ashok Menon
@@ -9,64 +9,64 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-30 00:00:00.000000000 Z
+date: 2014-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 description: Create, destroy and manage your heroku applications programmatically,
   using the Heroku Platform API.
 email:
@@ -76,8 +76,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -118,17 +119,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby client for the Heroku Platform API.
@@ -139,3 +140,4 @@ test_files:
 - spec/heroku/properties/null_logger_spec.rb
 - spec/heroku/properties_spec.rb
 - spec/spec_helper.rb
+has_rdoc: