valanga 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30f3d50c38df00da1f3e548631ce0095ebc2d1f6
-  data.tar.gz: fd5b7fa4a329dd838808372ed47a2fd664e86e37
+  metadata.gz: 0e04b358a187ccce5fa8743f643f117836f664f4
+  data.tar.gz: caaed27bae15172fcc4a6a7d3294054eb32bbf37
 SHA512:
-  metadata.gz: d673cc1558adf2dfd5a07e3e9d88b74113b16674599eb9ec13bf651ebb6d67eb8449fb16c945c6651c8147fad1c62f9f563fb3119d89dcb95d80db64924353a3
-  data.tar.gz: e2ec20c5b598f9974f3504f4d279e551c9b5dafb5b0e68d779114bb05a3cbf9a8f8c6bb18a3673866e1785ef41ddb3147f252528832d5ad11fd6e832c4d160d7
+  metadata.gz: 6b9c244a0c3c871f0f3f15c42f18bf191f46b214d0cfa4f2c42e336d28cc63ce86cea0dc9287f57d64c4822486bfc1ffa92b6d33e8ad3eecc72a78af58efb4af
+  data.tar.gz: 169a438a3e701a3c5d72cca6cd9574c58c8fe2c5f2b5cc494fd7b22c6e54ae8e190873accd09b139c1289205a6bc34847ceb00d49f249fbc567fc0a82dad766c

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# Version 0.3.0
+* Updates README.md
+* Supports `Valanga::Client#musics_at`, `Valanga::Client#music_image_url`
+
 # Version 0.2.0
 * Supports environment variable login for `ENV['KONAMI_ID']` `ENV['KONAMI_PASSWORD']`.
 * Caches the search query and url, Second time result is directly access to cached url.

data/README.md

@@ -1,4 +1,7 @@
 # Valanga
+[![Gem Version](https://badge.fury.io/rb/valanga.svg)](http://badge.fury.io/rb/valanga)
+[![Gemnasium](https://gemnasium.com/mgi166/valanga.svg)](https://gemnasium.com/mgi166/valanga)
+[![Code Climate](https://codeclimate.com/github/mgi166/valanga/badges/gpa.svg)](https://codeclimate.com/github/mgi166/valanga)
 
 A Ruby client for [REFLEC BEAT](http://p.eagate.573.jp/game/reflec/groovin/p/index.html)
 
@@ -12,9 +15,14 @@ A Ruby client for [REFLEC BEAT](http://p.eagate.573.jp/game/reflec/groovin/p/ind
 ### Prepare
 Create `Valanga::Client` instance.  
 The arguments of `name_or_email` is `KONAMI ID` or `email` that you registered.  
+  
+If you set environment variables `KONAMI_ID` and `KONAMI_PASSWORD`, Valanga::Client uses the values for credentials.  
 
 ```ruby
 client = Valanga::Client.new(name_or_email, password)
+
+# Use ENV['KONAMI_ID'], ENV['KONAMI_PASSWORD'] if client received no arguments.
+client = Valanga::Client.new
 ```
 
 ### Fetch all music names
@@ -24,6 +32,16 @@ client.list_musics
 #=> ["Artifacter", "Army of Marionette", "RPG", "アイネクライネ", ....]
 ```
 
+### Fetch music names specified page, sorttype, and sort
+
+```ruby
+client.musics_at(page: 3)
+#=> ["踊るフィーバーロボ", "鬼天", "朧", ...]
+
+client.musics_at(sorttype: :special, sort: :desc)
+#=> ["Butter-Fly", "七転八起☆至上主義！", "嘘", ...]
+```
+
 ### Search music
 Specifies the music name, returns `Valanga::Music` instance.
 

data/lib/valanga/client.rb

@@ -7,7 +7,8 @@ module Valanga
 
     LOGIN_PAGE  = "https://p.eagate.573.jp/gate/p/login.html"
 
-    attr_reader :session, :pages
+    attr_reader :session
+    attr_accessor :music_ids
 
     def initialize(username = nil, password = nil)
       Capybara.register_driver :poltergeist do |app|
@@ -15,7 +16,7 @@ module Valanga
       end
 
       @session = Capybara::Session.new(:poltergeist)
-      @pages   = {}
+      @music_ids = {}
 
       login!(username, password)
     end

data/lib/valanga/music.rb

@@ -2,8 +2,15 @@ module Valanga
   class Music
     def initialize(document)
       @document = Nokogiri::HTML.parse(document, nil, 'Shift_JIS')
+      @music_bk = @document.css("div.music_bk dl")
+
+      unless @music_bk.size == 8 || @music_bk.size == 9
+        raise NoMusicInformationError, "Not found music informations"
+      end
     end
 
+    attr_reader :music_bk
+
     def basic
       Difficulty::Basic.new(self)
     end
@@ -53,17 +60,5 @@ module Valanga
         end
       end
     end
-
-    def music_bk
-      return @music_bk if defined? @music_bk
-
-      music_bk = @document.css("div.music_bk dl")
-
-      unless music_bk.size == 8 || music_bk.size == 9
-        raise NoMusicInformationError, "Not found music informations"
-      end
-
-      @music_bk = music_bk
-    end
   end
 end

data/lib/valanga/music/collete.rb

@@ -11,50 +11,35 @@ module Valanga
 
       def basic
         if has_special?
-          MusicAttribute.new(create_attr(6)).tap do |attr|
-            attr.name   = name
-            attr.artist = artist
-          end
+          MusicAttribute.new(create_attr(6))
         else
-          MusicAttribute.new(create_attr(5)).tap do |attr|
-            attr.name   = name
-            attr.artist = artist
-          end
+          MusicAttribute.new(create_attr(5))
         end
       end
 
       def medium
         if has_special?
-          MusicAttribute.new(create_attr(7)).tap do |attr|
-            attr.name   = name
-            attr.artist = artist
-          end
+          MusicAttribute.new(create_attr(7))
         else
-          MusicAttribute.new(create_attr(6)).tap do |attr|
-            attr.name   = name
-            attr.artist = artist
-          end
+          MusicAttribute.new(create_attr(6))
         end
       end
 
       def hard
         if has_special?
-          MusicAttribute.new(create_attr(8)).tap do |attr|
-            attr.name   = name
-            attr.artist = artist
-          end
+          MusicAttribute.new(create_attr(8))
         else
-          MusicAttribute.new(create_attr(7)).tap do |attr|
-            attr.name   = name
-            attr.artist = artist
-          end
+          MusicAttribute.new(create_attr(7))
         end
       end
 
       private
 
       def create_attr(index)
-        Hash[COLLETE_KEY.zip(music_info_box[index])]
+        Hash[COLLETE_KEY.zip(music_info_box[index])].merge(
+          'name'   => name,
+          'artist' => artist,
+        )
       end
     end
   end

data/lib/valanga/music/groovin.rb

@@ -13,39 +13,30 @@ module Valanga
       )
 
       def basic
-        Valanga::MusicAttribute.new(create_attr(1)).tap do |attr|
-          attr.name   = name
-          attr.artist = artist
-        end
+        Valanga::MusicAttribute.new(create_attr(1))
       end
 
       def medium
-        Valanga::MusicAttribute.new(create_attr(2)).tap do |attr|
-          attr.name   = name
-          attr.artist = artist
-        end
+        Valanga::MusicAttribute.new(create_attr(2))
       end
 
       def hard
-        Valanga::MusicAttribute.new(create_attr(3)).tap do |attr|
-          attr.name   = name
-          attr.artist = artist
-        end
+        Valanga::MusicAttribute.new(create_attr(3))
       end
 
       def special
         if has_special?
-          Valanga::MusicAttribute.new(create_attr(4)).tap do |attr|
-            attr.name   = name
-            attr.artist = artist
-          end
+          Valanga::MusicAttribute.new(create_attr(4))
         end
       end
 
       private
 
       def create_attr(index)
-        Hash[GROOVIN_KEY.zip(music_info_box[index])]
+        Hash[GROOVIN_KEY.zip(music_info_box[index])].merge(
+          'name'   => name,
+          'artist' => artist,
+        )
       end
     end
   end

data/lib/valanga/music_search.rb

@@ -2,16 +2,10 @@ module Valanga
   module MusicSearch
     MUSIC_INDEX = "http://p.eagate.573.jp/game/reflec/groovin/p/music/index.html"
 
-    def list_musics(page: nil, sorttype: nil, sort: nil)
+    def list_musics
       musics = []
 
-      if [page, sorttype, sort].none?
-        page_sessions do |session|
-          html = Nokogiri::HTML.parse(session.html)
-          musics << html.css("#music_table1 td.music_jkimg a").map(&:text).map(&:strip)
-        end
-      else
-        session.visit(music_url(page: page, sorttype: sorttype, sort: sort))
+      page_sessions do |session|
         html = Nokogiri::HTML.parse(session.html)
         musics << html.css("#music_table1 td.music_jkimg a").map(&:text).map(&:strip)
       end
@@ -19,9 +13,15 @@ module Valanga
       musics.flatten
     end
 
+    def musics_at(page: nil, sorttype: nil, sort: nil)
+      session.visit(music_url(page: page, sorttype: sorttype, sort: sort))
+      html = Nokogiri::HTML.parse(session.html)
+      html.css("#music_table1 td.music_jkimg a").map(&:text).map(&:strip)
+    end
+
     def search(music_name)
-      if url = pages[music_name]
-        return create_music(url)
+      if music_id = music_ids[music_name]
+        return create_music(music_id)
       end
 
       page_sessions do |session|
@@ -30,10 +30,9 @@ module Valanga
             session.click_link(music_name)
           end
 
-          src = session.find(:css, "iframe")['src']
-          pages[music_name] = info_url(src)
+          music_ids[music_name] = music_id(session)
 
-          return create_music(info_url(src))
+          return create_music(music_ids[music_name])
         rescue Capybara::ElementNotFound
           # if link is not found, go next page.
         end
@@ -42,10 +41,30 @@ module Valanga
     alias_method :[], :search
     alias_method :find_music, :search
 
+    def music_image_url(music_name)
+      if music_id = music_ids[music_name]
+        return image_url(music_id)
+      end
+
+      page_sessions do |session|
+        begin
+          session.within("#music_table1") do
+            on_click = session.find_link(music_name)['onClick']
+            music_id = $1 if on_click =~ /id=([\w%]+)/
+            music_ids[music_name] = music_id
+            return image_url(music_id)
+          end
+        rescue Capybara::ElementNotFound
+          # if link is not found, go next page.
+        end
+      end
+    end
+
     private
 
-    def create_music(info_url)
-      session.visit(info_url)
+    def create_music(music_id)
+      info = info_url(music_id)
+      session.visit(info)
       Music.new(session.html)
     end
 
@@ -67,8 +86,12 @@ module Valanga
       end
     end
 
-    def info_url(src)
-      "http://p.eagate.573.jp/game/reflec/groovin/p/music/#{src}"
+    def image_url(music_id)
+      "http://p.eagate.573.jp/game/reflec/groovin/p/images/binary.html?img=#{music_id}"
+    end
+
+    def info_url(music_id)
+      "http://p.eagate.573.jp/game/reflec/groovin/p/music/m_info.html?id=#{music_id}"
     end
 
     def music_url(page: nil, sorttype: nil, sort: nil)
@@ -93,6 +116,11 @@ module Valanga
       end
     end
 
+    def music_id(session)
+      src = session.find(:css, "iframe")['src']
+      src.to_s.split('=').last
+    end
+
     def valid_sorttypes
       { "music_name" => 0, "basic" => 1, "medium" => 2, "hard" => 3, "special" => 4 }
     end

data/lib/valanga/version.rb

@@ -1,3 +1,3 @@
 module Valanga
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valanga
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - mgi166
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler