qismo 0.8.6 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39920707bba81e3df5853731180b02e10d694a4cbf793c6f64c7bfe169a6a9c2
-  data.tar.gz: 4871ab5d1557e8ccd6c249354b4117da16779b5ecdcafb906641597a8ca39358
+  metadata.gz: 4e2ec0fd1f33602149f8bdee9c1f197470c9bac2f381460fd7ade574a3106941
+  data.tar.gz: c08c1226ba080a9b42c114cf4e742efca2dc57c69d629c9402561c0fcb302b9a
 SHA512:
-  metadata.gz: 448f4ba83da3cc5adefebe4b893b1372f2b43e582fa7b3ee8cd6d1d4f8ff2e07fc43a0a27de438c80b30a2dc7f65e2e7af718ad61757c33111b22ff88d5c4af4
-  data.tar.gz: 824b127bfbaad9e0f380f1765011cd76b626e7a957aa52a3845a25789a68860d23af2de435b3a543dab9428be052ffc49ada6710e088d30c6a6e998a774bf641
+  metadata.gz: 0e97d7caa322c1e60ad35316295fb1cf8107c3f9527abed5514e9ce83b20a1d141558356fe4fe825b259b849149402d71910a50d0e558dc358d581a8509c864d
+  data.tar.gz: 795bfb449d7d08bb654bdaee29486a29b654b98c69ad30fa736a3d1d12ecd8139a7776b96de07c651f371497d52f431837d86e010d6afd866a125399cc446172

data/Gemfile.lock

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

data/lib/qismo/client.rb

@@ -4,18 +4,26 @@ module Qismo
   class Client
     include Qismo::Api
 
-    VALID_OPTIONS = [:app_id, :secret_key, :url, :logger, :instrumentation, :timeout, :proxy]
-
-    attr_accessor(*VALID_OPTIONS)
+    DEFAULT_APP_ID = ENV["QISCUS_APP_ID"]
+    DEFAULT_SECRET_KEY = ENV["QISCUS_SECRET_KEY"]
+    DEFAULT_URL = ENV["QISCUS_OMNICHANNEL_URL"] || "https://qismo.qiscus.com"
+
+    DEFAULT_OPTIONS = {
+      app_id: DEFAULT_APP_ID,
+      secret_key: DEFAULT_SECRET_KEY,
+      url: DEFAULT_URL,
+      logger: nil,
+      instrumentation: nil,
+      timeout: nil,
+      proxy: nil,
+    }
+
+    attr_accessor(*DEFAULT_OPTIONS.keys)
 
     def initialize(**opt)
-      @app_id = opt[:app_id] || ENV["QISCUS_APP_ID"]
-      @secret_key = opt[:secret_key] || ENV["QISCUS_SECRET_KEY"]
-      @url = opt[:url] || ENV["QISCUS_OMNICHANNEL_URL"] || "https://qismo.qiscus.com"
-      @logger = opt[:logger]
-      @instrumentation = opt[:instrumentation]
-      @timeout = opt[:timeout]
-      @proxy = opt[:proxy]
+      DEFAULT_OPTIONS.merge(opt).each do |key, value|
+        instance_variable_set("@#{key}", value)
+      end
     end
 
     def post(path, body = {})

data/lib/qismo/model.rb

@@ -2,24 +2,17 @@
 
 module Qismo
   class DataObject
-    def initialize(opt = {})
+    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))
         elsif value.is_a?(TrueClass) || value.is_a?(FalseClass)
-          method_name = key.to_s.delete_prefix("is_")
-          method_name = "#{method_name}?".to_sym
-
-          self.class.define_method(method_name) { value }
-
+          self.class.define_method("#{key.to_s.delete_prefix("is_")}?".to_sym) { value }
           value
         else
           value
-          # instance_variable_set("@#{key}", value)
         end
 
         self.class.attr_reader(key.to_sym)

data/lib/qismo/util.rb

@@ -15,8 +15,10 @@ module Qismo
         start_hour = today_office_hour.starttime
         end_hour = today_office_hour.endtime
 
+        # rubocop:disable Layout/LineLength
         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}")
+        # rubocop:enable Layout/LineLength
 
         tz_current.between?(start_time, end_time)
       end

data/lib/qismo/version.rb

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

data/lib/qismo.rb

@@ -13,14 +13,14 @@ require "qismo/client"
 # Qismo
 module Qismo
   class << self
-    attr_reader(*Qismo::Client::VALID_OPTIONS)
-
     def configure
       yield client
 
-      Qismo::Client::VALID_OPTIONS.each do |opt|
-        instance_variable_set("@#{opt}", client.send(opt))
-      end
+      client
+    end
+
+    def new(**opt)
+      @client = Client.new(opt)
     end
 
     if Gem::Version.new(RUBY_VERSION).release >= Gem::Version.new("3.0.0")
@@ -41,6 +41,8 @@ module Qismo
       Qismo::Client.instance_methods.include?(method_name)
     end
 
+    private
+
     def client
       @client ||= Client.new
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qismo
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
 platform: ruby
 authors:
 - Qiscus Integration