toggl-jobcan 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c00b08fdda200e0497122388bb5d2db2c99900e402bcb1f5a010159e19a590e6
-  data.tar.gz: 24b1c959733b880de6da0df91abcace2ff1968038869f76fc3741410211e6847
+  metadata.gz: 244e975f62315605010d0406d950787e3ee36e185e0ee44047906ac0ec733ef9
+  data.tar.gz: 3597150dc8da666f61eead6e61e3aa24176a0c6fb84cbe013f905db779771ab6
 SHA512:
-  metadata.gz: ef121f202a902d3455b7b5e3dd30b47eef1b6a2b0548a962ef4673f13f3dc1c63933cfdc68d0eb351eb5afd36f9724258b70156044c8619ce45c83fd980e1775
-  data.tar.gz: 763dc53f7743d916cf1dad3b946f63689affb2f1f2955d052d53e91b9b0f9561e2a99841a90fc70d2b33fef7c3960442a37ad979a612019042e258faf9ec194c
+  metadata.gz: 5c9c96bd57d7638a9c84a50eed6564a59e863bf6dd20956cf091445119e9cc0a3c27add50a2b5746a5d7da9661795c5d006e29357dfb5089c15341d6d7475131
+  data.tar.gz: db76e625afd07b6fa2eff0433f037f4f3e7bc02826c85d9f1320153d44aecb1959c79a9dec6625edcdbacb2506ec3adcaa9727e10036ae63eeeae54beb1feb4a

data/.rubocop.yml

@@ -1,2 +1,5 @@
 AllCops:
   TargetRubyVersion: 2.5
+
+Metrics/AbcSize:
+  Max: 20

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    toggl-jobcan (0.1.0)
+    toggl-jobcan (0.3.0)
       chromedriver-helper
       selenium-webdriver
-      toggl-worktime (>= 0.2.0)
+      toggl-worktime (~> 0.3.0, >= 0.3.2)
 
 GEM
   remote: https://rubygems.org/
@@ -15,22 +15,22 @@ GEM
     byebug (10.0.2)
     childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
-    chromedriver-helper (1.2.0)
+    chromedriver-helper (2.1.0)
       archive-zip (~> 0.10)
       nokogiri (~> 1.8)
     coderay (1.1.2)
     diff-lcs (1.3)
-    faraday (0.14.0)
+    faraday (0.15.3)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.23)
+    ffi (1.9.25)
     io-like (0.3.0)
     logger (1.2.8)
     method_source (0.9.0)
     mini_portile2 (2.3.0)
     multipart-post (2.0.0)
-    nokogiri (1.8.2)
+    nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
-    oj (3.5.0)
+    oj (3.6.10)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -51,11 +51,11 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
-    rubyzip (1.2.1)
-    selenium-webdriver (3.11.0)
+    rubyzip (1.2.2)
+    selenium-webdriver (3.14.0)
       childprocess (~> 0.5)
       rubyzip (~> 1.2)
-    toggl-worktime (0.2.0)
+    toggl-worktime (0.3.2)
       awesome_print
       togglv8
     togglv8 (1.2.1)

data/README.md

@@ -14,11 +14,15 @@ gem 'toggl-jobcan'
 
 And then execute:
 
-    $ bundle
+```console
+bundle
+```
 
 Or install it yourself as:
 
-    $ gem install toggl-jobcan
+```console
+gem install toggl-jobcan
+```
 
 ## Configuration
 
@@ -28,8 +32,9 @@ Prepare `~/.toggl_worktime` for [Toggl::Worktime](https://github.com/limitusus/t
 
 Prepare `~/.jobcan` YAML file that includes:
 
+From v0.3.0 you need to specify *Jobcan ID*, not *Jobcan Attendance ID*. For details read the [documentation by Jobcan](https://jobcanwf.zendesk.com/hc/ja/articles/224910508).
+
 ```yaml
-client_id: YOUR_CLIENT_ID
 email: YOUR_EMAIL_ADDRESS
 password: YOUR_PASSWORD
 ```
@@ -58,7 +63,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/limitusus/toggl-jobcan. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at [limitusus/toggl-jobcan](https://github.com/limitusus/toggl-jobcan). This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 

data/exe/toggl-jobcan

@@ -22,8 +22,10 @@ opt.on('--dryrun') { |v| dryrun = v }
 opt.parse!(ARGV)
 
 raise RangeError, 'No dates given' if ARGV.empty?
+
 target_days = ARGV.map do |s|
   raise RangeError, 'Invalid format' unless s.match?(/\d#{8}/)
+
   Date.parse(s)
 end
 
@@ -46,12 +48,12 @@ puts 'Driver ready'
 
 target_days.each do |date|
   puts "Input date: #{date}"
-  jobcan.navigate_to_attendance_modify_day(date)
   working_times = jobcan.fetch_toggl_worktime(date).flatten
   if working_times.any?(&:nil?)
     puts 'Includes nil data: skip'
     next
   end
+  jobcan.navigate_to_attendance_modify_day(date)
   jobcan.input_day_worktime(date, working_times)
   sleep 1
   puts "  - Finish: #{date}; Total time: #{jobcan.toggl.total_time}"

data/lib/toggl/jobcan/client.rb

@@ -8,9 +8,13 @@ module Toggl
       attr_reader :driver
       attr_reader :toggl
 
+      class JobcanLoginFailure < StandardError; end
+
       include Toggl::Jobcan::TogglSupport
 
       JOBCAN_URLS = {
+        login: 'https://id.jobcan.jp/users/sign_in',
+        attendance_login: 'https://ssl.jobcan.jp/jbcoauth/login',
         attendance: 'https://ssl.jobcan.jp/employee/attendance',
         attendance_modify: 'https://ssl.jobcan.jp/employee/adit/modify/'
       }.freeze
@@ -18,8 +22,8 @@ module Toggl
       XPATHS = {
         notice: %(//textarea[@name='notice']),
         load_button: %(//input[@value='表示']),
-        submit: %(//button[@type='submit']),
-        password_label: %(//label[@for='password'])
+        submit: %(//input[@type='submit']),
+        flash: %(//p[@class='flash flash__alert'])
       }.freeze
 
       def initialize(
@@ -38,20 +42,20 @@ module Toggl
       end
 
       def login
-        @driver.navigate.to JOBCAN_URLS[:attendance]
-        # login if <label for="password"> exists
-        return unless may_find_element(:xpath, XPATHS[:password_label])
+        @driver.navigate.to JOBCAN_URLS[:login]
         send_credentials
         @driver.find_element(:xpath, XPATHS[:submit]).click
-        # attendance again
+        raise JobcanLoginFailure if may_find_element(:xpath, XPATHS[:flash])
+
+        # attendance login
+        @driver.navigate.to JOBCAN_URLS[:attendance_login]
         @driver.navigate.to JOBCAN_URLS[:attendance]
       end
 
       def send_credentials
         [
-          ['client_id', :client_id],
-          ['email', :email],
-          ['password', :password]
+          ['user_email', :email],
+          ['user_password', :password]
         ].each do |id, method|
           element = @driver.find_element(:id, id)
           element.send_keys(@credentials.send(method))

data/lib/toggl/jobcan/credentials.rb

@@ -6,14 +6,13 @@ module Toggl
   module Jobcan
     # Jobcan credentials manager
     class Credentials
-      attr_accessor :client_id
       attr_accessor :email
       attr_accessor :password
 
-      ATTRS = %i[client_id email password].freeze
+      ATTRS = %i[email password].freeze
 
       def initialize(args)
-        attr_set(args) if args.key?(:client_id)
+        attr_set(args) if args.key?(:email)
         c = self.class.load_config(args[:path])
         attr_set(c)
       end

data/lib/toggl/jobcan/version.rb

@@ -2,6 +2,6 @@
 
 module Toggl
   module Jobcan
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

data/toggl-jobcan.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'chromedriver-helper'
   spec.add_dependency 'selenium-webdriver'
-  spec.add_dependency 'toggl-worktime', '~> 0.3.0'
+  spec.add_dependency 'toggl-worktime', '~> 0.3.0', '>= 0.3.2'
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'pry-byebug'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toggl-jobcan
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Tomoya Kabe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-01 00:00:00.000000000 Z
+date: 2018-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chromedriver-helper
@@ -45,6 +45,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,6 +55,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement