attend 0.1.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 471822b59755387034cbc0d793c8148d27199f8a
-  data.tar.gz: 5551b59d7a3d781e08f14e4e557ec597a97f3492
+SHA256:
+  metadata.gz: 3821ac26f7e464f34f20aebddf9c0ea6ec05a48e2449f7f0761241968e40d9d0
+  data.tar.gz: 66e6a441166ad77a8b4dbbf0d228f323480f37ed6f7b74539de7036c5455c10c
 SHA512:
-  metadata.gz: c98e4a99fb66075256c7343d83f4977749fb1382c96d1e32143d51e5e407796760e56ee28f878e66572628b5ebb029883645609a2ef429fedb5e4c0ea4c5e9a3
-  data.tar.gz: 28448fbbebfdb1de44fafa5c3e617bf5899b3822ff1bad9fa8f56c52fadfd5cac53b6e0f4e5646cec1ebec52297d8aaabfd6ce797fba0ec9ce5fda90bed4aae0
+  metadata.gz: de9de2168901829ef26ea336d63cacabea6b9239a58913df3ec77ac5ba4e4f2106157ac5c324546d177e84442e7284690f6349b745a6483c562ebebfa9542256
+  data.tar.gz: 18a15085d5f615e4ad42889fab043e37ee372ab233907c41069a281b8f663d813c6ef35019cda1e567523b6af4fcc92ebc7e75cc0bd8cd255f335873dd117afa

data/.rubocop.yml

@@ -1,2 +1,7 @@
+AllCops:
+  NewCops: enable
+  TargetRubyVersion: 2.7
 Documentation:
-  Enabled: false
+  Enabled: false
+Layout/LineLength:
+  Max: 120

data/.ruby-version

@@ -1 +1 @@
-2.4.1
+3.0.0

data/.travis.yml

@@ -1,5 +1,6 @@
 sudo: false
 language: ruby
+script: bundle exec rspec
 rvm:
-  - 2.4.1
-before_install: gem install bundler -v 1.15.1
+  - 2.7.2
+  - 3

data/Gemfile.lock

@@ -1,57 +1,80 @@
 PATH
   remote: .
   specs:
-    attend (0.1.0)
-      clamp (~> 1.1)
-      httparty (~> 0.15)
+    attend (2.0.1)
+      clamp (~> 1.3)
+      http (~> 4.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.3.0)
-    clamp (1.1.2)
-    diff-lcs (1.3)
-    httparty (0.15.5)
-      multi_xml (>= 0.5.2)
-    multi_xml (0.6.0)
-    parallel (1.11.2)
-    parser (2.4.0.0)
-      ast (~> 2.2)
-    powerpack (0.1.1)
-    rainbow (2.2.2)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    ast (2.4.2)
+    clamp (1.3.2)
+    diff-lcs (1.4.4)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    ffi (1.15.4)
+    ffi-compiler (1.0.1)
+      ffi (>= 1.0.0)
       rake
-    rake (10.5.0)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    http (4.4.1)
+      addressable (~> 2.3)
+      http-cookie (~> 1.0)
+      http-form_data (~> 2.2)
+      http-parser (~> 1.2.0)
+    http-cookie (1.0.4)
+      domain_name (~> 0.5)
+    http-form_data (2.3.0)
+    http-parser (1.2.3)
+      ffi-compiler (>= 1.0, < 2.0)
+    parallel (1.21.0)
+    parser (3.0.2.0)
+      ast (~> 2.4.1)
+    public_suffix (4.0.6)
+    rainbow (3.0.0)
+    rake (13.0.6)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
-    rubocop (0.49.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.22.0)
       parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.12.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
-    unicode-display_width (1.3.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.12.0)
+      parser (>= 3.0.1.1)
+    ruby-progressbar (1.11.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.8)
+    unicode-display_width (2.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   attend!
-  bundler (~> 1.15)
-  rspec (~> 3.0)
-  rubocop (~> 0.49.1)
+  bundler (~> 2.1)
+  rspec (~> 3.9)
+  rubocop (~> 1.11)
 
 BUNDLED WITH
-   1.15.1
+   2.2.13

data/README.md

@@ -1,35 +1,37 @@
-# Attend
+# Attend [![Build Status](https://travis-ci.org/mckomo/attend.svg?branch=master)](https://travis-ci.org/mckomo/attend)
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/attend`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+Register your attendance at Zoho using CLI.
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Install `attend` Ruby gem:
 
-```ruby
-gem 'attend'
+```bash
+gem install attend
 ```
 
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install attend
+and that's it!
 
 ## Usage
 
-TODO: Write usage instructions here
+First of all you need to set [Zoho Poeople auth token](https://www.zoho.com/people/help/api/auth-token.html) as env variable in your terminal. After that you will be ready to use `attend`.
 
-## Development
+```bash
+export ZOHO_PEOPLE_ROOT_TOKEN='YOUR_TOKEN'
+```
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+To register attendance on current day:
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+```bash
+attend --email "your.employee@email.com" --check_in "10:00" --check_out "18:00"
+# Successfully registered attendance from 2017-07-04T10:00:00+10:00 to 2017-07-04T18:00:00+18:00
+```
 
-## Contributing
+You can also register attendance for a few days:
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/attend.
+```bash
+ attend --email "your.employee@email.com" --check_in "10:00" --check_out "18:00" --from "04/07/2017" --to "07/07/2017"
+ # Successfully registered attendance from 2017-07-04T10:00:00+10:00 to 2017-07-04T18:00:00+18:00
+ # Successfully registered attendance from 2017-07-05T10:00:00+10:00 to 2017-07-05T18:00:00+18:00
+ # ...
+```

data/attend.gemspec

@@ -1,7 +1,6 @@
-# coding: utf-8
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'attend/version'
 
@@ -12,8 +11,10 @@ Gem::Specification.new do |spec|
   spec.email         = ['mckomo@gmail.com']
   spec.license       = 'MIT'
 
-  spec.summary       = 'Register Zoho Poeople attendance using CLI'
-  spec.description   = 'Attend is command line tool that will help you register your Zoho Poeople attendance in fast and easy way'
+  spec.required_ruby_version = '>= 2.7.2'
+
+  spec.summary       = 'Register Zoho People attendance using CLI'
+  spec.description   = 'Attend is CLI tool that will help you register your Zoho People attendance in fast and easy way'
   spec.homepage      = 'https://github.com/mckomo/attend'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
@@ -23,10 +24,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'httparty', '~> 0.15'
-  spec.add_dependency 'clamp', '~> 1.1'
+  spec.add_dependency 'clamp', '~> 1.3'
+  spec.add_dependency 'http', '~> 4.4'
 
-  spec.add_development_dependency 'bundler', '~> 1.15'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.49.1'
+  spec.add_development_dependency 'bundler', '~> 2.1'
+  spec.add_development_dependency 'rspec', '~> 3.9'
+  spec.add_development_dependency 'rubocop', '~> 1.11'
 end

data/exe/attend

@@ -1,54 +1,33 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
+STDOUT.sync = true
 
 require 'clamp'
 require 'date'
-require 'httparty'
 
-AUTH_TOKEN = ENV['ZOHO_PEOPLE_AUTH_TOKEN']
-DATE_FORMAT = 'dd/MM/yyyy HH:mm:ss'
+require_relative '../lib/attend'
 
-parse_date = ->(v) { Date.parse(v) }
+parse_date = Date.method(:parse)
 
 Clamp do
   option '--email', 'EMAIL', 'employee email id', required: true
-  option '--check_in', 'CHECK_IN', 'check in time', required: true
-  option '--check_out', 'CHECK_OUT', 'check out time', required: true
+  option '--check_in', 'CHECK_IN', 'check in time', default: '9:00'
+  option '--check_out', 'CHECK_OUT', 'check out time', default: '17:00'
   option '--from', 'FROM', 'date of the first work day', default: Date.today, &parse_date
   option '--to', 'TO', 'date of the las work day', default: Date.today, &parse_date
   option '--dry', :flag, 'enables dry run'
+  option '--verbose', :flag, 'print verbose error message'
 
   def execute
-    days_between = from.step(to).reject(&:sunday?).reject(&:saturday?)
-
-    days_between.map(&:to_datetime).each do |date_time|
-      check_in_time = date_time.new_offset("+#{check_in}")
-      check_out_time = date_time.new_offset("+#{check_out}")
-
-      if dry?
-        puts "DRY RUN: Committing attendance from #{check_in_time} to #{check_out_time}"
-        next
-      end
-
-      response = post_attendance(check_in_time, check_out_time)
-
-      if response.ok?
-        puts "Successfully registered attendance from #{check_in_time} to #{check_out_time}"
-      elsif response
-        raise "Failed to register attendance. Error: #{response.body}"
-      end
+    Attend.register(email: email, from: from, to: to, check_in: check_in, check_out: check_out, dry_run: dry?)
+  rescue StandardError => e
+    if verbose?
+      puts e.full_message
+    else
+      puts e.message
     end
-  end
 
-  def post_attendance(check_in_time, check_out_time)
-    parameters = {
-      'authtoken' => AUTH_TOKEN,
-      'dateFormat' => DATE_FORMAT,
-      'checkIn' => check_in_time.strftime('%d/%m/%Y %H:%M:%S'),
-      'checkOut' => check_out_time.strftime('%d/%m/%Y %H:%M:%S'),
-      'emailId' => email,
-    }
-
-    HTTParty.post('https://people.zoho.com/people/api/attendance', query: parameters)
+    exit 1
   end
 end
-

data/lib/attend/get_absent_days.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Attend
+  class GetAbsentDays
+    attr_reader :zoho
+
+    def initialize(zoho:)
+      @zoho = zoho
+    end
+
+    def call(email:, from:, to:)
+      attendance_report = zoho.get_attendance_report(email: email, from: from, to: to)
+
+      attendance_report.records.select(&:missing_work?).map(&:date)
+    end
+  end
+end

data/lib/attend/register_attendances.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Attend
+  class RegisterAttendances
+    attr_reader :zoho, :dry_run
+
+    def initialize(zoho:, dry_run: true)
+      @zoho = zoho
+      @dry_run = dry_run
+    end
+
+    def call(attendances)
+      attendances.each do |attendance|
+        if dry_run
+          puts "DRY RUN: Committing #{attendance}"
+          next
+        end
+
+        zoho.post_attendance(attendance)
+
+        puts "Successfully registered #{attendance}"
+      end
+    end
+  end
+end

data/lib/attend/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Attend
-  VERSION = '0.1.0'
+  VERSION = '2.0.1'
 end

data/lib/attend.rb

@@ -1,7 +1,34 @@
 # frozen_string_literal: true
 
 require 'attend/version'
+require_relative './zoho/people/api'
+require_relative './zoho/people/attendance'
+require_relative './attend/get_absent_days'
+require_relative './attend/register_attendances'
 
 module Attend
-  # Your code goes here...
+  def self.register(email:, from:, to:, check_in:, check_out:, dry_run: true)
+    absent_days = GetAbsentDays.new(zoho: zoho_api).call(email: email, from: from, to: to)
+
+    if absent_days.empty?
+      puts "No absent days between #{from} and #{to}"
+      return
+    end
+
+    attendances = absent_days.map do |day|
+      day_beginning = day.to_datetime
+
+      Zoho::People::Attendance.new(email: email,
+                                   check_in: day_beginning.new_offset("+#{check_in}"),
+                                   check_out: day_beginning.new_offset("+#{check_out}"))
+    end
+
+    RegisterAttendances.new(zoho: zoho_api, dry_run: dry_run).call(attendances)
+  end
+
+  def self.zoho_api
+    Zoho::People::API.new
+  end
+
+  private_class_method :zoho_api
 end

data/lib/zoho/people/api.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require 'http'
+
+require_relative './attendance_report'
+
+module Zoho
+  module People
+    class API
+      URL = 'https://people.zoho.com/people/api'
+
+      attr_reader :auth_token
+
+      def initialize(auth_token: ENV['ZOHO_PEOPLE_ROOT_TOKEN'])
+        raise 'You must provide Zoho People authorization token' unless auth_token
+
+        @auth_token = auth_token
+      end
+
+      def post_attendance(attendance)
+        params = {
+          'authtoken' => auth_token,
+          'dateFormat' => 'dd/MM/yyyy HH:mm:ss',
+          'emailId' => attendance.email,
+          'checkIn' => attendance.check_in.strftime('%d/%m/%Y %H:%M:%S'),
+          'checkOut' => attendance.check_out.strftime('%d/%m/%Y %H:%M:%S')
+        }
+
+        request(:post, 'attendance', params: params)
+      end
+
+      def get_attendance_report(email:, from:, to:)
+        params = {
+          'authtoken' => auth_token,
+          'dateFormat' => 'yyyy-MM-dd',
+          'emailId' => email,
+          'sdate' => from.strftime('%Y-%m-%d'),
+          'edate' => to.strftime('%Y-%m-%d')
+        }
+
+        data = request(:get, 'attendance/getUserReport', params: params)
+
+        AttendanceReport.parse(data)
+      end
+
+      private
+
+      def request(method, endpoint, options)
+        response = HTTP.method(method).call("#{URL}/#{endpoint}", options)
+
+        if response.status.success?
+          response.parse
+        elsif response
+          raise "Failed to #{method.to_s.upcase} #{endpoint}. Error: #{response.body}"
+        else
+          raise 'Failed to request Zoho API'
+        end
+      end
+    end
+  end
+end

data/lib/zoho/people/attendance.rb

@@ -3,14 +3,25 @@
 module Zoho
   module People
     class Attendance
-      DATE_FORMAT = 'dd/MM/yyyy HH:mm:ss'
+      attr_reader :check_in, :check_out, :email
 
-      attr_reader :check_in, :check_out, :email_id
+      def initialize(email:, check_in:, check_out:)
+        raise ArgumentError, 'check_in must be DateTime instance' unless check_in.is_a?(DateTime)
+        raise ArgumentError, 'check_out must be DateTime instance' unless check_out.is_a?(DateTime)
 
-      def initialize(check_in:, check_out:, email_id:)
+        @email = email
         @check_in = check_in
         @check_out = check_out
-        @email_id = email_id
+      end
+
+      def to_s
+        "attendance from #{format(check_in)} to #{format(check_out)}"
+      end
+
+      private
+
+      def format(datetime)
+        datetime.strftime('%F@%H:%M')
       end
     end
   end

data/lib/zoho/people/attendance_report/record.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Zoho
+  module People
+    class AttendanceReport
+      class Record
+        attr_reader :date, :status
+
+        def initialize(date:, status:)
+          @date = date
+          @status = status
+        end
+
+        def missing_work?
+          status.empty? || status == 'Absent'
+        end
+      end
+    end
+  end
+end

data/lib/zoho/people/attendance_report.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require_relative './attendance_report/record'
+
+module Zoho
+  module People
+    class AttendanceReport
+      attr_reader :records
+
+      def self.parse(data)
+        records = data.map do |date, entry|
+          Record.new(date: Date.parse(date), status: entry['Status'])
+        end
+
+        new(records)
+      end
+
+      def initialize(records)
+        @records = records.sort_by(&:date)
+      end
+    end
+  end
+end

metadata

@@ -1,87 +1,87 @@
 --- !ruby/object:Gem::Specification
 name: attend
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Maciej Komorowski
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-07-01 00:00:00.000000000 Z
+date: 2021-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: clamp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: clamp
+  name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '4.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '4.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.1
-description: Attend is command line tool that will help you register your Zoho Poeople
-  attendance in fast and easy way
+        version: '1.11'
+description: Attend is CLI tool that will help you register your Zoho People attendance
+  in fast and easy way
 email:
 - mckomo@gmail.com
 executables:
@@ -102,16 +102,20 @@ files:
 - attend.gemspec
 - bin/console
 - bin/setup
-- entrypoiny.rb
 - exe/attend
 - lib/attend.rb
+- lib/attend/get_absent_days.rb
+- lib/attend/register_attendances.rb
 - lib/attend/version.rb
+- lib/zoho/people/api.rb
 - lib/zoho/people/attendance.rb
+- lib/zoho/people/attendance_report.rb
+- lib/zoho/people/attendance_report/record.rb
 homepage: https://github.com/mckomo/attend
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -119,16 +123,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.2.13
+signing_key:
 specification_version: 4
-summary: Register Zoho Poeople attendance using CLI
+summary: Register Zoho People attendance using CLI
 test_files: []

data/entrypoiny.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-require 'httparty'
-
-DATE_FORMAT = 'dd/MM/yyyy HH:mm:ss'
-AUTH_TOKEN = '3322c84ac90c17b50ad5268795854197'
-
-attendance_endpoint = 'https://people.zoho.com/people/api/attendance'
-
-parameters = {
-  'authtoken' => AUTH_TOKEN,
-  'dateFormat' => DATE_FORMAT,
-  'checkIn' => '26/06/2017 10:00:00',
-  'checkOut' => '26/06/2017 18:00:00',
-  'emailId' => 'krzysztof.kucharski@codete.com'
-}
-
-response = HTTParty.post(attendance_endpoint, query: parameters)
-
-puts response.body, response.code, response.message, response.headers.inspect