qismo 0.6.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82fdfb3850c268372f3bb9a626923296a277365a2e418e39e77faee771a17f01
-  data.tar.gz: 5e8e7248607487caab854fc59b45a4db35140b8f48392c3a52ef46fcb7d3b02f
+  metadata.gz: 37a8b45b1fb3c7a407f44bb9490f47f101a6c617347fa81519195d408aadd7d8
+  data.tar.gz: 48ff80a20004cd10e970fd07276e61aa9e1edffe575e7803fe8e10c2bdba1bdb
 SHA512:
-  metadata.gz: 6f18f2d1e90c3892e8793f8e48af1643a8c91fa94307197cab6660df6130aa7e9e6d28d9e8942e51fb9c538d0531e9532275bb728c2ae3cb05c57f539e4f6d0c
-  data.tar.gz: 804e77fe38f0bb3e5da3859e2560bb74586960d8a7c96a9b723c0026ee2cfdf16ceca7531d05bc3ce7f9e3c748092daad112e458f66800b18776073e6711125e
+  metadata.gz: 0dd79f84b481f832e7d6433d20af7e9b6cb729d3e2d19255024ec673eacfb8bde3441c253f6fadc240014d2d8be6c1bd839e09c3defdf3fd1784b66d4751dbc1
+  data.tar.gz: f6893f2b12eb14a3770bfd28ed1bf96b286d46ae6fb7b4d4426e954c637e8a5fe842f45e54817abd3ee86156650cfb49003142fe4ba1196791d0c00859da4d64

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    qismo (0.5.0)
+    qismo (0.6.0)
       activesupport
       http
 

data/lib/qismo/api.rb

@@ -2,8 +2,6 @@
 
 module Qismo
   module Api
-    include Qismo::Model
-
     def rooms(**opt)
       body = post("/api/v2/customer_rooms", opt)
       Collection.new(
@@ -167,7 +165,11 @@ module Qismo
     end
 
     def office_hours
-      get("/api/v1/admin/office_hours").data
+      data = get("/api/v1/admin/office_hours").data
+      data_hash = data.as_json
+      data_hash["is_in_office_hour"] = Util.in_office_hour?(data)
+
+      DataObject.new(data_hash)
     end
 
     def wa_broadcast_templates(**opt)

data/lib/qismo/client.rb

@@ -2,7 +2,6 @@
 
 module Qismo
   class Client
-    include Qismo::Model
     include Qismo::Api
 
     VALID_OPTIONS = [:app_id, :secret_key, :url, :logger, :instrumentation, :timeout, :proxy]
@@ -34,7 +33,7 @@ module Qismo
     def request(method, path, **opt)
       res = connection.request(method, @url + path, opt.compact)
       if res.status.success?
-        return JSON.parse(res.to_s, object_class: Data)
+        return DataObject.new(JSON.parse(res.to_s))
       end
 
       if res.status.server_error?
@@ -42,9 +41,10 @@ module Qismo
       end
 
       if res.status.client_error?
-        body = JSON.parse(res.to_s, object_class: Data)
+        body = DataObject.new(JSON.parse(res.to_s))
+
         error = body.errors
-        error = error.message if error.is_a?(Hash)
+        error = error.message if error.is_a?(DataObject)
 
         error_klass_map = {
           400 => BadRequestError,

data/lib/qismo/model.rb

@@ -1,48 +1,80 @@
 # frozen_string_literal: true
 
 module Qismo
-  module Model
-    class Data < OpenStruct # rubocop:disable Style/OpenStructUse
+  class DataObject
+    def initialize(opt = {})
+      opt.each do |key, value|
+        value = if value.is_a?(Array)
+          handle_array(value)
+          # instance_variable_set("@#{key}", handle_array(value))
+        elsif value.is_a?(Hash)
+          self.class.new(value)
+          # instance_variable_set("@#{key}", self.class.new(value))
+        else
+          value
+          # instance_variable_set("@#{key}", value)
+        end
+
+        self.class.attr_reader(key.to_sym)
+        instance_variable_set("@#{key}", value)
+      end
     end
 
-    class Collection < Array
-      def initialize(data, prev_page: nil, next_page: nil, prev_func: -> { nil }, next_func: -> { nil })
-        super(data)
+    def inspect
+      inspected_func ||= -> do
+        attributes = instance_variables.map do |iv|
+          "#{iv.to_s.delete_prefix("@")}=#{instance_variable_get(iv).inspect}"
+        end
 
-        @prev_page = prev_page
-        @next_page = next_page
-        @prev_func = prev_func
-        @next_func = next_func
+        "#<#{self.class.name} #{attributes.join(", ")}>"
       end
 
-      def has_next_page?
-        @next_page != nil
-      end
+      inspected_func.call
+    end
 
-      alias_method :next_page?, :has_next_page?
+    alias_method :to_s, :inspect
 
-      def has_prev_page?
-        @prev_page != nil
+    private
+
+    def handle_array(values)
+      values.map do |value|
+        if value.is_a?(Hash)
+          self.class.new(value)
+        else
+          value
+        end
       end
+    end
+  end
 
-      alias_method :prev_page?, :has_prev_page?
+  class Collection < Array
+    def initialize(data, prev_page: nil, next_page: nil, prev_func: -> { nil }, next_func: -> { nil })
+      super(data)
 
-      def next_page
-        @next_func.call if has_next_page?
-      end
+      @prev_page = prev_page
+      @next_page = next_page
+      @prev_func = prev_func
+      @next_func = next_func
+    end
 
-      def prev_page
-        @prev_func.call if has_prev_page?
-      end
+    def has_next_page?
+      @next_page != nil
     end
 
-    class Response
-      attr_reader :data, :meta
+    alias_method :next_page?, :has_next_page?
 
-      def initialize(data, meta = {})
-        @data = data
-        @meta = meta
-      end
+    def has_prev_page?
+      @prev_page != nil
+    end
+
+    alias_method :prev_page?, :has_prev_page?
+
+    def next_page
+      @next_func.call if has_next_page?
+    end
+
+    def prev_page
+      @prev_func.call if has_prev_page?
     end
   end
 end

data/lib/qismo/util.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Qismo
+  class Util
+    class << self
+      def in_office_hour?(data)
+        return false if data.timezone.blank?
+
+        offset = Time.zone_offset(data.timezone)
+        tz_current = Time.current.getlocal(offset)
+
+        today_office_hour = data.office_hours.find { |oh| oh.day == tz_current.strftime("%u").to_i }
+        return false if today_office_hour.nil?
+
+        start_hour = today_office_hour.starttime
+        end_hour = today_office_hour.endtime
+
+        start_time = Time.parse("#{tz_current.year}-#{tz_current.month}-#{tz_current.day} #{start_hour} #{data.timezone}")
+        end_time = Time.parse("#{tz_current.year}-#{tz_current.month}-#{tz_current.day} #{end_hour} #{data.timezone}")
+
+        tz_current.between?(start_time, end_time)
+      end
+    end
+  end
+end

data/lib/qismo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Qismo
-  VERSION = "0.6.0"
+  VERSION = "0.7.1"
 end

data/lib/qismo.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
+require "active_support/all"
 require "http"
 
+require "qismo/util"
 require "qismo/version"
 require "qismo/error"
 require "qismo/model"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qismo
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Qiscus Integration
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-04 00:00:00.000000000 Z
+date: 2022-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -127,6 +127,7 @@ files:
 - lib/qismo/client.rb
 - lib/qismo/error.rb
 - lib/qismo/model.rb
+- lib/qismo/util.rb
 - lib/qismo/version.rb
 homepage: https://qiscus.com
 licenses: