buzzdata 0.0.1 → 0.0.2

data/README.md

@@ -1,6 +1,37 @@
 # BuzzData Ruby Client Library
 
-## Getting Started
+The BuzzData Ruby Client Library is a simple wrapper for the BuzzData HTTP API that allows you to easily interact with datasets on BuzzData. 
+
+## Example
+
+    # Setup the API
+    require "rubygems"
+    require "buzzdata"
+    buzzdata = Buzzdata.new('YOUR_API_KEY')
+    
+    # Create a Dataset
+    dataset = buzzdata.create_dataset(:username => 'eviltrout',
+                                      :name => "My Awesome Dataset!",
+                                      :public => false,
+                                      :readme => "This is my awesome dataset",
+                                      :license => 'cc0',
+                                      :topics => ['testing-buzzdata'])
+                                 
+    # Upload some data
+    buzzdata.upload(dataset['id'], File.new('datasets/celebrities.csv'), 'My first dataset!')
+  
+## Installation
+
+If you already have Ruby and RubyGems installed then installation is as simple as running the following command in a terminal:
+
+    >> gem install buzzdata
+  
+Mac OS X and most Unix/Linux distributions come with an installation of Ruby and RubyGems. If you do not have Ruby and RubyGems installed please [check the Ruby website for instructions](http://www.ruby-lang.org/).
+  
+
+## API Documentation
+
+### Getting Started
 
 Create an instance of the Buzzdata client:
 
@@ -11,13 +42,13 @@ To make it even simpler, if you create a file, `config/buzzdata.yml` with your `
     >> buzzdata = Buzzdata.new
 
 
-## Downloading Data
+### Downloading Data
 
 To download data from a dataset, just do this:
 
     >> buzzdata.download_data 'eviltrout/b-list-celebrities'
 
-## Dataset Information
+### Dataset Information
 
 Using `dataset_overview` you can get an overview of a Dataset's information. It returns a hash of attribute names and their values. See the *API Documentation* below for a list of the returned attributes.
 
@@ -25,7 +56,7 @@ Using `dataset_overview` you can get an overview of a Dataset's information. It
     >> puts ds['name']  # outputs B-List Celebrities
 
 
-## Listing Datasets
+### Listing Datasets
 
 You can view a user's datasets by calling `datasets_list`. You'll get back an array with information on their datasets.
 
@@ -33,14 +64,14 @@ You can view a user's datasets by calling `datasets_list`. You'll get back an ar
     >> datasets.each {|ds| puts ds['id'] }
 
 
-## Upload History
+### Dataset History
 
 You can retrieve a list of uploaded versions of a dataset by calling `dataset_history`:
 
     >> buzzdata.dataset_history.each {|v| puts "version #{v['version']}!" }
 
 
-## Creating a Dataset
+### Creating a Dataset
 
 You can use the `create_dataset` method to create a new dataset. All fields are required:
 
@@ -53,389 +84,49 @@ You can use the `create_dataset` method to create a new dataset. All fields are
 
     >> puts ds['id']     # outputs eviltrout/my-awesome-dataset
 
-## Uploading Data
+### Uploading Data
 
 If your account has the ability to upload data to a dataset, you can do so like this:
 
-    >> upload = buzzdata.start_upload('eviltrout/b-list-celebrities', File.new('datasets/celebrities.csv')
-
-Uploads take some time to be processed. You can poll how the processing is going using `in_progress?`
-
-    >> upload.in_progress?   # true - upload is going on
-
-    # (wait for some time to pass..)
+    >> buzzdata.upload('eviltrout/b-list-celebrities', File.new('datasets/celebrities.csv'), 'Release notes...')
 
-    >> upload.in_progress?   # false - upload is done!
 
-For a more thourough example of this, look at the sample in *samples/upload_data.rb*
-
-
-## Publish a dataset
+### Publish a dataset
 
     >> buzzdata.publish_dataset('eviltrout/b-list-celebrities')
 
 
-## Clone another user's dataset
+### Clone another user's dataset
 
     >> buzzdata.clone_dataset('pete/pete-forde-s-genome')
 
 
-## Delete a dataset
+### Delete a dataset
 
     >> buzzdata.delete_dataset('eviltrout/tasteless-dataset')    
 
 
-## Get a user's information
+### Get a user's information
 
     >> user = buzzdata.user_info('eviltrout')
     >> puts user['name']   # Robin Ward
 
 
-## Search BuzzData
+### Search BuzzData
 
     >> buzzdata.search("pets").each do |r|
          puts r['label']    # Outputs each search result label
        end
 
 
-## Get a list of usable Licenses 
+### Get a list of usable Licenses 
 
     >> buzzdata.licenses
 
 
-## Get a list of usable Topics 
+### Get a list of usable Topics 
 
     >> buzzdata.topics
   
 
-# BuzzData API 
-
-The BuzzData API returns results in JSON.
-
-You must attach your API key as either a query parameter or post variable in the form of `api_key=YOUR_KEY`.
-
-For example, to test if your API key works, try this url:
-
-    https://buzzdata.com/api/test?api_key=YOUR_KEY
-  
-You should get back a JSON object with your username in it, confirming that the key is yours and has authenticated properly.
-
-## Rate Limits
-
-The API currently limits the requests you can make against it hourly. If you need more requests than that, please contact us and we'll let you know.
-
-We have provided two response headers with each request to the API with Rate Limiting Information. They are returned from every API call.
-
-    X-RateLimit-Limit: 5000
-    X-RateLimit-Remaining: 4998
-
-`X-RateLimit-Limit` is your current limit per hour. `X-RateLimit-Remaining` is how many requests you have left.
-
-# Datasets
-
-## Dataset Details (Overview)
-
-To retrieve information about a dataset, simply make a GET:
-
-**GET https://buzzdata.com/api/:username/:dataset**
-
-**GET Parameters:**
-
-* `api_key` = your API Key  (optional - but necessary for viewing private or unpublished datasets.)
-
-**Returns JSON:**
-
-    {"dataset":
-      {"id":"eviltrout/b-list-celebrities",
-       "username":"eviltrout",
-       "shortname":"b-list-celebrities",
-       "name":"B-List Celebrities",
-       "readme":"Here's a list of B-List Celebrities that I've curated.",
-       "public":true,
-       "license":"cc0",
-       "published":true,
-       "url":"http://buzzdata.com/eviltrout/b-list-celebrities",
-       "avatar":"/images/avatars/b9/e987d17045c649da4de2a580e8109d655e6a12?1312292315",
-       "followers_count":10,
-       "clones_count":2,
-       "articles_count":5,
-       "visualizations_count":10,
-       "attachments_count":2,
-       "created_at":"2011-07-12T14:31:21-04:00",
-       "data_updated_at":"2011-07-12T14:41:52-04:00"}}
-
-
-## Listing Datasets
-
-You can view a list of any user's datasets. 
-
-**GET https://buzzdata.com/api/:username/datasets/list**
-
-**GET Parameters:**
-
-* `api_key` = your API Key  (optional - but necessary for viewing private or unpublished datasets.)
-
-**Returns JSON:**
-
-    [
-      {"id":"eviltrout/b-list-celebrities",
-        "url":"http://buzzdata.com/eviltrout/b-list-celebrities",
-        "name":"B-List Celebrities",
-        "public":true,
-        "published":true,
-        "readme":"Here's a list of B-List Celebrities that I've curated."},
-       {"id":"eviltrout/pets",
-        "url":"http://buzzdata.com/eviltrout/pets",
-        "name":"Pets",
-        "public":true,
-        "published":true,
-        "readme":"A list of pets by owner."}
-        ...
-    ]
-
-
-## Dataset History
-
-To retrieve a list of uploads and versions to a dataset:
-
-**GET https://buzzdata.com/api/:username/:dataset/history**
-
-**GET Paramters: **
-
-* `api_key` = your API Key  (optional - but necessary for viewing private or unpublished datasets.)
-
-**Returns JSON:**
-
-    [
-      {"version":1,"created_at":"2011-07-12T14:41:52-04:00","username":"eviltrout"},
-      {"version":2,"created_at":"2011-07-13T13:00:21-04:00","username":"eviltrout"}
-    ]
-
-
-## Downloading Data
-
-Before you can download data, you need to create a `download_request`. If successful you will be given a
-url to download the data from.
-
-**POST https://buzzdata.com/api/:username/:dataset/download_request**
-
-* `:username` is your username: ex: 'eviltrout'
-* `:dataset` is the short name (url name) of the dataset you are uploading to. For example: 'b-list-celebrities'
-
-**POST Parameters:**
-
-* `api_key` = your API key
-* `version` = the version of the dataset you wish to download
-
-**Returns JSON:**
-
-    {download_request: {path:'PATH_TO_DOWNLOAD_YOUR_DATA'}}
-  
-You can then perform a GET to download the data from the path you are given.
-
-
-## Creating a Dataset
-
-Before you can upload data to a dataset, you need to create a dataset object in our system with meta-data about the dataset. 
-
-**POST https://buzzdata.com/api/:username/datasets**
-
-* `:username` is your username: ex: 'eviltrout'
-
-**POST Parameters:**
-
-* `api_key` = your API Key
-* `dataset[name]` = the name of the dataset
-* `dataset[public]` = (true/false) whether the dataset is public or private
-* `dataset[readme]` = the content for "About this Dataset"
-* `dataset[license]` = the license the dataset is being offered with. See *Licenses* below
-* `dataset[topics]` = the ids of the topics associated with this dataset. See *Topics* below
-
-**Returns JSON:**
-
-It returns the same output from the *Dataset Details (Overview)* above of the completed dataset, or an error message if the dataset couldn't be created.
-
-
-## Upload Requests
-
-To upload data to the system, you need to create an `upload_request`. An upload request tells you the HTTP end point your upload should be going to, as well as an `upload_code` you should pass along with your upload to verify it.
-
-**POST https://buzzdata.com/api/:username/:dataset/upload_request**
-
-* `:username` = your username: ex: 'eviltrout'
-* `:dataset` = the short name (url name) of the dataset you are uploading to. For example: 'b-list-celebrities'
-
-
-**POST Parameters:**
-
-* `api_key` = your API key
-
-**Returns JSON:**
-
-    {upload_request: {upload_code: 'SOME_CODE_HERE', url: 'URL_TO_UPLOAD_TO'} }
-
-* `upload_code` = a unique token that authenticates your upload
-* `url` = the endpoint for where the file should be uploaded
-
-
-## Performing an Upload
-
-After creating an `upload_request`, you can then POST your data file to be ingested. To do this, send a POST request to the `url` you received in your `upload_request` JSON.
-
-*note: Make sure your POST is a multipart, otherwise the file upload will not work.*
-
-**POST Parameters:**
-
-* `api_key` = your API Key
-* `upload_code` = the `upload_code` returned in the `upload_request`
-* `file` = the file data you are uploading to be ingested
-
-**Returns JSON:**
-
-    [{"name"=>"kittens_born.csv", "size"=>187, "job_status_token"=>"a24b2155-e2ec-48d4-8bc0-f77e3758966f"}]
-
-* `name` = the filename of the upload.
-* `size` = the size of the upload in bytes
-* `job_status_token` = an important 
-
-
-## Checking your Upload Status
-
-After a file has been uploaded, you can check out the upload's status by making a GET to:
-
-**GET https://buzzdata.com/api/:username/:dataset/upload_request/status**
-
-* `:username` = your username: ex: 'eviltrout'
-* `:dataset` = the short name (url name) of the dataset you are uploading to. For example: 'b-list-celebrities'
-
-**GET Parameters:**
-
-* `api_key` = your API Key
-* `job_status_token` = The job status token you received when you performed your upload.
-
-**Returns JSON:**
-
-    {"message"=>"Ingest Job Created", "status_code"=>"created"}
-
-* `message` is a textual description of the current status, or an error message in the event of an error
-* `status_code` is the status of the current job. The job has finished when it is `complete` or `error`.
-
-Important! You should wait a little while between polls to the job status. We recommend sleeping for one second in most cases.
-
-Note: If you receive a status of 'Unknown' it means the file has not begun processing yet. If you continue to poll it will move to 'created'
-
-
-## Publishing a Dataset
-
-Once a dataset has an upload associated with it, you can publish it:
-
-**POST https://buzzdata.com/api/:username/:dataset/publish**
-
-**POST Parameters:**
-
-* `api_key` = your API Key
-
-**Returns JSON:**
-
-It returns the same output from the *Dataset Details (Overview)* above of the completed dataset, or an error message if the dataset couldn't be published.
-
-
-## Cloning a Dataset
-
-You can clone another's dataset by making a post. Note the username in this case is the user whose dataset you want to clone, not your own:
-
-**POST https://buzzdata.com/api/:username/:dataset/publish**
-
-**POST Parameters:**
-
-* `api_key` = your API Key
-
-**Returns JSON:**
-
-It returns the same output from the *Dataset Details (Overview)* above of the completed dataset, or an error message if the dataset couldn't be cloned.
-
-
-## Delete a Dataset
-
-To delete a dataset, make a DELETE call:
-
-**DELETE https://buzzdata.com/api/:username/:dataset**
-
-**POST Parameters:**
-
-* `api_key` = your API Key
-
-**Returns JSON:**
-
-    {"id"=>"eviltrout/tasteless-dataset", "deleted"=>true}
-
-# Users
-
-To retrieve information about a particular BuzzData user, perform the following GET:
-
-**GET https://buzzdata.com/api/:username**
-
-**Returns JSON:**
-
-    {"user":
-      {"id":"eviltrout",
-       "name":"Robin Ward",
-       "description":"The Evilest Trout of them all and BuzzData Developer",
-       "location":"Toronto, Canada",
-       "url":"http://buzzdata.com/eviltrout",
-       "avatar":"/images/avatars/b9/e987d17045c649da4de2a580e8109d655e6a12?1312292315",
-       "followers_count": 12}
-    }
-
-
-# Searching BuzzData
-
-To search BuzzData, make a GET call:
-
-**GET https://buzzdata.com/api/search**
-
-**GET Parameters:**
-
-* `query` = the string you'd like to search for
-
-**Returns JSON:**
-
-    [
-      {"label":"Pets","value":"Pets","id":"pets","url":"/eviltrout/pets","cloned":false,"type":"Dataset"},
-      {"label":"Business","value":"Business","id":"business","url":"/topics/business","type":"Topic"},
-      {"label":"Momoko Price","value":"Momoko Price","id":"momoko","url":"/momoko","type":"User","icon":"http://buzzdata.s3.amazonaws.com/avatars/fe/fe361ff01695aa4741840f4f8851a6da9e2ef64c"},
-      ...
-    ]
-
-Note that while in the sample output above there is one of each Dataset, Topic and Users, a search can return many more. The type of result is based on the `type` attribute.
-
-
-# Topics
-
-When creating a dataset, it is necessary to supply at least once topic. To retrieve a list of topics and their ids:
-
-**GET https://buzzdata.com/api/topics**
-
-**Returns JSON:**
-
-    [
-      {"id":"agriculture","name":"Agriculture"},
-      {"id":"animals","name":"Animals"},
-      {"id":"anthropology","name":"Anthropology"},
-      ...
-    ]
-
-# Licenses
-
-When creating a dataset, it is necessary to supply a valid license for the data. You can query the available licenses by:
-
-**GET https://buzzdata.com/api/licenses**
-
-**Returns JSON:**
-
-    [
-      {"id":"cc0"},
-      {"id":"pdm"},
-      {"id":"cc_by"},
-      ...
-    ]
+Copyright © 2011 [BuzzData](http://buzzdata.com/), released under the MIT license 

data/lib/buzzdata.rb

@@ -4,9 +4,8 @@ require 'json'
 require 'yaml'
 
 # Our code
-require_relative 'buzzdata/error'
-require_relative 'buzzdata/rest_helpers'
-require_relative 'buzzdata/upload'
+require './buzzdata/error'
+require './buzzdata/rest_helpers'
 
 class Buzzdata
   YAML_ERRORS = [ArgumentError]
@@ -56,18 +55,15 @@ class Buzzdata
     result['upload_request']
   end
 
-  def start_upload(dataset, file)
+  def upload(dataset, file, release_notes = "")
     upload_request = new_upload_request(dataset)
 
     # Prepare our request
     post_url = upload_request.delete('url')
     upload_request['file'] = file
+    upload_request['release_notes'] = release_notes
     
-    Buzzdata::Upload.new(self, dataset, post_json(post_url, upload_request))    
-  end 
-
-  def upload_status(dataset, job_status_token)
-    get_json(url_for("#{dataset}/upload_request/status"), :job_status_token => job_status_token)
+    post_json(post_url, upload_request)
   end
 
   def download_path(dataset)
@@ -95,7 +91,7 @@ class Buzzdata
   end
 
   def delete_dataset(dataset)
-    delete_json(url_for("#{dataset}"))
+    delete_json(url_for(dataset))
   end
 
   def licenses
@@ -126,10 +122,10 @@ class Buzzdata
   def create_dataset(attributes)
     
     # Validate attributes
-    raise BuzzData::Error, "Missing attributes" if attributes.nil?    
+    raise Buzzdata::Error, "Missing attributes" if attributes.nil?
     raise Buzzdata::Error, "Username is required" if param_blank?(attributes, :username)
     raise Buzzdata::Error, "Dataset name is required" if param_blank?(attributes, :name)
-    raise Buzzdata::Error, "Dataset readme is required" if param_blank?(attributes, :name)
+    raise Buzzdata::Error, "Dataset readme is required" if param_blank?(attributes, :readme)
     raise Buzzdata::Error, "Dataset license is required" if param_blank?(attributes, :license)
     raise Buzzdata::Error, "Dataset topics are required" if param_blank?(attributes, :topics)
 

data/lib/buzzdata/rest_helpers.rb

@@ -11,6 +11,7 @@ module RestHelpers
     
     define_method(method) do |url, params={}|
       params['api_key'] = @api_key
+      params = {:params => params} unless method == :post
 
       RestClient.send(method, url, params) do |response, request, result, &block|        
         case response.code

data/lib/buzzdata/version.rb

@@ -1,3 +1,3 @@
 class Buzzdata
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/samples/upload_data.rb

@@ -2,30 +2,17 @@
 
 require '../lib/buzzdata'
 
-if ARGV.size != 2
-  puts "Usage: ./upload_data.rb dataset filename"
-  puts "Example: ./upload_data.rb eviltrout/kittens-born-by-month kittens_born.csv"
+if ARGV.size != 3
+  puts "Usage: ./upload_data.rb dataset filename 'Change notes...'"
+  puts "Example: ./upload_data.rb eviltrout/kittens-born-by-month kittens_born.csv 'Added more kittens'"
   exit(0)
 end
 
 buzzdata = Buzzdata.new
 
-dataset_name, filename = *ARGV
+dataset_name, filename, release_notes = *ARGV
 
 # Upload a file to a dataset
 print "Uploading #{filename}..."
-upload = buzzdata.start_upload(dataset_name, File.new(filename))
-puts "Done!"
-
-# Wait while it's being processed
-print "Waiting for processing to finish..."
-while upload.in_progress?
-  print "." 
-  sleep(1)    # Let's not poll too frequently
-end
-
-if upload.success?
-  puts "Done!"
-else
-  puts "ERROR! #{upload.status_message}"
-end
+upload = buzzdata.upload(dataset_name, File.new(filename), release_notes)
+puts "Done!"

data/spec/buzzdata_spec.rb

@@ -1,19 +1,36 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
+require 'time'
+require 'securerandom'
+
 class Buzzdata
   describe Buzzdata do
-    describe '#initialize' do
-      def fixture_path(fixture)
-        File.expand_path File.dirname(__FILE__) + '/fixtures/' + fixture
-      end
+    GENERIC_USER = 'eviltrout'
+    NONEXISTENT_USER = 'missing'
+    USER_WITH_PRIVATE_DATASET = 'jpmckinney'
+    PUBLISH_SLEEP_INTERVAL = 5
+
+    CLONABLE_DATASET = 'eviltrout/pets'
+    NONEXISTENT_DATASET = 'missing/missing'
+    PRIVATE_DATASET_BELONGING_TO_ANOTHER_USER = 'jpmckinney/private'
+    UNPUBLISHED_DATASET_BELONGING_TO_ANOTHER_USER = 'jpmckinney/unpublished'
+
+    def fixture_path(basename)
+      File.expand_path File.dirname(__FILE__) + '/fixtures/' + basename
+    end
 
+    describe '#initialize' do
       it 'should use custom configuration file' do
         client = Buzzdata.new nil, :config_file => fixture_path('custom.yml')
         client.instance_variable_get('@api_key').should == 'dummy'
       end
 
-      it "should not raise an error if the configuration file is default and missing" do
-        expect{Buzzdata.new nil}.not_to raise_error(Buzzdata::Error, /No such file or directory/)
+      it "should not raise an error if an API key is provided" do
+        expect{Buzzdata.new 'dummy'}.not_to raise_error(Buzzdata::Error)
+      end
+
+      it "should raise an error if the configuration file is default and missing" do
+        expect{Buzzdata.new}.to raise_error(Buzzdata::Error, /No API key provided/)
       end
 
       it "should raise an error if the configuration file is custom and missing" do
@@ -35,7 +52,6 @@ class Buzzdata
 
       it "should raise an error if the API key is missing from the configuration file" do
         expect{Buzzdata.new nil, :config_file => fixture_path('missing_api_key.yml')}.to raise_error(Buzzdata::Error, /API key missing/)
-        
       end
     end
   end

data/spec/fixtures/data.csv

@@ -0,0 +1,2 @@
+column1,column2
+key1,value1

data/spec/fixtures/invalid_yaml.yml

@@ -1,2 +1,11 @@
 -----
-foo: bar
+foo: bar
+asdf
+
+dd
+asd
+f
+as
+df
+a
+sdf

metadata

@@ -1,50 +1,46 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: buzzdata
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.2
   prerelease: 
-  version: 0.0.1
 platform: ruby
-authors: 
+authors:
 - BuzzData
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-22 00:00:00 -05:00
+date: 2011-12-05 00:00:00.000000000 -05:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rest-client
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2169622940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.6.7
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2169622940
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2169622200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *2169622200
 description: 
-email: 
+email:
 - support@buzzdata.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENCE
@@ -54,7 +50,6 @@ files:
 - lib/buzzdata.rb
 - lib/buzzdata/error.rb
 - lib/buzzdata/rest_helpers.rb
-- lib/buzzdata/upload.rb
 - lib/buzzdata/version.rb
 - samples/config/buzzdata.yml.sample
 - samples/dataset_overview.rb
@@ -63,6 +58,7 @@ files:
 - samples/upload_data.rb
 - spec/buzzdata_spec.rb
 - spec/fixtures/custom.yml
+- spec/fixtures/data.csv
 - spec/fixtures/invalid_yaml.yml
 - spec/fixtures/missing_api_key.yml
 - spec/fixtures/not_a_hash.yml
@@ -71,34 +67,32 @@ files:
 has_rdoc: true
 homepage: http://buzzdata.com/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: buzzdata
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby client for the BuzzData API
-test_files: 
+test_files:
 - spec/buzzdata_spec.rb
 - spec/fixtures/custom.yml
+- spec/fixtures/data.csv
 - spec/fixtures/invalid_yaml.yml
 - spec/fixtures/missing_api_key.yml
 - spec/fixtures/not_a_hash.yml

data/lib/buzzdata/upload.rb

@@ -1,38 +0,0 @@
-class Buzzdata
-  class Upload
-
-    attr_reader :filename, :size, :job_status_token, :dataset
-
-    def initialize(buzzdata_api, dataset, upload_response)
-      @api = buzzdata_api
-      @dataset = dataset
-      @filename = upload_response[0]['name']
-      @size = upload_response[0]['size']
-      @job_status_token = upload_response[0]['job_status_token']
-    end
-
-    def in_progress?
-      !is_complete?(current_status)
-    end
-
-    def success?
-      (current_status['status_code'] == "complete")
-    end
-
-    def status_message
-      current_status['message']
-    end
-
-    private
-
-      def is_complete?(status)
-        return false if status.nil?        
-        ['complete', 'error'].include?(status['status_code'])
-      end
-
-      def current_status
-        return @current_status if is_complete?(@current_status)
-        @current_status = @api.upload_status(@dataset, @job_status_token)
-      end
-  end
-end