LyricFind 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da1b66e31f48f26036d612ecf429f5eb623696bf
-  data.tar.gz: 608c02edb5eea6ac9966023a583cd2722819df3b
+  metadata.gz: 3fdf2f4d062693f196d6dbbad0d79b7afdc64305
+  data.tar.gz: a4aa878c290fdd3daf7960fcff95422e8faf85b6
 SHA512:
-  metadata.gz: adb4ce5659103ade5103c9af102d6844993399e8bdf78397d070b7d795681d4c4dbba69c502e51291794f73909d3ad5b86581f989eb094b02ac6816d0653c9a5
-  data.tar.gz: 2607ed2478ab873b120a483366859e6e5dea2b8d764feba0d84cf6ea554db71f1659ee6b329780a3fe084020f86b586d76e42f18a39b43edd838caeccb134439
+  metadata.gz: f33aa6c38e308eee978a5576b54c70b41df4a99433c78410d8fbc6a7283b05148911db9b8dc503d8b7b7ee265dca9df17718e2126ef3fd7c17ba44e79ddad766
+  data.tar.gz: 90e9574edb1d97200de4db64eb04e70902988b93106d2f1cf28709586c6c86b00e10ffd3778b86aff60c1e1b9f601b9a9a996cc12aaceafbda91abcc03b8608b

data/.gitignore

@@ -12,4 +12,6 @@ log/**
 spec/lyricfind.yml
 spec/vcr_cassettes/*
 *.gem
-
+build/**
+pkg/**
+install/**

data/.travis.yml

@@ -1,3 +1,4 @@
 language: ruby
 rvm:
   - 2.2.1
+sudo: required

data/Gemfile

@@ -2,3 +2,6 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in lyricfind.gemspec
 gemspec
+
+gem 'bundler'
+gem 'vcr'

data/README.md

@@ -1,6 +1,6 @@
 # LyricFind
 
-[![Gem Version](https://badge.fury.io/rb/LyricFind.svg)](http://badge.fury.io/rb/LyricFind)
+[![Gem Version](https://badge.fury.io/rb/LyricFind.svg)](http://badge.fury.io/rb/LyricFind) | [![Code Climate](https://codeclimate.com/github/ihassin/lyricfind/badges/gpa.svg)](https://codeclimate.com/github/ihassin/lyricfind) | [![License](http://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](http://opensource.org/licenses/MIT) | [![Issues](http://img.shields.io/github/issues/ihassin/lyricfind.svg?style=flat-square)](http://github.com/ihassin/lyricfind/issues) | [![Releases](http://img.shields.io/github/release/ihassin/lyricfind.svg?style=flat-square)](http://github.com/ihassin/lyricfind/releases) | [![Dependencies](http://img.shields.io/gemnasium/ihassin/lyricfind.svg?style=flat-square)](https://gemnasium.com/ihassin/lyricfind)
 
 This gem allows your application to access LyricFind's API services 
 
@@ -9,7 +9,7 @@ This gem allows your application to access LyricFind's API services
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'lyricfind'
+gem 'LyricFind'
 ```
 
 And then execute:
@@ -18,7 +18,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install lyricfind
+    $ gem install LyricFind
 
 ## Running tests
 
@@ -32,7 +32,15 @@ rake
 
 ## Usage
 
-For usage examples, please see [here](https://github.com/ihassin/lyricfind/blob/master/spec/lyricfind_spec.rb)
+For usage examples from tests, please see [here](https://github.com/ihassin/lyricfind/blob/master/spec/lyricfind_spec.rb)
+
+Simple example:
+```ruby
+require 'LyricFind'
+
+lf = LyricFind::API.new 'search-key', 'display-key'
+puts lf.get_lyrics_by_song_name 'u2', 'one'
+```
 
 ## Contributing
 

data/Rakefile

@@ -12,5 +12,5 @@ task :build do
 end
 
 task :release => :build do
-  system "gem push lyricfind-#{LYRICFIND::VERSION}"
+  system "gem push lyricfind-#{LyricFind::VERSION}"
 end

data/lib/lyricfind/get_lyrics_by_song_name.rb

@@ -9,32 +9,46 @@ module LyricFind
     end
 
     def get_lyrics_by_song_name artist, song_name
-      query_url = URI.escape "http://api.lyricfind.com/search.do?apikey=#{@search_key}&reqtype=default&searchtype=track&artist=#{artist}&track=#{song_name}"
-      response = open(query_url).read
-      doc = Nokogiri::HTML(response)
-      doc.encoding = 'utf-8'
+      return nil if artist.nil? or artist.length == 0
+      return nil if song_name.nil? or song_name.length == 0
 
-      return nil if !(check_success doc, 100)
-      tracks = doc.xpath('//tracks')[0]['totalresults'].to_i
-      return nil if tracks == 0
+      artist = URI.escape artist
+      song_name = URI.escape song_name
 
-      track = doc.xpath('//tracks/track')[0]['amg']
+      begin
+        query_url = URI.escape "http://api.lyricfind.com/search.do?apikey=#{@search_key}&reqtype=default&searchtype=track&artist=#{artist}&track=#{song_name}"
+        response = open(query_url).read
+        doc = Nokogiri::HTML(response)
+        doc.encoding = 'utf-8'
 
-      query_url = URI.escape "http://api.lyricfind.com/lyric.do?apikey=#{@display_key}&reqtype=default&trackid=amg:#{track}"
+        return nil if !(check_success doc, 100)
+        tracks = doc.xpath('//tracks')[0]['totalresults'].to_i
+        return nil if tracks == 0
 
-      response = open(query_url).read
-      doc = Nokogiri::HTML(response)
-      doc.encoding = 'utf-8'
+        track = doc.xpath('//tracks/track')[0]['amg']
 
-      return nil if !(check_success doc, 101)
+        query_url = URI.escape "http://api.lyricfind.com/lyric.do?apikey=#{@display_key}&reqtype=default&trackid=amg:#{track}"
 
-      lyrics = doc.xpath('//lyrics')
-      lyrics[0].content
+        response = open(query_url).read
+        doc = Nokogiri::HTML(response)
+        doc.encoding = 'utf-8'
+
+        return nil if !(check_success doc, 101)
+
+        lyrics = doc.xpath('//lyrics')
+        lyrics[0].content
+      rescue
+        nil
+      end
     end
 
     def check_success doc, code
-      response = doc.xpath('//response')
-      response[0]['code'].to_i == code
+      begin
+        response = doc.xpath('//response')
+        response[0]['code'].to_i == code
+      rescue
+        false
+      end
     end
 
   end

data/lib/lyricfind/version.rb

@@ -1,3 +1,3 @@
 module LyricFind
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: LyricFind
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Itamar Hassin
@@ -125,32 +125,6 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- build/.gitignore
-- build/.rspec
-- build/.travis.yml
-- build/Gemfile
-- build/README.md
-- build/Rakefile
-- build/bin/console
-- build/bin/setup
-- build/build.gemspec
-- build/lib/build.rb
-- build/lib/build/version.rb
-- build/spec/build_spec.rb
-- build/spec/spec_helper.rb
-- install/.gitignore
-- install/.rspec
-- install/.travis.yml
-- install/Gemfile
-- install/README.md
-- install/Rakefile
-- install/bin/console
-- install/bin/setup
-- install/install.gemspec
-- install/lib/install.rb
-- install/lib/install/version.rb
-- install/spec/install_spec.rb
-- install/spec/spec_helper.rb
 - lib/lyricfind.rb
 - lib/lyricfind/get_lyrics_by_song_name.rb
 - lib/lyricfind/version.rb

data/build/.gitignore

@@ -1,9 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/

data/build/.rspec

@@ -1,2 +0,0 @@
---format documentation
---color

data/build/.travis.yml

@@ -1,3 +0,0 @@
-language: ruby
-rvm:
-  - 2.2.1

data/build/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in build.gemspec
-gemspec

data/build/README.md

@@ -1,39 +0,0 @@
-# Build
-
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/build`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'build'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install build
-
-## Usage
-
-TODO: Write usage instructions here
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release` to create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-1. Fork it ( https://github.com/[my-github-username]/build/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

data/build/Rakefile

@@ -1 +0,0 @@
-require "bundler/gem_tasks"

data/build/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "build"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start

data/build/bin/setup

@@ -1,7 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/build/build.gemspec

@@ -1,27 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'build/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "build"
-  spec.version       = Build::VERSION
-  spec.authors       = ["Itamar Hassin"]
-  spec.email         = ["ihassin@mac.com"]
-
-  spec.summary       = %q{TODO: Write a short summary, because Rubygems requires one.}
-  spec.description   = %q{TODO: Write a longer description or delete this line.}
-  spec.homepage      = "TODO: Put your gem's website or public repo URL here."
-
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com' to prevent pushes to rubygems.org, or delete to allow pushes to any server."
-  end
-
-  spec.add_development_dependency "bundler", "~> 1.9"
-  spec.add_development_dependency "rake", "~> 10.0"
-end

data/build/lib/build.rb

@@ -1,5 +0,0 @@
-require "build/version"
-
-module Build
-  # Your code goes here...
-end

data/build/lib/build/version.rb

@@ -1,3 +0,0 @@
-module Build
-  VERSION = "0.1.0"
-end

data/build/spec/build_spec.rb

@@ -1,11 +0,0 @@
-require 'spec_helper'
-
-describe Build do
-  it 'has a version number' do
-    expect(Build::VERSION).not_to be nil
-  end
-
-  it 'does something useful' do
-    expect(false).to eq(true)
-  end
-end

data/build/spec/spec_helper.rb

@@ -1,2 +0,0 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'build'

data/install/.gitignore

@@ -1,9 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/

data/install/.rspec

@@ -1,2 +0,0 @@
---format documentation
---color

data/install/.travis.yml

@@ -1,3 +0,0 @@
-language: ruby
-rvm:
-  - 2.2.1

data/install/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in install.gemspec
-gemspec

data/install/README.md

@@ -1,39 +0,0 @@
-# Install
-
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/install`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'install'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install install
-
-## Usage
-
-TODO: Write usage instructions here
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release` to create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-1. Fork it ( https://github.com/[my-github-username]/install/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

data/install/Rakefile

@@ -1 +0,0 @@
-require "bundler/gem_tasks"

data/install/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "install"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start

data/install/bin/setup

@@ -1,7 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/install/install.gemspec

@@ -1,27 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'install/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "install"
-  spec.version       = Install::VERSION
-  spec.authors       = ["Itamar Hassin"]
-  spec.email         = ["ihassin@mac.com"]
-
-  spec.summary       = %q{TODO: Write a short summary, because Rubygems requires one.}
-  spec.description   = %q{TODO: Write a longer description or delete this line.}
-  spec.homepage      = "TODO: Put your gem's website or public repo URL here."
-
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com' to prevent pushes to rubygems.org, or delete to allow pushes to any server."
-  end
-
-  spec.add_development_dependency "bundler", "~> 1.9"
-  spec.add_development_dependency "rake", "~> 10.0"
-end

data/install/lib/install.rb

@@ -1,5 +0,0 @@
-require "install/version"
-
-module Install
-  # Your code goes here...
-end

data/install/lib/install/version.rb

@@ -1,3 +0,0 @@
-module Install
-  VERSION = "0.1.0"
-end

data/install/spec/install_spec.rb

@@ -1,11 +0,0 @@
-require 'spec_helper'
-
-describe Install do
-  it 'has a version number' do
-    expect(Install::VERSION).not_to be nil
-  end
-
-  it 'does something useful' do
-    expect(false).to eq(true)
-  end
-end

data/install/spec/spec_helper.rb

@@ -1,2 +0,0 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'install'