xmfun 0.0.4 → 0.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +5 -13
  2. data/lib/xmfun/mp3/track.rb +4 -0
  3. data/lib/xmfun/util/decoder.rb +8 -2
  4. data/lib/xmfun/version.rb +1 -1
  5. data/spec/xmfun/decode_spec.rb +13 -3
  6. metadata +43 -29
checksums.yaml CHANGED
@@ -1,15 +1,7 @@
1
1
  ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- NGY4NmI2ODczZjRkY2M4MmM5ZTdkMDY5MTk0NGJjMzQyMDA0YzA2ZA==
5
- data.tar.gz: !binary |-
6
- YTQxNjk4YjgyYTZiNzdlZTFkNmNhMzY2YTczYjQzNWUyY2I1NmExNg==
2
+ SHA1:
3
+ metadata.gz: 932fc6fda59787b6b88e1f62c3a1034bae61ac60
4
+ data.tar.gz: 93965c8ab3a8dac6bbec723e2409cd9815ada775
7
5
  SHA512:
8
- metadata.gz: !binary |-
9
- ZDhlOGI2YTE2ZjAyZDVhYWJkYzZlZDMyZWNkM2U2N2NkZTNhYmJjYjQwMmNl
10
- ZTM0MjY2ZGUyOTA3NGFhNGQ4MTU2YTViNzI3YjViOTM5ZTYzZmRkYzZjNGQx
11
- NDM2NmY2NmRmZDMzZTRlYTk2NjdiNTliYWI3ODM1MDUzYjM0MGQ=
12
- data.tar.gz: !binary |-
13
- Mzg2NGFiYTU0MjAwY2YwM2ZlNzM2YmIyODBiODE0N2Q5ZDVlZWJmOTFiODc2
14
- NzgxZWQ2OTkwMzYwYTdlMDNmYjM4NDE1YzgxNDY1YTUzZmYxODA4ZGYzNWQ0
15
- ZjEzZDFhNDExMWIyYWE3ZTYyZGYzYjBkYjk4OGJlMTUwYTQwMDg=
6
+ metadata.gz: a742a339d225638d8e15b2570b993fde8da9cca484a1ce01b7d61aace7c7b0e39bdf2ef19785e0d7f27d4bb943d012cea7157a7b54eac56733c6346c49d223f0
7
+ data.tar.gz: 137c2b70396da5739e5b50b730e53108084f5493a14d12ed2dc8091f7f4f76b61ee1308178fe637cec97d49e3b2514e47203b93eb9eca1a3573c66b156fc226b
data/lib/xmfun/mp3/track.rb CHANGED
@@ -1,12 +1,16 @@
1
1
  # -*- encoding : utf-8 -*-
2
2
 
3
3
  require 'ostruct'
4
+ require 'cgi'
4
5
 
5
6
  module Xmfun
6
7
  module Mp3
7
8
  class Track
8
9
  def self.new(track_hash)
9
10
  track_hash["location"] = Xmfun::Util::Decoder.decode(track_hash["location"])
11
+ track_hash["title"] = CGI.unescapeHTML(track_hash["title"])
12
+ track_hash["artist"] = CGI.unescapeHTML(track_hash["artist"])
13
+
10
14
  track_hash["file_name"] = "#{track_hash["title"]}_#{track_hash["artist"]}.mp3"
11
15
  OpenStruct.new track_hash
12
16
  end
data/lib/xmfun/util/decoder.rb CHANGED
@@ -7,12 +7,18 @@ module Xmfun
7
7
  module Util
8
8
  class Decoder
9
9
  def self.decode(input)
10
- text = input[1..-1].chars.to_a
11
- row = input[0].to_i
10
+ row, text = strtok(input)
12
11
 
13
12
  tmp = text.in_groups(row).transpose.join
14
13
  CGI::unescape(tmp).gsub('^', '0')
15
14
  end
15
+
16
+ def self.strtok(s)
17
+ m = /^(\d+)/.match(s)
18
+ raise ArgumentError, "invalid input #{s}" unless m
19
+
20
+ [$1.to_i, $'.chars.to_a]
21
+ end
16
22
  end
17
23
  end
18
24
  end
data/lib/xmfun/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # -*- encoding : utf-8 -*-
2
2
 
3
3
  module Xmfun
4
- VERSION = "0.0.4"
4
+ VERSION = "0.0.5"
5
5
  end
data/spec/xmfun/decode_spec.rb CHANGED
@@ -5,12 +5,22 @@ module Xmfun
5
5
  describe Util::Decoder do
6
6
  before do
7
7
  @decoder = Xmfun::Util::Decoder
8
- @location = "8h2fmF%2956mtDe%fc185utFii12F%65ph3e5d24%Elt%l.%F35233_%4Ece%5-lp2ec272E74%k57e235E%%F.oF1%%123eE2eefE%53mxm16527_Fyd%6ab75EA5i%69EF_la%c52d88E-%.a29%333.u38E6a-8%n"
9
- @url = "http://m5.file.xiami.com/1/169/7169/320390/3562717_365342_l.mp3?auth_key=30dc8ee47200ee626fdc2eadac2e3fb8-1407888000-0-null"
10
8
  end
11
9
 
12
10
  it "#should return a decoded url" do
13
- expect(@decoder.decode(@location)).to eq(@url)
11
+ location = "8h2fmF%2956mtDe%fc185utFii12F%65ph3e5d24%Elt%l.%F35233_%4Ece%5-lp2ec272E74%k57e235E%%F.oF1%%123eE2eefE%53mxm16527_Fyd%6ab75EA5i%69EF_la%c52d88E-%.a29%333.u38E6a-8%n"
12
+ url = "http://m5.file.xiami.com/1/169/7169/320390/3562717_365342_l.mp3?auth_key=30dc8ee47200ee626fdc2eadac2e3fb8-1407888000-0-null"
13
+ expect(@decoder.decode(location)).to eq(url)
14
+
15
+ location = "10h%i5F1t2.%18tFn23.pfeF2m%1t11p3.%183Ax23_%iF312a3%3Fm522"
16
+ url = "http://f1.xiami.net/355/1133/13218_13218.mp3"
17
+ expect(@decoder.decode(location)).to eq(url)
18
+ end
19
+
20
+ it "#should raise an error when decoding an invalid url" do
21
+ location = "this_is_invalid_url"
22
+ expect_msg = "invalid input #{location}"
23
+ expect { @decoder.decode(location) }.to raise_error(ArgumentError, expect_msg)
14
24
  end
15
25
  end
16
26
  end
metadata CHANGED
@@ -1,169 +1,183 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: xmfun
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.4
4
+ version: 0.0.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - ipmsteven
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-09-02 00:00:00.000000000 Z
11
+ date: 2014-09-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: clap
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ~>
17
+ - - "~>"
18
18
  - !ruby/object:Gem::Version
19
19
  version: 1.0.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ~>
24
+ - - "~>"
25
25
  - !ruby/object:Gem::Version
26
26
  version: 1.0.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: nori
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ~>
31
+ - - "~>"
32
32
  - !ruby/object:Gem::Version
33
33
  version: 2.4.0
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ~>
38
+ - - "~>"
39
39
  - !ruby/object:Gem::Version
40
40
  version: 2.4.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: nokogiri
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ~>
45
+ - - "~>"
46
46
  - !ruby/object:Gem::Version
47
47
  version: 1.6.3.1
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ~>
52
+ - - "~>"
53
53
  - !ruby/object:Gem::Version
54
54
  version: 1.6.3.1
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: parallel
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ~>
59
+ - - "~>"
60
60
  - !ruby/object:Gem::Version
61
61
  version: 1.2.2
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ~>
66
+ - - "~>"
67
67
  - !ruby/object:Gem::Version
68
68
  version: 1.2.2
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: ruby-mp3info
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - ~>
73
+ - - "~>"
74
74
  - !ruby/object:Gem::Version
75
75
  version: 0.8.4
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - ~>
80
+ - - "~>"
81
81
  - !ruby/object:Gem::Version
82
82
  version: 0.8.4
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: activesupport
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - ~>
87
+ - - "~>"
88
88
  - !ruby/object:Gem::Version
89
89
  version: 4.1.5
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - ~>
94
+ - - "~>"
95
95
  - !ruby/object:Gem::Version
96
96
  version: 4.1.5
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: ruby-progressbar
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - ~>
101
+ - - "~>"
102
102
  - !ruby/object:Gem::Version
103
103
  version: 1.5.1
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - ~>
108
+ - - "~>"
109
109
  - !ruby/object:Gem::Version
110
110
  version: 1.5.1
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: bundler
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - ~>
115
+ - - "~>"
116
116
  - !ruby/object:Gem::Version
117
117
  version: '1.3'
118
118
  type: :development
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
- - - ~>
122
+ - - "~>"
123
123
  - !ruby/object:Gem::Version
124
124
  version: '1.3'
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: rake
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
- - - ~>
129
+ - - "~>"
130
130
  - !ruby/object:Gem::Version
131
131
  version: 10.3.2
132
132
  type: :development
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
- - - ~>
136
+ - - "~>"
137
137
  - !ruby/object:Gem::Version
138
138
  version: 10.3.2
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: rspec
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
- - - ~>
143
+ - - "~>"
144
144
  - !ruby/object:Gem::Version
145
145
  version: 3.0.0
146
146
  type: :development
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
- - - ~>
150
+ - - "~>"
151
151
  - !ruby/object:Gem::Version
152
152
  version: 3.0.0
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: pry
155
155
  requirement: !ruby/object:Gem::Requirement
156
156
  requirements:
157
- - - ~>
157
+ - - "~>"
158
158
  - !ruby/object:Gem::Version
159
159
  version: 0.10.0
160
160
  type: :development
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
- - - ~>
164
+ - - "~>"
165
165
  - !ruby/object:Gem::Version
166
166
  version: 0.10.0
167
+ - !ruby/object:Gem::Dependency
168
+ name: pry-byebug
169
+ requirement: !ruby/object:Gem::Requirement
170
+ requirements:
171
+ - - "~>"
172
+ - !ruby/object:Gem::Version
173
+ version: 1.3.3
174
+ type: :development
175
+ prerelease: false
176
+ version_requirements: !ruby/object:Gem::Requirement
177
+ requirements:
178
+ - - "~>"
179
+ - !ruby/object:Gem::Version
180
+ version: 1.3.3
167
181
  description: Yet another xiami music downloader
168
182
  email:
169
183
  - steven.lyl147@gmail.com
@@ -172,9 +186,9 @@ executables:
172
186
  extensions: []
173
187
  extra_rdoc_files: []
174
188
  files:
175
- - .gitignore
176
- - .rspec
177
- - .travis.yml
189
+ - ".gitignore"
190
+ - ".rspec"
191
+ - ".travis.yml"
178
192
  - Gemfile
179
193
  - LICENSE.txt
180
194
  - README.md
@@ -200,12 +214,12 @@ require_paths:
200
214
  - lib
201
215
  required_ruby_version: !ruby/object:Gem::Requirement
202
216
  requirements:
203
- - - ! '>='
217
+ - - ">="
204
218
  - !ruby/object:Gem::Version
205
219
  version: '0'
206
220
  required_rubygems_version: !ruby/object:Gem::Requirement
207
221
  requirements:
208
- - - ! '>='
222
+ - - ">="
209
223
  - !ruby/object:Gem::Version
210
224
  version: '0'
211
225
  requirements: []