holysugar-www-enbujyo 0.1.7 → 0.1.9

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.9

data/lib/www/enbujyo/game.rb

@@ -1,10 +1,14 @@
 require 'time'
+require 'json'
+
+require 'www/enbujyo/helper'
 
 module WWW
   class Enbujyo
     class Game
       attr_reader :player0, :deck0, :location0, :player1, :deck1, :location1,
         :date, :movie_date
+      attr_reader :id
 
       def initialize(p0, p0deck, p0loc, p1, p1deck, p1loc, options = {})
         @player0 = p0
@@ -22,6 +26,8 @@ module WWW
         when 'win'
           @winner = 0
         end
+
+        @id = options[:id]
       end
 
       def to_s
@@ -29,12 +35,72 @@ module WWW
 #{player0} #{"「#{player0.team}」" if player0.team}
 #{location0}
 #{deck0}
-----
+---
 #{player1} #{"「#{player1.team}」" if player1.team}
 #{location1}
 #{deck1}
         EOD
       end
+
+      def self.parse_replay(agent, id)
+        url = "http://enbujyo.3594t.com/members/replay.cgi?u=#{id}"
+        gamedata = agent.get(url).body
+        parse(gamedata, id)
+      end
+
+      def self.parse(gamedata, id = nil)
+        if gamedata.is_a? String
+          json = Utils.hack_json(gamedata)
+          gamedata = JSON.parse(json)
+        end
+
+        rep = gamedata['replay'][0]
+
+        rep[:id] = id if id
+
+        p0, p0deck, p0loc = _parse_player_data('p0', rep)
+        p1, p1deck, p1loc = _parse_player_data('p1', rep)
+
+        game = new(p0, p0deck, p0loc, p1, p1deck, p1loc, rep)
+        game
+      end
+
+      def self._parse_player_data(prefix, rep)
+        deck = Deck.new
+        rep.keys.grep(/#{prefix}card_params_\d/).sort.each{|k|
+          deck.cards.push WWW::Enbujyo::Card.parse_from_jsonstr(rep[k])
+        }
+        %w|0 1|.each do |num|
+          next unless rep[prefix+'staff_image_'+num]
+
+          deck.gcards.push(WWW::Enbujyo::Gunshi.new(
+            :image => rep[prefix+'staff_image_'+num],
+            :level => rep[prefix+'staff_level_'+num],
+            :longname => rep[prefix+'staff_name_'+num],
+            :team => rep[prefix+'staff_seiryoku_name_'+num],
+            :attribute => rep[prefix+'staff_zokusei_name'],
+            :strategy => rep[prefix+'strategy_name'],
+            :ex => rep[prefix+'skill_ex_name']
+          ))
+        end
+        player = WWW::Enbujyo::Player.new(
+          :name => rep[prefix+'name'],
+          :name_image_url => rep[prefix+'image'],
+          :team => rep[prefix+'team_name'],
+          :title => rep[prefix+'grade_name'],
+          :brave => rep[prefix+'brave'],
+          :brave_desc => rep[prefix+'brave_desc'],
+          :rank => rep[prefix+'rank'],
+          :wins => rep[prefix+'win'],
+          :loses => rep[prefix+'lose'],
+          :rate => rep[prefix+'win_rate']
+        )
+        location = WWW::Enbujyo::Location.new(
+          :pref => rep[prefix+'pref_name'],
+          :office => rep[prefix+'office']
+        )
+        return [player, deck, location]
+      end
     end
   end
 end

data/lib/www/enbujyo/helper.rb

@@ -0,0 +1,89 @@
+module WWW
+  class Enbujyo
+    module ExtendedAgent
+      def auth_get(url)
+        baseurl = URI.parse('http://enbujyo.3594t.com/')
+        url = (baseurl + url).to_s
+        ret = get(url)
+        if /error/i =~ page.uri.to_s or /エラー/ =~ page.title 
+          if self.autologin?
+            login
+            ret = get(url)
+            if /error/i =~ page.uri.to_s or /エラー/ =~ page.title 
+              raise LoginError
+            end
+          else
+            raise LoginError
+          end
+        end
+        ret
+      end
+      def autologin=(b)
+        @autologin = b
+      end
+      def autologin?
+        @autologin
+      end
+    end
+
+    module Utils
+      module_function
+      def random_string(length = 10, strings = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789')
+        Array.new(length).map{ strings[rand(strings.size),1] }.join
+      end
+
+      def download_movie(agent, url, options = {})
+        puts "Downloading #{url} ..."
+        tmpname = "_enbujyo_download.#{random_string}.wmv"
+        open(tmpname, 'w'){|tmp|
+          tmp.print agent.get_file(url)
+        }
+        if options[:filename]
+          filename = options[:filename]
+        elsif agent.page.response['content-disposition']
+          /filename="(.*?)"/ =~ agent.page.response['content-disposition']
+          if $1
+            filename = windows? ? $1 : NKF.nkf('-Sw', $1) # cp932 -> utf-8
+          end
+        end
+        if filename
+          FileUtils.mv(tmpname, filename)
+        else
+          filename = tmpname
+        end
+        puts "Downloading #{filename} has finished."
+        filename
+      end
+
+      def windows?
+        RUBY_PLATFORM.downcase =~ /mswin(?!ce)|mingw|cygwin|bccwin/
+      end
+
+      def hack_json(jsonstr)
+        jsonstr.sub(/^\w+=/,'').gsub(/\},.*\]/m, '}]')
+      end
+      
+      CH_NUMBER_TABLE = {
+        '〇' => 0,
+        '一' => 1,
+        '二' => 2,
+        '三' => 3,
+        '四' => 4,
+        '五' => 5,
+        '六' => 6,
+        '七' => 7,
+        '八' => 8,
+        '九' => 9,
+        '十' => 10,
+      }
+
+      def ch_to_i(chinesenumber)
+        CH_NUMBER_TABLE[chinesenumber]
+      end
+
+    end
+  end
+end
+
+
+

data/lib/www/enbujyo/movie.rb

@@ -0,0 +1,107 @@
+# -*- mode:ruby; coding:utf-8 -*-
+require 'www/enbujyo/helper'
+
+module WWW
+  class Enbujyo
+    class Movie
+      include WWW::Enbujyo::Utils
+      STATES = [:none, :accepted, :encoding, :completed, :downloaded, :unavailable]
+      RESULT = [:win, :draw, :lose]
+
+      # needed
+      attr_reader :title, :date, :result, :status
+
+      # maybe nil
+      attr_reader :encoded_at, :requested_at, :bought_at
+      attr_reader :download_limit, :download_left
+      attr_reader :thumbnail
+      attr_reader :url, :delete_url
+      attr_reader :id
+      attr_reader :game
+
+      def initialize(info, game, max_download = 5)
+        @game = game
+
+        @title = info[:title] or warn 'Movie: title not found'
+        @date = info[:date] or warn 'Movie: date not found'
+        @result = info[:result]
+        @result = case info[:result]
+                  when /勝利/ : :win
+                  when /敗北/ : :lose
+                  when /分/   : :draw
+                  else
+                    warn 'Movie: result not found'
+                  end
+
+        @status = case info[:encode_status]
+        when /受付中/ : :accepted
+        when /エンコード中/ : :encoding
+        else
+          if info[:download_left].nil?
+            :completed
+          elsif info[:download_left] > 0
+            :downloaded
+          else
+            :unavailable
+          end
+        end
+
+        @encoded_at = info[:encoded_at]
+        @requested_at = info[:requested_at]
+        @bought_at = info[:bought_at]
+        @download_limit = info[:download_limit]
+        @download_left = info[:download_left]
+        @thumbnails = info[:thumbnails]
+
+        @url = info[:url] || info[:purchase_url] 
+        @id = @url.scan(/u=(.*)/).to_s if @url
+        @delete_url = info[:delete_url]
+      end
+
+      def download(agent)
+        unless @url
+          warn "Can't download this movie yet."
+          return false
+        end
+        case @status
+        when :completed
+          download_completed(agent, @url)
+        when :downloaded
+          download_downloaded(agent, @url)
+        else
+          warn "Can't download this movie."
+          return false
+        end
+      end
+
+      def downloadable?
+        [:downloaded, :completed].include? @status
+      end
+
+      private
+      def download_completed(agent, url)
+        page = agent.auth_get url
+        # XXX: 動画券がないときの処理.
+        link = page.links.find{|l| /download-ok\.html/ =~ l.href }
+        if link
+          download_downloaded(agent, page.uri + link.href)
+        else
+          warn "Download link is not found in #{page.uri}"
+          false
+        end
+      end
+
+      def download_downloaded(agent, url)
+        page = agent.auth_get url
+        link = page.links.find{|l| /download.cgi/ =~ l.href }
+        if link
+          download_movie(agent, page.uri + link.href)
+        else
+          warn "Download link is not found in #{page.uri}"
+          false
+        end
+      end
+    end
+  end
+end
+ 

data/lib/www/enbujyo/my_movie.rb

@@ -0,0 +1,68 @@
+require 'www/enbujyo/game'
+require 'www/enbujyo/movie'
+require 'activesupport'
+
+module WWW
+  class Enbujyo
+    class MyMovie
+      def initialize(agent)
+        @agent = agent
+      end
+
+      def parse
+        page = @agent.auth_get '/members/movie/list.html'
+        slots_status = page.search('div[@class="st_block_info2_body"] a')
+
+        movies_info_html = page.search('div.st_movie_info')
+        movies_info = movies_info_html.collect do |div|
+          info = {}
+          info[:title] = div.search('div.st_movie_info_desc_battle_vs').text
+          date = div.search('div.st_movie_info_desc_battle_date span')
+          info[:date] = Time.parse(date[0].text)
+          info[:result] = date[1].text
+          info[:movie] = div.search('div.st_movie_info_desc_movie').text
+
+          # if completed...
+
+          div.search('div.st_movie_info_datetime_date').each do |d|
+            case d.text
+            when /完成日時: (20.*?)/
+              info[:encoded_at] = Time.parse($1)
+            when /完成日時: \[(.*?)\]/
+              info[:encode_status] = $1
+            when /発注日時: (20.*?)/
+              info[:requested_at] = Time.parse($1)
+            when /購入日時: (20.*?)/
+              info[:bought_at] = Time.parse($1)
+            when /ダウンロード期限: (20.*?)/
+              info[:download_limit] = Time.parse($1)
+            when /残りダウンロード回数: (\d+)回/
+              info[:download_left] = $1.to_i
+            end
+          end
+
+          id = div.search('*/@u')[0].to_s
+
+          if thumbnail = div.search('div.st_movie_info_thumbnail_mini_all')
+            info[:thumbnails] = thumbnail.search('a/@href').collect(&:to_s)
+          end
+          if download = div.search('span.st_reserve_menu_download_l a/@href')[0]
+            info[:url] = (page.uri + download.to_s).to_s unless download.to_s.blank?
+          end
+          if purchase_url = div.search('span.st_reserve_menu_purchase_l a/@href')[0]
+            info[:purchase_url] = (page.uri + purchase_url.to_s).to_s
+          end
+          if delete_url = div.search('span.st_reserve_menu_delete_l a/@href')[0]
+            info[:delete_url] = page.uri + delete_url.to_s
+          end
+
+          game = Game.parse_replay(@agent, id)
+          Movie.new(info, game)
+        end
+        movies_info
+      end
+
+    end
+  end
+end
+ 

data/lib/www/enbujyo/player.rb

@@ -1,4 +1,3 @@
-require 'www/enbujyo/util'
 
 module WWW
   class Enbujyo

data/lib/www/enbujyo.rb

@@ -7,17 +7,22 @@ require 'tempfile'
 require 'fileutils'
 require 'nkf'
 require 'json'
+require 'uri'
 
+require 'www/enbujyo/helper'
 require 'www/enbujyo/player'
 require 'www/enbujyo/deck'
 require 'www/enbujyo/location'
 require 'www/enbujyo/game'
+require 'www/enbujyo/my_movie'
 
 #
 # SEGA の三国志大戦公式サイトへアクセスするライブラリ.
 #
 module WWW
   class Enbujyo
+    include Utils
+
     attr_accessor :mail, :password
     attr_reader :agent
 
@@ -31,6 +36,8 @@ module WWW
       unless @agent
         @agent = WWW::Mechanize.new
         @agent.user_agent_alias = 'Windows Mozilla'
+        @agent.extend ExtendedAgent
+        @agent.autologin = @options['autologin']
       end
     end
 
@@ -47,7 +54,7 @@ module WWW
 
     def get_player_user(reload = false)
       if reload or not @player_user
-        auth_get(@agent, 'http://enbujyo.3594t.com/members/player/index.html')
+        @agent.auth_get 'http://enbujyo.3594t.com/members/player/index.html'
         @player_user = get_player_data(@agent)
       end
       @player_user
@@ -86,107 +93,26 @@ module WWW
     end
 
     def get_selection_info
-      @agent.post('http://enbujyo.3594t.com/members/selection/selection.cgi', {
+      page = @agent.post('http://enbujyo.3594t.com/members/selection/selection.cgi', {
         'mode' => 'latest',
         'version' => 1
       })
-      json = hack_json(@agent.page.body)
-      obj = JSON.parse(json)
-      rep = obj['replay'][0]
-
-      p0, p0deck, p0loc = get_selection_info_build('p0', rep)
-      p1, p1deck, p1loc = get_selection_info_build('p1', rep)
-
-      game = WWW::Enbujyo::Game.new(p0, p0deck, p0loc, p1, p1deck, p1loc, rep)
-      game
-    end
-
-    def get_selection_info_build(prefix, rep)
-      deck = Deck.new
-      rep.keys.grep(/#{prefix}card_params_\d/).sort.each{|k|
-        deck.cards.push WWW::Enbujyo::Card.parse_from_jsonstr(rep[k])
-      }
-      %w|0 1|.each do |num|
-        next unless rep[prefix+'staff_image_'+num]
-
-        deck.gcards.push(WWW::Enbujyo::Gunshi.new(
-          :image => rep[prefix+'staff_image_'+num],
-          :level => rep[prefix+'staff_level_'+num],
-          :longname => rep[prefix+'staff_name_'+num],
-          :team => rep[prefix+'staff_seiryoku_name_'+num],
-          :attribute => rep[prefix+'staff_zokusei_name'],
-          :strategy => rep[prefix+'strategy_name'],
-          :ex => rep[prefix+'skill_ex_name']
-        ))
-      end
-      player = WWW::Enbujyo::Player.new(
-        :name => rep[prefix+'name'],
-        :name_image_url => rep[prefix+'image'],
-        :team => rep[prefix+'team_name'],
-        :title => rep[prefix+'grade_name'],
-        :brave => rep[prefix+'brave'],
-        :brave_desc => rep[prefix+'brave_desc'],
-        :rank => rep[prefix+'rank'],
-        :wins => rep[prefix+'win'],
-        :loses => rep[prefix+'lose'],
-        :rate => rep[prefix+'win_rate']
-      )
-      location = WWW::Enbujyo::Location.new(
-        :pref => rep[prefix+'pref_name'],
-        :office => rep[prefix+'office']
-      )
-      return [player, deck, location]
+      Game.parse(page.body)
     end
 
     def download_selection(movie_type = 's')
       movie_date = (Time.now - 60*60*17).strftime("%Y%m%d")  # 17時で切り替え/JST前提
-      auth_get(@agent, 'http://enbujyo.3594t.com/members/selection/index.html')
-
-      tmpname = "_enbujyo_download.#{random_string}.wmv"
-      open(tmpname, 'w'){|tmp|
-        tmp.print @agent.get_file("http://download.enbujyo.3594t.com/selection_download.cgi?date=#{movie_date}&type=#{movie_type}")
-      }
-      filename = "selection_#{movie_date}.wmv"
-      if @agent.page.response['content-disposition']
-        /filename="(.*\.wmv)"/ =~ @agent.page.response['content-disposition']
-        filename = windows? ? $1 : NKF.nkf('-Sw', $1)
-      end
-      FileUtils.mv(tmpname, filename)
-      puts "Downloading #{filename} has finished." unless silent?
-      filename
-    end
+      @agent.auth_get 'http://enbujyo.3594t.com/members/selection/index.html'
 
-    private
-    def random_string(length = 10, strings = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789')
-      Array.new(length).map{ strings[rand(strings.size),1] }.join
+      download_movie(@agent, "http://download.enbujyo.3594t.com/selection_download.cgi?date=#{movie_date}&type=#{movie_type}")
     end
 
-    def windows?
-      RUBY_PLATFORM.downcase =~ /mswin(?!ce)|mingw|cygwin|bccwin/
+    def my_movies
+      m = WWW::Enbujyo::MyMovie.new(@agent)
+      m.parse
     end
 
     def silent?
-      @options[:silent]
-    end
-
-    def auto_relogin?
-      @options[:auto_relogin]
-    end
-
-    def auth_get(agent, url)
-      ret = agent.get(url)
-      if /error/i =~ agent.page.uri.to_s or /エラー/ =~ agent.page.title 
-        if auto_relogin?
-          login
-        else
-          raise LoginError
-        end
-      end
-      ret
-    end
-
-    def hack_json(jsonstr)
-      jsonstr.sub(/^\w+=/,'').gsub(/\},.*\]/m, '}]')
     end
 
   end

data/test/www-enbujyo_test.rb

@@ -38,6 +38,15 @@ class WwwEnbujyoTest < Test::Unit::TestCase
         assert game.location1.is_a? WWW::Enbujyo::Location
       end
     end
+
+    context "my_movies method" do
+      should "return my movie information list" do
+        @agent.login
+        movies = @agent.my_movies
+        assert movies.length >= 5
+      end
+    end
+
   end
 end
 

data/www-enbujyo.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{www-enbujyo}
-  s.version = "0.1.7"
+  s.version = "0.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["holysugar"]
-  s.date = %q{2009-08-28}
+  s.date = %q{2009-09-06}
   s.email = %q{holysugar@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -22,9 +22,11 @@ Gem::Specification.new do |s|
      "lib/www/enbujyo.rb",
      "lib/www/enbujyo/deck.rb",
      "lib/www/enbujyo/game.rb",
+     "lib/www/enbujyo/helper.rb",
      "lib/www/enbujyo/location.rb",
+     "lib/www/enbujyo/movie.rb",
+     "lib/www/enbujyo/my_movie.rb",
      "lib/www/enbujyo/player.rb",
-     "lib/www/enbujyo/util.rb",
      "test/test_helper.rb",
      "test/www-enbujyo_test.rb",
      "www-enbujyo.gemspec"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: holysugar-www-enbujyo
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors: 
 - holysugar
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-28 00:00:00 -07:00
+date: 2009-09-06 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -32,15 +32,16 @@ files:
 - lib/www/enbujyo.rb
 - lib/www/enbujyo/deck.rb
 - lib/www/enbujyo/game.rb
+- lib/www/enbujyo/helper.rb
 - lib/www/enbujyo/location.rb
+- lib/www/enbujyo/movie.rb
+- lib/www/enbujyo/my_movie.rb
 - lib/www/enbujyo/player.rb
-- lib/www/enbujyo/util.rb
 - test/test_helper.rb
 - test/www-enbujyo_test.rb
 - www-enbujyo.gemspec
 has_rdoc: true
 homepage: http://github.com/holysugar/www-enbujyo
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -61,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: TODO

data/lib/www/enbujyo/util.rb

@@ -1,26 +0,0 @@
-# -*- mode:ruby; coding:utf-8 -*-
-
-module WWW
-  class Enbujyo
-    module Util
-      ch_number_table = {
-        '〇' => 0,
-        '一' => 1,
-        '二' => 2,
-        '三' => 3,
-        '四' => 4,
-        '五' => 5,
-        '六' => 6,
-        '七' => 7,
-        '八' => 8,
-        '九' => 9,
-        '十' => 10,
-      }
-      def self.ch_to_i(chinesenumber)
-        ch_number_table[chinesenumber]
-      end
-    end
-  end
-end
-
-