witei_web_api 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff86af65124a22f14b2a6c047eba2dfd8a326fd61e44cc46b7e2b68173dc1886
-  data.tar.gz: d0090260665754d8d95ae9c51b2e11dd8be4d09ff8f06e1db33bf3d97a90fc26
+  metadata.gz: ef7ae971b1b5c8710e2d84df99059690b8d5793c0357be1eec2a330f19dc8898
+  data.tar.gz: 34c882511b11b6e9bb56e9bc30480d4e08023f44aa4f5afb26f03e817e1216bf
 SHA512:
-  metadata.gz: 1e70f5a774f33a57a3326f1c73d4048bc0f9d1d3e5fab51c72c2f652031f007d735e87070d8b9100d65fd6373748a1fde5d0b9d18c7402b809707a75bf6a59d6
-  data.tar.gz: ce07c85a6c082e61f181db5d0a4b61573ac25e060ffd52fb4b45ffac10332943dde6deda7dbdd947be4a8d3217664b520284394955dca0655bbee48722aa8ffe
+  metadata.gz: 0aac2f6a738ecb3f8526a4c03eac43b29282060f51cba3b04cf57455c5b0bd451f23ff5164674079b32cd2b1dc3e92275e3cc3440b848e077fd9330d45803b6c
+  data.tar.gz: 1ad0754a9ff942f9f9996eaea74ee714a693a43be13647f2e20f91a0ad3da967a5c9662d272aef0840e0dce516cb513f1f6560fc3384cdd4ddffe7b6fee1eae1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    witei_web_api (0.1.2)
+    witei_web_api (0.2.0)
       activemodel (~> 5.0)
       mechanize (~> 2.7)
 
@@ -92,4 +92,4 @@ DEPENDENCIES
   yard (~> 0.9, >= 0.9.11)
 
 BUNDLED WITH
-   1.16.4
+   1.17.1

data/lib/witei_web_api/base.rb

@@ -9,25 +9,23 @@ module WiteiWebApi
     def self.agent
       Thread.current[:witei_web_api_agent] ||= begin
         agent = WiteiWebApi::Agent.new
-        login!(agent)
+        login(agent)
         agent
       end
     end
 
-    def self.login(agent, login, password)
-      page = agent.get 'https://witei.com/pro/accounts/login/?next=/pro/agencies/dashboard/'
+    def self.login(agent, login: WiteiWebApi.login, password: WiteiWebApi.password, uri: nil)
+      uri ||= '/pro/agencies/dashboard/'
+      page = agent.get("https://witei.com/pro/accounts/login/?next=#{CGI.escape(uri)}")
 
-      form = page.form_with class: 'form-horizontal'
+      form = page.form_with(class: 'form-horizontal')
       form.login = login
       form.password = password
-      x = form.submit
-      x.uri.path == '/pro/agencies/dashboard/'
-    end
-
-    def self.login!(agent)
-      unless login(agent, WiteiWebApi.login, WiteiWebApi.password)
+      new_page = form.submit
+      if new_page.uri.path != URI.parse(uri).path
         raise(LoginFailedException.new)
       end
+      new_page
     end
 
     def self.has_one(name, &block)
@@ -39,7 +37,22 @@ module WiteiWebApi
       end
     end
 
+    def self.get(uri)
+      page = agent.get("https://witei.com#{uri}")
+      uri_path = URI.parse(uri).path
+      if page.uri.path != uri_path
+        page = login(agent, uri: uri)
+        if page.uri.path != uri_path
+          raise LoggedOutException.new("Cannot get #{uri}")
+        end
+      end
+      page
+    end
+
     class LoginFailedException < Exception
     end
+
+    class LoggedOutException < Exception
+    end
   end
 end

data/lib/witei_web_api/contact.rb

@@ -4,7 +4,7 @@ class WiteiWebApi::Contact < WiteiWebApi::Base
   has_one(:commercial) { WiteiWebApi::OfficeUser }
 
   def self.find(id)
-    page = agent.get "https://witei.com/pro/agencies/contact/#{id}/update/"
+    page = get("/pro/agencies/contact/#{id}/update/")
     form = page.forms_with(css: '.form-horizontal').first
 
     contact = new

data/lib/witei_web_api/house.rb

@@ -8,11 +8,8 @@ class WiteiWebApi::House < WiteiWebApi::Base
   has_one(:creator) { WiteiWebApi::OfficeUser }
 
   def self.find(identifier)
-    page = agent.get "https://witei.com/pro/agencies/houses/list/?_hidden__action_identifier_bcd32c=unacc_eq&_hidden_identifier_bcd32c=#{identifier}&listView=block"
-    id = page.css('#id_houses_0').first['value']
-p id
-
-    page = agent.get "https://witei.com/pro/house/update/#{id}/"
+    id = id_by_identifier(identifier)
+    page = get("/pro/house/update/#{id}/")
 
     form = page.forms_with(css: '.form-horizontal').first
 
@@ -26,4 +23,9 @@ p id
     )
     house
   end
+
+  def self.id_by_identifier(identifier)
+    page = get("/pro/agencies/houses/list/?_hidden__action_identifier_bcd32c=unacc_eq&_hidden_identifier_bcd32c=#{identifier}&listView=block")
+    page.css('#id_houses_0').first['value']
+  end
 end

data/lib/witei_web_api/office_user.rb

@@ -1,12 +1,8 @@
 class WiteiWebApi::OfficeUser < WiteiWebApi::Base
   attr_accessor :id, :name, :email, :phone
 
-  # def self.all
-  #   agent.get 'https://witei.com/pro/agencies/account_management/agency_users/'
-  # end
-
   def self.find(id)
-    page = agent.get "https://witei.com/pro/agencies/account_management/agency/user_update/#{id}/"
+    page = get("/pro/agencies/account_management/agency/user_update/#{id}/")
 
     form = page.forms_with(css: '.form-horizontal').first
 

data/lib/witei_web_api/version.rb

@@ -1,3 +1,3 @@
 module WiteiWebApi
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: witei_web_api
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Dmitry Polushkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-31 00:00:00.000000000 Z
+date: 2019-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler