swivel 0.0.102 → 0.0.103

data/bin/swivel

@@ -12,7 +12,7 @@ config.load
 config.save
 
 ARGV.options do |opts|
-  opts.banner = 'Usage: swivel < list, show, upload, append > [options]'
+  opts.banner = 'Usage: swivel < list, show, upload, append, replace > [options]'
 
   opts.separator ''
 
@@ -31,6 +31,34 @@ ARGV.options do |opts|
       options[:filename] = v
     end
 
+  opts.on '-n', '--column-names=column_names', String,
+    "Column names." do |v|
+    options[:column_names] = v
+  end
+
+  opts.on '-t', '--column-types=column_types', String,
+    "Column types specification.  Choose from {number, currency, date, percent, text}." do |v|
+      options[:column_types] =
+        v.split(',').collect do |type|
+          case type
+          when /^n/i
+            'NumberDataColumnType'
+          when /^w/i
+            'WholeNumberDataColumnType'
+          when /^c/i
+            'CurrencyDataColumnType'
+          when /^t/i
+            'DateTimeDataColumnType'
+          when /^d/i
+            'DateDataColumnType'
+          when /^p/i
+            'PercentageDataColumnType'
+          else
+            'TextDataColumnType'
+          end
+        end.join ','
+  end
+
   opts.on_tail '-r', '--raw=path', String,
     "Perform a raw call and print the XML response." do |v|
       puts Swivel::Connection.new(options).call(v, options)
@@ -74,25 +102,22 @@ class SwivelHelper
 
   def upload name, options = Hash.new
     filename = options[:filename]
-    data_set = @swivel.upload! :original_asset_name => filename,
-      :original_asset_path => filename,
-      :auto_estimate => true,
-      :data => read(filename),
-      :name => name,
-      :citation => $0,
-      :display_tags => 'swivel'
+    opts = {:original_asset_name => filename, :original_asset_path => filename,
+      :name => name, :citation => $0, :display_tags => 'swivel'}
+    opts.merge! column_types(options)
+    data_set = @swivel.upload! opts.merge(:data => read(filename))
     puts "uploaded #{data_set.id}"
   end
 
   def append id, options = Hash.new
-    filename = options[:filename]
-    data_set = @swivel.append :id => id, :data => read(filename)
+    opts = {:id => id}.merge column_types(options)
+    data_set = @swivel.append! opts.merge(:data => read(options[:filename]))
     puts "appended #{data_set.id}"
   end
 
   def replace id, options = Hash.new
-    filename = options[:filename]
-    data_set = @swivel.replace :id => id, :data => read(filename)
+    opts = {:id => id}.merge column_types(options)
+    data_set = @swivel.replace! opts.merge(:data => read(options[:filename]))
     puts "replaced #{data_set.id}"
   end
 
@@ -106,6 +131,16 @@ class SwivelHelper
         readlines.join
       end
     end
+
+    def column_types options
+      if options[:column_types].blank?
+        {:auto_estimate => true}
+      else
+        {:column_types => options[:column_types],
+         :column_names => options[:column_names],
+         :column_separator => options[:column_separator] || ','}
+      end
+    end
 end
 
 helper = SwivelHelper.new options

data/lib/swivel.rb

@@ -724,7 +724,7 @@ module Swivel
     silence_warnings do
     DEFAULT_UPLOAD_OPTIONS = {
       :citation => 'swivel.rb',
-      :citation_url => 'www.swivel.com/developer',
+      :citation_url => 'http://www.swivel.com/developer',
       :image_url => 'http://www.swivel.com/images/logo.png',
       :image_source_url => 'http://www.swivel.com',
       :display_tags => 'swivel api swivel.rb'
@@ -780,12 +780,8 @@ module Swivel
       uri, method =
         case opts[:mode]
         when 'append', 'replace'
-          opts[:auto_estimate] = true
           ["/data_sets/#{opts[:id]}", :put]
         else
-          force_auto_estimate =
-            !opts.has_key?(:auto_estimate) && !opts.has_key?(:column_types)
-          opts[:auto_estimate] = true if force_auto_estimate
           opts.reverse_merge! DEFAULT_UPLOAD_OPTIONS
           ['/data_sets', :post]
         end
@@ -802,6 +798,9 @@ module Swivel
         end
       LAZY
     end
+    # TODO: deprecate the non-bang versions of these methods
+    alias_method :append!, :append
+    alias_method :replace!, :replace
 
     # Lets you create a transient graph in Swivel.
     #

metadata

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

data/lib/benchmarking.rb

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