jaxx 0.0.9 → 0.0.11

data/lib/jaxx/cli.rb

@@ -25,12 +25,13 @@ module Jaxx
       OptionParser.new do |o|
         o.banner = "jaxx [options]"
 
-        o.on('-b', '--bucket [BUCKET]')                 { |b| options['bucket'] = b }
-        o.on('-k', '--access-key [ACCESS_KEY]')         { |k| options['access_key'] = k }
-        o.on('-s', '--access-secret [ACCESS_SECRET]')   { |s| options['access_secret'] = s }
-        o.on('-f', '--file [FILE]')                     { |f| options['file'] = f }
-        o.on('-p', '--privacy [privacy]')               { |p| options['privacy'] = p }
-        o.on('-h', '--help')                            { o }
+        o.on('-b',  '--bucket [BUCKET]')                 { |b| options['bucket'] = b }
+        o.on('-k',  '--access-key [ACCESS_KEY]')         { |k| options['access_key'] = k }
+        o.on('-s',  '--access-secret [ACCESS_SECRET]')   { |s| options['access_secret'] = s }
+        o.on('-f',  '--file [FILE]')                     { |f| options['file'] = f }
+        o.on('-n',  '--name [name]')                     { |f| options['filename'] = f }
+        o.on('-p',  '--privacy [privacy]')               { |p| options['privacy'] = p }
+        o.on('-h',  '--help')                            { o }
       end
     end
 

data/lib/jaxx/upload.rb

@@ -7,13 +7,18 @@ module Jaxx
 
     def initialize args = {}
       @process = Process.new(args.merge('validations' => [:privacy, :file_exists]))
+      @filename = args['filename']
+    end
+
+    def filename
+      @filename || File.basename(process.file)
     end
 
     def execute
       process.start do |storage|
         directory  = storage.directories.get(process.bucket)
         directory ||= storage.directories.create(:key => process.bucket, :public => process.public?)
-        directory.files.create(:key => File.basename(process.file), :body => File.read(process.file), :public => process.public?)
+        directory.files.create(:key => filename, :body => File.read(process.file), :public => process.public?)
       end
     end
 

data/lib/jaxx/version.rb

@@ -1,3 +1,3 @@
 module Jaxx
-  VERSION = "0.0.9"
+  VERSION = "0.0.11"
 end

data/spec/lib/jaxx/upload_spec.rb

@@ -8,15 +8,26 @@ module Jaxx
 
       subject { described_class.new(args) }
 
-      it "sends file to storage" do
+      before :each do
         Fog.mock!
-         
+      end
+
+      it "sends file to storage" do
         File.stub(:exist?).with(args['file']).and_return(true)
         File.should_receive(:read).with(args['file']).and_return("")
         File.should_receive(:basename).with(args['file']).and_return('bar.txt')
 
         subject.execute
       end
+
+      it "defaults filename to original filename" do
+        subject.filename.should eq('bar.txt')
+      end
+
+      it "allows assignment of filename" do
+        args['filename'] = 'foo.txt'
+        subject.filename.should eq('foo.txt')
+      end
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jaxx
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-07 00:00:00.000000000 Z
+date: 2013-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -228,7 +228,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -835552838123551112
+      hash: -3120191955893654967
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -237,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -835552838123551112
+      hash: -3120191955893654967
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25