carrierwave-azure 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 249499710b8f42a2c0cb7a9ea400aa4ae82ab96c
-  data.tar.gz: 63b7d19173fa80c79c7be45db9251e5c80bb362f
+  metadata.gz: 2e0a56c09c0ae1636071257a539bee848f732bf8
+  data.tar.gz: c5aac6ae83e8fb9332a61cfd560816a21b27ff4a
 SHA512:
-  metadata.gz: 761567767273463b0deb34113fee1e5caa7a12829dc5fe8a7761b93ef65788d52c8d645ce3db9ff1bdd3d16dc78c7650b965efe068cc1de25ea699358024a921
-  data.tar.gz: a3bfc7d0b16f8ea38f228c147a29ed788c5a99ccc03da50f8dbdbae6f066c2f1b4a8a512a1d58864b58a612c3e08b5673fff1e89e1c7e5b1aa8030c9c6aff8d4
+  metadata.gz: 3b936fa3d28be01ca38afe6963349c768285e9543e109da57e0ead9115b1220f42d90b117c75030c1177ef3dc6c27e3efa957fe1921b146d1f3ccc164c69eb6d
+  data.tar.gz: c771bb6be7a4d94e7a86bca5095faf6ded36734a6b79ad4a0c33eb175265f47a33d7d929fac87312c2dd7ed585c3a2a4ee5308ab5e805d07686f0235a2ec13f4

data/README.md

@@ -16,14 +16,15 @@ And then execute:
 
 First configure CarrierWave with your Azure storage credentials
 
+see [Azure/azure-sdk-for-ruby](https://github.com/Azure/azure-sdk-for-ruby#via-code)
+
 ```ruby
 CarrierWave.configure do |config|
-  config.azure_credentials = {
-    storage_account_name: 'YOUR STORAGE ACCOUNT NAME',
-    storage_access_key:   'YOUR STORAGE ACCESS KEY'
-  }
+  config.azure_storage_account_name = 'YOUR STORAGE ACCOUNT NAME'
+  config.azure_storage_access_key = 'YOUR STORAGE ACCESS KEY'
+  config.azure_storage_blob_host = 'YOUR STORAGE BLOB HOST' # optional
   config.azure_container = 'YOUR CONTAINER NAME'
-  config.azure_host = 'YOUR CDN HOST' # optional
+  config.asset_host = 'YOUR CDN HOST' # optional
 end
 ```
 

data/carrierwave-azure.gemspec

@@ -19,5 +19,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'carrierwave'
   gem.add_dependency 'azure'
 
-  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rspec', '~> 3'
 end

data/lib/carrierwave-azure.rb

@@ -3,8 +3,9 @@ require 'carrierwave/azure/version'
 require 'carrierwave/storage/azure'
 
 class CarrierWave::Uploader::Base
-  add_config :azure_credentials
-  add_config :azure_host
+  add_config :azure_storage_account_name
+  add_config :azure_storage_access_key
+  add_config :azure_storage_blob_host
   add_config :azure_container
 
   configure do |config|

data/lib/carrierwave/azure/version.rb

@@ -1,5 +1,5 @@
 module Carrierwave
   module Azure
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
   end
 end

data/lib/carrierwave/storage/azure.rb

@@ -15,9 +15,9 @@ module CarrierWave
 
       def connection
         @connection ||= begin
-          uploader.azure_credentials.map do |key, val|
-            ::Azure.config.send("#{key}=", val)
-          end unless uploader.azure_credentials.nil?
+          %i(storage_account_name storage_access_key storage_blob_host).each do |key|
+            ::Azure.config.send("#{key}=", uploader.send("azure_#{key}"))
+          end
           ::Azure::BlobService.new
         end
       end
@@ -40,8 +40,8 @@ module CarrierWave
 
         def url(options = {})
           path = ::File.join @uploader.azure_container, @path
-          if @uploader.azure_host
-            "#{@uploader.azure_host}/#{path}"
+          if @uploader.asset_host
+            "#{@uploader.asset_host}/#{path}"
           else
             @connection.generate_uri(path).to_s
           end

data/spec/carrierwave-azure_spec.rb

@@ -2,12 +2,13 @@ require 'spec_helper'
 
 describe CarrierWave::Uploader::Base do
   it 'should define azure as a storage engine' do
-    described_class.storage_engines[:azure].should == 'CarrierWave::Storage::Azure'
+    expect(described_class.storage_engines[:azure]).to eq 'CarrierWave::Storage::Azure'
   end
 
   it 'should define azure options' do
-    should respond_to(:azure_credentials)
-    should respond_to(:azure_container)
-    should respond_to(:azure_host)
+    is_expected.to respond_to(:azure_storage_account_name)
+    is_expected.to respond_to(:azure_storage_access_key)
+    is_expected.to respond_to(:azure_storage_blob_host)
+    is_expected.to respond_to(:azure_container)
   end
 end

data/spec/carrierwave/storage/azure_file_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe CarrierWave::Storage::Azure::File do
+  class TestUploader < CarrierWave::Uploader::Base
+    storage :azure
+  end
+
+  let(:uploader) { TestUploader.new }
+  let(:storage)  { CarrierWave::Storage::Azure.new uploader }
+
+  describe '#url' do
+    before do
+      allow(uploader).to receive(:azure_container).and_return('test')
+    end
+
+    subject { CarrierWave::Storage::Azure::File.new(uploader, storage.connection, 'dummy.txt').url }
+
+    context 'with storage_blob_host' do
+      before do
+        allow(uploader).to receive(:azure_storage_blob_host).and_return('http://example.com')
+      end
+
+      it 'should return on asset_host' do
+        expect(subject).to eq 'http://example.com/test/dummy.txt'
+      end
+    end
+
+    context 'with asset_host' do
+      before do
+        allow(uploader).to receive(:asset_host).and_return('http://example.com')
+      end
+
+      it 'should return on asset_host' do
+        expect(subject).to eq 'http://example.com/test/dummy.txt'
+      end
+    end
+  end
+end

data/spec/carrierwave/storage/azure_spec.rb

@@ -11,85 +11,68 @@ describe CarrierWave::Storage::Azure do
   let(:storage)  { CarrierWave::Storage::Azure.new uploader }
 
   shared_examples_for 'an expected return value' do
+    let(:stored_file) do
+      allow(uploader).to receive(:store_path).and_return('test/dummy.png')
+      tempfile = Tempfile.new 'test.jpg'
+      open(tempfile.path, 'w') do |f|
+        f.print '1234567890'
+      end
+      storage.store! CarrierWave::SanitizedFile.new(
+        tempfile:     tempfile,
+        filename:     'test.jpg',
+        content_type: 'image/png'
+      )
+    end
+
+    let(:retrieved_file) do
+      storage.retrieve! stored_file.path
+    end
+
     it 'should have a path' do
-      expect(@azure_file.path).to eq expect_path
+      expect(subject.path).to eq 'test/dummy.png'
     end
 
     it 'should have a url' do
-      url = @azure_file.url
+      url = subject.url
       expect(url).to match /^https?:\/\//
-      expect(open(url).read).to eq expect_content
+      expect(open(url).read).to eq '1234567890'
     end
 
     it 'should have a content' do
-      expect(@azure_file.read).to eq expect_content
+      expect(subject.read).to eq '1234567890'
     end
 
     it 'should have a content_type' do
-      expect(@azure_file.content_type).to eq expect_content_type
+      expect(subject.content_type).to eq 'image/png'
     end
 
     it 'should have a size' do
-      expect(@azure_file.size).to eq expect_size
+      expect(subject.size).to eq 10
     end
 
     it 'should have a filename' do
-      expect(@azure_file.filename).to eq expect_filename
+      expect(subject.filename).to eq 'dummy.png'
     end
 
     it 'should have an extension' do
-      expect(@azure_file.extension).to eq expect_extension
+      expect(subject.extension).to eq 'png'
     end
 
     it 'should be deletable' do
-      @azure_file.delete
-      expect{open @azure_file.url}.to raise_error OpenURI::HTTPError
+      subject.delete
+      expect{open subject.url}.to raise_error OpenURI::HTTPError
     end
   end
 
   describe '#store!' do
-    before do
-      uploader.stub!(:store_path).and_return('test/dummy1.png')
-      tempfile = Tempfile.new 'test.jpg'
-      open(tempfile.path, 'w') do |f|
-        f.print '1234567890'
-      end
-      @azure_file = storage.store! CarrierWave::SanitizedFile.new(
-        tempfile:     tempfile,
-        filename:     'test.jpg',
-        content_type: 'image/png'
-      )
-    end
-
     it_should_behave_like 'an expected return value' do
-      let(:expect_path)         { 'test/dummy1.png' }
-      let(:expect_content)      { '1234567890' }
-      let(:expect_content_type) { 'image/png' }
-      let(:expect_size)         { 10 }
-      let(:expect_filename)     { 'dummy1.png' }
-      let(:expect_extension)    { 'png' }
+      subject { stored_file }
     end
   end
 
   describe '#retrieve' do
-    before do
-      uploader.stub!(:store_path).and_return('test/dummy2.png')
-      storage.connection.create_block_blob(
-        uploader.azure_container,
-        'test/dummy2.png',
-        '0123456789ABCDEF',
-        content_type: 'text/plain'
-      )
-      @azure_file = storage.retrieve! 'test/dummy2.png'
-    end
-
     it_should_behave_like 'an expected return value' do
-      let(:expect_path)         { 'test/dummy2.png' }
-      let(:expect_content_type) { 'text/plain' }
-      let(:expect_content)      { "0123456789ABCDEF" }
-      let(:expect_size)         { 16 }
-      let(:expect_filename)     { 'dummy2.png' }
-      let(:expect_extension)    { 'png' }
+      subject { retrieved_file }
     end
   end
 end

data/spec/environment.rb.sample

@@ -1,7 +1,5 @@
 CarrierWave.configure do |config|
-  config.azure_credentials = {
-    storage_account_name: 'YOUR STORAGE ACCOUNT NAME',
-    storage_access_key:   'YOUR STORAGE ACCESS KEY'
-  }
+  config.azure_storage_account_name = 'YOUR STORAGE ACCOUNT NAME'
+  config.azure_storage_access_key = 'YOUR STORAGE ACCESS KEY'
   config.azure_container = 'YOUR CONTAINER NAME'
 end

metadata

@@ -1,57 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-azure
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Yusuke Shibahara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2015-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: azure
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 description: Allows file upload to Azure with the officail sdk
 email:
 - yusuke.shibahara@heathrow.co.jp
@@ -59,8 +73,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -70,6 +84,7 @@ files:
 - lib/carrierwave/azure/version.rb
 - lib/carrierwave/storage/azure.rb
 - spec/carrierwave-azure_spec.rb
+- spec/carrierwave/storage/azure_file_spec.rb
 - spec/carrierwave/storage/azure_spec.rb
 - spec/environment.rb.sample
 - spec/spec_helper.rb
@@ -83,17 +98,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Windows Azure blob storage support for CarrierWave