remote_files 1.6.1 → 2.0.0

data/README.md

@@ -77,6 +77,17 @@ This will store the file on one of the stores and then asynchronously copy the f
 If you just need to store the file in a single store, the you can use `RemoteFiles::File#store_once!`. It will
 behave exactly like `RemoteFiles::File#store!`, but will not asynchronously copy the file to the other stores.
 
+## Copyright and license
+
+Copyright 2013 Zendesk
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
 ## Contributing
 
 1. Fork it

data/lib/remote_files/file_store.rb

@@ -19,8 +19,14 @@ module RemoteFiles
       FileUtils.mkdir_p(file_name.parent)
 
       file_name.open('w') do |f|
-        f.write(file.content)
-        # what about content-type?
+        if file.content.respond_to?(:read)
+          while blk = file.content.read(2048)
+            f << blk
+          end
+        else
+          f.write(file.content)
+          # what about content-type?
+        end
       end
     end
 

data/lib/remote_files/memory_store.rb

@@ -21,7 +21,8 @@ module RemoteFiles
     end
 
     def store!(file)
-      data[file.identifier] = { :content => file.content, :content_type => file.content_type}
+      content = file.content.respond_to?(:read) ? file.content.read : file.content
+      data[file.identifier] = { :content => content, :content_type => file.content_type}
     end
 
     def retrieve!(identifier)

data/lib/remote_files/version.rb

@@ -1,3 +1,3 @@
 module RemoteFiles
-  VERSION = '1.6.1'
+  VERSION = '2.0.0'
 end

data/test/file_store_test.rb

@@ -11,16 +11,38 @@ describe RemoteFiles::FileStore do
 
   describe '#store!' do
     before do
-      @file = RemoteFiles::File.new('foo/identifier', :content_type => 'text/plain', :content => 'content')
+      @file = RemoteFiles::File.new('foo/identifier', :content_type => 'text/plain', :content => content)
     end
 
-    it 'should store the file on disk' do
-      @store.store!(@file)
+    def self.it_should_store_file
+      it 'should store the file on disk' do
+        @store.store!(@file)
 
-      file_path = @directory + 'foo/identifier'
-      file_path.exist?
+        file_path = @directory + 'foo/identifier'
+        file_path.exist?
 
-      assert_equal 'content', file_path.read
+        assert_equal 'content', file_path.read
+      end
+    end
+
+    describe "content = string" do
+      let(:content) { "content" }
+      it_should_store_file
+    end
+
+    describe "content = stringio" do
+      let(:content) { StringIO.new("content") }
+      it_should_store_file
+    end
+
+    describe "content = io" do
+      let(:content) do
+        mock('IO').tap do |io|
+          io.stubs(:read).returns("content").then.returns(nil)
+        end
+      end
+
+      it_should_store_file
     end
   end
 

data/test/memory_store_test.rb

@@ -8,13 +8,35 @@ describe RemoteFiles::MemoryStore do
 
   describe '#store!' do
     before do
-      @file = RemoteFiles::File.new('identifier', :content_type => 'text/plain', :content => 'content')
+      @file = RemoteFiles::File.new('identifier', :content_type => 'text/plain', :content => content)
     end
 
-    it 'should store the file in the memory' do
-      @store.store!(@file)
+    def self.it_should_store_file
+      it 'should store the file in the memory' do
+        @store.store!(@file)
 
-      assert_equal({:content_type => 'text/plain', :content => 'content'}, @store.data['identifier'])
+        assert_equal({:content_type => 'text/plain', :content => 'content'}, @store.data['identifier'])
+      end
+    end
+
+    describe "content = string" do
+      let(:content) { "content" }
+      it_should_store_file
+    end
+
+    describe "content = stringio" do
+      let(:content) { StringIO.new("content") }
+      it_should_store_file
+    end
+
+    describe "content = io" do
+      let(:content) do
+        mock('IO').tap do |io|
+          io.stubs(:read).returns("content").then.returns(nil)
+        end
+      end
+
+      it_should_store_file
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remote_files
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-17 00:00:00.000000000 Z
+date: 2013-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -134,8 +134,9 @@ files:
 - test/resque_job_test.rb
 - test/test_helper.rb
 - README.md
-homepage: https://github.com/staugaard/remote_file
-licenses: []
+homepage: https://github.com/zendesk/remote_files
+licenses:
+- Apache License Version 2.0
 post_install_message: 
 rdoc_options: []
 require_paths: