s3itch_client 1.2.1 → 1.3.0

data/.travis.yml

@@ -4,6 +4,7 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
   - jruby-18mode
   - jruby-19mode
   - rbx-18mode

data/lib/s3itch_client/version.rb

@@ -1,3 +1,3 @@
 module S3itchClient
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 end

data/lib/s3itch_client.rb

@@ -20,7 +20,7 @@ module S3itchClient
     password = options[:password]
 
     if File.exists?(filepath) && !File.directory?(filepath)
-      uniq_name = build_unique_name(filepath, options[:parameterize])
+      uniq_name = build_unique_name(filepath, options[:parameterize], options[:use_timestamp_suffix])
 
       uri.path = "/#{uniq_name}"
 
@@ -49,15 +49,19 @@ module S3itchClient
     end
   end
 
-  def self.build_unique_name(filepath, to_param=false)
+  def self.build_unique_name(filepath, to_param=false, use_timestamp_suffix=false)
     filename = File.basename(filepath)
     extname = File.extname(filename)
     basename = File.basename(filename, extname)
 
-    # Ruby 1.8.7 compatibility
-    uuid = SecureRandom.respond_to?(:uuid) ? SecureRandom.uuid : SecureRandom.hex
+    suffix = if use_timestamp_suffix
+      Time.now.to_i.to_s(36)
+    else
+      # Ruby 1.8.7 compatibility
+      SecureRandom.respond_to?(:uuid) ? SecureRandom.uuid : SecureRandom.hex
+    end
 
-    uniq_name = "#{basename}_#{uuid}"
+    uniq_name = "#{basename}_#{suffix}"
     uniq_name = parameterize(uniq_name) if to_param
     uniq_name << extname
 

data/spec/s3itch_client_spec.rb

@@ -33,6 +33,12 @@ describe S3itchClient do
       name.should match(/\Akitten_[\da-z-]{32,36}\.jpeg\z/)
     end
 
+    it "uses a timestamp instead of a UUID if required to" do
+      name = S3itchClient.build_unique_name(kitten_path, false, true)
+      name.should match(/\Akitten_[\da-z]+\.jpeg\z/)
+      name.should_not match(/\Akitten_[\da-z-]{32,36}\.jpeg\z/)
+    end
+
     it "URI encodes the file name" do
       name = S3itchClient.build_unique_name("/tmp/cute kitten.jpeg")
       name.should match(/\Acute%20kitten_[\da-z-]{32,36}\.jpeg\z/)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: s3itch_client
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,14 +9,14 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-12 00:00:00.000000000 Z
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.1
   type: :runtime
@@ -24,7 +24,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.1
 - !ruby/object:Gem::Dependency
@@ -32,7 +32,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
@@ -40,7 +40,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -48,7 +48,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
@@ -56,7 +56,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -141,24 +141,24 @@ require_paths:
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: -3640099612951680876
+      hash: 2323134864524827593
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: -3640099612951680876
+      hash: 2323134864524827593
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Upload files to S3 via your own s3itch instance