songle-song-uri-parser 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e56cc4ca2df8bd3dcea18a2822627b9dc30561eca2c75d32e88b8c54033f7f0f
-  data.tar.gz: e3ade3da897f495a3c021e9b96fdd0203fad7fc872123fc12c237631df29e6ff
+  metadata.gz: 51439885a41518b7959c19cae4bc9c32cd9efe73e29418210350edaee6c7d400
+  data.tar.gz: 53fa81ee144ca6e51dee68c8d10aade917b678879ef0cc79b05f14e35ab3209e
 SHA512:
-  metadata.gz: d8eae1681c74a6b82402ec2434c1fcc0d3f56058a1ea77895409199ddcf596ca4ba6b743f9350435d68308824339a26c441738e06dbdba1e7ab6e81a71167e68
-  data.tar.gz: c6a5a1cae2bab2731862a8b9558f8339bd43c24cf914528b77fc1efaa11f2c3b1e72d02fde12149aa93614f3b7fb912c25c3d892f3f68cd7344f2f6773fad4d8
+  metadata.gz: f86b90bc2139f1820b0cb23b463416b1a675ea1c1c3b46f3714557d5f62cf3deb82a9fd770b05797a3904161bacf3df39aac86414f458873a407a96966a8df32
+  data.tar.gz: 2928cb4c48b0b06c6eb1112e835598452302b8ad540324532fbf7c481a569fe7837dbc9a0ec39735af7cb78c63d939b84d396f067e434825f7fbd8becf85ba84

data/CHANGELOG.md

@@ -1,4 +1,8 @@
 # CHANGELOG.md
 
+## 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")
+
 ## v1.0.0 (2019-01-09)
 - Initial public release

data/Dockerfile

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
-ARG RUBY_VERSION=2.6
+ARG RUBY_VERSION=2.6.0
 
-FROM ruby:${RUBY_VERSION}.0-alpine
+FROM ruby:${RUBY_VERSION}-alpine
 MAINTAINER Takahiro INOUE <takahiro.inoue@aist.go.jp>
 
 WORKDIR /work

data/Gemfile.lock

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

data/lib/songle/song_uri/mp3_song_uri.rb

@@ -40,14 +40,14 @@ module ::Songle::SongURI
     end
 
     ##
-    # @function
+    # @method
     #
     def type
       return TYPE
     end
 
     ##
-    # @function
+    # @method
     #
     def to_s
       encoded_source_host =

data/lib/songle/song_uri/nn_scheme_song_uri.rb

@@ -41,7 +41,7 @@ module ::Songle::SongURI
     end
 
     ##
-    # @function
+    # @method
     #
     def type
       return TYPE

data/lib/songle/song_uri/nn_short_song_uri.rb

@@ -41,7 +41,7 @@ module ::Songle::SongURI
     end
 
     ##
-    # @function
+    # @method
     #
     def type
       return TYPE

data/lib/songle/song_uri/nn_song_uri.rb

@@ -16,7 +16,7 @@ module ::Songle::SongURI
     ##
     # @constant
     #
-    TYPE = "nn"
+    TYPE = "niconico"
 
     ##
     # @constant
@@ -39,7 +39,7 @@ module ::Songle::SongURI
     end
 
     ##
-    # @function
+    # @method
     #
     def type
       return TYPE

data/lib/songle/song_uri/numeric_song_uri.rb

@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+module ::Songle::SongURI
+  class NumericSongURI
+    include ::Songle::SongURI
+
+    ##
+    # @constant
+    #
+    TYPE = "numeric"
+
+    ##
+    # @constant
+    #
+    URI_REGEX = /^(|\/\/[\w.]+\/[\w.]+\/|http(|s):\/\/[\w.]+\/[\w.]+\/)(\d+)$/
+
+    ##
+    # @constructor
+    #
+    def initialize string, options
+      super(string, options)
+
+      @source_host = nil
+      @source_path = nil
+      @source_id   = $3 if string =~ URI_REGEX
+    end
+
+    ##
+    # @method
+    #
+    def type
+      return TYPE
+    end
+
+    ##
+    # @method
+    #
+    def to_s
+      return "#{ self.endpoint }#{ @source_id }"
+    end
+  end
+end

data/lib/songle/song_uri/sc_scheme_song_uri.rb

@@ -41,7 +41,7 @@ module ::Songle::SongURI
     end
 
     ##
-    # @function
+    # @method
     #
     def type
       return TYPE

data/lib/songle/song_uri/sc_song_uri.rb

@@ -16,7 +16,7 @@ module ::Songle::SongURI
     ##
     # @constant
     #
-    TYPE = "sc"
+    TYPE = "soundcloud"
 
     ##
     # @constant
@@ -39,7 +39,7 @@ module ::Songle::SongURI
     end
 
     ##
-    # @function
+    # @method
     #
     def type
       return TYPE

data/lib/songle/song_uri/yt_scheme_song_uri.rb

@@ -41,7 +41,7 @@ module ::Songle::SongURI
     end
 
     ##
-    # @function
+    # @method
     #
     def type
       return TYPE

data/lib/songle/song_uri/yt_short_song_uri.rb

@@ -41,7 +41,7 @@ module ::Songle::SongURI
     end
 
     ##
-    # @function
+    # @method
     #
     def type
       return TYPE

data/lib/songle/song_uri/yt_song_uri.rb

@@ -16,7 +16,7 @@ module ::Songle::SongURI
     ##
     # @constant
     #
-    TYPE = "yt"
+    TYPE = "youtube"
 
     ##
     # @constant
@@ -39,7 +39,7 @@ module ::Songle::SongURI
     end
 
     ##
-    # @function
+    # @method
     #
     def type
       return TYPE

data/lib/songle/song_uri.rb

@@ -40,28 +40,28 @@ module ::Songle
     end
 
     ##
-    # @function
+    # @method
     #
     def endpoint
       return "#{ self.endpoint_scheme }://#{ self.endpoint_host }#{ self.endpoint_path }"
     end
 
     ##
-    # @function
+    # @method
     #
     def permalink
       return "http://#{ self.source_host }#{ self.source_path }"
     end
 
     ##
-    # @function
+    # @method
     #
     def type
       return nil
     end
 
     ##
-    # @function
+    # @method
     #
     def to_s
       encoded_source_host =
@@ -75,12 +75,12 @@ module ::Songle
 
     class << self
       ##
-      # @function
+      # @method
       # @static
       #
       def parse string, options = nil
         string =
-          ::URI.decode_www_form_component(string)
+          ::URI.decode_www_form_component(string.to_s)
 
         case
         when string =~ ::Songle::SongURI::NnSongURI::URI_REGEX
@@ -99,6 +99,8 @@ module ::Songle
           return ::Songle::SongURI::YtSchemeSongURI.new(string, options)
         when string =~ ::Songle::SongURI::YtShortSongURI::URI_REGEX
           return ::Songle::SongURI::YtShortSongURI.new(string, options)
+        when string =~ ::Songle::SongURI::NumericSongURI::URI_REGEX
+          return ::Songle::SongURI::NumericSongURI.new(string, options)
         else
           return ::Songle::SongURI::Mp3SongURI.new(string, options)
         end

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

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 require "songle/song_uri"
 require "songle/song_uri/mp3_song_uri"
+require "songle/song_uri/numeric_song_uri"
 require "songle/song_uri/nn_song_uri"
 require "songle/song_uri/nn_scheme_song_uri"
 require "songle/song_uri/nn_short_song_uri"
@@ -12,5 +13,5 @@ require "songle/song_uri/yt_short_song_uri"
 require "songle/song_uri/invalid_song_uri_error"
 
 module ::SongleSongURIParser
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: songle-song-uri-parser
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Takahiro INOUE
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-09 00:00:00.000000000 Z
+date: 2019-01-25 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
@@ -77,6 +76,7 @@ files:
 - lib/songle/song_uri/nn_scheme_song_uri.rb
 - lib/songle/song_uri/nn_short_song_uri.rb
 - lib/songle/song_uri/nn_song_uri.rb
+- lib/songle/song_uri/numeric_song_uri.rb
 - lib/songle/song_uri/sc_scheme_song_uri.rb
 - lib/songle/song_uri/sc_song_uri.rb
 - lib/songle/song_uri/yt_scheme_song_uri.rb

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 -t ${IMAGE_PATH}:${APP_ENV} .
-    - docker run ${IMAGE_PATH}:${APP_ENV}
-    - docker build --build-arg RUBY_VERSION=2.4 -t ${IMAGE_PATH}:${APP_ENV} .
-    - docker run ${IMAGE_PATH}:${APP_ENV}
-    - docker build --build-arg RUBY_VERSION=2.5 -t ${IMAGE_PATH}:${APP_ENV} .
-    - docker run ${IMAGE_PATH}:${APP_ENV}
-    - docker build --build-arg RUBY_VERSION=2.6 -t ${IMAGE_PATH}:${APP_ENV} .
-    - docker run ${IMAGE_PATH}:${APP_ENV}
-  environment: ${APP_ENV}