xiami_sauce 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca6f3d6701281dfc430d2fd2f17bdb58dc622c92
-  data.tar.gz: 97b99e4e6a7d83017b026415bf0ed1641cf6db5f
+  metadata.gz: 3423795b0d768a407e7f25c4a94275247e62345a
+  data.tar.gz: 40ecbda12d6b5728d566f7317daf00323a7b5f7f
 SHA512:
-  metadata.gz: 0831a00e09656a48b0d1b5619889c3c1f48e9a5960c994d8a337ee7307aeba267100ee2cabc8ee84b6e051aaeb67ffd6f0237bb1890d985b0903cd5f743f376b
-  data.tar.gz: 92ee592a6ecd6256f04d9907d760c5cf1f7f2bef11299467338deaaa4d0da58fde895c79d005dac83ca7d61db6129196f06d1d69094659462f32b2676324f48e
+  metadata.gz: 1d7340440be6543d4ccfda5f78b007853a10079ed59d739837ac7fcee3d1a91a1c896978829a8866c6414df8500e422f1715fe54a414b87a547440e6c496ac7c
+  data.tar.gz: 20d983ff820b645a9e501647fe066a6319d5035d059752a6e3fc2fcd82acfefc7e350f8f34596499a46be12f2f589a7d2ed06e26b30bd635eb7f420774127d14

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage

data/.travis.yml

@@ -1,5 +1,4 @@
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
   - jruby

data/Gemfile

@@ -1,5 +1,4 @@
-source 'http://ruby.taobao.org'
-# source 'https://rubygems.org'
+source 'https://rubygems.org'
 
 gemspec
 

data/Gemfile.lock

@@ -0,0 +1,98 @@
+PATH
+  remote: .
+  specs:
+    xiami_sauce (0.0.3)
+      nokogiri (~> 1.6)
+      rainbow (~> 2.0)
+      thor (~> 0.17)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    coderay (1.1.0)
+    diff-lcs (1.2.5)
+    ffi (1.9.10)
+    formatador (0.2.5)
+    guard (2.13.0)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, <= 4.0)
+      lumberjack (~> 1.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.9.12)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-bundler (2.1.0)
+      bundler (~> 1.0)
+      guard (~> 2.2)
+      guard-compat (~> 1.1)
+    guard-compat (1.2.1)
+    guard-rspec (4.6.4)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
+    libnotify (0.9.1)
+      ffi (>= 1.0.11)
+    listen (3.0.5)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    lumberjack (1.0.9)
+    metaclass (0.0.4)
+    method_source (0.8.2)
+    mini_portile2 (2.0.0)
+    mocha (0.13.3)
+      metaclass (~> 0.0.1)
+    nenv (0.2.0)
+    nokogiri (1.6.7.1)
+      mini_portile2 (~> 2.0.0.rc2)
+    notiffany (0.0.8)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rainbow (2.0.0)
+    rake (10.4.2)
+    rb-fsevent (0.9.6)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.1)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    shellany (0.0.1)
+    slop (3.6.0)
+    terminal-notifier-guard (1.6.4)
+    thor (0.19.1)
+    version (1.0.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.3)
+  guard
+  guard-bundler
+  guard-rspec
+  libnotify
+  mocha (~> 0.13.0)
+  rake
+  rb-fsevent (>= 0.3.9)
+  rb-inotify (>= 0.5.1)
+  rspec
+  terminal-notifier-guard
+  version
+  xiami_sauce!
+
+BUNDLED WITH
+   1.11.2

data/Rakefile

@@ -10,7 +10,7 @@ Rake::VersionTask.new
 
 # include Rake::DSL if defined?(Rake::DSL)
 
-RVM_PREFIX = "rvm 1.8.7,1.9.3-p327,2.0.0 do"
+RVM_PREFIX = "rvm 1.9.3-p327,2.0.0 do"
 
 
 namespace :spec do

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/xiami_sauce/track.rb

@@ -38,10 +38,10 @@ module XiamiSauce
     private
 
     def parse_info
-      url_str = URI.parse(info_src)
-      site    = Net::HTTP.new(url_str.host, url_str.port)
-      xml     = site.get2(url_str.path,{'accept'=>'text/html'}).body
-      doc     = Nokogiri::XML(xml)
+      uri  = URI.parse(info_src)
+      site = Net::HTTP.new(uri.host, uri.port)
+      xml  = site.get2(uri.path,{'accept' => 'text/html', 'user-agent' => 'Mozilla/5.0'}).body
+      doc  = Nokogiri::XML(xml)
 
       doc.css('track *').each do |element|
         instance_variable_set("@#{element.name}", element.content)
@@ -50,56 +50,25 @@ module XiamiSauce
       @url         = sospa(@location)
     end
 
+    # Rewrite the algorithm, much much more better.
     def sospa(location)
-      totle   = location.to_i
-      new_str = location[1..-1]
-      chu     = (new_str.length.to_f / totle).floor
-      yu      = new_str.length % totle
-      stor    = []
-
-      i = 0
-      while i < yu do
-        index = (chu+1)*i
-        length = chu+1
-        stor[i] = new_str[index...index+length]
-
-        i+=1
-      end
-
-
-      i = yu
-      while i < totle do
-        index = chu*(i-yu)+(chu+1)*yu
-        length = chu
-
-        stor[i] = new_str[index...index+length]
-
-        i+=1
-      end
-
-      pin_str = ""
-      0.upto(stor[0].length-1) do |ii|
-        0.upto(stor.length-1) do |jj|
-          pin_str += stor[jj][ii...ii+1]
-        end
-      end
-
-      pin_str = rtan(pin_str)
-      return_str = ""
-
-      0.upto(pin_str.length-1) do |iii|
-        if pin_str[iii...iii+1]=='^'
-          return_str<<"0"
-        else
-          return_str<<pin_str[iii...iii+1]
-        end
-      end
-
-      return_str
+      string    = location[1..-1]
+      col       = location[0].to_i
+      row       = (string.length.to_f / col).floor
+      remainder = string.length % col
+      address   = [[nil]*col]*(row+1)
+
+      sizes = [row+1] * remainder + [row] * (col - remainder)
+      pos = 0
+      sizes.each_with_index { |size, i|
+        size.times { |index| address[col * index + i] = string[pos + index] }
+        pos += size
+      }
+
+      address = CGI::unescape(address.join).gsub('^', '0')
+    rescue
+      raise location
     end
 
-    def rtan(str)
-      CGI::unescape(str)
-    end
   end
 end

data/spec/xiami_sauce/track_list_spec.rb

@@ -33,8 +33,8 @@ describe XiamiSauce::TrackList do
 
     it "should parse url" do
       uri, type = subject.send(:parse_url, url)
-      uri.path.should == '/song/1770450682'
-      type.should == :song
+      expect(uri.path).to be == '/song/1770450682'
+      expect(type).to be == :song
     end
 
     it "should parse doc" do
@@ -43,7 +43,7 @@ describe XiamiSauce::TrackList do
       subject.instance_variable_set("@type", type)
       doc = subject.send(:parse_doc, uri)
       subject.instance_variable_set("@doc", doc)
-      subject.instance_variable_get("@doc").should be_kind_of Nokogiri::HTML::Document
+      expect(subject.instance_variable_get("@doc")).to be_kind_of Nokogiri::HTML::Document
     end
   end
 
@@ -76,7 +76,7 @@ describe XiamiSauce::TrackList do
     let(:b_list) { XiamiSauce::TrackList.new(b_url) }
 
     it "should be able to add" do
-      (a_list << b_list).list.should be == (a_list.list << b_list.list)
+      expect((a_list << b_list).list).to be == (a_list.list << b_list.list)
     end
   end
 end

data/spec/xiami_sauce/track_spec.rb

@@ -6,15 +6,16 @@ describe XiamiSauce::Track do
 
   subject { XiamiSauce::Track.new(song_url, index) }
 
-  its('id') { should == '1770361274' }
-  its('index') { should == '9' }
-  its('name') { should == 'Kids (Unedited Version)' }
-  its('url') { should == 'http://f1.xiami.net/11768/454588/02_1770361274_2491919.mp3' }
-  its('album_id') { should == '454588' }
-  its('album_cover') { should == 'http://img.xiami.com/./images/album/img68/11768/4545881311563810_3.jpg' }
-  its('album_name') { should == 'The Way I Am' }
-  its('artist_id') { should == '11768' }
-  its('artist_name') { should == 'Eminem' }
+  it { expect(subject.id).to be == '1770361274' }
+  it { expect(subject.index).to be == '9' }
+  it { expect(subject.name).to be == 'Kids (Unedited Version)' }
+  it { expect(subject.album_id).to be == '454588' }
+  it { expect(subject.album_cover).to be == 'http://img.xiami.com/./images/album/img68/11768/4545881311563810_3.jpg' }
+  it { expect(subject.album_name).to be == 'The Way I Am' }
+  it { expect(subject.artist_id).to be == '11768' }
+  it { expect(subject.artist_name).to be == 'Eminem' }
 
-  its('file_name') { should == '[Eminem-The Way I Am]09.Kids (Unedited Version).mp3' }
+  it { expect(subject.file_name).to be == '[Eminem-The Way I Am]09.Kids (Unedited Version).mp3' }
+
+  it { expect(subject.url).to be == 'http://f1.xiami.net/11768/454588/02_1770361274_2491919.mp3' }
 end

data/xiami_sauce.gemspec

@@ -16,9 +16,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'thor', '~> 0.17.0'
-  spec.add_dependency 'nokogiri', '~> 1.5.0'
-  spec.add_dependency 'rainbow', '~> 1.1.0'
+  spec.add_dependency 'thor', '~> 0.17'
+  spec.add_dependency 'nokogiri', '~> 1.6'
+  spec.add_dependency 'rainbow', '~> 2.0'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: xiami_sauce
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Wanzhang Sheng
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-17 00:00:00.000000000 Z
+date: 2015-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: version
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.13.0
 description: A Xiami Downloader.
@@ -130,9 +130,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
+- Gemfile.lock
 - Guardfile
 - LICENSE.txt
 - README.md
@@ -159,17 +160,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A Xiami Downloader.