swivel 0.0.96 → 0.0.102

data/bin/swivel

@@ -74,7 +74,7 @@ class SwivelHelper
 
   def upload name, options = Hash.new
     filename = options[:filename]
-    data_set = @swivel.upload :original_asset_name => filename,
+    data_set = @swivel.upload! :original_asset_name => filename,
       :original_asset_path => filename,
       :auto_estimate => true,
       :data => read(filename),

data/lib/benchmarking.rb

@@ -0,0 +1,4 @@
+module Swivel
+  module Benchmarking
+  end
+end

data/lib/swivel.rb

@@ -10,7 +10,9 @@ require 'rexml/document'
 require 'yaml'
 
 class Time
+  silence_warnings do
   RFC822_DATETIME_REGEX = /\w{3}, \d{2} \w{3} \d{4} \d{2}:\d{2}:\d{2} [+-]\d{4}/
+  end
 end
 
 class String
@@ -102,16 +104,16 @@ end
 #
 # Upload data
 #
-#   See Swivel::Connection#upload for a detailed list of options
+#   See Swivel::Connection#upload! for a detailed list of options
 #
 #   # upload a new data_set
-#   data_set = swivel.upload {...}
+#   data_set = swivel.upload! {...}
 #
 #   # append to an existing data_set
-#   data_set = swivel.append {...}.merge(:id => orig_data_set_id)
+#   data_set = swivel.append! {...}.merge(:id => orig_data_set_id)
 #
 #   # replace data for an existing data_set
-#   data_set = swivel.replace {...}.merge(:id => orig_data_set_id)
+#   data_set = swivel.replace! {...}.merge(:id => orig_data_set_id)
 #
 # TODO: constructing URLs for csvs, html pages, etc
 #
@@ -348,7 +350,7 @@ module Swivel
     def append! options = Hash.new
       options.merge! :mode => 'append', :id => self.id
       raise 'feed me data!' if options[:data].blank?
-      appended_data_set = @connection.upload options
+      appended_data_set = @connection.upload! options
       @refreshed_at = nil
       @retried = false
       @doc = appended_data_set.instance_variable_get :@doc
@@ -365,7 +367,7 @@ module Swivel
     def replace! options = Hash.new
       options.merge! :mode => 'replace', :id => self.id
       raise 'feed me data!' if options[:data].blank?
-      replaced_data_set = @connection.upload options
+      replaced_data_set = @connection.upload! options
       @refreshed_at = nil
       @retried = false
       @doc = replaced_data_set.instance_variable_get :@doc
@@ -540,13 +542,15 @@ module Swivel
     #
 
     class Config
+      silence_warnings do
       CONFIG_DIR = ENV['HOME']
       CONFIG_DIR = RAILS_ROOT if PLATFORM.include?('win32')
       CONFIG_FILE = '.swivelrc'
       DEFAULT_HOST = 'api.swivel.com'
       DEFAULT_CONFIG = { :api_key => '', :protocol => 'http://',
         :host => DEFAULT_HOST, :port => 80,
-        :timeout_up => 200, :timeout_down => 100, :path_prefix => '', :logfile => nil }
+        :timeout_up => 1000, :timeout_down => 1000, :path_prefix => '', :logfile => nil }
+      end
 
       attr_accessor :config
 
@@ -717,6 +721,7 @@ module Swivel
       LAZY
     end
 
+    silence_warnings do
     DEFAULT_UPLOAD_OPTIONS = {
       :citation => 'swivel.rb',
       :citation_url => 'www.swivel.com/developer',
@@ -724,6 +729,7 @@ module Swivel
       :image_source_url => 'http://www.swivel.com',
       :display_tags => 'swivel api swivel.rb'
     }
+    end
 
     # Performs an upload, append, or replace to a data_set in Swivel.
     #   # upload a file to swivel
@@ -767,7 +773,7 @@ module Swivel
     # * You must post data as a string of text.
     # * Actually, that's it, I think.
 
-    def upload options = Hash.new
+    def upload! options = Hash.new
       opts = options.clone
       opts[:mode] ||= 'initial'
 
@@ -783,16 +789,16 @@ module Swivel
           opts.reverse_merge! DEFAULT_UPLOAD_OPTIONS
           ['/data_sets', :post]
         end
-      call uri, opts, method
+      call! uri, opts, method
     end
-    alias_method :create_data_set, :upload
+    alias_method :create_data_set, :upload!
 
     %w/append replace/.each do |mode|
       class_eval <<-LAZY
         def #{mode} options = Hash.new
           opts = options.clone
           opts[:mode] = "#{mode}"
-          upload opts
+          upload! opts
         end
       LAZY
     end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: swivel
 version: !ruby/object:Gem::Version 
-  version: 0.0.96
-date: 2007-10-12 00:00:00 -07:00
+  version: 0.0.102
+date: 2007-10-18 00:00:00 -07:00
 summary: Ruby interface to the Swivel API.
 require_paths: 
 - lib
@@ -32,7 +32,9 @@ files:
 - COPYING
 - README
 - Rakefile
+- lib/benchmarking.rb
 - lib/swivel.rb
+- lib/test
 - bin/swivel
 - CHANGELOG
 test_files: []