s3itch_client 1.1.0 → 1.2.0

data/CHANGELOG.md

@@ -0,0 +1,18 @@
+# CHANGELOG
+
+## 1.2.0
+
+* Adds filename parameterization support
+
+## 1.1.0
+
+* Adds HTTPS support (without certificate validation)
+
+## 1.0.1
+
+* URI encoding for filenames
+* Doumentation updates
+
+## 1.0.0
+
+* Initial release

data/README.md

@@ -18,6 +18,7 @@ For your own convenience, create the `~/.s3itch.yml` file with the following con
     url: http://YOUR-S3ITCH-INSTANCE.herokuapp.com
     username: S3ITCH_USERNAME
     password: YOUR_PASSWORD
+    parameterize: true
 
 ## Usage
 

data/lib/s3itch_client.rb

@@ -1,5 +1,6 @@
 require "s3itch_client/version"
 
+require "i18n"
 require "net/http"
 require "securerandom"
 require "uri"
@@ -19,7 +20,7 @@ module S3itchClient
     password = options[:password]
 
     if File.exists?(filepath) && !File.directory?(filepath)
-      uniq_name = build_unique_name(filepath)
+      uniq_name = build_unique_name(filepath, options[:parameterize])
 
       uri.path = "/#{uniq_name}"
 
@@ -48,7 +49,7 @@ module S3itchClient
     end
   end
 
-  def self.build_unique_name(filepath)
+  def self.build_unique_name(filepath, to_param=false)
     filename = File.basename(filepath)
     extname = File.extname(filename)
     basename = File.basename(filename, extname)
@@ -56,7 +57,10 @@ module S3itchClient
     # Ruby 1.8.7 compatibility
     uuid = SecureRandom.respond_to?(:uuid) ? SecureRandom.uuid : SecureRandom.hex
 
-    URI.encode("#{basename}_#{uuid}#{extname}")
+    uniq_name = "#{basename}_#{uuid}#{extname}"
+    uniq_name = parameterize(uniq_name) if to_param
+
+    URI.encode(uniq_name)
   end
 
   def self.indifferent_hash(hash)
@@ -64,4 +68,21 @@ module S3itchClient
     indifferent.merge(hash)
   end
 
+  def self.parameterize(string)
+    parameterized_string = I18n.transliterate(string, :replacement => "-", :locale => :en)
+
+    # Turn unwanted chars into the separator
+    parameterized_string.gsub!(/[^a-z0-9\-_]+/i, "-")
+
+    re_sep = Regexp.escape("-")
+
+    # No more than one of the separator in a row.
+    parameterized_string.gsub!(/#{re_sep}{2,}/, "-")
+
+    # Remove leading/trailing separator.
+    parameterized_string.gsub!(/^#{re_sep}|#{re_sep}$/i, '')
+
+    parameterized_string
+  end
+
 end

data/lib/s3itch_client/cli.rb

@@ -29,6 +29,10 @@ module S3itchClient
           options["password"] = password
         end
 
+        opts.on("-e", "--[no-]parameterize", "Parameterize the filename") do |parameterize|
+          options["parameterize"] = parameterize
+        end
+
         opts.on_tail("-h", "--help", "Show this message") do
           puts opts
           exit

data/lib/s3itch_client/version.rb

@@ -1,3 +1,3 @@
 module S3itchClient
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/s3itch_client.gemspec

@@ -12,6 +12,8 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{Upload files to S3 via your own s3itch instance}
   gem.homepage      = "https://github.com/k33l0r/s3itch_client"
 
+  gem.add_dependency "i18n", ">= 0.6.1"
+
   gem.add_development_dependency "bundler"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec", "~> 2.11.0"

data/spec/s3itch_client_spec.rb

@@ -37,6 +37,29 @@ describe S3itchClient do
       name = S3itchClient.build_unique_name("/tmp/cute kitten.jpeg")
       name.should match(/\Acute%20kitten_[\da-z-]{32,36}\.jpeg\z/)
     end
+
+    it "parameterizes the name if required to" do
+      S3itchClient.should_receive(:parameterize).with(/\Akitten/).and_return do |argument|
+        argument
+      end
+      S3itchClient.build_unique_name("kitten", true)
+    end
+  end
+
+  describe ".parameterize" do
+    it "transliterates non-ASCII characters" do
+      utf8 = "Ä-Ö-Ü-Å-Æ-and-Ø"
+      ascii = S3itchClient.parameterize(utf8)
+      ascii.should == "A-O-U-A-AE-and-O"
+    end
+
+    it "converts spaces to hyphens" do
+      S3itchClient.parameterize("This and that").should == "This-and-that"
+    end
+
+    it "removes 'unwanted' characters" do
+      S3itchClient.parameterize("Unwanted?!€Characters").should == "Unwanted-Characters"
+    end
   end
 
   describe ".upload" do

metadata

@@ -1,96 +1,112 @@
 --- !ruby/object:Gem::Specification
 name: s3itch_client
 version: !ruby/object:Gem::Version
-  version: 1.1.0
-  prerelease:
+  version: 1.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Matias Korhonen
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2012-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
-  version_requirements: !ruby/object:Gem::Requirement
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.1
+- !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
-    none: false
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: webmock
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.11
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.11
-    none: false
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: simplecov
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.4
-    none: false
-  prerelease: false
-  type: :development
 description: Send files to s3itch from the command line
 email:
 - me@matiaskorhonen.fi
@@ -102,6 +118,7 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
@@ -117,36 +134,35 @@ files:
 - spec/support/kitten.jpeg
 homepage: https://github.com/k33l0r/s3itch_client
 licenses: []
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      version: '0'
       segments:
       - 0
-      version: '0'
-      hash: 2
-  none: false
+      hash: 3180291602005236204
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      version: '0'
       segments:
       - 0
-      version: '0'
-      hash: 2
-  none: false
+      hash: 3180291602005236204
 requirements: []
-rubyforge_project:
+rubyforge_project: 
 rubygems_version: 1.8.24
-signing_key:
+signing_key: 
 specification_version: 3
 summary: Upload files to S3 via your own s3itch instance
 test_files:
 - spec/s3itch_client_spec.rb
 - spec/spec_helper.rb
 - spec/support/kitten.jpeg
-...