nab 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 276ebcbc2b437f6832f7d40f63086cfb1beb1255
-  data.tar.gz: 2aa66966bec0c0f537e096a723187f282d963552
+  metadata.gz: 88dff9f0057c872115d2b4ab618534acb0d9b6db
+  data.tar.gz: 651c067a126989179b2614fbe4a92e5d5000b0e0
 SHA512:
-  metadata.gz: 3da7c427f07ea594ad5fef284f2368842de4246b91c1551e9d3bff72837c1b53d77f91fe319ed055d5838f04610954a70c7aa5574ef9e65d6ea09e2ee9bbd285
-  data.tar.gz: 293bf411ad3fa723c8c05888b470f86e2af82bdc3daf1a6641f9fb625d7ef61e701e668917f1147e412be989071f628b70677edf13a69afc6c56c62013e1bddc
+  metadata.gz: ec41b11c7b04a140a5104074f53131924006e7b70789eeea7cb6fc235349ff5b0f3d5feb1f99eca3946a501593e2b28ce6967b8d850c0d7e879b4d549a103d92
+  data.tar.gz: ed2eba0384bc46fd4a130d366b960b1baea83070e6431feb5ce98d70d7c1931708cae25bb359ddc96161ff660d1b7b126adb13afe462cb963ea5ef4968551f62

data/changelog.md

@@ -1,6 +1,10 @@
 Nab Changelog
 ===
 
+1.1.0
+---
+  - Factors out path_from_uri into new Utils module
+
 1.0.0
 ---
   - Adds ability to change destination directory (where files go)

data/lib/nab.rb

@@ -13,6 +13,7 @@ require_relative 'nab/client.rb'
 require_relative 'nab/logger.rb'
 require_relative 'nab/version.rb'
 require_relative 'nab/adapters/s3.rb'
+require_relative 'nab/util.rb'
 require_relative 'nab/writers/file_writer.rb'
 require_relative 'nab/writers/stdout_writer.rb'
 require_relative 'nab/writers/stderr_writer.rb'

data/lib/nab/adapters/s3.rb

@@ -12,13 +12,11 @@ module Nab
 
     def get(uri,destination)
       bucket_name = uri.host
-      asset_name  = uri.path.gsub(/^\//, "") # remove leading slashes
       s3          = AWS::S3.new
       bucket      = s3.buckets[bucket_name]
-      asset       = bucket.objects[asset_name]
-
+      asset       = bucket.objects[Util.path_from_uri(uri)]
+      asset_name  = Util.path_from_uri(uri,strip_dirs)
       Nab::Log.info "Retrieving #{File.join(bucket_name,asset_name)}"
-      asset_name  = File.basename(asset_name) if strip_dirs
       store       = write_adapter.new(destination, asset_name)
 
       asset.read { |chunk| store.write chunk }

data/lib/nab/util.rb

@@ -0,0 +1,11 @@
+module Nab
+  module Util
+    def self.path_from_uri(uri,strip_dirs=false)
+      if strip_dirs
+        File.basename(uri.path.gsub(/^\//, ""))
+      else
+        uri.path.gsub(/^\//, "") # remove leading slashes
+      end
+    end
+  end
+end

data/lib/nab/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module Nab
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nab
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Brian Bianco
@@ -55,6 +55,7 @@ files:
 - lib/nab/adapters/s3.rb
 - lib/nab/client.rb
 - lib/nab/logger.rb
+- lib/nab/util.rb
 - lib/nab/version.rb
 - lib/nab/writers/file_writer.rb
 - lib/nab/writers/stderr_writer.rb