razorpay 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cd8a703b64189d31348ac44fccf9edef384ff5af
-  data.tar.gz: f007b3cd479849931bda5fc5f59d584f4a15e18b
+SHA256:
+  metadata.gz: 39cc293b9e35da57fbe365e94ee9d46d9c21d7843d8e08f40382d9683d5dac8a
+  data.tar.gz: '086f7b483c58b0841a5b4a7cc677f4d4cc083536b0999f5abff1986287be0fe3'
 SHA512:
-  metadata.gz: 6d0c677d255482d7378c2eecf523d3ee8ae9d106af592885613d6c08a4a2b5be24c39c9c1c8dba270029336e1a1a56dc385358b48e90ff3e80adf638dedcf266
-  data.tar.gz: 942c7c1247d66d697b4f597125d5c2c145112e0ea62f1fa14c4fe5835c03607a13fdcce26c36185a4ccd0fd08cd08fbaeb260a4751e2983c105c7a9d0229a22c
+  metadata.gz: af4c5ba0f617c776ac5b4ad191062e9530eb1c70443bc1e030873f90edb8b6072a90e66d50e7b55da8d1cbf30f6f590cb94f51c67b6cb9383584cd1f44182aaa
+  data.tar.gz: 1ddbe5914250c4dd745da91780ad0ac9e35f13fee040490a4b49cd43f5a72a5882aeaec3af6b311220c3537af41b36e5348428dc746f0f8fe3a1f24cbcc45fe2

data/.rubocop.yml

@@ -9,9 +9,6 @@ Metrics/LineLength:
 Style/SymbolArray:
   MinSize: 3
 
-Style/ClassVars:
-  Enabled: false
-
 Metrics/MethodLength:
   Max: 15
 
@@ -19,3 +16,7 @@ Naming/UncommunicativeMethodParamName:
   MinNameLength: 1
   AllowNamesEndingInNumbers: false
 
+# Near-duplicate of a file from an external package, want to keep changes minimal
+AllCops:
+  Exclude:
+    - 'lib/extensions/httparty/hash_conversions.rb'

data/.travis.yml

@@ -3,20 +3,16 @@ language: ruby
 # Merged with whatever is the top of each branch at https://www.ruby-lang.org/en/downloads/releases/
 matrix:
   include:
-    - rvm: "1.9.3"
-    - rvm: "2.0.0"
-    - rvm: "2.1.10"
-    - rvm: "2.2.9"
-    - rvm: "2.3.6"
-    - rvm: "2.4.2"
-    - rvm: "2.5.0"
-    - rvm: "2.5.0"
+    - rvm: "2.6.2"
+    - rvm: "2.5.5"
+    - rvm: "2.4.6"
       env: LINT=rubocop
   allow_failures:
   # These are EOL versions of ruby
-    - rvm: "1.9.3"
-    - rvm: "2.0.0"
+    - rvm: "2.3.8"
     - rvm: "2.1.10"
+    - rvm: "2.0.0"
+    - rvm: "1.9.3"
 before_install: gem update --system
 script:
   - bundle exec rake test

data/CHANGELOG.md

@@ -4,32 +4,56 @@ Changelog for Razorpay-Ruby SDK.
 
 ## Unreleased
 
+## [2.4.0] - 2019-04-08
+
+### Changed
+
+- Indexed keys used in x-www-form-urlencoded request bodies [[#68][68]]
+- Updated Utility verify\_\* methods to return verification bool [[#72][72]]
+
+### Added
+
+- Support for custom JSON options to Entity to_json [[#75][75]]
+
 ## [2.3.0] - 2018-04-20
+
 ### Added
+
 - Support for subscription signature verification
 - Bang! methods (`capture!`, `refund!`) that update the calling entity
 
 ## [2.2.0] - 2018-01-29
+
 ### Added
+
 - Support for Subscriptions
 
 ## [2.1.0] - 2017-11-17
+
 ### Changed
+
 - Generic `Razorpay::Error` is thrown when server is unreachable
 
 ### Added
+
 - Support for making raw requests to the API via `raw_request`.
 
 ## [2.1.0.pre] - 2017-08-17
+
 ### Added
+
 - Support for Virtual Accounts
 
 ## [2.0.1] - 2017-07-31
+
 ### Fixed
+
 - Webhook signature verification
 
 ## [2.0.0] - 2017-03-02
+
 ### Added
+
 - Adds `require` for all Razorpay supported entities
 - All entity objects now throw `NoMethodError` instead of `NameError` if the attribute doesn't exist
 - Adds customer edit API
@@ -42,43 +66,63 @@ Changelog for Razorpay-Ruby SDK.
 - Adds rake test groups
 
 ## [1.2.1] - 2016-12-22
+
 ### Changed
+
 - Drops ArgumentError checks for local validation. Rely on server side checks instead.
 
 ### Added
+
 - Support for customers and invoices API
 - Loads Order class by default.
 
 ## [1.2.0] - 2016-11-23
+
 ### Added
+
 - Fixed payment.method as an attribute accessor
 
 ## [1.1.0] - 2016-02-25
+
 ### Added
+
 - Add support for Orders API
 - Bundles the CA Certificate with the gem. See #6
 
 ## [1.0.3] - 2015-03-31
+
 ### Changed
+
 - Handles error requests properly
 
 ## [1.0.1] - 2015-02-23
+
 ### Added
+
 - Added support for ruby versions below 2.0
 
 ## [1.0.0] - 2015-01-17
+
 ### Added
+
 - Initial Release
 
-[Unreleased]: https://github.com/razorpay/razorpay-ruby/compare/2.3.0...HEAD
-[2.3.0]: https://github.com/razorpay/razorpay-ruby/compare/2.2.0...2.3.0
-[2.2.0]: https://github.com/razorpay/razorpay-ruby/compare/2.1.0...2.2.0
-[2.1.0]: https://github.com/razorpay/razorpay-ruby/compare/2.0.1...2.1.0
-[2.1.0.pre]: https://github.com/razorpay/razorpay-ruby/compare/2.0.1...2.1.0.pre
-[2.0.1]: https://github.com/razorpay/razorpay-ruby/compare/2.0.0...2.0.1
-[2.0.0]: https://github.com/razorpay/razorpay-ruby/compare/1.2.1...2.0.0
-[1.2.1]: https://github.com/razorpay/razorpay-ruby/compare/1.2.0...1.2.1
-[1.2.0]: https://github.com/razorpay/razorpay-ruby/compare/1.1.0...1.2.0
-[1.1.0]: https://github.com/razorpay/razorpay-ruby/compare/1.0.3...1.1.0
-[1.0.3]: https://github.com/razorpay/razorpay-ruby/compare/1.0.1...1.0.3
-[1.0.1]: https://github.com/razorpay/razorpay-ruby/compare/1.0.0...1.0.1
+# Diff
+
+- [Unreleased](https://github.com/razorpay/razorpay-ruby/compare/2.4.0...HEAD)
+- [2.4.0](https://github.com/razorpay/razorpay-ruby/compare/2.3.0...2.4.0)
+- [2.3.0](https://github.com/razorpay/razorpay-ruby/compare/2.2.0...2.3.0)
+- [2.2.0](https://github.com/razorpay/razorpay-ruby/compare/2.1.0...2.2.0)
+- [2.1.0](https://github.com/razorpay/razorpay-ruby/compare/2.0.1...2.1.0)
+- [2.1.0.pre](https://github.com/razorpay/razorpay-ruby/compare/2.0.1...2.1.0.pre)
+- [2.0.1](https://github.com/razorpay/razorpay-ruby/compare/2.0.0...2.0.1)
+- [2.0.0](https://github.com/razorpay/razorpay-ruby/compare/1.2.1...2.0.0)
+- [1.2.1](https://github.com/razorpay/razorpay-ruby/compare/1.2.0...1.2.1)
+- [1.2.0](https://github.com/razorpay/razorpay-ruby/compare/1.1.0...1.2.0)
+- [1.1.0](https://github.com/razorpay/razorpay-ruby/compare/1.0.3...1.1.0)
+- [1.0.3](https://github.com/razorpay/razorpay-ruby/compare/1.0.1...1.0.3)
+- [1.0.1](https://github.com/razorpay/razorpay-ruby/compare/1.0.0...1.0.1)
+
+[68]: https://github.com/razorpay/razorpay-ruby/pull/68
+[72]: https://github.com/razorpay/razorpay-ruby/pull/72
+[75]: https://github.com/razorpay/razorpay-ruby/pull/75

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Razorpay
+Copyright (c) 2019 Razorpay
 
 MIT License
 

data/README.md

@@ -191,10 +191,10 @@ only, the code is tested against the following versions:
 * 1.9.3
 * 2.0.0
 * 2.1.10
-* 2.2.9
-* 2.3.6
-* 2.4.2
-* 2.5.0
+* 2.3.8
+* 2.4.6
+* 2.5.5
+* 2.6.2
 
 ## Release
 

data/lib/extensions/httparty/hash_conversions.rb

@@ -0,0 +1,44 @@
+require 'httparty'
+
+# :nocov:
+module HTTParty
+  # Extension of HTTParty:HashConversions. Changes made to add index to arrays
+  # https://github.com/jnunemaker/httparty/blob/master/lib/httparty/hash_conversions.rb#L42,L55
+  module HashConversions
+    def self.normalize_keys(key, value)
+      stack = []
+      normalized_keys = []
+
+      if value.respond_to?(:to_ary)
+        if value.empty?
+          normalized_keys << ["#{key}[]", '']
+        else
+          normalized_keys = value.to_ary.flat_map.with_index do
+            |element, index| normalize_keys("#{key}[#{index}]", element)
+          end
+        end
+      elsif value.respond_to?(:to_hash)
+        stack << [key, value.to_hash]
+      else
+        normalized_keys << [key.to_s, value]
+      end
+
+      stack.each do |parent, hash|
+        hash.each do |child_key, child_value|
+          if child_value.respond_to?(:to_hash)
+            stack << ["#{parent}[#{child_key}]", child_value.to_hash]
+          elsif child_value.respond_to?(:to_ary)
+            child_value.to_ary.each_with_index do |v, index|
+              normalized_keys << normalize_keys("#{parent}[#{child_key}][#{index}]", v).flatten
+            end
+          else
+            normalized_keys << normalize_keys("#{parent}[#{child_key}]", child_value).flatten
+          end
+        end
+      end
+
+      normalized_keys
+    end
+  end
+end
+# :nocov:

data/lib/razorpay/constants.rb

@@ -2,5 +2,5 @@
 module Razorpay
   BASE_URI = 'https://api.razorpay.com/v1/'.freeze
   TEST_URL = 'https://api.razorpay.com/'.freeze
-  VERSION = '2.3.0'.freeze
+  VERSION = '2.4.0'.freeze
 end

data/lib/razorpay/entity.rb

@@ -28,8 +28,8 @@ module Razorpay
 
     # Public: Convert the Entity object to JSON
     # Returns the JSON representation of the Entity (as a string)
-    def to_json
-      @attributes.to_json
+    def to_json(*args)
+      @attributes.to_json(*args)
     end
 
     # Mutates the entity in accordance with

data/lib/razorpay/request.rb

@@ -1,5 +1,6 @@
-require 'razorpay/constants'
 require 'httparty'
+require 'extensions/httparty/hash_conversions'
+require 'razorpay/constants'
 
 module Razorpay
   # Request objects are used to create fetch

data/lib/razorpay/utility.rb

@@ -28,6 +28,8 @@ module Razorpay
         verified = secure_compare(expected_signature, signature)
 
         raise SecurityError, 'Signature verification failed' unless verified
+
+        verified
       end
 
       def secure_compare(a, b)

data/test/razorpay/test_entity.rb

@@ -44,6 +44,10 @@ module Razorpay
       assert_equal '{"a":1}', @entity.to_json
     end
 
+    def test_json_conversion_with_args
+      assert_equal '{"a": 1}', @entity.to_json(space: ' ')
+    end
+
     def test_invalid_attribute_get
       assert_raises(NoMethodError, 'It must raise a NoMethodError on invalid attribute') { @entity.b }
     end

data/test/razorpay/test_subscription.rb

@@ -51,6 +51,31 @@ module Razorpay
       assert_subscription_details(subscription)
     end
 
+    def test_subscription_should_be_created_with_upfront_amount
+      subscription_attrs = {
+        plan_id: 'fake_plan_id',
+        total_count: 12,
+        addons: [
+          { item: { amount: 100, currency: 'INR' } },
+          { item: { amount: 200, currency: 'INR' } }
+        ]
+      }
+
+      #
+      # Note that the stubbed request has the addons array
+      # indexed, ensuring that the right request is being built
+      #
+      # This test will fail if the request sends
+      # "addons[][item][amount]=100&addons[][item][currency]=INR" instead
+      #
+      stub_params = 'plan_id=fake_plan_id&total_count=12&' \
+                    'addons[0][item][amount]=100&addons[0][item][currency]=INR&' \
+                    'addons[1][item][amount]=200&addons[1][item][currency]=INR'
+      stub_post(/subscriptions$/, 'fake_subscription', stub_params)
+
+      Razorpay::Subscription.create subscription_attrs
+    end
+
     def test_subscription_can_be_cancelled_by_subscription_id
       stub_post(%r{subscriptions\/#{@subscription_id}\/cancel$}, 'cancel_subscription', {})
       subscription = Razorpay::Subscription.cancel(@subscription_id)

data/test/razorpay/test_virtual_account.rb

@@ -24,7 +24,7 @@ module Razorpay
       stub_post(
         /virtual_accounts$/,
         'fake_virtual_account',
-        'receiver_types[]=bank_account&description=First%20Virtual%20Account'
+        'receiver_types[0]=bank_account&description=First%20Virtual%20Account'
       )
 
       virtual_account = Razorpay::VirtualAccount.create @virtual_account_create_array

data/test/test_helper.rb

@@ -8,6 +8,7 @@ Coveralls.wear! if ENV['CI']
 
 def fixture_file(filename)
   return '' if filename == ''
+
   file_path = File.expand_path(File.dirname(__FILE__) + '/fixtures/' + filename + '.json')
   File.read(file_path)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: razorpay
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Abhay Rana
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-20 00:00:00.000000000 Z
+date: 2019-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -114,6 +114,7 @@ files:
 - README.md
 - Rakefile
 - lib/ca-bundle.crt
+- lib/extensions/httparty/hash_conversions.rb
 - lib/razorpay.rb
 - lib/razorpay/addon.rb
 - lib/razorpay/card.rb
@@ -205,8 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Razorpay's Ruby API