moving ledger and balance API's to v1.1

Author: Puneet Khushwani

lib/ost-sdk-ruby/saas.rb

@@ -13,8 +13,10 @@
 require_relative 'saas/v1/airdrops'
 require_relative 'saas/v1/transfers'
 require_relative 'saas/v1/transactions'
-require_relative 'saas/v1/balances'
-require_relative 'saas/v1/ledger'
+
+require_relative 'saas/v1.1/services'
+require_relative 'saas/v1.1/balances'
+require_relative 'saas/v1.1/ledger'
 
 module OSTSdk
 

lib/ost-sdk-ruby/saas/services.rb

@@ -20,7 +20,7 @@ def initialize(params)
         fail 'missing API Key' if params[:api_key].nil?
         fail 'missing API Secret' if params[:api_secret].nil?
 
-        params[:api_base_url].gsub!(/\/$/, '') # remove trailing slash
+        params[:api_base_url] = params[:api_base_url].gsub(/\/$/, '') # remove trailing slash
         params[:api_spec] = false if params[:api_spec].nil?
 
         set_manifest(params)
@@ -31,27 +31,55 @@ def initialize(params)
 
       def set_manifest(params)
 
-        api_version = extract_api_version(params[:api_base_url])
+        int_api_version = extract_integer_api_version(params[:api_base_url])
 
         # Provide access to version specific API endpoints
-        if api_version == ''
+        if int_api_version == v0_int_api_version
           # puts("You are using an deprecated version of OST API. Please update to the latest version.")
           @services = OSTSdk::Saas::V0::Services.new(params)
-        elsif api_version == 'v1'
+        elsif int_api_version == v1_int_api_version
           @services = OSTSdk::Saas::V1::Services.new(params)
+        elsif int_api_version < v2_int_api_version
+          @services = OSTSdk::Saas::V1Dot1::Services.new(params)
         else
           fail 'Api endpoint is invalid'
         end
 
       end
 
-      def extract_api_version(api_base_url)
+      def extract_integer_api_version(api_base_url)
 
         api_version = ((api_base_url || '').split("/")[3] || '').downcase
-        api_major_version = (api_version.split('.')[0] || '')
+        return v0_int_api_version if api_version == ''
 
-        return api_major_version
+        # version if passed should always start with 'v'
+        fail "invalid version string #{api_version}" if api_version[0] != 'v'
 
+        # exclude 'v'
+        str_api_version = api_version[1..-1]
+
+        # if str_api_version doesn't start with a integer value fail
+        fail "invalid version string #{api_version}" if str_api_version.to_i == 0
+
+        buffer = str_api_version.split('.')
+
+        # version can not have more than 2 '.' ie 1.1.1.2 is not allowed
+        fail "invalid version string #{api_version}" if buffer.length > 3
+
+        buffer[0].to_i * 100 + (buffer[1] || 0).to_i * 10 + (buffer[2] || 0).to_i
+
+      end
+
+      def v0_int_api_version
+        0
+      end
+
+      def v1_int_api_version
+        100
+      end
+
+      def v2_int_api_version
+        200
       end
 
     end

lib/ost-sdk-ruby/saas/v1/balances.rb lib/ost-sdk-ruby/saas/v1.1/balances.rblib/ost-sdk-ruby/saas/v1/balances.rb renamed to lib/ost-sdk-ruby/saas/v1.1/balances.rb

@@ -2,7 +2,7 @@ module OSTSdk
 
   module Saas
 
-    module V1
+    module V1Dot1
 
       class Balances < OSTSdk::Saas::Base
 

lib/ost-sdk-ruby/saas/v1/ledger.rb lib/ost-sdk-ruby/saas/v1.1/ledger.rblib/ost-sdk-ruby/saas/v1/ledger.rb renamed to lib/ost-sdk-ruby/saas/v1.1/ledger.rb

@@ -2,7 +2,7 @@ module OSTSdk
 
   module Saas
 
-    module V1
+    module V1Dot1
 
       class Ledger < OSTSdk::Saas::Base
 

lib/ost-sdk-ruby/saas/v1.1/services.rb

@@ -0,0 +1,41 @@
+module OSTSdk
+
+  module Saas
+
+    module V1Dot1
+
+      class Services
+
+        attr_reader :users, :token, :actions, :airdrops, :transactions, :transfers, :balances, :ledger
+
+        # Initialize
+        #
+        # Arguments:
+        #   api_base_url: (String)
+        #   api_key: (String)
+        #   api_secret: (String)
+        #   api_spec: (Boolean)
+        #
+        def initialize(params)
+
+          # Modules which were implemented with V1.0
+          @users = OSTSdk::Saas::V1::Users.new(params)
+          @token = OSTSdk::Saas::V1::Token.new(params)
+          @actions = OSTSdk::Saas::V1::Actions.new(params)
+          @airdrops = OSTSdk::Saas::V1::Airdrops.new(params)
+          @transactions = OSTSdk::Saas::V1::Transactions.new(params)
+          @transfers = OSTSdk::Saas::V1::Transfers.new(params)
+
+          # Modules which were implemented with V1.1
+          @balances = OSTSdk::Saas::V1Dot1::Balances.new(params)
+          @ledger = OSTSdk::Saas::V1Dot1::Ledger.new(params)
+
+        end
+
+      end
+
+    end
+
+  end
+
+end

lib/ost-sdk-ruby/saas/v1/services.rb

@@ -6,7 +6,7 @@ module V1
 
       class Services
 
-        attr_reader :users, :token, :actions, :airdrops, :transactions, :transfers, :balances, :ledger
+        attr_reader :users, :token, :actions, :airdrops, :transactions, :transfers
 
         # Initialize
         #
@@ -24,8 +24,6 @@ def initialize(params)
           @airdrops = OSTSdk::Saas::V1::Airdrops.new(params)
           @transactions = OSTSdk::Saas::V1::Transactions.new(params)
           @transfers = OSTSdk::Saas::V1::Transfers.new(params)
-          @balances = OSTSdk::Saas::V1::Balances.new(params)
-          @ledger = OSTSdk::Saas::V1::Ledger.new(params)
 
         end