Skip to content

Guard against nil value for x-ms-blob-content-type #212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sethboyles wants to merge 5 commits into
base: dev
Choose a base branch
from
Open

Guard against nil value for x-ms-blob-content-type #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
00f86d0
Resolve dependency issue for Nokogiri/Faraday
katmsft Nov 2, 2021
e2f2b7d
Merge pull request #206 from katmsft/prvalidation
katmsft Dec 3, 2021
cae7ca0
Version and Doc change for 2.0.3/2.0.4 release.
katmsft Dec 5, 2021
8d01d12
Merge pull request #208 from katmsft/releasedoc
katmsft Dec 6, 2021
6c2140d
Guard against nil value for x-ms-blob-content-type
sethboyles Feb 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,7 @@ source "https://rubygems.org" do
gem "faraday", "~> 1.0", :require => false
gem "faraday_middleware", "~> 1.0.0.rc1", :require => false
gem "net-http-persistent", "~> 4.0", :require => false
if RUBY_VERSION < "2.4.0"
gem "nokogiri", "~> 1.10.4", :require => false
elsif RUBY_VERSION < "2.5.0"
gem "nokogiri", "~> 1.11.0.rc2", :require => false
else
gem "nokogiri", "~> 1", ">= 1.12.5", :require => false
end
gem "nokogiri", "~> 1", ">= 1.10.8", :require => false
gem "adal", "~> 1.0", :require => false
gem "dotenv", "~> 2.0", :require => false
gem "minitest", "~> 5", :require => false
Expand Down
3 changes: 3 additions & 0 deletions blob/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
2021.12 - version 2.0.3
* Lifted Ruby-version-based restrictions on Nokogiri version.

2021.10 - version 2.0.2
* Allowed to use any version 1.x of Nokogiri for Ruby version later than or equal to 2.5.0.
* Added access tier information and creation time of blob in response.
Expand Down
8 changes: 1 addition & 7 deletions blob/azure-storage-blob.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,7 @@ Gem::Specification.new do |s|
s.required_ruby_version = ">= 2.3.0"

s.add_runtime_dependency("azure-storage-common", "~> 2.0")
if RUBY_VERSION < "2.4.0"
s.add_runtime_dependency("nokogiri", "~> 1.10.4")
elsif RUBY_VERSION < "2.5.0"
s.add_runtime_dependency("nokogiri", "~> 1.11.0.rc2")
else
s.add_runtime_dependency("nokogiri", "~> 1", ">= 1.12.5")
end
s.add_runtime_dependency("nokogiri", "~> 1", ">= 1.10.8")
s.add_development_dependency("dotenv", "~> 2.0")
s.add_development_dependency("minitest", "~> 5")
s.add_development_dependency("minitest-reporters", "~> 1")
Expand Down
2 changes: 1 addition & 1 deletion blob/lib/azure/storage/blob/block.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ def create_block_blob_single_put(container, blob, content, options = {})

StorageService.add_metadata_to_headers options[:metadata], headers
add_blob_conditional_headers options, headers
headers["x-ms-blob-content-type"] = get_or_apply_content_type(content, options[:content_type])
StorageService.with_header headers, "x-ms-blob-content-type", get_or_apply_content_type(content, options[:content_type])
# call PutBlob
response = call(:put, uri, content, headers, options)

Expand Down
2 changes: 1 addition & 1 deletion blob/lib/azure/storage/blob/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class Version
# Fields represent the parts defined in http://semver.org/
MAJOR = 2 unless defined? MAJOR
MINOR = 0 unless defined? MINOR
UPDATE = 2 unless defined? UPDATE
UPDATE = 3 unless defined? UPDATE

class << self
# @return [String]
Expand Down
3 changes: 3 additions & 0 deletions common/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
2021.12 - version 2.0.4
* Lifted Ruby-version-based restrictions on Nokogiri version.

2021.10 - version 2.0.3
* Allowed to use any version 1.x of Nokogiri for Ruby version later than or equal to 2.5.0.
* Fixed handling of invalid connection strings
Expand Down
11 changes: 2 additions & 9 deletions common/azure-storage-common.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,9 @@ Gem::Specification.new do |s|
s.required_ruby_version = ">= 2.3.0"

s.add_runtime_dependency('faraday', '~> 1.0')
s.add_runtime_dependency('faraday_middleware', '~> 1.0.0.rc1')
s.add_runtime_dependency('faraday_middleware', "~> 1.0", ">= 1.0.0.rc1")
s.add_runtime_dependency("net-http-persistent", '~> 4.0')
if RUBY_VERSION < "2.4.0"
s.add_runtime_dependency("nokogiri", "~> 1.10.4")
elsif RUBY_VERSION < "2.5.0"
s.add_runtime_dependency("nokogiri", "~> 1.11.0.rc2")
else
s.add_runtime_dependency("nokogiri", "~> 1", ">= 1.12.5")
end

s.add_runtime_dependency("nokogiri", "~> 1", ">= 1.10.8")
s.add_development_dependency("dotenv", "~> 2.0")
s.add_development_dependency("minitest", "~> 5")
s.add_development_dependency("minitest-reporters", "~> 1")
Expand Down
2 changes: 1 addition & 1 deletion common/lib/azure/storage/common/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class Version
# Fields represent the parts defined in http://semver.org/
MAJOR = 2 unless defined? MAJOR
MINOR = 0 unless defined? MINOR
UPDATE = 3 unless defined? UPDATE
UPDATE = 4 unless defined? UPDATE

class << self
# @return [String]
Expand Down
3 changes: 3 additions & 0 deletions file/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
2021.12 - version 2.0.4
* Lifted Ruby-version-based restrictions on Nokogiri version.

2021.10 - version 2.0.3
* Allowed to use any version 1.x of Nokogiri for Ruby version later than or equal to 2.5.0.

Expand Down
9 changes: 1 addition & 8 deletions file/azure-storage-file.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,7 @@ Gem::Specification.new do |s|
s.required_ruby_version = ">= 2.3.0"

s.add_runtime_dependency("azure-storage-common", "~> 2.0")
if RUBY_VERSION < "2.4.0"
s.add_runtime_dependency("nokogiri", "~> 1.10.4")
elsif RUBY_VERSION < "2.5.0"
s.add_runtime_dependency("nokogiri", "~> 1.11.0.rc2")
else
s.add_runtime_dependency("nokogiri", "~> 1", ">= 1.12.5")
end

s.add_runtime_dependency("nokogiri", "~> 1", ">= 1.10.8")
s.add_development_dependency("dotenv", "~> 2.0")
s.add_development_dependency("minitest", "~> 5")
s.add_development_dependency("minitest-reporters", "~> 1")
Expand Down
2 changes: 1 addition & 1 deletion file/lib/azure/storage/file/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class Version
# Fields represent the parts defined in http://semver.org/
MAJOR = 2 unless defined? MAJOR
MINOR = 0 unless defined? MINOR
UPDATE = 3 unless defined? UPDATE
UPDATE = 4 unless defined? UPDATE

class << self
# @return [String]
Expand Down
3 changes: 3 additions & 0 deletions queue/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
2021.12 - version 2.0.4
* Lifted Ruby-version-based restrictions on Nokogiri version.

2021.10 - version 2.0.3
* Allowed to use any version 1.x of Nokogiri for Ruby version later than or equal to 2.5.0.

Expand Down
9 changes: 1 addition & 8 deletions queue/azure-storage-queue.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,7 @@ Gem::Specification.new do |s|
s.required_ruby_version = ">= 2.3.0"

s.add_runtime_dependency("azure-storage-common", "~> 2.0")
if RUBY_VERSION < "2.4.0"
s.add_runtime_dependency("nokogiri", "~> 1.10.4")
elsif RUBY_VERSION < "2.5.0"
s.add_runtime_dependency("nokogiri", "~> 1.11.0.rc2")
else
s.add_runtime_dependency("nokogiri", "~> 1", ">= 1.12.5")
end

s.add_runtime_dependency("nokogiri", "~> 1", ">= 1.10.8")
s.add_development_dependency("dotenv", "~> 2.0")
s.add_development_dependency("minitest", "~> 5")
s.add_development_dependency("minitest-reporters", "~> 1")
Expand Down
2 changes: 1 addition & 1 deletion queue/lib/azure/storage/queue/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class Version
# Fields represent the parts defined in http://semver.org/
MAJOR = 2 unless defined? MAJOR
MINOR = 0 unless defined? MINOR
UPDATE = 3 unless defined? UPDATE
UPDATE = 4 unless defined? UPDATE

class << self
# @return [String]
Expand Down
3 changes: 3 additions & 0 deletions table/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
2021.12 - version 2.0.4
* Lifted Ruby-version-based restrictions on Nokogiri version.

2021.10 - version 2.0.3
* Allowed to use any version 1.x of Nokogiri for Ruby version later than or equal to 2.5.0.

Expand Down
8 changes: 1 addition & 7 deletions table/azure-storage-table.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,7 @@ Gem::Specification.new do |s|
s.required_ruby_version = ">= 2.3.0"

s.add_runtime_dependency("azure-storage-common", "~> 2.0")
if RUBY_VERSION < "2.4.0"
s.add_runtime_dependency("nokogiri", "~> 1.10.4")
elsif RUBY_VERSION < "2.5.0"
s.add_runtime_dependency("nokogiri", "~> 1.11.0.rc2")
else
s.add_runtime_dependency("nokogiri", "~> 1", ">= 1.12.5")
end
s.add_runtime_dependency("nokogiri", "~> 1", ">= 1.10.8")
s.add_development_dependency("dotenv", "~> 2.0")
s.add_development_dependency("minitest", "~> 5")
s.add_development_dependency("minitest-reporters", "~> 1")
Expand Down
2 changes: 1 addition & 1 deletion table/lib/azure/storage/table/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class Version
# Fields represent the parts defined in http://semver.org/
MAJOR = 2 unless defined? MAJOR
MINOR = 0 unless defined? MINOR
UPDATE = 3 unless defined? UPDATE
UPDATE = 4 unless defined? UPDATE

class << self
# @return [String]
Expand Down