takenoko-s3 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6922c02010745f12516ecedde82d5d58b28528d
-  data.tar.gz: 0d21656bde5a035f48bc594f634179325d20020d
+  metadata.gz: 0ecdf63d9549954b21928d1f36b25e4ce9ad9faf
+  data.tar.gz: 6facfa7c96a66d5f5128a30cd90bdd91cb96ec4b
 SHA512:
-  metadata.gz: e7682d01f2a68bb3f78292495dd552494df603c43afad03780514882bec670c168c6663fc08754922145e0d89df04c5c6622c5c975c81119438884174c74e29c
-  data.tar.gz: 826600fc19787eb2ab050b9bf3fbb833d2fcba077e95ea0112dc10abb9818b7c4a3f7760cb696c5043c9b042f064565deb5d7cfdf3d1adb0cffa7e9d2d30cd31
+  metadata.gz: 31f41d70552a5c90b28bd59c5347bdb503475f717babcf5124edd11a57be4a8a3f227942bc1acf5450a804d3dfc82a6e800e102ba2c7a8ab59b5b8b01043f960
+  data.tar.gz: bec6826e76376233d979ab2571b3f365b2eb0cbb8bd69467d58c9933532c02713c6dd7b98b3d7617c75c7792e4766aec855a6f7230e6f9ad3fb164698517d94d

data/lib/takenoko/s3/attach_helper.rb

@@ -23,12 +23,17 @@ module Takenoko
           end
 
           file = File.open(file_path)
-          s3_path = col[:s3_folder]+ "/" +  File.basename(row[col[:column_name]])
+          file_name = File.basename(row[col[:column_name]])
+          s3_path = col[:s3_folder]+ "/" +  file_name
 
-          find_val = row[table_data[:find_column]]
+          # find_val = row[table_data[:find_column]]
+          find_val = "#{col[:folder_id]}_#{file_name}"
 
           if log_data[find_val].present? && (f = bucket.files.get(s3_path))
-            next if log_data[find_val][:s3_last_upload] && log_data[find_val][:s3_last_upload] >= file.mtime.to_i
+            if log_data[find_val][:s3_last_upload] && log_data[find_val][:s3_last_upload] >= file.mtime.to_i
+              Rails.logger.info "Skip uploaded file: #{file_name}"
+              next
+            end
           end
 
           Rails.logger.info "Uploading to s3: #{file_path} -> #{s3_path}"

data/lib/takenoko/s3/version.rb

@@ -1,5 +1,5 @@
 module Takenoko
   module S3
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

data/takenoko-s3.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{S3 Uploader plugin for takenoko}
   spec.description   = %q{S3 Uploader plugin for takenoko}
-  spec.homepage      = "https://github.com/khiemns54/takenoko-s3/tree/release/0.0.6"
+  spec.homepage      = "https://github.com/khiemns54/takenoko-s3/tree/release/0.0.7"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_dependency "takenoko", "~> 0.2.5"
+  spec.add_dependency "takenoko", "~> 0.2.6"
   spec.add_dependency "fog-aws"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: takenoko-s3
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - KhiemNS
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-18 00:00:00.000000000 Z
+date: 2016-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.2.6
 - !ruby/object:Gem::Dependency
   name: fog-aws
   requirement: !ruby/object:Gem::Requirement
@@ -104,7 +104,7 @@ files:
 - lib/takenoko/s3/tasks/takenoko.rake
 - lib/takenoko/s3/version.rb
 - takenoko-s3.gemspec
-homepage: https://github.com/khiemns54/takenoko-s3/tree/release/0.0.6
+homepage: https://github.com/khiemns54/takenoko-s3/tree/release/0.0.7
 licenses:
 - MIT
 metadata: {}