lyne 0.0.2.5 → 0.0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea1d82a183033607f858c72013a2525cc4c8511f
-  data.tar.gz: 7269371389a1217d40c60ce4cc97e3a550e5b695
+  metadata.gz: f873cc06ede289851018df24a5f9ad86f451ac55
+  data.tar.gz: 725e0496085d265e335c5a641addcc5dec9db7eb
 SHA512:
-  metadata.gz: 04830c3f87a9369e6f3451b875980fd462a7d3f17b913bbc08dc431f66af85d98aa288175377dd56114779718d497008dabef145036f36cda1a5a87028626024
-  data.tar.gz: 356c406dec1a188e0fd8ef63312f4112de4c32c0ad180268a24ff0f979cbb140b3b0fa56ae14b7604ec0d9479e9c089275d33e253679ad5d7d9dff54581aa748
+  metadata.gz: a5fd513d89731a80cb20ca98f9dce234cb2e2700e3fcac87436d4e1a3c1758ef6ba12c4e74d6be6f525568079999837493c06fcd4d01c0f9a62dfd13775d64db
+  data.tar.gz: 0eb76a15a2209c734c178ef030e0f4a5bb16929a0c4be4143716020321d75cff90d623cad87fe22c892ed7976ae35bc44beb55c1a20d4d2ac3360a2b8921cfba

data/README.md

@@ -35,19 +35,58 @@ dqx = Lyne::Account.new(
 )
 
 chara = dqx.character
+```
+
+### Info Class
 
+```ruby
 info = chara.info
 info.id   #=> "TV327-610"
 info.name #=> "ソプラナ"
 # フレンド申請おｋ
+```
+
+```
+# id name job tribe level next_level gold genki_charge
 
+> info.show_table
+
++---------+--------+--------------+------+------+--------------+----------+------------+
+|ID       |名前    |職業          |種族  |レベル|次のレベルまで|所持金    |元気チャージ|
++---------+--------+--------------+------+------+--------------+----------+------------+
+|TV327-610|ソプラナ|バトルマスター|エルフ|80    |              |2,340,609G|209時間     |
++---------+--------+--------------+------+------+--------------+----------+------------+
+```
+
+### House Class
+
+```ruby
 house = chara.house
-house.country      #=> "アズラン住宅村"
-house.city         #=> "おごそかな林道地区"
+house.city         #=> "アズラン住宅村"
+house.area         #=> "おごそかな林道地区"
 house.house_number #=> "3849丁目 6番地 （Ｓサイズ）"
 # 遊びにきておｋ
 ```
 
+```
+# city area house_number setting setting_type
+
+> house.show_table
+
++--------------+------------------+-------------------------+----------------------+------------------------+
+|町            |地区              |番地                     |ウェルカム設定        |設定内容                |
++--------------+------------------+-------------------------+----------------------+------------------------+
+|アズラン住宅村|おごそかな林道地区|3849丁目6番地（Ｓサイズ）|ウェルカムハウス設定中|インテリアじまん・その他|
++--------------+------------------+-------------------------+----------------------+------------------------+
+```
+
+### キャラチェンジ
+
+```ruby
+chara = dqx.character
+chara.change('122233333444') #=> character_idを指定
+```
+
 # test
 
 ```bash

data/lib/lyne.rb

@@ -12,7 +12,7 @@ require './lib/lyne/session/browser.rb'
 require './lib/lyne/parser/base.rb'
 require './lib/lyne/parser/home.rb'
 require './lib/lyne/page/hook.rb'
-#require './lib/lyne/page/show_table.rb'
+require './lib/lyne/page/show_table.rb'
 require './lib/lyne/page/character.rb'
 
 module Lyne

data/lib/lyne/page/character.rb

@@ -3,7 +3,7 @@ module Lyne::Page
   # Character情報に紐づくオブジェクト
   module Character
     class Base
-      #include Lyne::Page::ShowTable
+      include Lyne::Page::ShowTable
 
       def initialize session
         @parser = parser_class.new(session)
@@ -24,7 +24,7 @@ module Lyne::Page
 
         private
         def table_headers
-          %w(ID 名前 種族 職業 レベル 次のレベルまで 所持金 元気チャージ)
+          %w(ID 名前 職業 種族 レベル 次のレベルまで 所持金 元気チャージ)
         end
 
         def table_rows
@@ -38,10 +38,18 @@ module Lyne::Page
       end
 
       class House < Lyne::Page::Character::Base
-        PROPERTYS = %w(country city house_number setting setting_type)
+        PROPERTYS = %w(city area house_number setting setting_type)
         include Lyne::Page::Hook::CreateProperty
 
         private
+        def table_headers
+          %w(町 地区 番地 ウェルカム設定 設定内容)
+        end
+
+        def table_rows
+          [city, area, house_number, setting, setting_type]
+        end
+
         def parser_class
           Lyne::Parser::House
         end

data/lib/lyne/page/show_table.rb

@@ -1,12 +1,73 @@
-#module Lyne::Page
-#  module ShowTable
-#    def show_table
-#      table = Kosi::Table.new({header: table_headers})
-#      print table.render([table_rows])
-#    end
-#
-#    private
-#    def table_headers; [] end
-#    def table_rows;    [] end
-#  end
-#end
+class String
+  def byte_size
+    hankaku = self.scan(/[ -~｡-ﾟ]/).size
+    zenkaku = (self.size - hankaku)*2
+    hankaku + zenkaku
+  end
+end
+
+module Lyne::Util
+  class TerminalTable
+    def initialize header
+      @header = header
+      @table  = []
+    end
+
+    def render rows
+      rows = rows.map{|r| r.nil? ? '' : r}
+      if @header.size > rows.size
+        rows = rows + Array.new(@header.size - rows.size, '')
+      else
+        @header = @header + Array.new(rows.size - @header.size, '')
+      end
+
+      table       = width(@header.zip(rows))
+      width_list  = table.map{|t|t[0]}
+      table_width = width_list.inject(&:+)
+      @width = "+#{width_list.map{|w| "#{'-'*w}+"}.join}"
+
+      puts_row
+
+      rows = [@header] + [rows]
+      rows.each_with_index do |row, i|
+        table_row = ''
+        row.each_with_index do |r, j|
+          blank_size = width_list[j] - r.byte_size
+          table_row += "#{r}#{" "*blank_size}|"
+        end
+        puts "|#{table_row}"
+        puts_row if i == 0
+      end
+      puts_row
+    end
+
+    private
+    def puts_header
+      puts "|#{@header.join(' ')}|"
+      puts "|#{@rows[0].join(' ')}|"
+    end
+
+    def puts_row
+      puts @width
+    end
+
+    def width table
+      table.inject([]) do |new_table, old_table|
+        new_table << old_table.unshift(old_table.map{|t| t.nil? ? 0 : t.byte_size}.max)
+        new_table
+      end
+    end
+  end
+end
+
+module Lyne::Page
+  module ShowTable
+    def show_table
+      Lyne::Util::TerminalTable.new(table_headers).render(table_rows)
+    end
+
+    private
+    def table_headers; [] end
+    def table_rows;    [] end
+  end
+end

data/lib/lyne/parser/base.rb

@@ -21,12 +21,12 @@ module Lyne::Parser
       raise Lyne::Error::ParseError.new if parse_data.blank?
       option = option.reverse_merge(default_parse_result_options)
       text   = parse_data.children[option[:index]].children.text
-
-      if option[:regexp].present?
-        text.gsub(option[:regexp], '')
-      else
-        text
-      end
+      text   = if option[:regexp].present?
+                 text.gsub(option[:regexp], '')
+               else
+                 text
+               end
+      text.gsub(/\s|#{nbsp}/,'')
     end
 
     def default_parse_result_options

data/lib/lyne/parser/home.rb

@@ -55,19 +55,27 @@ module Lyne::Parser
   end
 
   class House < Home
-    def country
+    def city
       text = get_parse_data(index: 3)
       text.split[0].scan(/.*住宅村/)[0] if text.present?
     end
 
-    def city
+    def area
       text = get_parse_data(index: 3)
-      text.split[0].gsub(/#{country}/,'') if text.present?
+      if text.present? && text =~ /\d/
+        text[0...text.index(/\d/)].gsub(/#{city}/,'')
+      else
+        nil
+      end
     end
 
     def house_number
       text = get_parse_data(index: 3)
-      text.split[1] if text.present?
+      if text.present? && text =~ /\d/
+        text[text.index(/\d/)..-1]
+      else
+        nil
+      end
     end
 
     def setting

data/lib/lyne/version.rb

@@ -1,3 +1,3 @@
 module Lyne
-  VERSION = "0.0.2.5"
+  VERSION = "0.0.2.6"
 end

data/spec/character/info_spec.rb

@@ -38,8 +38,8 @@ describe Lyne::Page::Character do
     context 'Houseが取得できているる' do
       subject{ @character.house }
 
-      context 'countryが取得できている' do
-        it { expect(subject.country).to match(/.*住宅村$/) }
+      context 'cityが取得できている' do
+        it { expect(subject.city).to match(/.*住宅村$/) }
       end
 
       context 'house_numberが取得できている' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lyne
 version: !ruby/object:Gem::Version
-  version: 0.0.2.5
+  version: 0.0.2.6
 platform: ruby
 authors:
 - soplana
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2014-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler