lyriki 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87ce33fa711df489d17d4ca2b4fcfce5459a140a
-  data.tar.gz: 0ff054ad4a5c8254bb18a112667239fecb226d05
+  metadata.gz: c81a53ab938c4b637d662453d77039754457bf73
+  data.tar.gz: 9ad1c2cdf6067e005152783e7b66500a7e644d10
 SHA512:
-  metadata.gz: e1d7a146cd0a25d19fd4f8215f890c11dce3f9a3865864fa8e277c155c7fb3a3737440a8f652708a8606b71a705029a55229b87af4d738a51305978a1947b6d3
-  data.tar.gz: aa195eb8c70fb570e8ffdcd275734bd809b1eecdf13017f91e46b4bd834b140a1efd859a709027cc65bfb02c99a93e76db338c72f44dae1b6f0e0b9829b00297
+  metadata.gz: e37e051f19666f28efad6a75a09fcd667e6a2f04b77e9066ed49e60d9ba1a1ce88e582014f4a1de030426121dba7748783d6c3c991ee2417aa54608e512ab892
+  data.tar.gz: c54f196ab6a624a75ead07a2787df6a1c0f185e13824419d3ddc730b203f59144a70ad5c9fef3d5b311295c8d3bc8551931c1c2adbd802f8a7a0fd42abe89fec

data/.codeclimate.yml

@@ -0,0 +1,27 @@
+---
+engines:
+  # brakeman:
+  #   enabled: true
+  duplication:
+    enabled: true
+    config:
+      languages:
+       ruby:
+         mass_threshold: 45
+       javascript:
+         mass_threshold: 30
+  fixme:
+    enabled: true
+  rubocop:
+    enabled: true
+    config: "config/rubocop.yml"
+ratings:
+  paths:
+  - "**.inc"
+  - "**.js"
+  - "**.jsx"
+  - "**.module"
+  - "**.rb"
+exclude_paths:
+- config/
+- spec/fixtures/

data/.travis.yml

@@ -1,9 +1,21 @@
+sudo: false
 language: ruby
 bundler_args: --without development
 rvm:
-  - ruby-head
-  - 2.2.0
-  - 2.1.4
+  - 2
   - 2.0
+  - 2.1
+  - 2.1.10
+  - 2.2
+  - ruby-head
+  - ruby-head-clang
+  - jruby-head
+matrix:
+  fast_finish: true
+  allow_failures:
+    - rvm: jruby-head
+    - rvm: ruby-head
+    - rvm: ruby-head-clang
+    - rvm: 2.1.10
 script:
   - bundle exec rspec

data/Guardfile

@@ -1,7 +1,6 @@
-guard :rspec, cmd: 'bundle exec rspec' do
+guard :rspec, cmd: "bundle exec rspec" do
   watch(%r{^lib/(.+)\.rb$})          { |m| "spec/#{m[1]}_spec.rb" }
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^spec/support/(.+)\.rb$}) { "spec" }
   watch("spec/spec_helper.rb")       { "spec" }
 end
-

data/config/rubocop.yml

@@ -6,6 +6,21 @@ AllCops:
 Metrics/LineLength:
   Max: 120
 
+Style/Documentation:
+  Enabled: false
+
+Style/EmptyLinesAroundBlockBody:
+  Enabled: false
+
+Style/EmptyLinesAroundClassBody:
+  Enabled: false
+
+Style/EmptyLinesAroundModuleBody:
+  Enabled: false
+
+Style/ExtraSpacing:
+  Enabled: false
+
 Style/SpaceAroundEqualsInParameterDefault:
   Enabled: false
 

data/lib/lyriki/legacy/song_data.rb

@@ -9,11 +9,13 @@ module Lyriki
 
       def initialize(**args)
         raise ArgumentError unless args[:artist] && args[:song]
-        @data = get(url_for_song(args[:artist], args[:song]))
+        data = JSON.parse(get(url_for_song(args[:artist], args[:song])))
+        raise NoLyricsError, "lyrics not found: #{data}" if data["lyrics"] == "Not found"
+        @data = data
       end
 
       def response_data
-        JSON.parse @data
+        @data
       end
 
       private
@@ -25,3 +27,5 @@ module Lyriki
     end
   end
 end
+
+class NoLyricsError < StandardError; end

data/lib/lyriki/legacy/song_lyrics.rb

@@ -11,6 +11,10 @@ module Lyriki
       def initialize(**args)
         raise ArgumentError unless args[:artist] && args[:song]
         song_data = SongData.new(args).response_data
+        if song_data["lyrics"] == "Not found"
+          raise NoLyricsError, "lyrics not found: #{song_data}"
+        end
+
         @data = get(song_data["url"])
       end
 

data/lib/lyriki/version.rb

@@ -1,3 +1,3 @@
 module Lyriki
-  VERSION = "1.0.1"
+  VERSION = "1.1.1".freeze
 end

data/lib/web_helpers.rb

@@ -5,11 +5,13 @@ module WebHelpers
   def get(url, limit=10)
     raise ArgumentError, "get() redirects too deep" if limit < 1
 
+    raise EditUrlError, "shouldn't be trying to edit... #{url}" if url =~ /[?&]action=edit\b/
+
     response = Net::HTTP.get_response(URI(url))
     case response
     when Net::HTTPSuccess     then response.body
     when Net::HTTPRedirection then get(response["location"], limit - 1)
-    else response.error!
+    else                           response.error!
     end
   end
 
@@ -18,3 +20,5 @@ module WebHelpers
   end
 
 end
+
+class EditUrlError < StandardError; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lyriki
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
 platform: ruby
 authors:
 - Alexander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-21 00:00:00.000000000 Z
+date: 2016-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -118,6 +118,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".pullreview.yml"