enigma_io 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73060a713b2c7c3f6b0ab2fba935b94ae0833113
-  data.tar.gz: ff631614d254b6443b820f0b5f02306806175b37
+  metadata.gz: a747d35d0d4bc97a8590df2eeaba2a21fb5f7566
+  data.tar.gz: 0203d3a76ec2c280ca3d7e08f7a045b065748da1
 SHA512:
-  metadata.gz: 0a0259dd0b09f59ab179451dbc249e76473596d9a2f0f7f77818ede09edc57ded6ef5f74d7c6d771f0bafeb2043eef3b7a8dd342f99e32a406a41a11273e8ec3
-  data.tar.gz: 7b21195ff07b82260251cea50f7abdbfa95d33e60e498b87e06aa73cfcb5429c5f54bcb1ba288acda79d7d89bb98a0f2bd1726131f953441a04c530acd2e9430
+  metadata.gz: 4494f3b6c8fc8dc4d720e1aec016e3cb3f2ffa31eba3d04729bfca1621a9234d9b4a8509537853eba283760aea102a0343347b11d61e084bbce25ae38131d018
+  data.tar.gz: 5346fdefe3243b9a3068b7688d65cac28aad1334ebe9aec7653d2db95fc6f91f79ceb22e4c98744419d2bbe89cc32395e4923c38a9693e3cd9fa2d7182167231

data/README.md

@@ -2,7 +2,7 @@
 
 Ruby client for the enigma api located at https://app.enigma.io/api. Supports ruby >= 1.9.3
 
-Note that you need api key to use their api.
+Note that you need an api key to use their api.
 
 [![Build Status](https://travis-ci.org/scpike/enigma.png?branch=master)](https://travis-ci.org/scpike/enigma)
 

data/lib/enigma/download.rb

@@ -49,15 +49,30 @@ module Enigma
       tmp
     end
 
+    def unzip_zip
+      tmp = write_tmp
+      Zip::File.open(tmp.path) do |zipfile|
+        zipfile.first.get_input_stream.read
+      end
+    end
+
+    def unzip_gz
+      tmp = write_tmp
+      Zlib::GzipReader.open(tmp.path) do |zipfile|
+        zipfile.read
+      end
+    end
+
+    # Handle either .zip or .gz responses since they've changed the
+    # format.
     def unzip
       @download_contents ||=
         begin
-          tmp = write_tmp
-          contents = nil
-          Zip::File.open(tmp.path) do |zipfile|
-            contents = zipfile.first.get_input_stream.read
+          if download_url =~ /\.gz/
+            unzip_gz
+          else
+            unzip_zip
           end
-          contents
         end
     end
 

data/lib/enigma/version.rb

@@ -2,5 +2,5 @@
 
 # Enigma version
 module Enigma
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/test/export_test.rb

@@ -7,12 +7,13 @@ class ExportTest < Test::Unit::TestCase
     Enigma::Download.any_instance.stubs(:sleep)
 
     # These are identical, just one is zipped
-    @zipped = File.read 'test/fixtures/download.zip'
+    @old_zipped = File.read 'test/fixtures/download.zip'
+    @zipped = File.read 'test/fixtures/download.csv.gz'
     @unzipped = File.read 'test/fixtures/download.csv'
 
     # www.example.com is the URL in the response to the export
     # cassette
-    stub_request(:get, 'www.example.com').to_return do
+    stub_request(:get, 'www.example.com/us.gov.whitehouse.visitor-list.csv.gz').to_return do
       if @tried
         { body: @zipped }
       else
@@ -20,6 +21,17 @@ class ExportTest < Test::Unit::TestCase
         { status: 404 }
       end
     end
+
+    # www.example.com is the URL in the response to the export
+    # cassette
+    stub_request(:get, 'www.example.com/us.gov.whitehouse.visitor-list.zip').to_return do
+      if @tried
+        { body: @old_zipped }
+      else
+        @tried = true
+        { status: 404 }
+      end
+    end
   end
 
   def test_export_no_dl
@@ -64,4 +76,16 @@ class ExportTest < Test::Unit::TestCase
       assert_equal 'Steve', parsed.first[:name]
     end
   end
+
+  def test_writing_csv_from_old_format
+    VCR.use_cassette('export_old') do
+      # www.example.com is the URL in the response to the export
+      # cassette
+      dl = @client.export('us.gov.whitehouse.visitor-list')
+      dl.get
+      testIO = StringIO.new
+      dl.write_csv(testIO)
+      assert_equal @unzipped, testIO.string
+    end
+  end
 end

data/test/fixtures/vcr_cassettes/export.yml

@@ -31,7 +31,7 @@ http_interactions:
     body:
       encoding: US-ASCII
       string: ! "{\n  \"datapath\": \"us.gov.whitehouse.visitor-list\",\n  \"success\":
-        true,\n  \"export_url\": \"www.example.com\"\n}"
+        true,\n  \"export_url\": \"www.example.com/us.gov.whitehouse.visitor-list.csv.gz\"\n}"
     http_version:
   recorded_at: Sun, 26 Jan 2014 22:11:57 GMT
 recorded_with: VCR 2.8.0

data/test/fixtures/vcr_cassettes/export_old.yml

@@ -0,0 +1,37 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.enigma.io/v2/export/test-key/us.gov.whitehouse.visitor-list
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Typhoeus - https://github.com/typhoeus/typhoeus
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx/1.2.9
+      Date:
+      - Sun, 26 Jan 2014 22:10:52 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '302'
+      Connection:
+      - keep-alive
+      Vary:
+      - Accept-Encoding
+      Access-Control-Allow-Origin:
+      - ! '*'
+    body:
+      encoding: US-ASCII
+      string: ! "{\n  \"datapath\": \"us.gov.whitehouse.visitor-list\",\n  \"success\":
+        true,\n  \"export_url\": \"www.example.com/us.gov.whitehouse.visitor-list.zip\"\n}"
+    http_version:
+  recorded_at: Sun, 26 Jan 2014 22:11:57 GMT
+recorded_with: VCR 2.8.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enigma_io
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Stephen Pike
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,10 +140,12 @@ files:
 - test/endpoint_test.rb
 - test/export_test.rb
 - test/fixtures/download.csv
+- test/fixtures/download.csv.gz
 - test/fixtures/download.zip
 - test/fixtures/vcr_cassettes/compound_average.yml
 - test/fixtures/vcr_cassettes/data_with_error.yml
 - test/fixtures/vcr_cassettes/export.yml
+- test/fixtures/vcr_cassettes/export_old.yml
 - test/fixtures/vcr_cassettes/filtered_data.yml
 - test/fixtures/vcr_cassettes/limit_data.yml
 - test/fixtures/vcr_cassettes/page_data.yml
@@ -187,10 +189,12 @@ test_files:
 - test/endpoint_test.rb
 - test/export_test.rb
 - test/fixtures/download.csv
+- test/fixtures/download.csv.gz
 - test/fixtures/download.zip
 - test/fixtures/vcr_cassettes/compound_average.yml
 - test/fixtures/vcr_cassettes/data_with_error.yml
 - test/fixtures/vcr_cassettes/export.yml
+- test/fixtures/vcr_cassettes/export_old.yml
 - test/fixtures/vcr_cassettes/filtered_data.yml
 - test/fixtures/vcr_cassettes/limit_data.yml
 - test/fixtures/vcr_cassettes/page_data.yml