chargebee 2.46.0 → 2.47.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 23c0cce80dc54db94f1a7b6138751ab2653d66fd
-  data.tar.gz: 249627e284ea46d5666697acacb34c060326b7cd
+SHA256:
+  metadata.gz: 9ba2e9aa886846370aae3bdc348f1bb5b1aa6fc09f80d1b49724078980c13f6e
+  data.tar.gz: 6cdeb1bc586bad518cf36f2176fdc1d84a186e88cae3e8761628a8282fd93915
 SHA512:
-  metadata.gz: c89c552e4a27ac177cd59ef88ff197c2059f9876971922611350d787d87eddea51b12634a3a356e08b661cea9d0658d9f6a517f67d092a37857cb351253f8595
-  data.tar.gz: 1aacbfa93badb7b99f7a6b0b18dc2dd3109a999aeaa0efc8a697069f7a80284acbb0087a318f2425e33ee5343b79f83f2a2cdca3f8ba22b37d6cdc6c542f4f6f
+  metadata.gz: 9ff62f2371fc2682a0d279dc6457c4da9a5912d3607088dd35d97f34d3e6a9460bdd39b0d5988fdc4808a41ddf3be86c4a71a2b03e944bbd9a93d44b2c28be4c
+  data.tar.gz: 292df818217334208d83cfe72b0dc118918db9efb6103a889f56f010e32978d70f3eb251393d424240b6efe851a506f1d94b010f0d89231a852f6c4b654911d2

data/Gemfile.lock

@@ -4,7 +4,6 @@ PATH
     chargebee (2.46.0)
       cgi (>= 0.1.0, < 1.0.0)
       json_pure (~> 2.1)
-      rest-client (>= 1.8, <= 2.0.2)
 
 GEM
   remote: https://rubygems.org/
@@ -21,10 +20,6 @@ GEM
     mime-types-data (3.2022.0105)
     mocha (1.13.0)
     netrc (0.11.0)
-    rest-client (2.0.2)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 4.0)
-      netrc (~> 0.8)
     rspec (3.0.0)
       rspec-core (~> 3.0.0)
       rspec-expectations (~> 3.0.0)
@@ -43,6 +38,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-21
+  arm64-darwin-23
   x86_64-darwin-20
   x86_64-linux
 

data/Rakefile

@@ -148,3 +148,16 @@ task :validate do
     exit!
   end
 end
+
+desc "Create tag v#{version} and build and push #{gem_file} to Rubygems for Beta version."
+task :release_beta => :build do
+  unless `git branch` =~ /^\* next$/
+    puts "You must be on the next branch to release beta!"
+    exit!
+  end
+  sh "git commit --allow-empty -a -m 'Release #{version}'"
+  sh "git tag v#{version}"
+  sh "git push origin next"
+  sh "git push origin v#{version}"
+  sh "gem push pkg/#{name}-#{version}.gem"
+end

data/chargebee.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
   s.required_ruby_version = '>= 1.9.3'
   s.name              = 'chargebee'
-  s.version           = '2.46.0'
+  s.version           = '2.47.0.beta.1'
   s.date              = '2024-11-14'
   s.summary     = "Ruby client for Chargebee API."
   s.description = "Subscription Billing - Simple. Secure. Affordable. More details at www.chargebee.com."
@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = %w[README.md LICENSE]
 
   s.add_dependency('json_pure', '~> 2.1')
-  s.add_dependency('rest-client', '>=1.8', '<=2.0.2')
   s.add_dependency('cgi', '>=0.1.0', '<1.0.0')
   s.add_development_dependency('rspec', '~> 3.0.0')
   s.add_development_dependency('mocha')
@@ -123,8 +122,8 @@ Gem::Specification.new do |s|
     lib/chargebee/models/unbilled_charge.rb
     lib/chargebee/models/usage.rb
     lib/chargebee/models/virtual_bank_account.rb
+    lib/chargebee/nativeRequest.rb
     lib/chargebee/request.rb
-    lib/chargebee/rest.rb
     lib/chargebee/result.rb
     lib/chargebee/util.rb
     lib/ssl/ca-certs.crt

data/lib/chargebee/nativeRequest.rb

@@ -0,0 +1,136 @@
+require 'json'
+require 'net/http'
+require 'uri'
+require 'stringio'
+
+module ChargeBee
+  module NativeRequest
+
+    def self.request(method, url, env, params = nil, headers = {})
+      raise Error.new('No environment configured.') unless env
+      api_key = env.api_key
+
+      uri = URI(env.api_url(url))
+
+      case method.to_s.downcase.to_sym
+      when :get, :head, :delete
+        uri.query = URI.encode_www_form(params) if params
+        payload = nil
+      else
+        payload = URI.encode_www_form(params || {})
+      end
+      user_agent = ChargeBee.user_agent
+      headers = {
+        "User-Agent" => user_agent,
+        "Accept" => "application/json",
+        "Lang-Version" => RUBY_VERSION,
+        "OS-Version" => RUBY_PLATFORM,
+        "Content-Type" => "application/x-www-form-urlencoded"
+      }.merge(headers)
+
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      http.open_timeout=env.connect_timeout
+      http.read_timeout=env.read_timeout
+      if ChargeBee.verify_ca_certs?
+        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        http.ca_file = ChargeBee.ca_cert_path
+      else
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      end
+
+      request_class = case method.to_s.downcase.to_sym
+                      when :get then Net::HTTP::Get
+                      when :post then Net::HTTP::Post
+                      when :put then Net::HTTP::Put
+                      when :delete then Net::HTTP::Delete
+                      else raise Error.new("Unsupported HTTP method: #{method}")
+                      end
+
+      request = request_class.new(uri, headers)
+      request.body = payload if payload
+
+      request.basic_auth(api_key, nil)
+      begin
+        response = http.request(request)
+      rescue => e
+        raise IOError.new("IO Exception when trying to connect to ChargeBee with URL #{uri} . Reason: #{e}", e)
+      end
+      handle_response(response, headers)
+    end
+
+    def self.handle_response(response, headers)
+      rcode = response.code.to_i
+      rbody = response.body
+
+      # converting headers to rest-client format previously we were using rest-client,
+      # and mapping headers to that format to support backward compatability
+      rheaders = beautify_headers(response.to_hash)
+
+      # When a custom 'Accept-Encoding' header is set to gzip, Net::HTTP will not automatically
+      # decompress the response. Therefore, we need to manually handle decompression
+      # based on the 'Content-Encoding' header in the response.
+      # https://github.com/ruby/ruby/blob/19c1f0233eb5202403c52b196f1d573893eacab7/lib/net/http/generic_request.rb#L82
+      if headers.keys.any? { |k| k.downcase == 'accept-encoding' } && rheaders[:content_encoding] == 'gzip' && rbody && !rbody.empty?
+        rbody = Zlib::GzipReader.new(StringIO.new(rbody)).read
+      end
+
+      if rcode >= 200 && rcode < 300
+        begin
+          resp = JSON.parse(rbody)
+        rescue JSON::ParserError => e
+          raise handle_json_error(rbody, e)
+        end
+        return Util.symbolize_keys(resp), rheaders
+      else
+        raise handle_for_error(rcode, rbody)
+      end
+    end
+
+    def self.handle_json_error(rbody, e)
+      if rbody.include?("503")
+        raise Error.new("Sorry, the server is currently unable to handle the request due to a temporary overload or scheduled maintenance. Please retry after sometime. \n type: internal_temporary_error, \n http_status_code: 503, \n error_code: internal_temporary_error,\n content: #{rbody.inspect}",e)
+      elsif rbody.include?("504")
+        raise Error.new("The server did not receive a timely response from an upstream server, request aborted. If this problem persists, contact us at support@chargebee.com. \n type: gateway_timeout, \n http_status_code: 504, \n error_code: gateway_timeout,\n content:  #{rbody.inspect}",e)
+      else
+        raise Error.new("Sorry, something went wrong when trying to process the request. If this problem persists, contact us at support@chargebee.com. \n type: internal_error, \n http_status_code: 500, \n error_code: internal_error,\n content:  #{rbody.inspect}",e)
+      end
+    end
+
+    def self.handle_for_error(rcode, rbody)
+      return Error.new("No response returned by ChargeBee API. HTTP status code: #{rcode}") if rcode == 204
+      begin
+        error_obj = JSON.parse(rbody)
+        error_obj = Util.symbolize_keys(error_obj)
+      rescue Exception => e
+        raise Error.new("Error response not in JSON format. The http status code is #{rcode} \n #{rbody.inspect}",e)
+      end
+      type = error_obj[:type]
+      case type
+      when "payment"
+        raise PaymentError.new(rcode, error_obj)
+      when "operation_failed"
+        raise OperationFailedError.new(rcode, error_obj)
+      when "invalid_request"
+        raise InvalidRequestError.new(rcode, error_obj)
+      else
+        raise APIError.new(rcode, error_obj)
+      end
+    end
+    # directly copying headers formatting from rest-client to support backward compatability for rest-client
+    def self.beautify_headers(headers)
+      headers.inject({}) do |out, (key, value)|
+        key_sym = key.tr('-', '_').downcase.to_sym
+
+        # Handle Set-Cookie specially since it cannot be joined by comma.
+        if key.downcase == 'set-cookie'
+          out[key_sym] = value
+        else
+          out[key_sym] = value.join(', ')
+        end
+
+        out
+      end
+    end
+  end
+end

data/lib/chargebee/request.rb

@@ -15,7 +15,7 @@ module ChargeBee
     def self.send(method, url, params={}, env=nil, headers={})
       env ||= ChargeBee.default_env
       ser_params = Util.serialize(params)
-      resp, rheaders = Rest.request(method, url, env, ser_params||={}, headers)
+      resp, rheaders = NativeRequest.request(method, url, env, ser_params||={}, headers)
       if resp.has_key?(:list)
         ListResult.new(resp[:list], resp[:next_offset], rheaders) 
       else 

data/lib/chargebee.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/chargebee/environment'
-require File.dirname(__FILE__) + '/chargebee/rest'
+require File.dirname(__FILE__) + '/chargebee/nativeRequest'
 require File.dirname(__FILE__) + '/chargebee/util'
 require File.dirname(__FILE__) + '/chargebee/request'
 require File.dirname(__FILE__) + '/chargebee/result'
@@ -86,7 +86,7 @@ require File.dirname(__FILE__) + '/chargebee/models/recorded_purchase'
 
 module ChargeBee
 
-  VERSION = '2.46.0'
+  VERSION = '2.47.0.beta.1'
 
   @@default_env = nil
   @@verify_ca_certs = true

data/spec/chargebee/list_result_spec.rb

@@ -43,7 +43,7 @@ describe ChargeBee::ListResult do
   end
 
   before do
-    ChargeBee::Rest.stubs(:request).returns(response)
+    ChargeBee::NativeRequest.stubs(:request).returns(response)
   end
 
   it "returns list object, with next offset attribute" do

data/spec/chargebee_spec.rb

@@ -1,11 +1,10 @@
 require 'spec_helper'
-require 'rest_client'
 require 'sample_response'
 
 describe "chargebee" do
 
   before(:all) do
-    @request = RestClient::Request
+    @request = ChargeBee::NativeRequest
   end
 
   it "serialize should convert the hash to acceptable format" do
@@ -55,7 +54,7 @@ describe "chargebee" do
   end
 
   it "should properly convert the response json into proper object" do
-    @request.expects(:execute).once.returns(mock_response(simple_subscription, headers))
+    @request.expects(:request).once.returns([simple_subscription, headers])
     result = ChargeBee::Subscription.retrieve("simple_subscription")
     h = result.get_response_headers
     expect(h).to eq(headers)
@@ -68,7 +67,7 @@ describe "chargebee" do
   end
 
   it "should properly convert the nested response json into proper object with sub types" do
-    @request.expects(:execute).once.returns(mock_response(nested_subscription, headers))
+    @request.expects(:request).once.returns([nested_subscription, headers])
     result = ChargeBee::Subscription.retrieve("nested_subscription")
     s = result.subscription
     expect(s.id).to eq("nested_subscription")
@@ -80,7 +79,7 @@ describe "chargebee" do
   end
 
   it "should properly convert the list response json into proper result object" do
-    @request.expects(:execute).once.returns(mock_response(list_subscriptions, headers))
+    @request.expects(:request).once.returns([list_subscriptions, headers])
     result = ChargeBee::Subscription.list({:limit => 2})
     expect(result.length).to eq(2)
     result.each do |i|
@@ -89,7 +88,7 @@ describe "chargebee" do
   end
 
   it "should parse event api response and provide the content properly" do
-    @request.expects(:execute).once.returns(mock_response(sample_event, headers))
+    @request.expects(:request).once.returns([sample_event, headers])
     result = ChargeBee::Event.retrieve("sample_event")
     event = result.event
     s = event.content.subscription

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: chargebee
 version: !ruby/object:Gem::Version
-  version: 2.46.0
+  version: 2.47.0.beta.1
 platform: ruby
 authors:
 - Rajaraman S
 - Thiyagarajan T
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2024-11-14 00:00:00.000000000 Z
@@ -15,82 +15,62 @@ dependencies:
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '1.8'
-    - - <=
-      - !ruby/object:Gem::Version
-        version: 2.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '1.8'
-    - - <=
-      - !ruby/object:Gem::Version
-        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: cgi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Subscription Billing - Simple. Secure. Affordable. More details at www.chargebee.com.
@@ -196,8 +176,8 @@ files:
 - lib/chargebee/models/unbilled_charge.rb
 - lib/chargebee/models/usage.rb
 - lib/chargebee/models/virtual_bank_account.rb
+- lib/chargebee/nativeRequest.rb
 - lib/chargebee/request.rb
-- lib/chargebee/rest.rb
 - lib/chargebee/result.rb
 - lib/chargebee/util.rb
 - lib/ssl/ca-certs.crt
@@ -211,25 +191,24 @@ licenses:
 - MIT
 metadata:
   changelog_uri: https://github.com/chargebee/chargebee-ruby/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.5.9
+signing_key:
 specification_version: 2
 summary: Ruby client for Chargebee API.
 test_files:

data/lib/chargebee/rest.rb

@@ -1,99 +0,0 @@
-require 'rest_client'
-require 'json'
-
-module ChargeBee
-  module Rest
-    
-    def self.request(method, url, env, params=nil, headers={})
-      raise Error.new('No environment configured.') unless env
-      api_key = env.api_key
-      
-      if(ChargeBee.verify_ca_certs?)
-        ssl_opts = {
-          :verify_ssl => OpenSSL::SSL::VERIFY_PEER,
-          :ssl_ca_file => ChargeBee.ca_cert_path
-        }
-      else
-        ssl_opts = {
-          :verify_ssl => false
-        }
-      end
-      case method.to_s.downcase.to_sym
-      when :get, :head, :delete
-        headers = { :params => params }.merge(headers)
-        payload = nil
-      else
-        payload = params
-      end
-        
-      user_agent = ChargeBee.user_agent 
-      headers = { 
-        "User-Agent" => user_agent,
-        :accept => :json,
-        "Lang-Version" => RUBY_VERSION,
-        "OS-Version" => RUBY_PLATFORM 
-        }.merge(headers)      
-      opts = {
-        :method => method,
-        :url => env.api_url(url),
-        :user => api_key,
-        :headers => headers,
-        :payload => payload,
-        :open_timeout => env.connect_timeout,
-        :timeout => env.read_timeout
-        }.merge(ssl_opts)
-
-      begin
-        response = RestClient::Request.execute(opts)
-      rescue RestClient::ExceptionWithResponse => e
-        if rcode = e.http_code and rbody = e.http_body
-            raise handle_for_error(e, rcode, rbody)
-        else
-            raise IOError.new("IO Exception when trying to connect to chargebee with url #{opts[:url]} . Reason #{e}",e)
-        end
-      rescue Exception => e
-            raise IOError.new("IO Exception when trying to connect to chargebee with url #{opts[:url]} . Reason #{e}",e)        
-      end
-      rheaders = response.headers
-      rbody = response.body
-      rcode = response.code
-      begin
-        resp = JSON.parse(rbody)
-      rescue Exception => e
-        if rbody.include? "503"
-            raise Error.new("Sorry, the server is currently unable to handle the request due to a temporary overload or scheduled maintenance. Please retry after sometime. \n type: internal_temporary_error, \n http_status_code: 503, \n error_code: internal_temporary_error,\n content: #{rbody.inspect}",e)
-        elsif rbody.include? "504"
-            raise Error.new("The server did not receive a timely response from an upstream server, request aborted. If this problem persists, contact us at support@chargebee.com. \n type: gateway_timeout, \n http_status_code: 504, \n error_code: gateway_timeout,\n content:  #{rbody.inspect}",e)
-        else
-            raise Error.new("Sorry, something went wrong when trying to process the request. If this problem persists, contact us at support@chargebee.com. \n type: internal_error, \n http_status_code: 500, \n error_code: internal_error,\n content:  #{rbody.inspect}",e)
-        end
-      end
-      resp = Util.symbolize_keys(resp)
-      return resp, rheaders
-    end
-    
-    def self.handle_for_error(e, rcode=nil, rbody=nil)
-      if(rcode == 204)
-        raise Error.new("No response returned by the chargebee api. The http status code is #{rcode}")
-      end
-      begin
-        error_obj = JSON.parse(rbody)
-        error_obj = Util.symbolize_keys(error_obj)
-      rescue Exception => e
-        raise Error.new("Error response not in JSON format. The http status code is #{rcode} \n #{rbody.inspect}",e)
-      end
-      type = error_obj[:type]
-      if("payment" == type)
-        raise PaymentError.new(rcode, error_obj)
-      elsif("operation_failed" == type)
-        raise OperationFailedError.new(rcode, error_obj)
-      elsif("invalid_request" == type)
-        raise InvalidRequestError.new(rcode, error_obj)
-      else
-        raise APIError.new(rcode, error_obj)
-      end
-      
-    end
-    
-  end
-end