gooddata_s3 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47dc8e87e10d925ec00de09f149f1d0199394220
-  data.tar.gz: 5ad2f2bd5018e53e61f1c7fcefe05b5a9e147fc2
+  metadata.gz: 086dbc09b0f9d03a30918f41b7ad26747d05c9f3
+  data.tar.gz: 561f7abcacc1d31e3b0816b06946ac9913743a93
 SHA512:
-  metadata.gz: bcdec9ce0d4afe77d01e06d13bbf27691ae0f371882b8ba0475278a6b3f46d63897f89c38652546509b2a09fe72febd7d733e973f565e260697b84c7f51cab14
-  data.tar.gz: 0078fc39f87e1454b077118927dfba674c55c6b926a33b1a88671d4ade4fc73c99e993785cc7d3cabd583013369214e2b11a39bc23d050ed573968cf7041deaf
+  metadata.gz: 2505025053c35f23d24c7faa2ec3fd6b2a71d4509dd71007364aa54d1b69266f80955db6ac46210548dfb4645dd201cbd114f334d2a83e955fe905cfcc26879a
+  data.tar.gz: 743811f9ab12f52fb2721cf1113c43994189da88ce590459c0f513390746fe13db391ddf8683efd1d21cb967bb0fdbefffe047678777378f6d62f8840da3dac3

data/lib/gooddata_s3/client.rb

@@ -1,17 +1,26 @@
 require 'json'
-require 'pry'
 require 'aws-sdk'
+require 'fileutils'
+require 'securerandom'
+
+require_relative 'models/buckets'
 
 class GoodDataS3::Client
 
   attr_accessor :bucket_name
   attr_accessor :bucket
+  attr_accessor :directories
+
+  alias :directory :directories
 
   def initialize config = {}
 
     public_key = config[:public_key]
     private_key = config[:private_key] || config[:secret_key]
-    self.bucket_name = config[:bucket] || 'gooddata_connector'
+    proposed_bucket = S3Bucket.new(config[:bucket] || 'gooddata_connector')
+
+    @bucket_name = proposed_bucket.name
+    @directories = proposed_bucket.directories
 
     AWS.config(:access_key_id => public_key, :secret_access_key => private_key)
 
@@ -25,6 +34,11 @@ class GoodDataS3::Client
       bucket = bucket_exists
     end
 
+    puts "#{Time.now} => Connected to S3 Bucket: \"#{@bucket_name}\""
+    unless @directories.empty?
+      puts "#{Time.now} => Assigned default directory location: \"#{@directories.join('/')}\""
+    end
+
     raise 'ERROR! :public_key, :private_key must be passed for configuration.' unless public_key && private_key
 
   end
@@ -39,22 +53,85 @@ class GoodDataS3::Client
     end
   end
 
-  def upload file
-    puts "#{Time.now} => Uploading:S3_Bucket#{@bucket_name}: \"#{file}\""
+  def upload file_path, config = {}
+
+    if File.exists? file_path
+
+      if @directories.empty?
+        directory = config[:directory] || ''
+      else
+        puts "#{Time.now} => Using default directory \"#{@directories.join('/')}\""
+        directory = @directories.join('/')
+      end
+
+      puts local_file = file_path.split('/')[-1]
+
+    else
+
+      statement = file_path.split('/')
+      local_file = statement.pop
+
+      if @directories.empty?
+        directory = statement.join('/')
+      else
+        puts "#{Time.now} => Using default directory \"#{@directories.join('/')}\""
+        default_directory = @directories.join('/')
+        directory = default_directory+"/"+statement.join('/')
+      end
+
+    end
+
+    raise 'Could not find local file...' unless File.exists? local_file
+
+    key = directory+"/"+local_file
+
+    puts "#{Time.now} => Uploading local file \"#{local_file}\" to S3 Bucket \"#{@bucket_name}\" (\"#{key}\")"
+    resp = @s3.put_object(
+        data: IO.read(local_file),
+        bucket_name: @bucket_name,
+        key: key
+    )
+  end
+
+  def create_directory name
     resp = @s3.put_object(
-        data: IO.read(file),
+        data:'',
         bucket_name: @bucket_name,
-        key: file
+        key: name
     )
   end
 
-  def download file
+  def download file_path, config ={}
+
     begin
-      puts "#{Time.now} => Downloading:S3_Bucket#{@bucket_name}: \"#{file}\""
-      resp = @s3.get_object(bucket_name: @bucket_name, key:file)
+
+      if @directories.any?
+        puts "#{Time.now} => Using default directory \"#{@directories.join('/')}\""
+
+        statement = file_path.split('/')
+        local_file = statement.pop
+        directory = @directories.join('/')
+        key = directory+"/"+statement.join('/')+"/"+local_file
+
+      elsif @directories.empty?
+
+        directory = config[:directory] || ''
+        key = directory+file_path
+
+      else
+
+        key = file_path
+
+      end
+
+      puts "#{Time.now} => Downloading from S3 Bucket (#{@bucket_name}): \"#{key}\""
+
+      resp = @s3.get_object(bucket_name: @bucket_name, key:key)
       resp[:data]
-    rescue
-      nil
+
+    rescue Exception => exp
+      puts exp
+
     end
   end
 
@@ -134,9 +211,40 @@ class GoodDataS3::Client
 
   alias :include? :exists?
 
-  def delete file
-    @s3.delete_object(bucket_name: @bucket_name, key: file)
+  def delete file_path
+
+    begin
+
+      if @directories.any?
+        puts "#{Time.now} => Using default directory \"#{@directories.join('/')}\""
+
+        statement = file_path.split('/')
+        local_file = statement.pop
+        directory = @directories.join('/')
+        key = directory+"/"+statement.join('/')+"/"+local_file
+
+      elsif @directories.empty?
+
+        directory = config[:directory] || ''
+        key = directory+file_path
+
+      else
+
+        key = file_path
+
+      end
+
+      puts "#{Time.now} => Deleting from S3 Bucket (#{@bucket_name}): \"#{key}\""
+      @s3.delete_object(bucket_name: @bucket_name, key: key)
+
+    rescue Exception => exp
+      puts exp
+
+    end
+
+
   end
 
 
 end
+

data/lib/gooddata_s3/models/buckets.rb

@@ -0,0 +1,17 @@
+class S3Bucket
+  attr_accessor :name
+  attr_accessor :directories
+
+  def initialize object_string
+
+    if object_string.include? '/'
+      statement = object_string.split('/')
+      @name = statement.shift
+      @directories = statement
+    else
+      @name = object_string
+      @directories = []
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gooddata_s3
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Patrick McConlogue
@@ -88,6 +88,7 @@ extra_rdoc_files: []
 files:
 - lib/gooddata_s3.rb
 - lib/gooddata_s3/client.rb
+- lib/gooddata_s3/models/buckets.rb
 homepage: https://github.com/thnkr/connectors/tree/master/s3
 licenses:
 - MIT