razorpay 1.0.3 → 1.1.0

data/lib/razorpay/constants.rb

@@ -1,5 +1,6 @@
 # Version and other constants are defined here
 module Razorpay
-  BASE_URI = 'https://api.razorpay.com/v1/'
-  VERSION = '1.0.3'
+  BASE_URI = 'https://api.razorpay.com/v1/'.freeze
+  TEST_URL = 'https://api.razorpay.com/'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/lib/razorpay/entity.rb

@@ -14,11 +14,8 @@ module Razorpay
     # instance variables
     def method_missing(name)
       name = name.to_s
-      if @attributes.key?(name)
-        @attributes[name]
-      else
-        fail NameError, "No such data member: #{name}"
-      end
+      raise NameError, "No such data member: #{name}" unless @attributes.key? name
+      @attributes[name]
     end
 
     # Public: Convert the Entity object to JSON

data/lib/razorpay/order.rb

@@ -0,0 +1,32 @@
+require 'razorpay/request'
+require 'razorpay/entity'
+
+module Razorpay
+  # Order API is currently in beta and allows you to
+  # associate Payments with an order entity
+  class Order < Entity
+    def self.request
+      Razorpay::Request.new('orders')
+    end
+
+    def self.create(options)
+      raise ArgumentError, 'Please provide order amount' unless options.key?(:amount)
+      raise ArgumentError, 'Please provide order currency' unless options.key?(:currency)
+      raise ArgumentError, 'Please provide order receipt' unless options.key?(:receipt)
+      request.create options
+    end
+
+    def self.fetch(id)
+      request.fetch id
+    end
+
+    def self.all(options = {})
+      request.all options
+    end
+
+    def payments(options = {})
+      r = self.class.request
+      r.request :get, "/orders/#{id}/payments", options
+    end
+  end
+end

data/lib/razorpay/payment.rb

@@ -29,7 +29,7 @@ module Razorpay
     end
 
     def capture(options)
-      fail ArgumentError, 'Please provide capture amount' unless options.key?(:amount)
+      raise ArgumentError, 'Please provide capture amount' unless options.key?(:amount)
       self.class.request.post "#{id}/capture", options
     end
   end

data/lib/razorpay/request.rb

@@ -8,9 +8,18 @@ module Razorpay
   class Request
     include HTTParty
 
+    ssl_ca_file File.dirname(__FILE__) + '/../ca-bundle.crt'
+
     def initialize(entity_name)
       self.class.base_uri(Razorpay::BASE_URI)
       @entity_name = entity_name
+      @options = {
+        basic_auth: Razorpay.auth,
+        timeout: 30,
+        headers: {
+          'User-Agent' => "Razorpay-Ruby/#{Razorpay::VERSION}"
+        }
+      }
     end
 
     def fetch(id)
@@ -25,13 +34,23 @@ module Razorpay
       request :post, "/#{@entity_name}/#{url}", data
     end
 
+    def create(data)
+      request :post, "/#{@entity_name}", data
+    end
+
     def request(method, url, data = {})
       case method
       when :get
-        create_instance self.class.send(method, url, query: data, basic_auth: Razorpay.auth)
+        @options[:query] = data
       when :post
-        create_instance self.class.send(method, url, body:  data, basic_auth: Razorpay.auth)
+        @options[:body] = data
       end
+      create_instance self.class.send(method, url, @options)
+    end
+
+    # Since we need to change the base route
+    def make_test_request
+      self.class.get Razorpay::TEST_URL, @options
     end
 
     # Recursively builds entity instances
@@ -67,7 +86,7 @@ module Razorpay
         rescue NameError
           Razorpay::Error
         end
-      fail klass.new(*args), error['description']
+      raise klass.new(*args), error['description']
     end
   end
 end

data/razorpay-ruby.gemspec

@@ -18,10 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(/^(test|spec|features)/)
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.6'
-  spec.add_development_dependency 'rake', '~> 10.4'
-  spec.add_development_dependency 'minitest', '~> 5.5'
-  spec.add_development_dependency 'webmock', '~> 1.20'
-  spec.add_development_dependency 'simplecov', '~> 0.9'
+  spec.add_development_dependency 'rake', '~> 10.5'
+  spec.add_development_dependency 'minitest', '~> 5.8'
+  spec.add_development_dependency 'webmock', '~> 1.24'
+  spec.add_development_dependency 'simplecov', '~> 0.11'
   spec.add_dependency 'httparty', '~> 0.13'
 end

data/test/fixtures/fake_order.json

@@ -0,0 +1,10 @@
+{
+  "id": "order_50sX9hGHZJvjjI",
+  "entity": "order",
+  "amount": 5000,
+  "currency": "INR",
+  "receipt": "TEST",
+  "status": "attempted",
+  "attempts": 1,
+  "created_at": 1456411883
+}

data/test/fixtures/hello_response.json

@@ -0,0 +1,3 @@
+{
+    "message": "Welcome to Razorpay API."
+}

data/test/fixtures/order_collection.json

@@ -0,0 +1,36 @@
+{
+  "entity": "collection",
+  "count": 3,
+  "items": [
+    {
+      "id": "order_50snfRNtuFmFBZ",
+      "entity": "order",
+      "amount": 5000,
+      "currency": "INR",
+      "receipt": "TEST",
+      "status": "created",
+      "attempts": 0,
+      "created_at": 1456412821
+    },
+    {
+      "id": "order_50snJlH2AMYOYK",
+      "entity": "order",
+      "amount": 5000,
+      "currency": "INR",
+      "receipt": "TEST",
+      "status": "created",
+      "attempts": 0,
+      "created_at": 1456412801
+    },
+    {
+      "id": "order_50smJrkZ4Qb0HJ",
+      "entity": "order",
+      "amount": 5000,
+      "currency": "INR",
+      "receipt": "TEST",
+      "status": "created",
+      "attempts": 0,
+      "created_at": 1456412744
+    }
+  ]
+}

data/test/fixtures/order_payments.json

@@ -0,0 +1,29 @@
+{
+  "entity": "collection",
+  "count": 1,
+  "items": [
+    {
+      "id": "pay_50sbkZA9AcyE5a",
+      "entity": "payment",
+      "amount": 5000,
+      "currency": "INR",
+      "status": "authorized",
+      "method": "card",
+      "emi_plan_id": null,
+      "amount_refunded": 0,
+      "refund_status": null,
+      "captured": false,
+      "description": null,
+      "email": "test@razorpay.com",
+      "contact": "1234567890",
+      "notes": {
+        "order_id": "3453"
+      },
+      "fee": 0,
+      "service_tax": 0,
+      "error_code": null,
+      "error_description": null,
+      "created_at": 1456412144
+    }
+  ]
+}

data/test/razorpay/test_errors.rb

@@ -7,7 +7,7 @@ module Razorpay
   class ErrorTest < Minitest::Test
     def setup
       @payment_id = 'fake_payment_id'
-      stub_get(/payments\/#{Regexp.quote(@payment_id)}$/, 'fake_payment')
+      stub_get(%r{payments\/#{Regexp.quote(@payment_id)}$}, 'fake_payment')
     end
 
     def test_bad_request_error

data/test/razorpay/test_order.rb

@@ -0,0 +1,50 @@
+require 'test_helper'
+require 'razorpay/order'
+require 'razorpay/collection'
+
+module Razorpay
+  # Tests for Razorpay::Order
+  class RazorpayOrderTest < Minitest::Test
+    def setup
+      @order_id = 'order_50sX9hGHZJvjjI'
+
+      # Any request that ends with orders/order_id
+      stub_get(%r{orders/#{@order_id}$}, 'fake_order')
+    end
+
+    def test_order_should_be_defined
+      refute_nil Razorpay::Order
+    end
+
+    def test_order_should_be_created
+      stub_post(/orders$/, 'fake_order', 'amount=5000&currency=INR&receipt=TEST')
+      order = Razorpay::Order.create amount: 5000, currency: 'INR', receipt: 'TEST'
+
+      assert_equal 5000, order.amount
+      assert_equal 'INR', order.currency
+      assert_equal 'TEST', order.receipt
+    end
+
+    def test_orders_should_be_fetched
+      order = Razorpay::Order.fetch(@order_id)
+      assert_instance_of Razorpay::Order, order, 'order not an instance of Razorpay::Order class'
+      assert_equal @order_id, order.id, 'order IDs do not match'
+    end
+
+    def test_fetching_all_orders
+      stub_get(/orders$/, 'order_collection')
+      orders = Razorpay::Order.all
+      assert_instance_of Razorpay::Collection, orders, 'Orders should be an array'
+      assert !orders.items.empty?, 'orders should be more than one'
+    end
+
+    def test_order_payments_should_be_fetched
+      stub_get(%r{orders/#{@order_id}/payments$}, 'order_payments')
+
+      payments = Razorpay::Order.fetch(@order_id).payments
+      assert_instance_of Razorpay::Collection, payments, 'Payments should be an array'
+      assert !payments.items.empty?, 'payments should be more than one'
+      assert_equal 'pay_50sbkZA9AcyE5a', payments.items[0]['id'], 'payment id should match'
+    end
+  end
+end

data/test/razorpay/test_payment.rb

@@ -9,7 +9,7 @@ module Razorpay
       @payment_id = 'fake_payment_id'
 
       # Any request that ends with payments/payment_id
-      stub_get(/payments\/#{Regexp.quote(@payment_id)}$/, 'fake_payment')
+      stub_get(%r{payments\/#{Regexp.quote(@payment_id)}$}, 'fake_payment')
       stub_get(/payments$/, 'payment_collection')
     end
 
@@ -26,7 +26,7 @@ module Razorpay
     def test_all_payments
       payments = Razorpay::Payment.all
       assert_instance_of Razorpay::Collection, payments, 'Payments should be an array'
-      assert payments.items.size > 0, 'Payments should be more than one'
+      assert !payments.items.empty?, 'Payments should be more than one'
     end
 
     def test_all_payments_with_options

data/test/razorpay/test_razorpay.rb

@@ -1,5 +1,7 @@
 require 'test_helper'
 require 'razorpay'
+require 'webmock'
+require 'test_helper'
 
 module Razorpay
   # Tests for Razorpay
@@ -16,5 +18,24 @@ module Razorpay
       auth = { username: 'key_id', password: 'key_secret' }
       assert_equal auth, Razorpay.auth
     end
+
+    # We make a request to the / endpoint to test SSL support
+    def test_sample_request
+      WebMock.allow_net_connect!
+      req = Razorpay::Request.new('dummy')
+      response = req.make_test_request.parsed_response
+      assert_equal 'Welcome to Razorpay API.', response['message']
+      WebMock.disable_net_connect!
+    end
+
+    # We mock this request
+    def test_auth_header_and_user_agent
+      stub_get(/$/, 'hello_response')
+      Razorpay::Request.new('dummy').make_test_request
+      user_agent = "Razorpay-Ruby/#{Razorpay::VERSION}"
+      assert_requested :get, 'https://key_id:key_secret@api.razorpay.com/',
+                       headers: { 'User-Agent' => user_agent },
+                       times: 1
+    end
   end
 end

data/test/razorpay/test_refund.rb

@@ -7,7 +7,7 @@ module Razorpay
   class RazorpayRefundTest < Minitest::Test
     def setup
       @payment_id = 'fake_payment_id'
-      stub_get(/payments\/#{Regexp.quote(@payment_id)}$/, 'fake_payment')
+      stub_get(%r{payments\/#{Regexp.quote(@payment_id)}$}, 'fake_payment')
     end
 
     def test_refund_should_be_defined
@@ -15,7 +15,7 @@ module Razorpay
     end
 
     def test_fetch_all_refunds
-      stub_get(%r{/payments/#{@payment_id}/refunds$}, 'refund_collection')
+      stub_get(%r{payments/#{@payment_id}/refunds$}, 'refund_collection')
       refunds = Razorpay::Payment.fetch(@payment_id).refunds.all
       assert_instance_of Razorpay::Collection, refunds
     end

data/test/test_helper.rb

@@ -10,7 +10,7 @@ end
 
 def stub_response(_url, filename, status = nil)
   response = { body: fixture_file(filename) }
-  response.merge!(status: status) unless status.nil?
+  response[:status] = status unless status.nil?
   response.merge!(headers: { 'Content-Type' => 'application/json' })
 end
 

metadata

@@ -1,97 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: razorpay
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Abhay Rana
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-31 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '10.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '10.5'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.5'
+        version: '5.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.5'
+        version: '5.8'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.20'
+        version: '1.24'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.20'
+        version: '1.24'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
 description: Official ruby bindings for the Razorpay API
@@ -101,15 +87,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .editorconfig
-- .gitignore
-- .rubocop.yml
-- .simplecov
-- .travis.yml
+- ".editorconfig"
+- ".gitignore"
+- ".rubocop.yml"
+- ".simplecov"
+- ".travis.yml"
+- CHANGELOG
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- lib/ca-bundle.crt
 - lib/razorpay.rb
 - lib/razorpay/collection.rb
 - lib/razorpay/constants.rb
@@ -119,19 +107,25 @@ files:
 - lib/razorpay/errors/gateway_error.rb
 - lib/razorpay/errors/razorpay_error.rb
 - lib/razorpay/errors/server_error.rb
+- lib/razorpay/order.rb
 - lib/razorpay/payment.rb
 - lib/razorpay/refund.rb
 - lib/razorpay/request.rb
 - razorpay-ruby.gemspec
 - test/fixtures/bad_request_error.json
 - test/fixtures/fake_captured_payment.json
+- test/fixtures/fake_order.json
 - test/fixtures/fake_payment.json
 - test/fixtures/fake_refund.json
+- test/fixtures/hello_response.json
+- test/fixtures/order_collection.json
+- test/fixtures/order_payments.json
 - test/fixtures/payment_collection.json
 - test/fixtures/payment_collection_with_one_payment.json
 - test/fixtures/refund_collection.json
 - test/razorpay/test_entity.rb
 - test/razorpay/test_errors.rb
+- test/razorpay/test_order.rb
 - test/razorpay/test_payment.rb
 - test/razorpay/test_razorpay.rb
 - test/razorpay/test_refund.rb
@@ -146,32 +140,36 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Razorpay's Ruby API
 test_files:
 - test/fixtures/bad_request_error.json
 - test/fixtures/fake_captured_payment.json
+- test/fixtures/fake_order.json
 - test/fixtures/fake_payment.json
 - test/fixtures/fake_refund.json
+- test/fixtures/hello_response.json
+- test/fixtures/order_collection.json
+- test/fixtures/order_payments.json
 - test/fixtures/payment_collection.json
 - test/fixtures/payment_collection_with_one_payment.json
 - test/fixtures/refund_collection.json
 - test/razorpay/test_entity.rb
 - test/razorpay/test_errors.rb
+- test/razorpay/test_order.rb
 - test/razorpay/test_payment.rb
 - test/razorpay/test_razorpay.rb
 - test/razorpay/test_refund.rb
 - test/test_helper.rb
-has_rdoc: