jaxx 0.0.20 → 0.0.21

data/.gitignore

@@ -16,4 +16,3 @@ test/tmp
 test/version_tmp
 tmp
 log/
-.DS_Store

data/lib/jaxx/download.rb

@@ -1,20 +1,18 @@
 require 'jaxx/process'
-require 'fileutils'
 
 module Jaxx
   class Download
 
     attr_reader :process, :filename
 
-    def initialize(args = {})
+    def initialize args = {}
       @process = Process.new(args)
     end
 
-    def files(directory)
+    def files directory
       if process.file.match(%r{/$})
         directory.files.inject({}) do |hsh, f|
-          key = f.key.gsub(process.file, '')
-          hsh[key] = f.key if !key.empty? and f.key.match(process.file)
+          hsh[f.key.gsub(process.file, '')] = f.key if f.key.match(process.file)
           hsh
         end
       else
@@ -27,16 +25,9 @@ module Jaxx
         directory = storage.directories.get(process.bucket)
 
         files(directory).each do |target, source|
-
-          # Ensure directory exists
-          dir = File.dirname(target)
-          FileUtils.mkdir_p(dir) unless File.exist?(dir)
-
-          # Create file
           File.open(target, 'wb') do |file|
             directory.files.get(source) {|chunk, byt_remain, byt_total| file.write(chunk) }
           end
-
         end
       end
     end

data/lib/jaxx/upload.rb

@@ -63,7 +63,7 @@ module Jaxx
     def create_file dir, file, name
       dir.files.create(
         :key          => name || file, 
-        :body         => File.read(file), 
+        :body         => File.open(file), 
         :public       => process.public?,
         :content_type => MIME::Types.type_for(file).last
       ) 

data/lib/jaxx/version.rb

@@ -1,3 +1,3 @@
 module Jaxx
-  VERSION = "0.0.20"
+  VERSION = "0.0.21"
 end

data/spec/lib/jaxx/download_spec.rb

@@ -5,12 +5,7 @@ module Jaxx
   describe Download do
 
     describe "#process" do
-      let(:args) { ({ 
-        'access_key' => 'foo', 
-        'access_secret' => 'bar', 
-        'file' => File.expand_path('bar.txt', __FILE__), 
-        'bucket' => 'temp' 
-      }) }
+      let(:args) { ({ 'access_key' => 'foo', 'access_secret' => 'bar', 'file' => File.expand_path('bar.txt', __FILE__), 'bucket' => 'temp' }) }
 
       subject { described_class.new(args) }
 
@@ -25,17 +20,5 @@ module Jaxx
       end
     end
 
-    describe "#files" do
-
-      it "does not process empty filenames" do
-        args['file'] = "foo/"
-
-        file = mock('file', key: "foo/")
-        directory = double('directory', :files => [file])
-
-        subject.files(directory).should eq({})
-      end
-    end
-
   end
 end

data/spec/lib/jaxx/upload_spec.rb

@@ -32,7 +32,7 @@ module Jaxx
           File.stub(:exist?).with(args['file']).and_return(true)
           File.stub(:basename).with(args['file']).and_return('bar.txt')
           Fog::Storage::AWS::Directory.any_instance.stub(:files).and_return(files)
-          File.stub(:read).with(args['file']).any_number_of_times.and_return("")
+          File.stub(:open).with(args['file']).any_number_of_times.and_return("")
         end
 
         it "to storage" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jaxx
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-23 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -261,7 +261,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 698514907351388838
+      hash: 2671804250398414592
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -270,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 698514907351388838
+      hash: 2671804250398414592
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25