songle-song-uri-parser 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7480417e74b0383a3cda4cde57348712bafbc711b833c9f496c9bf2618d7ad3
-  data.tar.gz: 31d4ed9a5535bc6acfea59bdee72bf0e9219667b4e6633fcc6430396e257b6f2
+  metadata.gz: 388cb8181670bfbead32c915b52db458cd301562ab0f725027a71b5084996f8a
+  data.tar.gz: 3005daf63382239a9f9e5215311848bc0f376281cdf87b5de79d9787930473b8
 SHA512:
-  metadata.gz: 735482c4059e6996e94b67a86b9260d0252b0adcf1afd14820bc92624b08c4365c1be4092959da0cd65ea7a6ba671746ba5be396719d01a10d2f3074a0aa0f86
-  data.tar.gz: f3d511745918750294b297a19fe2037d402e92d48acbfc28d25800e86396b77bb618538b08dd5f3291e90abb3908516c2505ec5cfd92aa081a88c03f417a9114
+  metadata.gz: 83f9a0db6c25017edf52a3fa235398b0df23670008c776798caa052bd7a0672f58511ff7975833566aa3e3f1fba6e4f5562fd8ee10c53826af1b1b5b6057c99b
+  data.tar.gz: 843e9555670e12f4e534497a952cc594d7e1de81d1e5b1dae16fb8dd38134bcf9c85b10723d2a79c228f93f00e2f7249390b005cf8feb55ff50885f0b3caf525

data/.ruby-version

@@ -1 +1 @@
-2.6.1
+2.6.3

data/CHANGELOG.md

@@ -1,18 +1,22 @@
 # CHANGELOG.md
 
+## v1.1.4 (2019-07-08)
+- Fixed minor bugs
+- Supported the private song URI (e.g. "https://songle.jp/uploads/{ID}.mp3")
+
 ## v1.1.3 (2019-02-06)
 - Updated README.md
 
 ## v1.1.2 (2019-01-31)
 - Changed constractor parameters in `::Songle::SongURI` class
-- Improved about loading module
+- Improved about the loading modules
 
 ## v1.1.1 (2019-01-26)
 - 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 format (e.g. "https://songle.jp/songs/12345")
+- Supported to the numeric URI (e.g. "https://songle.jp/songs/12345")
 
 ## v1.0.0 (2019-01-09)
 - Initial public release

data/Dockerfile

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+#@# vim: set filetype=ruby:
 ARG RUBY_VERSION=2.6.0
 
 FROM ruby:${RUBY_VERSION}-alpine

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    songle-song-uri-parser (1.1.3)
+    songle-song-uri-parser (1.1.4)
 
 GEM
   remote: https://rubygems.org/
@@ -12,23 +12,23 @@ GEM
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
       rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
+    rspec-core (3.8.2)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
+    rspec-support (3.8.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0)
-  rake (~> 10.0)
-  rspec (~> 3.0)
+  bundler (~> 1)
+  rake (~> 10)
+  rspec (~> 3)
   songle-song-uri-parser!
 
 BUNDLED WITH

data/README.md

@@ -10,7 +10,7 @@ This gem package can parse it.
 
 ### Prerequirements
 
-- ruby 2.x
+- ruby >= 2.3
 
 ### Installation
 
@@ -35,7 +35,7 @@ p song.to_s      #=> "https://songle.jp/songs/staff.aist.go.jp%2Ft.nakano%2Fmusi
 
 ### Prerequirements
 
-- ruby 2.x
+- ruby >= 2.3
 
 Install dependenting gem packages using bundler.
 

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

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+#@# vim: set filetype=ruby:
 require "songle/song_uri"
 
 require "songle/song_uri/invalid_song_uri_error"

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

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+#@# vim: set filetype=ruby:
 module ::SongleSongURIParser
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

data/lib/songle/song_uri.rb

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+#@# vim: set filetype=ruby:
 module ::Songle
   module SongURI
     attr_reader :endpoint_scheme
@@ -83,23 +83,23 @@ module ::Songle
           ::URI.decode_www_form_component(query_string.to_s)
 
         case
-        when query_string =~ ::Songle::SongURI::NnSongURI::URI_REGEX
+        when query_string =~ ::Songle::SongURI::NnSongURI::URI_REGEXP
           return ::Songle::SongURI::NnSongURI.new(query_string, options)
-        when query_string =~ ::Songle::SongURI::NnSchemeSongURI::URI_REGEX
+        when query_string =~ ::Songle::SongURI::NnSchemeSongURI::URI_REGEXP
           return ::Songle::SongURI::NnSchemeSongURI.new(query_string, options)
-        when query_string =~ ::Songle::SongURI::NnShortSongURI::URI_REGEX
+        when query_string =~ ::Songle::SongURI::NnShortSongURI::URI_REGEXP
           return ::Songle::SongURI::NnShortSongURI.new(query_string, options)
-        when query_string =~ ::Songle::SongURI::ScSongURI::URI_REGEX
+        when query_string =~ ::Songle::SongURI::ScSongURI::URI_REGEXP
           return ::Songle::SongURI::ScSongURI.new(query_string, options)
-        when query_string =~ ::Songle::SongURI::ScSchemeSongURI::URI_REGEX
+        when query_string =~ ::Songle::SongURI::ScSchemeSongURI::URI_REGEXP
           return ::Songle::SongURI::ScSchemeSongURI.new(query_string, options)
-        when query_string =~ ::Songle::SongURI::YtSongURI::URI_REGEX
+        when query_string =~ ::Songle::SongURI::YtSongURI::URI_REGEXP
           return ::Songle::SongURI::YtSongURI.new(query_string, options)
-        when query_string =~ ::Songle::SongURI::YtSchemeSongURI::URI_REGEX
+        when query_string =~ ::Songle::SongURI::YtSchemeSongURI::URI_REGEXP
           return ::Songle::SongURI::YtSchemeSongURI.new(query_string, options)
-        when query_string =~ ::Songle::SongURI::YtShortSongURI::URI_REGEX
+        when query_string =~ ::Songle::SongURI::YtShortSongURI::URI_REGEXP
           return ::Songle::SongURI::YtShortSongURI.new(query_string, options)
-        when query_string =~ ::Songle::SongURI::NumericSongURI::URI_REGEX
+        when query_string =~ ::Songle::SongURI::NumericSongURI::URI_REGEXP
           return ::Songle::SongURI::NumericSongURI.new(query_string, options)
         else
           return ::Songle::SongURI::Mp3SongURI.new(query_string, options)

data/lib/songle/song_uri/invalid_song_uri_error.rb

@@ -1,11 +1,11 @@
-# -*- coding: utf-8 -*-
+#@# vim: set filetype=ruby:
 module ::Songle::SongURI
   class InvalidSongURIError < ::StandardError
     ##
     # @constructor
     #
     def initialize query_string
-      super("'#{ query_string }' isn't song uri.")
+      super("'#{ query_string }' is invalid songle's song uri.")
     end
   end
 end

data/lib/songle/song_uri/mp3_song_uri.rb

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+#@# vim: set filetype=ruby:
 module ::Songle::SongURI
   class Mp3SongURI
     include ::Songle::SongURI
@@ -11,7 +11,7 @@ module ::Songle::SongURI
     ##
     # @constant
     #
-    URI_REGEX = /^(\/\/|http(|s):\/\/)(.+)$/
+    URI_REGEXP = /^(\/\/|http(|s):\/\/)(.+)$/
 
     ##
     # @constructor
@@ -19,15 +19,11 @@ module ::Songle::SongURI
     def initialize query_string, options
       super(options)
 
-      if query_string =~ URI_REGEX
+      if query_string =~ URI_REGEXP
         query_string = $3
       end
 
-      if query_string =~ /^#{ self.endpoint_host }(.+)$/
-        query_string = $1
-      end
-
-      if query_string =~ /^#{ self.endpoint_path }(.+)$/
+      if query_string =~ /#{ self.endpoint_host }#{ self.endpoint_path }(.+)/
         query_string = $1
       end
 
@@ -37,6 +33,10 @@ module ::Songle::SongURI
       @source_host = source_uri.host
       @source_path = source_uri.path
       @source_id   = nil
+
+      if source_uri.query
+        @source_path += "?#{ source_uri.query }"
+      end
     end
 
     ##

data/lib/songle/song_uri/nn_scheme_song_uri.rb

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+#@# vim: set filetype=ruby:
 module ::Songle::SongURI
   class NnSchemeSongURI
     include ::Songle::SongURI
@@ -21,7 +21,7 @@ module ::Songle::SongURI
     ##
     # @constant
     #
-    URI_REGEX = /^nn:\/\/(.+)$/
+    URI_REGEXP = /^nn:\/\/(.+)$/
 
     ##
     # @constructor
@@ -31,7 +31,7 @@ module ::Songle::SongURI
 
       @source_host = SOURCE_HOST
       @source_path = SOURCE_PATH
-      @source_id   = $1 if query_string =~ URI_REGEX
+      @source_id   = $1 if query_string =~ URI_REGEXP
 
       if @source_id.nil? || @source_id.strip.empty?
         raise ::Songle::SongURI::InvalidSongURIError.new(query_string)

data/lib/songle/song_uri/nn_short_song_uri.rb

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+#@# vim: set filetype=ruby:
 module ::Songle::SongURI
   class NnShortSongURI
     include ::Songle::SongURI
@@ -21,7 +21,7 @@ module ::Songle::SongURI
     ##
     # @constant
     #
-    URI_REGEX = /\/\/nico\.ms\/(.+)$/
+    URI_REGEXP = /nico\.ms\/(.+)$/
 
     ##
     # @constructor
@@ -31,7 +31,7 @@ module ::Songle::SongURI
 
       @source_host = SOURCE_HOST
       @source_path = SOURCE_PATH
-      @source_id   = $1 if query_string =~ URI_REGEX
+      @source_id   = $1 if query_string =~ URI_REGEXP
 
       if @source_id.nil? || @source_id.strip.empty?
         raise ::Songle::SongURI::InvalidSongURIError.new(query_string)

data/lib/songle/song_uri/nn_song_uri.rb

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+#@# vim: set filetype=ruby:
 module ::Songle::SongURI
   class NnSongURI
     include ::Songle::SongURI
@@ -21,7 +21,7 @@ module ::Songle::SongURI
     ##
     # @constant
     #
-    URI_REGEX = /#{ SOURCE_HOST.gsub("www.", "") }(#{ SOURCE_PATH.gsub("?", "\\?") }(.+))/
+    URI_REGEXP = /#{ SOURCE_HOST.gsub("www.", "") }(#{ SOURCE_PATH.gsub("?", "\\?") }(.+))/
 
     ##
     # @constructor
@@ -30,8 +30,8 @@ module ::Songle::SongURI
       super(options)
 
       @source_host = SOURCE_HOST
-      @source_path = $1 if query_string =~ URI_REGEX
-      @source_id   = $2 if query_string =~ URI_REGEX
+      @source_path = $1 if query_string =~ URI_REGEXP
+      @source_id   = $2 if query_string =~ URI_REGEXP
 
       if @source_id.nil? || @source_id.strip.empty?
         raise ::Songle::SongURI::InvalidSongURIError.new(query_string)

data/lib/songle/song_uri/numeric_song_uri.rb

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+#@# vim: set filetype=ruby:
 module ::Songle::SongURI
   class NumericSongURI
     include ::Songle::SongURI
@@ -11,7 +11,7 @@ module ::Songle::SongURI
     ##
     # @constant
     #
-    URI_REGEX = /^(|\/\/[\w.]+\/[\w.]+\/|http(|s):\/\/[\w.]+\/[\w.]+\/)(\d+)$/
+    URI_REGEXP = /^(|[\w.]+\/[\w.]+\/|\/\/[\w.]+\/[\w.]+\/|http(|s):\/\/[\w.]+\/[\w.]+\/)(\d+)$/
 
     ##
     # @constructor
@@ -21,7 +21,7 @@ module ::Songle::SongURI
 
       @source_host = nil
       @source_path = nil
-      @source_id   = $3 if query_string =~ URI_REGEX
+      @source_id   = $3 if query_string =~ URI_REGEXP
     end
 
     ##

data/lib/songle/song_uri/sc_scheme_song_uri.rb

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+#@# vim: set filetype=ruby:
 module ::Songle::SongURI
   class ScSchemeSongURI
     include ::Songle::SongURI
@@ -21,7 +21,7 @@ module ::Songle::SongURI
     ##
     # @constant
     #
-    URI_REGEX = /^sc:\/\/(.+)$/
+    URI_REGEXP = /^sc:\/\/(.+)$/
 
     ##
     # @constructor
@@ -31,7 +31,7 @@ module ::Songle::SongURI
 
       @source_host = SOURCE_HOST
       @source_path = SOURCE_PATH
-      @source_id   = $1 if query_string =~ URI_REGEX
+      @source_id   = $1 if query_string =~ URI_REGEXP
 
       if @source_id.nil? || @source_id.strip.empty?
         raise ::Songle::SongURI::InvalidSongURIError.new(query_string)

data/lib/songle/song_uri/sc_song_uri.rb

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+#@# vim: set filetype=ruby:
 module ::Songle::SongURI
   class ScSongURI
     include ::Songle::SongURI
@@ -21,7 +21,7 @@ module ::Songle::SongURI
     ##
     # @constant
     #
-    URI_REGEX = /#{ SOURCE_HOST.gsub("www.", "") }(#{ SOURCE_PATH.gsub("?", "\\?") }(.+))/
+    URI_REGEXP = /#{ SOURCE_HOST.gsub("www.", "") }(#{ SOURCE_PATH.gsub("?", "\\?") }(.+))/
 
     ##
     # @constructor
@@ -30,8 +30,8 @@ module ::Songle::SongURI
       super(options)
 
       @source_host = SOURCE_HOST
-      @source_path = $1 if query_string =~ URI_REGEX
-      @source_id   = $2 if query_string =~ URI_REGEX
+      @source_path = $1 if query_string =~ URI_REGEXP
+      @source_id   = $2 if query_string =~ URI_REGEXP
 
       if @source_id.nil? || @source_id.strip.empty?
         raise ::Songle::SongURI::InvalidSongURIError.new(query_string)

data/lib/songle/song_uri/yt_scheme_song_uri.rb

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+#@# vim: set filetype=ruby:
 module ::Songle::SongURI
   class YtSchemeSongURI
     include ::Songle::SongURI
@@ -21,7 +21,7 @@ module ::Songle::SongURI
     ##
     # @constant
     #
-    URI_REGEX = /^yt:\/\/(.+)$/
+    URI_REGEXP = /^yt:\/\/(.+)$/
 
     ##
     # @constructor
@@ -31,7 +31,7 @@ module ::Songle::SongURI
 
       @source_host = SOURCE_HOST
       @source_path = SOURCE_PATH
-      @source_id   = $1 if query_string =~ URI_REGEX
+      @source_id   = $1 if query_string =~ URI_REGEXP
 
       if @source_id.nil? || @source_id.strip.empty?
         raise ::Songle::SongURI::InvalidSongURIError.new(query_string)

data/lib/songle/song_uri/yt_short_song_uri.rb

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+#@# vim: set filetype=ruby:
 module ::Songle::SongURI
   class YtShortSongURI
     include ::Songle::SongURI
@@ -21,7 +21,7 @@ module ::Songle::SongURI
     ##
     # @constant
     #
-    URI_REGEX = /\/\/youtu\.be\/(.+)$/
+    URI_REGEXP = /youtu\.be\/(.+)$/
 
     ##
     # @constructor
@@ -31,7 +31,7 @@ module ::Songle::SongURI
 
       @source_host = SOURCE_HOST
       @source_path = SOURCE_PATH
-      @source_id   = $1 if query_string =~ URI_REGEX
+      @source_id   = $1 if query_string =~ URI_REGEXP
 
       if @source_id.nil? || @source_id.strip.empty?
         raise ::Songle::SongURI::InvalidSongURIError.new(query_string)

data/lib/songle/song_uri/yt_song_uri.rb

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+#@# vim: set filetype=ruby:
 module ::Songle::SongURI
   class YtSongURI
     include ::Songle::SongURI
@@ -21,7 +21,7 @@ module ::Songle::SongURI
     ##
     # @constant
     #
-    URI_REGEX = /#{ SOURCE_HOST.gsub("www.", "") }(#{ SOURCE_PATH.gsub("?", "\\?") }(.+))/
+    URI_REGEXP = /#{ SOURCE_HOST.gsub("www.", "") }(#{ SOURCE_PATH.gsub("?", "\\?") }(.+))/
 
     ##
     # @constructor
@@ -30,8 +30,8 @@ module ::Songle::SongURI
       super(options)
 
       @source_host = SOURCE_HOST
-      @source_path = $1 if query_string =~ URI_REGEX
-      @source_id   = $2 if query_string =~ URI_REGEX
+      @source_path = $1 if query_string =~ URI_REGEXP
+      @source_id   = $2 if query_string =~ URI_REGEXP
 
       if @source_id.nil? || @source_id.strip.empty?
         raise ::Songle::SongURI::InvalidSongURIError.new(query_string)

data/songle-song-uri-parser.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.0"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "bundler", "~> 1"
+  spec.add_development_dependency "rake", "~> 10"
+  spec.add_development_dependency "rspec", "~> 3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: songle-song-uri-parser
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Takahiro INOUE
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-06 00:00:00.000000000 Z
+date: 2019-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
 description: A Song URI parser for the Songle
 email:
 - takahiro.inoue@aist.go.jp
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A Song URI parser for the Songle