songle-song-uri-parser 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c22979f371c6a5784ddcc87e0fd53fd19037fa20be068220024642cfdf7db9e1
-  data.tar.gz: 030ba845ee09c70a6593a44043bf2c2aafb33eb76b58f55c7efaa2ccb0a2dd4e
+  metadata.gz: fd067bff144a149a57d0e361274d997451bbfdcb9fb50d4fa447f95123a84239
+  data.tar.gz: 2e4958fa28e3f3e46e8533ecee0239c7e09bf86b1ff819987f63f4d2b7d75cfb
 SHA512:
-  metadata.gz: a961f911dba3c51b657b97bad55d0832e1a385f05ca1fefd32f649cb2e987d843bda3717e8b9e55d30bab204c8dd8c87e2cb5175b5cfccffac70fcc48b6dae2b
-  data.tar.gz: d5c554eba8d3d27154c18004e7b3a291a522c65a8b1e599c18cbc6703157aa6e2e98d62b0999c123316b2f52442d96d54a0bb87a137d1188415137720f4c5e82
+  metadata.gz: aa416928abb241061bc2dbb2bbd4b91deaf221db6041d3867884e4df9151cce5f8fbb9f9c6024250fa9597aa8941ce568b07e611bc83dc83cb24c15fee13e96f
+  data.tar.gz: 41eb195f09a62cac1ab70ebeafd50ddb38c03e12822e70b8d57935940f260ee9efa33347362a5e089c0ad4bbae808f197a5c954f113051af795ae10a9b7dd99b

data/CHANGELOG.md

@@ -1,25 +1,28 @@
 # CHANGELOG.md
 
-## v1.1.5 (2019-07-19)
+## v1.1.6 (2019-07-27 JST)
+- Resolved it issue, when included the whitespace in the URI (e.g. "https://he3.magnatune.com/all/05-Goodbye%20Perfectionist-Linda%20Woods.mp3")
+
+## v1.1.5 (2019-07-19 JST)
 - Deleted unused gems
 
-## v1.1.4 (2019-07-08)
+## v1.1.4 (2019-07-08 JST)
 - Fixed minor bugs
 - Supported the private song URI (e.g. "https://songle.jp/uploads/{ID}.mp3")
 
-## v1.1.3 (2019-02-06)
+## v1.1.3 (2019-02-06 JST)
 - Updated README.md
 
-## v1.1.2 (2019-01-31)
-- Changed constractor parameters in `::Songle::SongURI` class
+## v1.1.2 (2019-01-31 JST)
+- Changed constractor parameters in a `::Songle::SongURI` class
 - Improved about loading modules
 
-## v1.1.1 (2019-01-26)
+## v1.1.1 (2019-01-26 JST)
 - Improved validation in constractor parameters
 
-## v1.1.0 (2019-01-25)
-- Changed return value of `Songle::SongURI#type` method (e.g. from "yt" to "youtube")
-- Supported to the numeric URI (e.g. "https://songle.jp/songs/12345")
+## v1.1.0 (2019-01-25 JST)
+- Changed return value of a `Songle::SongURI#type` method (e.g. from "yt" to "youtube")
+- Supported to the numeric URI (e.g. "https://songle.jp/songs/{ID}")
 
-## v1.0.0 (2019-01-09)
+## v1.0.0 (2019-01-09 JST)
 - Initial public release

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    songle-song-uri-parser (1.1.5)
+    songle-song-uri-parser (1.1.6)
 
 GEM
   remote: https://rubygems.org/

data/lib/songle-song-uri-parser/version.rb

@@ -1,4 +1,4 @@
 #@# vim: set filetype=ruby:
 module ::SongleSongURIParser
-  VERSION = "1.1.5"
+  VERSION = "1.1.6"
 end

data/lib/songle/song_uri.rb

@@ -80,7 +80,7 @@ module ::Songle
       #
       def parse query_string, options = nil
         query_string =
-          ::URI.decode_www_form_component(query_string.to_s)
+          ::URI.decode_www_form_component(query_string.to_s).gsub(/[+\s]/, "%20")
 
         case
         when query_string =~ ::Songle::SongURI::NnSongURI::URI_REGEXP

data/lib/songle/song_uri/mp3_song_uri.rb

@@ -31,12 +31,8 @@ module ::Songle::SongURI
         ::URI.parse("//#{ query_string }")
 
       @source_host = source_uri.host
-      @source_path = source_uri.path
+      @source_path = source_uri.path + (!!source_uri.query ? "?#{ source_uri.query }" : "")
       @source_id   = nil
-
-      if source_uri.query
-        @source_path += "?#{ source_uri.query }"
-      end
     end
 
     ##
@@ -51,10 +47,10 @@ module ::Songle::SongURI
     #
     def to_s
       encoded_source_host =
-        ::URI.encode_www_form_component(self.source_host).gsub("+", "%2520")
+        ::URI.encode_www_form_component(self.source_host).gsub(/[+\s]/, "%2520")
 
       encoded_source_path =
-        ::URI.encode_www_form_component(self.source_path).gsub("+", "%2520")
+        ::URI.encode_www_form_component(self.source_path).gsub(/[+\s]/, "%2520")
 
       return "#{ self.endpoint }#{ encoded_source_host }#{ encoded_source_path }"
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: songle-song-uri-parser
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Takahiro INOUE
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-19 00:00:00.000000000 Z
+date: 2019-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,7 +60,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".gitlab-ci.yml"
 - ".rspec"
 - ".ruby-version"
 - CHANGELOG.md

data/.gitlab-ci.yml

@@ -1,24 +0,0 @@
-####
-## @see http://docs.gitlab.com/ce/ci/yaml/README.html
-####
-image: docker:git
-
-stages:
-  - build_and_test
-
-variables:
-  APP_ENV: develop
-  IMAGE_PATH: ${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}
-
-build_and_test:
-  stage: build_and_test
-  script:
-    - docker build --build-arg RUBY_VERSION=2.3.8 -t ${IMAGE_PATH}:${APP_ENV} .
-    - docker run ${IMAGE_PATH}:${APP_ENV}
-    - docker build --build-arg RUBY_VERSION=2.4.6 -t ${IMAGE_PATH}:${APP_ENV} .
-    - docker run ${IMAGE_PATH}:${APP_ENV}
-    - docker build --build-arg RUBY_VERSION=2.5.3 -t ${IMAGE_PATH}:${APP_ENV} .
-    - docker run ${IMAGE_PATH}:${APP_ENV}
-    - docker build --build-arg RUBY_VERSION=2.6.3 -t ${IMAGE_PATH}:${APP_ENV} .
-    - docker run ${IMAGE_PATH}:${APP_ENV}
-  environment: ${APP_ENV}