lyne 0.0.2.3 → 0.0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14f9adc6efa4efacd2eab2aca6f7709523fe52f7
-  data.tar.gz: 356b4fae3b80649b12262048d14775136e487c54
+  metadata.gz: ea1d82a183033607f858c72013a2525cc4c8511f
+  data.tar.gz: 7269371389a1217d40c60ce4cc97e3a550e5b695
 SHA512:
-  metadata.gz: 0906bcdeb029cae9efbfaa6562cd3759d97e0969b72d13807935a388a370637e4fe781e880ab7fd0d560e85afb72b16fd5189689a54a875f1e79bd8e22dc93f1
-  data.tar.gz: e22cc22cc5b5d7c9238de7e53ddb9ff647e7392541857b984a39a948bf95130040167ec236a6ad09dfe5470c5212d087254ee77a90809f438b632d769333b7a5
+  metadata.gz: 04830c3f87a9369e6f3451b875980fd462a7d3f17b913bbc08dc431f66af85d98aa288175377dd56114779718d497008dabef145036f36cda1a5a87028626024
+  data.tar.gz: 356c406dec1a188e0fd8ef63312f4112de4c32c0ad180268a24ff0f979cbb140b3b0fa56ae14b7604ec0d9479e9c089275d33e253679ad5d7d9dff54581aa748

data/README.md

@@ -15,7 +15,7 @@ $ brew update && brew install phantomjs
 # use
 
 ```bash
-$ gem install Lyne
+$ gem install lyne
 ```
 ```
 gem 'lyne'
@@ -34,9 +34,18 @@ dqx = Lyne::Account.new(
   character_id: 975829418411224
 )
 
-info = dqx.character.info
+chara = dqx.character
+
+info = chara.info
 info.id   #=> "TV327-610"
 info.name #=> "ソプラナ"
+# フレンド申請おｋ
+
+house = chara.house
+house.country      #=> "アズラン住宅村"
+house.city         #=> "おごそかな林道地区"
+house.house_number #=> "3849丁目 6番地 （Ｓサイズ）"
+# 遊びにきておｋ
 ```
 
 # test

data/lib/lyne/page/character.rb

@@ -58,6 +58,20 @@ module Lyne::Page
         @character = Lyne::Page::Character::Base.new(session)
       end
 
+      def change character_id
+        @session.character_change character_id
+        @character = Lyne::Page::Character::Base.new(@session)
+
+        # CCのタイミングで存在するインスタンス変数を削除
+        Lyne::Page::Character::Target.constants.each do |target|
+          formatted_name = target.to_s.downcase
+          if instance_variable_defined?("@#{formatted_name}")
+            remove_instance_variable("@#{formatted_name}")
+          end
+        end
+        self
+      end
+
       Lyne::Page::Character::Target.constants.each do |target|
         formatted_name = target.to_s.downcase
         define_method(formatted_name) do

data/lib/lyne/parser/home.rb

@@ -56,15 +56,18 @@ module Lyne::Parser
 
   class House < Home
     def country
-      get_parse_data(index: 3).split[0].scan(/.*住宅村/)[0]
+      text = get_parse_data(index: 3)
+      text.split[0].scan(/.*住宅村/)[0] if text.present?
     end
 
     def city
-      get_parse_data(index: 3).split[0].gsub(/#{country}/,'')
+      text = get_parse_data(index: 3)
+      text.split[0].gsub(/#{country}/,'') if text.present?
     end
 
     def house_number
-      get_parse_data(index: 3).split[1]
+      text = get_parse_data(index: 3)
+      text.split[1] if text.present?
     end
 
     def setting
@@ -76,6 +79,12 @@ module Lyne::Parser
     end
 
     private
+    def get_parse_data option
+      super(option)
+    rescue
+      nil
+    end
+
     def parse_target_xpath
       "//div[@id='myHouseStage']"
     end

data/lib/lyne/session/browser.rb

@@ -16,6 +16,8 @@ module Lyne::Session
       Capybara.default_selector = :xpath
       @page = Capybara::Session.new(:poltergeist)
       @page.driver.headers = {'User-Agent' => @options[:user_agent]}
+
+      setup_cache
     end
 
     def start!
@@ -41,6 +43,11 @@ module Lyne::Session
       @page.html
     end
 
+    def character_change character_id
+      go :charaselect
+      go_to_home character_id
+    end
+
     private
     def default_options
       {
@@ -63,5 +70,9 @@ module Lyne::Session
     def character_select_url?
       @page.current_path == "/sc/login/characterselect/"
     end
+
+    def setup_cache
+      @cache = {}
+    end
   end
 end

data/lib/lyne/session/screen_transitions.rb

@@ -6,6 +6,7 @@ module Lyne::Session
         @page.fill_in '_pr_confData_sqexid', with: @options[:account]
         @page.fill_in '_pr_confData_passwd', with: @options[:password]
         @page.find(:xpath, ".//a[@id='btLogin']").click
+        @page.html
       end
     end
 
@@ -15,15 +16,21 @@ module Lyne::Session
       end
     end
 
-    def go_to_home
+    def go_to_home character_id=''
       move_to do
-        @page.find(:xpath, "//a[@rel='#{@options[:character_id]}']").click
+        @page.find(:xpath, "//a[@rel='#{character_id.presence || @options[:character_id]}']").click
+      end
+    end
+
+    def go_to_charaselect
+      move_to do
+        @page.find(:xpath, "//a[@href='/sc/home/characterchange/']").click
       end
     end
 
     def visit_to_home
       move_to do
-        @page.visit('sc/home/')
+        @page.visit('/sc/home/')
       end
     end
 
@@ -31,6 +38,7 @@ module Lyne::Session
     def move_to
       yield
       sleep(2)
+      @cache[@page.current_path] = @page.html
     end
   end
 end

data/lib/lyne/version.rb

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

data/spec/account.yaml.example

@@ -2,3 +2,10 @@ account:
   name:
   password:
   character_id:
+
+# account:
+#   name:         hogehoge
+#   password:     fugafuga
+#   character_id:
+#     - 111111
+#     - 222222

data/spec/character/info_spec.rb

@@ -10,7 +10,7 @@ describe Lyne::Page::Character do
       dqx = Lyne::Account.new({
         account:      @account[:name],
         password:     @account[:password],
-        character_id: @account[:character_id]
+        character_id: @account[:character_id][0]
       })
       @character = dqx.character
     end
@@ -46,5 +46,20 @@ describe Lyne::Page::Character do
         it { expect(subject.house_number).to match(/.*サイズ）$/) }
       end
     end
+
+    if YAML.load_file("./spec/account.yaml")['account']['character_id'][1]
+      context 'キャラチェンジできる' do
+        before(:all) do
+          @id = @character.info.id
+          @other_character = @character.change(@account[:character_id][1])
+        end
+        subject{ @other_character.info }
+
+        context 'キャラチェンジ後とinfo.idが違う' do
+          it { expect(subject.id).not_to match(@id) }
+        end
+      end
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lyne
 version: !ruby/object:Gem::Version
-  version: 0.0.2.3
+  version: 0.0.2.5
 platform: ruby
 authors:
 - soplana