portal_scraper 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 33892f3c3d5127d2a1330f14ef249281e9de97b4
-  data.tar.gz: 8063f1e877d9f6da2f18784b12f12b70cde6993f
+SHA256:
+  metadata.gz: c17340a2ba668c837521fc740a1b2f6f845e79f689121e351c0a46d3929de5ab
+  data.tar.gz: a9e36eea49ee51e7d0128f9cc706839983ef9dcafd8e584823527725c660e1ab
 SHA512:
-  metadata.gz: 397013f41893a3f0cb9d461e736cc23248e8ba20b1bdabf0894d2f6ed262c3d741802c0d1f671ae183556ec7e55625cad5674aa5888a3d0936b971f478a8663d
-  data.tar.gz: a677e1c67c6dd0f4e23a9bcffecadbc8e0b4a9fbf563379ee0900ea6028f9c878ecfa02901d17cc2c0155d405c3600409be99f58a60e163bad4432f57a79b156
+  metadata.gz: b188d4e98c4e8cf0cedc6e474cdaae9cb7de80f40e96776f94fbb2aff476bd2bb0a4b44aae497b29481104e80d139137adf76e19133a45c1c76a370c39075970
+  data.tar.gz: b711ef1ff9de12d9c51460e7df2e8b71717bf11154bc31d84fb960a17f587606b1ffde83080caa94cd172eac3065a9acde01f5e0c951877c5aa477b85b29f0c6

data/lib/portal_scraper.rb

@@ -1,4 +1,6 @@
 require 'portal_scraper/accounts/client'
+require 'portal_scraper/bad_root_url'
+require 'portal_scraper/bad_login_url'
 
 module PortalScraper
   Config = Struct.new(:root_url, :app_id, :secret, :login_url, :token_url)

data/lib/portal_scraper/accounts/client.rb

@@ -3,27 +3,38 @@ require 'mechanize'
 module PortalScraper
   module Accounts
     class Client
-      attr_accessor :app_id, :secret
+      attr_accessor :_app_id, :_secret
 
       def initialize(app_id = nil, secret = nil)
-        @app_id = app_id || config.app_id
-        @secret = secret || config.secret
+        _app_id = app_id || config.app_id
+        _secret = secret || config.secret
+        raise BadRootUrl unless config.root_url =~ URI::regexp
+      end
+
+      def try_form_fields(form, fields, value)
+        fields.each do |field|
+          if form.respond_to?("#{field}=")
+            form.send("#{}=", value)
+            break
+          end
+        end
       end
 
       def login
+        raise BadLoginUrl if config.login_url.nil?
         app.get(url_for(config.login_url)) do |login_page|
-          login_page.form_with(name: /login/i) do |creds|
-            creds.username = app_id
-            creds.password = secret
-          end.submit
+          form          = login_page.form_with(name: /login/i) || login_page.forms[0]
+          try_form_fields(form, %i(username login), _app_id)
+          try_form_fields(form, %i(password secret), _secret)
+          form.submit
         end
-        app.get(url_for(config.token_url))
+        app.get(url_for(config.token_url)) unless config.token_url.nil?
       end
 
       def get_accounts_balance
         login
         accounts_data = { accounts: [] }
-        results = app.post(url_for('/appRecherche.do'), { nom: '', prenom: '', chercher: 'Chercher' })
+        results       = app.post(url_for('/appRecherche.do'), { nom: '', prenom: '', chercher: 'Chercher' })
         results.links_with(href: /appTiersDetail.do/).each do |link|
           account = link.click
           accounts_data[:accounts] << {

data/lib/portal_scraper/bad_login_url.rb

@@ -0,0 +1,6 @@
+require 'portal_scraper/portal_scraper_error'
+
+module PortalScraper
+  class BadLoginUrl < Error
+  end
+end

data/lib/portal_scraper/bad_root_url.rb

@@ -0,0 +1,6 @@
+require 'portal_scraper/portal_scraper_error'
+
+module PortalScraper
+  class BadRootUrl < Error
+  end
+end

data/lib/portal_scraper/portal_scraper_error.rb

@@ -0,0 +1,4 @@
+module PortalScraper
+  class Error < StandardError
+  end
+end

data/lib/portal_scraper/version.rb

@@ -1,12 +1,11 @@
 module PortalScraper
   class Version
     MAJOR = 1
-    MINOR = 0
-    TINY  = 0
-    PRE   = nil
+    MINOR = 1
+    PATCH = 0
 
     def self.to_s
-      [MAJOR, MINOR, TINY, PRE].compact.join('.')
+      [MAJOR, MINOR, PATCH].compact.join('.')
     end
   end
 end

data/portal-scraper.gemspec

@@ -25,6 +25,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'mechanize', '~> 2.7'
 
   spec.add_development_dependency 'rspec', '~> 3.2'
-  spec.add_development_dependency 'bundler', "~> 1.16"
-  spec.add_development_dependency 'rake', "~> 10.0"
+  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'vcr'
+  spec.add_development_dependency 'webmock'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: portal_scraper
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Armand Mégrot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-14 00:00:00.000000000 Z
+date: 2019-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -66,6 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Scrapping client for extranet portals.
 email:
 - armand.megrot@gmail.com
@@ -75,6 +103,9 @@ extra_rdoc_files: []
 files:
 - lib/portal_scraper.rb
 - lib/portal_scraper/accounts/client.rb
+- lib/portal_scraper/bad_login_url.rb
+- lib/portal_scraper/bad_root_url.rb
+- lib/portal_scraper/portal_scraper_error.rb
 - lib/portal_scraper/version.rb
 - portal-scraper.gemspec
 homepage: https://github.com/cashbee-team/portal_scraper
@@ -97,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Ruby portal scraper