DhanHQ 2.3.0 → 2.4.0

data/lib/dhan_hq.rb

@@ -1,96 +1,46 @@
 # frozen_string_literal: true
 
-require "dotenv/load"
+require "json"
 require "logger"
-
-# Helper Methods
+require "zeitwerk"
+require "dotenv/load"
+# Minimal eager requires for backward-compatible constants.
+# These are widely referenced (e.g. `DhanHQ::BaseAPI`) and should not depend on
+# the autoloader being fully configured.
 require_relative "DhanHQ/helpers/api_helper"
 require_relative "DhanHQ/helpers/attribute_helper"
 require_relative "DhanHQ/helpers/validation_helper"
 require_relative "DhanHQ/helpers/request_helper"
 require_relative "DhanHQ/helpers/response_helper"
-require_relative "DhanHQ/json_loader"
-
 require_relative "DhanHQ/core/base_api"
-require_relative "DhanHQ/core/base_resource"
 require_relative "DhanHQ/core/base_model"
-require_relative "DhanHQ/core/error_handler"
-
-require_relative "DhanHQ/version"
-require_relative "DhanHQ/errors"
-require_relative "DhanHQ/error_object"
-
-require_relative "DhanHQ/client"
-require_relative "DhanHQ/configuration"
-require_relative "DhanHQ/rate_limiter"
-require_relative "DhanHQ/auth"
-
-# Contracts
-require_relative "DhanHQ/contracts/base_contract"
-require_relative "DhanHQ/contracts/historical_data_contract"
-require_relative "DhanHQ/contracts/margin_calculator_contract"
-require_relative "DhanHQ/contracts/position_conversion_contract"
-require_relative "DhanHQ/contracts/slice_order_contract"
-require_relative "DhanHQ/contracts/trade_contract"
-require_relative "DhanHQ/contracts/expired_options_data_contract"
-require_relative "DhanHQ/contracts/alert_order_contract"
-
-# Resources
-require_relative "DhanHQ/resources/option_chain"
-require_relative "DhanHQ/resources/orders"
-require_relative "DhanHQ/resources/forever_orders"
-require_relative "DhanHQ/resources/super_orders"
-require_relative "DhanHQ/resources/funds"
-require_relative "DhanHQ/resources/holdings"
-require_relative "DhanHQ/resources/positions"
-require_relative "DhanHQ/resources/statements"
-require_relative "DhanHQ/resources/trades"
-require_relative "DhanHQ/resources/historical_data"
-require_relative "DhanHQ/resources/margin_calculator"
-require_relative "DhanHQ/resources/market_feed"
-require_relative "DhanHQ/resources/instruments"
-require_relative "DhanHQ/resources/alert_orders"
-require_relative "DhanHQ/resources/edis"
-require_relative "DhanHQ/resources/ip_setup"
-require_relative "DhanHQ/resources/kill_switch"
-require_relative "DhanHQ/resources/trader_control"
-require_relative "DhanHQ/resources/profile"
-require_relative "DhanHQ/resources/expired_options_data"
-
-# Models
-require_relative "DhanHQ/models/alert_order"
-require_relative "DhanHQ/models/order"
-require_relative "DhanHQ/models/funds"
-require_relative "DhanHQ/models/option_chain"
-require_relative "DhanHQ/models/forever_order"
-require_relative "DhanHQ/models/super_order"
-require_relative "DhanHQ/models/historical_data"
-require_relative "DhanHQ/models/market_feed"
-require_relative "DhanHQ/models/instrument"
-require_relative "DhanHQ/models/position"
-require_relative "DhanHQ/models/holding"
-require_relative "DhanHQ/models/ledger_entry"
-require_relative "DhanHQ/models/trade"
-require_relative "DhanHQ/models/margin"
-require_relative "DhanHQ/models/kill_switch"
-require_relative "DhanHQ/models/profile"
-require_relative "DhanHQ/models/order_update"
-require_relative "DhanHQ/models/expired_options_data"
-
-require_relative "DhanHQ/constants"
-require_relative "DhanHQ/ws"
-require_relative "DhanHQ/ws/singleton_lock"
-require_relative "ta"
-require_relative "dhanhq/analysis/multi_timeframe_analyzer"
-require_relative "dhanhq/analysis/helpers/bias_aggregator"
-require_relative "dhanhq/analysis/helpers/moneyness_helper"
-require_relative "dhanhq/contracts/options_buying_advisor_contract"
-require_relative "dhanhq/analysis/options_buying_advisor"
+require_relative "DhanHQ/core/base_resource"
 
 # The top-level module for the DhanHQ client library.
 #
 # Provides configuration management for setting credentials and API-related settings.
 module DhanHQ
+  LOADER = Zeitwerk::Loader.new
+  LOADER.tag = "dhanhq"
+  LOADER.inflector.inflect(
+    "api_helper" => "APIHelper",
+    "auth_api" => "AuthAPI",
+    "base_api" => "BaseAPI",
+    "ip_setup" => "IPSetup",
+    "json_loader" => "JSONLoader",
+    "ws" => "WS"
+  )
+  LOADER.push_dir(File.join(__dir__, "DhanHQ"), namespace: self)
+  LOADER.push_dir(File.join(__dir__, "dhanhq"), namespace: self)
+  LOADER.collapse(File.join(__dir__, "DhanHQ", "core"))
+  LOADER.collapse(File.join(__dir__, "DhanHQ", "helpers"))
+  LOADER.collapse(File.join(__dir__, "dhanhq", "analysis", "helpers"))
+  LOADER.ignore(
+    File.join(__dir__, "DhanHQ", "errors.rb"),
+    File.join(__dir__, "DhanHQ", "version.rb")
+  )
+  LOADER.setup
+
   class Error < StandardError; end
 
   class << self
@@ -131,7 +81,7 @@ module DhanHQ
 
     # Configures the DhanHQ client using environment variables.
     #
-    # When credentials are injected via `ACCESS_TOKEN` and `CLIENT_ID` this helper
+    # When credentials are injected via `DHAN_ACCESS_TOKEN` and `DHAN_CLIENT_ID` this helper
     # can be used to initialise a configuration without a block.
     #
     # @example
@@ -140,8 +90,8 @@ module DhanHQ
     # @return [void]
     def configure_with_env
       self.configuration ||= Configuration.new
-      configuration.access_token = ENV.fetch("ACCESS_TOKEN", nil)
-      configuration.client_id = ENV.fetch("CLIENT_ID", nil)
+      configuration.access_token = ENV.fetch("DHAN_ACCESS_TOKEN", nil)
+      configuration.client_id = ENV.fetch("DHAN_CLIENT_ID", nil)
       configuration.base_url = ENV.fetch("DHAN_BASE_URL", BASE_URL)
       configuration.ws_version = ENV.fetch("DHAN_WS_VERSION", configuration.ws_version || 2).to_i
       configuration.ws_order_url = ENV.fetch("DHAN_WS_ORDER_URL", configuration.ws_order_url)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: DhanHQ
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Shubham Taywade
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-02-04 00:00:00.000000000 Z
+date: 2026-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -150,6 +150,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rotp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: DhanHQ is a simple CLI for DhanHQ API.
 email:
 - shubhamtaywade82@gmail.com
@@ -204,8 +232,10 @@ files:
 - examples/trading_fields_example.rb
 - exe/DhanHQ
 - lib/DhanHQ/auth.rb
+- lib/DhanHQ/auth/token_generator.rb
+- lib/DhanHQ/auth/token_manager.rb
+- lib/DhanHQ/auth/token_renewal.rb
 - lib/DhanHQ/client.rb
-- lib/DhanHQ/config.rb
 - lib/DhanHQ/configuration.rb
 - lib/DhanHQ/constants.rb
 - lib/DhanHQ/contracts/alert_order_contract.rb
@@ -220,7 +250,10 @@ files:
 - lib/DhanHQ/contracts/place_order_contract.rb
 - lib/DhanHQ/contracts/position_conversion_contract.rb
 - lib/DhanHQ/contracts/slice_order_contract.rb
+- lib/DhanHQ/contracts/trade_by_order_id_contract.rb
 - lib/DhanHQ/contracts/trade_contract.rb
+- lib/DhanHQ/contracts/trade_history_contract.rb
+- lib/DhanHQ/core/auth_api.rb
 - lib/DhanHQ/core/base_api.rb
 - lib/DhanHQ/core/base_model.rb
 - lib/DhanHQ/core/base_resource.rb
@@ -252,6 +285,7 @@ files:
 - lib/DhanHQ/models/position.rb
 - lib/DhanHQ/models/profile.rb
 - lib/DhanHQ/models/super_order.rb
+- lib/DhanHQ/models/token_response.rb
 - lib/DhanHQ/models/trade.rb
 - lib/DhanHQ/rate_limiter.rb
 - lib/DhanHQ/requests/optionchain/nifty.json

data/lib/DhanHQ/config.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-require "logger"
-
-# DhanHQ Ruby SDK for trading and market data
-module DhanHQ
-  class << self
-    # keep whatever you already have; add these if missing:
-    attr_accessor :client_id, :access_token, :base_url, :ws_version
-
-    # default logger so calls like DhanHQ.logger&.info never explode
-    def logger
-      @logger ||= Logger.new($stdout, level: Logger::INFO)
-    end
-
-    attr_writer :logger
-
-    # same API style as your README
-    def configure
-      yield self
-      # ensure a logger is present even if user didn’t set one
-      self.logger ||= Logger.new($stdout, level: Logger::INFO)
-    end
-
-    # if you support env bootstrap
-    def configure_with_env
-      self.client_id    = ENV.fetch("CLIENT_ID", nil)
-      self.access_token = ENV.fetch("ACCESS_TOKEN", nil)
-      self.base_url     = ENV.fetch("DHAN_BASE_URL", "https://api.dhan.co/v2")
-      self.ws_version   = ENV.fetch("DHAN_WS_VERSION", 2).to_i
-    end
-  end
-end