synaptic4r 0.1.6 → 0.1.8

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.8

data/bin/synrest

@@ -1,11 +1,10 @@
-#!/usr/bin/ruby
+#!/usr/local/bin/ruby
 
 ####---------------------------------------------------------------------------------------------------------
 SYNLIB = "#{File.dirname($0)}/../lib"
 $:.unshift(SYNLIB) unless $:.include?(SYNLIB)
 
 ####---------------------------------------------------------------------------------------------------------
-require 'yaml'
 require 'optparse'
 require 'synaptic4r'
 require 'logger'
@@ -61,7 +60,7 @@ def run(cmd, input)
     {:out => (input[:dump] or input[:payload]) ? dump(cmd, input, result) : result.print, :logger => :info}
   rescue RestClient::RequestFailed, RestClient::ResourceNotFound, RestClient::Unauthorized, 
          RestClient::NotModified => err
-    {:out => "#{err.message}\n" + Synaptic4r::RequestError.new(err).print, :logger => :error}
+    {:out => "#{err.http_code}\n#{err.message}\n" + Synaptic4r::RequestError.new(err).print, :logger => :error}
   rescue RestClient::Redirect, RestClient::ServerBrokeConnection, RestClient::RequestTimeout => err
     {:out => err.message, :logger => :error}
   rescue ArgumentError => err
@@ -86,7 +85,7 @@ end
 ####---------------------------------------------------------------------------------------------------------
 def format_required_args(args)
   args.inject("") do |f,a|
-    aname = lambda{|v,l| arg_name(Synaptic4r::Request.rest_arg(v),l)}
+    aname = lambda{|v,l| arg_name(Synaptic4r::StorageRequest.rest_arg(v),l)}
     if a.kind_of?(Array)
       f + [aname[a.first,false],a[1..-1].map{|v| aname[v,true]}].join('|') + ' '  
     else
@@ -97,7 +96,7 @@ end
 
 ####---------------------------------------------------------------------------------------------------------
 def diagnostic_args(opts, input, cmd)
-  if Synaptic4r::Request.diagnostics(cmd)
+  if Synaptic4r::StorageRequest.diagnostics(cmd)
     opts.separator "\ndiagnostic options"
     opts.on('-q', '--dump', 'do not send request but print headers and service url to STDOUT'){|d| input[:dump] = true}
     opts.on('-p', '--payload', 'do not send request print payload to STDOUT if present'){|p| input[:payload] = true}
@@ -120,7 +119,7 @@ def set_opts(opts, input, opt_args)
   unless opt_args.empty?
     opts.separator "\noptions"
     opt_args.sort_by{|m| m.to_s}.each do |a|
-      arg_info = Synaptic4r::Request.rest_arg(a)
+      arg_info = Synaptic4r::StorageRequest.rest_arg(a)
       sopt = arg_info[:cli][1]
       lopt = "--#{arg_info[:cli][0]}" + (arg_info[:cli][2].eql?(:flag) ? '' : " #{arg_info[:cli][0]}")
       opts.on(sopt, lopt, arg_info[:desc]) do |v|
@@ -133,11 +132,11 @@ end
 ####---------------------------------------------------------------------------------------------------------
 def set_args(opts, meths, input, cmd)
   extract_positional_args(meths, input, cmd)
-  all_args = Synaptic4r::Request.required_rest_args(cmd)
+  all_args = Synaptic4r::StorageRequest.required_rest_args(cmd)
   fmt = "    %-32s %s"
   unless all_args.empty?
     opts.separator "\nargs"
-    arg_row = lambda{|a,l| arg_info = Synaptic4r::Request.rest_arg(a)
+    arg_row = lambda{|a,l| arg_info = Synaptic4r::StorageRequest.rest_arg(a)
                            opts.separator fmt % [arg_name(arg_info,l), arg_info[:desc]]}
     all_args.each do |a|
       if a.kind_of?(Array)
@@ -173,11 +172,11 @@ end
 
 ####---------------------------------------------------------------------------------------------------------
 def extract_positional_args(meths, input, cmd)
-  eargs = Synaptic4r::Request.required_rest_args(cmd)
+  eargs = Synaptic4r::StorageRequest.required_rest_args(cmd)
   elength = eargs.length
   pvals= prep_argv.first(elength)
-  nvals = if Synaptic4r::Request.map_required_args(cmd)
-            Synaptic4r::Request.map_required_args(cmd)[pvals]
+  nvals = if Synaptic4r::StorageRequest.map_required_args(cmd)
+            Synaptic4r::StorageRequest.map_required_args(cmd)[pvals]
           else 
             {:pvals => pvals, :dlen => 0}
           end
@@ -200,7 +199,7 @@ end
 
 ####---------------------------------------------------------------------------------------------------------
 def set_positional_args(input, nvals, eargs)
-  assign_input = lambda{|a,v| info = Synaptic4r::Request.rest_arg(a); 
+  assign_input = lambda{|a,v| info = Synaptic4r::StorageRequest.rest_arg(a); 
                               input[a] = info[:map].nil? ? v : info[:map][v]}
   length = 0
   nvals[:pvals].each_index do |i|
@@ -210,7 +209,7 @@ def set_positional_args(input, nvals, eargs)
       if /^-/.match(pv)
         matched = false
         ea[1..-1].each do |a|
-          info = Synaptic4r::Request.rest_arg(a)
+          info = Synaptic4r::StorageRequest.rest_arg(a)
           flag = info[:cli][1]
           next unless flag
           if /^#{flag}/.match(pv)
@@ -246,8 +245,8 @@ end
 
 ####---------------------------------------------------------------------------------------------------------
 def build_banner(opts, cmd)
-  exp_args = Synaptic4r::Request.required_rest_args(cmd)
-  opts.banner = Synaptic4r::Request.banner(cmd) || \
+  exp_args = Synaptic4r::StorageRequest.required_rest_args(cmd)
+  opts.banner = Synaptic4r::StorageRequest.banner(cmd) || \
                 "\nUsage: synrest #{cmd.to_s.gsub(/_/,'-')} #{format_required_args(exp_args)} [options]"
 
 end
@@ -256,7 +255,7 @@ end
 def process_input(opts, meths, input, cmd)
   build_banner(opts, cmd)
   set_args(opts, meths, input, cmd)
-  set_opts(opts, input, Synaptic4r::Request.optional_rest_args(cmd))
+  set_opts(opts, input, Synaptic4r::StorageRequest.optional_rest_args(cmd))
   diagnostic_args(opts, input, cmd)
 end
 
@@ -268,7 +267,7 @@ def cmd_help(meths)
   meths.sort_by{|m| m.to_s}.each do |m| 
     next if m.eql?(:get_started)
     meth_str = "  %-30s" % m.to_s.gsub(/_/,'-')
-    puts "#{meth_str} #{Synaptic4r::Request.desc(m)}"
+    puts "#{meth_str} #{Synaptic4r::StorageRequest.desc(m)}"
   end
   puts "\nCommand args and options\n synrest command -h"
   puts "\nGet Started\n synrest get-started"
@@ -276,7 +275,7 @@ def cmd_help(meths)
 end
 
 ####---------------------------------------------------------------------------------------------------------
-meths = Synaptic4r::Request.rest_methods << :get_started
+meths = Synaptic4r::StorageRequest.rest_methods << :get_started
 input = {}
 cmd = extract_cmd(meths)
 

data/lib/synaptic4r/client.rb

@@ -17,7 +17,7 @@ module Synaptic4r
     end
 
     #.........................................................................................................
-    attr_reader :uid, :key, :site, :resource, :subtenant
+    attr_reader :credentials
   
     #.........................................................................................................
     def initialize(args = nil)
@@ -40,16 +40,13 @@ module Synaptic4r
         end
       end
       unary_args_given?(symbolize(config_params), args.keys)
-      @subtenant = args[:subtenant]
-      @uid = args[:uid]
-      @key = args[:key]
-      @site = args[:site]
+      @credentials= {:subtenant => args[:subtenant], :uid => args[:uid], :key => args[:key], :site => args[:site]}
     end
 
     #.........................................................................................................
     def method_missing(meth, *args, &blk)
-      if Request.has_rest_method?(meth)
-        Request.new(:uid => uid, :subtenant => subtenant, :key => key, :site => site).execute(meth, *args, &blk)
+      if StorageRequest.has_rest_method?(meth)
+        StorageRequest.new(credentials).execute(meth, *args, &blk)
       else
         super
       end

data/lib/synaptic4r/request.rb

@@ -2,10 +2,11 @@
 module Synaptic4r
   
   ####------------------------------------------------------------------------------------------------------
-  class Request
+  ####------------------------------------------------------------------------------------------------------
+  class StorageRequest
     
     ####------------------------------------------------------------------------------------------------------
-    include Rest
+    include StorageRest
 
 
     #.......................................................................................................
@@ -288,7 +289,7 @@ module Synaptic4r
     end
     
   
-  #### Request
+  #### SorageRequest
   end
 
 #### Synaptic4r

data/lib/synaptic4r/rest.rb

@@ -28,8 +28,9 @@ module Synaptic4r
       case file
         when String
           IO.read(file, length, offset)
-        else 
-          file.read
+        else
+          file.seek(offset)
+          file.read(length)
       end
     end
 
@@ -37,7 +38,7 @@ module Synaptic4r
   end
 
   ###########################################################################################################
-  module Rest
+  module StorageRest
     
     #------------------------------------------------------------------------------------------------------
     class << self
@@ -202,12 +203,12 @@ module Synaptic4r
       attr_reader :headers, :uid, :key, :site, :subtenant, :payload, :meth, :sign, :url
 
       #.......................................................................................................
-      def initialize(args)
-        unary_args_given?([:uid, :subtenant, :key, :site], args)
-        @uid = args[:uid]
-        @key = args[:key]
-        @site = args[:site]
-        @subtenant = args[:subtenant]
+      def initialize(cred)
+        unary_args_given?([:uid, :subtenant, :key, :site], cred)
+        @uid = cred[:uid]
+        @key = cred[:key]
+        @site = cred[:site]
+        @subtenant = cred[:subtenant]
         @headers = credentials
       end
 
@@ -364,7 +365,7 @@ module Synaptic4r
     end
 
      
-  ### Rest 
+  ### Storage Rest 
   end
 
 #### Synaptic4r

data/lib/synaptic4r/result.rb

@@ -327,16 +327,16 @@ module Synaptic4r
 
    #.......................................................................................................
     def code
-      @err.elements.to_a('Code').first.text      
+      @err.elements.to_a('Code').first.text if @err.elements.to_a('Code').first    
     end
 
     #.......................................................................................................
     def message
-      @err.elements.to_a('Message').first.text      
+      @err.elements.to_a('Message').first.text if @err.elements.to_a('Message').first     
     end
 
     #.......................................................................................................
-    def print
+    def print 
       @err.nil? ? '' : "#{code}: #{message}"
     end
 

data/lib/synaptic4r.rb

@@ -4,6 +4,7 @@ require 'time'
 require 'uri'
 require 'openssl'
 require 'digest'
+require 'yaml'
 require 'rexml/document'
 
 require 'rubygems'

data/synaptic4r.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{synaptic4r}
-  s.version = "0.1.6"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["troystribling-att"]
-  s.date = %q{2009-12-02}
+  s.date = %q{2010-03-23}
   s.default_executable = %q{synrest}
   s.email = %q{troy.stribling@usi.com}
   s.executables = ["synrest"]
@@ -49,15 +49,15 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{CLI and Ruby REST Client for ATT Synaptic Storage}
   s.test_files = [
-    "test/get_messages.rb",
-     "test/create_file_messages.rb",
+    "test/create_dir_test.rb",
      "test/get_test.rb",
+     "test/create_file_messages.rb",
+     "test/mock.rb",
+     "test/matchers.rb",
      "test/create_dir_messages.rb",
-     "test/helper.rb",
-     "test/create_dir_test.rb",
+     "test/get_messages.rb",
      "test/create_file_test.rb",
-     "test/mock.rb",
-     "test/matchers.rb"
+     "test/helper.rb"
   ]
 
   if s.respond_to? :specification_version then

data/test/create_dir_test.rb

@@ -15,7 +15,6 @@ class CreateDirTest < Test::Unit::TestCase
     @client.create_dir(a).should send_request(CreateDirMessages.request(a))
   end
 
-
   #.........................................................................................................
   should "return OID, location and creation date for created directory" do
     a = @args.merge({:rpath=>'newdir'})

data/test/create_file_messages.rb

@@ -8,34 +8,51 @@ module CreateFileMessages
   class << self
 
     #......................................................................................................
-    attr_reader :oid, :date, :full_payload, :partial_payload, :full_size
+    attr_reader :oid, :date, :payload
     attr_accessor :response_method
 
     #......................................................................................................
     def namespace_request(args)
-      full_payload = args[:file].kind_of?(String) ? IO.read(args[:file]) : (args[:file].rewind; args[:file].read)
-      @full_size = full_payload.length
-      full_content_md5 = Base64.encode64(Digest::MD5.digest(full_payload)).chomp()
+      payload = args[:file].kind_of?(String) ? IO.read(args[:file]) : (args[:file].rewind; args[:file].read)
+      size = payload.length
+      content_md5 = Base64.encode64(Digest::MD5.digest(payload)).chomp()
       {:url          => "#{args[:site]}/namespace/#{args[:rpath]}",
        :http_request => :post,
-       :headers      => {'content-length' => full_size,
-                         'content-md5'    => full_content_md5,
+       :headers      => {'content-length' => size,
+                         'content-md5'    => content_md5,
                          'content-type'   => 'application/octet-stream'},
-       :payload      => full_payload}
+       :payload      => payload}
+    end
+
+    #......................................................................................................
+    def namespace_partial_request(args)
+      size = args[:create_endoffset] - args[:create_beginoffset] + 1
+      payload = if args[:file].kind_of?(String)
+                  IO.read(args[:file], length, args[:create_beginoffset])
+                else
+                  args[:file].rewind; args[:file].seek(args[:create_beginoffset]); args[:file].read(size)
+                end
+      content_md5 = Base64.encode64(Digest::MD5.digest(payload)).chomp()
+      {:url          => "#{args[:site]}/namespace/#{args[:rpath]}",
+       :http_request => :post,
+       :headers      => {'content-length' => size,
+                         'content-md5'    => content_md5,
+                         'content-type'   => 'application/octet-stream'},
+       :payload      => payload}
     end
 
     #......................................................................................................
     def listable_metadata_request(args)
-      full_payload = IO.read(args[:file])
-      @full_size = full_payload.length
-      full_content_md5 = Base64.encode64(Digest::MD5.digest(full_payload)).chomp()
+      payload = IO.read(args[:file])
+      size = payload.length
+      content_md5 = Base64.encode64(Digest::MD5.digest(payload)).chomp()
       {:url          => "#{args[:site]}/objects",
        :http_request => :post,
-       :headers      => {'content-length'      => full_size,
-                         'content-md5'         => full_content_md5,
+       :headers      => {'content-length'      => size,
+                         'content-md5'         => content_md5,
                          'x-emc-listable-meta' => args[:listable_meta],
                          'content-type'        => 'application/octet-stream'},
-       :payload      => full_payload}
+       :payload      => payload}
     end
 
     #......................................................................................................
@@ -45,7 +62,7 @@ module CreateFileMessages
 
     #......................................................................................................
     def file_response(args)
-      HttpMessages::Result.new(:headers=> {:x_emc_delta    =>   full_size,
+      HttpMessages::Result.new(:headers=> {:x_emc_delta    =>   size,
                                            :date           =>   date,
                                            :content_type   =>   "text/plain; charset=UTF-8", 
                                            :location       =>   "/rest/objects/#{oid}"},

data/test/create_file_test.rb

@@ -24,10 +24,10 @@ class CreateFileTest < Test::Unit::TestCase
   end
 
   #.........................................................................................................
-  should "build request to create file with specified name and read entire file from disk when file IO object specified" do
+  should "build request to create file with specified name and read entire file from disk when local file IO object specified" do
     CreateFileMessages.response_method = :file_response
-    full_payload = File.new('test/test.txt')
-    a = @args.merge({:rpath=>'test.text', :file => full_payload, :payload => true})
+    payload = File.new('test/test.txt')
+    a = @args.merge({:rpath=>'test.text', :file => payload, :payload => true})
     @client.create_file(a).should send_request(CreateFileMessages.namespace_request(a))
   end
 
@@ -39,7 +39,32 @@ class CreateFileTest < Test::Unit::TestCase
     res[:oid].should be(CreateFileMessages.oid)
     res[:location].should be("/rest/objects/#{CreateFileMessages.oid}")
     res[:date].should be(CreateFileMessages.date)
-    res[:size].should be(CreateFileMessages.full_size)
+    res[:size].should be(File.size('test/test.txt'))
+  end
+ 
+  #.........................................................................................................
+  should "build request to create file with specified name and read a portion file from disk when local file name is specified" do
+    CreateFileMessages.response_method = :file_response
+    a = @args.merge({:rpath=>'test.text', :file => 'test/test.txt', :payload => true, :create_beginoffset => 10, :create_endoffset => 20})
+    @client.create_file(a).should send_request(CreateFileMessages.namespace_request(a))
+  end
+
+  #.........................................................................................................
+  should "build request to create file with specified name and read a portion file from disk when local file IO object is specified" do
+    CreateFileMessages.response_method = :file_response
+    a = @args.merge({:rpath=>'test.text', :file => 'test/test.txt', :payload => true, :create_beginoffset => 10, :create_endoffset => 20})
+    @client.create_file(a).should send_request(CreateFileMessages.namespace_request(a))
+  end
+
+  #.........................................................................................................
+  should "return OID, location and creation date for created file when partial file is uploaded" do
+    CreateFileMessages.response_method = :file_response
+    a = @args.merge({:listable_meta=>'test', :file => 'test/test.txt', :payload => true, :create_beginoffset => 10, :create_endoffset => 20})
+    res = @client.create_file(a)
+    res[:oid].should be(CreateFileMessages.oid)
+    res[:location].should be("/rest/objects/#{CreateFileMessages.oid}")
+    res[:date].should be(CreateFileMessages.date)
+    res[:size].should be(args[:create_endoffset] - args[:create_beginoffset] + 1)
   end
  
 end

data/test/mock.rb

@@ -11,7 +11,7 @@ module Synaptic4r
 
     #......................................................................................................
     def to_message_class(meth)
-      eval("#{meth.to_s.split('_').collect{|s| s.capitalize}.join}Messages")
+      eval("#{meth.to_s.split('_').map{|s| s.capitalize}.join}Messages")
     end
 
   ### Rest 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: synaptic4r
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors: 
 - troystribling-att
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-02 00:00:00 -05:00
+date: 2010-03-23 00:00:00 -04:00
 default_executable: synrest
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -85,12 +85,12 @@ signing_key:
 specification_version: 3
 summary: CLI and Ruby REST Client for ATT Synaptic Storage
 test_files: 
-- test/get_messages.rb
-- test/create_file_messages.rb
-- test/get_test.rb
-- test/create_dir_messages.rb
-- test/helper.rb
 - test/create_dir_test.rb
-- test/create_file_test.rb
+- test/get_test.rb
+- test/create_file_messages.rb
 - test/mock.rb
 - test/matchers.rb
+- test/create_dir_messages.rb
+- test/get_messages.rb
+- test/create_file_test.rb
+- test/helper.rb