xiami 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ed958b15c9b475d6f98252dbecac68459cabbac
-  data.tar.gz: 558e09fbf8dae4ab755908d3b8e0b769c6ef936c
+  metadata.gz: c2a1ea656102e669a7254fe9bca8051c42012eeb
+  data.tar.gz: 664f17e6b51050429bb6ac846444b0c587acd7e4
 SHA512:
-  metadata.gz: 91704ab7d25a73a5215188564e597b0d6d45466be0c0b1f82a4f211706e7a961d9a655a0f9860bcf71e8eb40f2b63f42fe56c85cec2f90c49470dbbc08de99f1
-  data.tar.gz: 6c4d62437775c9b913a201bc6f83db21cdcfe6499445b6505ea401ce5f1ffd03ad5e48c145bc7a8f98813cb9644071f781aed73ca06e3ea1927a5bd9ab4d8bd1
+  metadata.gz: 6b3d1c916fdf87e0d0c63f6db7b4792f77c3ddfd48332a4d15136c2de9c62f31b200f8fd2a57e73cfc649dcffeec9f3e2f4d0b4dbbbaa06ec5edcde15d92f323
+  data.tar.gz: 472ab7a53b73629678210fb8d617e15a5578ca09b10a5b64b6f37850e80b3a85c3a4e4e0aa6295f5da52c217c8b45509f889fefa20528ea19f2a2f3c06123c44

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
 rvm:
   - 2.0.0
+  - jruby-1.7.16
 script: bundle exec rspec
+gemfile: Gemfile.ci

data/Gemfile.ci

@@ -0,0 +1,12 @@
+source 'https://rubygems.org'
+
+gemspec
+
+group :development, :test do
+  gem 'rake'
+  gem 'nokogiri'
+  gem 'rspec', '~> 2.12.0'
+  gem 'webmock'
+  gem 'simplecov', require: false
+  gem 'coveralls', require: false
+end

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2014 Forrest Ye
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -4,5 +4,48 @@
 [![Code Climate](https://codeclimate.com/github/forresty/xiami/badges/gpa.svg)](https://codeclimate.com/github/forresty/xiami)
 [![Coverage Status](https://coveralls.io/repos/forresty/xiami/badge.png)](https://coveralls.io/r/forresty/xiami)
 [![Gem Version](https://badge.fury.io/rb/xiami.svg)](http://badge.fury.io/rb/xiami)
+[![Dependency Status](https://www.versioneye.com/user/projects/5471d5e19dcf6df5ea000ee9/badge.svg?style=flat)](https://www.versioneye.com/user/projects/5471d5e19dcf6df5ea000ee9)
 
 retrieve songs from xiami.com
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'xiami'
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install xiami
+
+
+## Usage
+
+```ruby
+Xiami::Song.new 42951
+=> #<Xiami::Song:0x007f8f35c43b48 @id="42951", @name="我爱台妹", @album=#<Xiami::Album:0x007f8f35c63560 @id="3488", @name="Wake Up", @cover_url="http://img.xiami.net/images/album/img24/724/34881343112513_3.jpg">, @artist=#<Xiami::Artist:0x007f8f35c79cc0 @id="724", @name="MC HotDog;张震岳">, @temporary_url="http://m5.file.xiami.com/724/724/3488/42951_28196_l.mp3?auth_key=77abde259cd6566a5c4222b4cca7331c-1416441600-0-null">
+```
+
+## Credits
+
+- [xiami_sauce gem](https://github.com/ranmocy/xiami_sauce)
+
+## Contributing
+
+1. Fork it ( https://github.com/forresty/xiami/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create a new Pull Request
+
+## Changelog
+
+### 0.1.0 / 2014-12-17
+
+- new `Song.fetch` method, will return nil when failed

data/lib/xiami/song.rb

@@ -1,6 +1,6 @@
 # originally from xiami_sauce gem
+require "httpclient"
 require "cgi"
-require 'net/http'
 require 'nokogiri'
 
 module Xiami
@@ -10,6 +10,14 @@ module Xiami
 
     attr_accessor :local_file_path
 
+    class << self
+      def fetch(song_url = nil)
+        new(song_url)
+      rescue
+        nil
+      end
+    end
+
     def initialize(song_url = nil)
       if song_url
         @id = song_url.match(/song\/([0-9]+)/)[1] rescue song_url
@@ -59,11 +67,7 @@ module Xiami
     private
 
     def info_xml
-      uri  = URI.parse("http://www.xiami.com/widget/xml-single/uid/0/sid/#{id}")
-
-      headers = { 'accept' => 'text/html', 'user-agent' => 'Mozilla/5.0' }
-
-      Net::HTTP.new(uri.host, uri.port).get2(uri.path, headers).body
+      HTTPClient.new.get("http://www.xiami.com/widget/xml-single/uid/0/sid/#{id}").body
     end
 
     def sospa(location)

data/lib/xiami/version.rb

@@ -1,3 +1,3 @@
 module Xiami
-  VERSION = '0.0.6'
+  VERSION = '0.1.0'
 end

data/xiami.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
 
   spec.add_runtime_dependency 'nokogiri'
+  spec.add_runtime_dependency 'httpclient'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xiami
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Forrest Ye
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-15 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - afu@forresty.com
@@ -62,6 +76,8 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
+- Gemfile.ci
+- LICENSE.txt
 - README.md
 - Rakefile
 - lib/xiami.rb
@@ -96,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: retrieve songs from http://xiami.com