istox 0.1.79.pre.test1 → 0.1.79.pre.test2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b9fe0e553280bf1aeb096f7a61a8e5fae7f6fa220e0bb6eb64cce5e0be685e2
-  data.tar.gz: adcc41c73750b9b3b09919a9b8fd20e7671eccd0dda34e730bd5cf59b00bb4bb
+  metadata.gz: e176f1517a34a5168750aecc2e64b86d497fcfafdfc03c4b301705009091f344
+  data.tar.gz: d61f64d0fa7d1792eb8f703a1abf93ff046ac770d7ef8260fadd6bbd5e110bcb
 SHA512:
-  metadata.gz: 07e4b1fb124bb17eb60c7c38e3e0c7faeec9afc1e9802da2fae721ad8cbf5fe8afea128c691b907f97799bdb8aa1805ad9c16e0d7321512972e9b7a505da1876
-  data.tar.gz: 79870c307e990da68a18f17633b49300b9348443baf5fed0ac5a32cc7c7a23c46eb0e0a85036bdcce4a6ae54a36c1d847de88b252b189944158cb6bbf3ea7f40
+  metadata.gz: 1ef16f8f9c63ed330f34f695aed8cf271bebbff916d702e503fe6f269479bb31e664c960fd4523959924c2de4c689ba38cc29b6b53b81be0eaf54c013650b197
+  data.tar.gz: 9c51fd8f23dedfb380fdfe12f2a3d529cfdbc03cdace09e5e5f33e2ddd715eec52512d84dfc69a3fcf5b51a4b358d7d9da500e028d3cc1c782709fc977b1162e

data/.rubocop.yml

@@ -0,0 +1,105 @@
+require: rubocop-rspec
+
+AllCops:
+  TargetRubyVersion: 2.5
+  Exclude:
+    - .gems/**/*
+    - bin/**/*
+    - config/**/*
+    - db/**/*
+    - log/**/*
+    - public/**/*
+    - tmp/**/*
+    - vendor/**/*
+    - spec/rails_helper.rb
+    - spec/spec_helper.rb
+    - config.ru
+    - Guardfile
+    - Rakefile
+
+Documentation:
+  Enabled: false
+
+Layout/SpaceBeforeFirstArg:
+  Exclude:
+    - app/views/api/**/**/*
+
+Lint/AmbiguousBlockAssociation:
+  Exclude:
+    - spec/**/*
+
+Metrics/AbcSize:
+  # The ABC size is a calculated magnitude, so this number can be an Integer or
+  # a Float.
+  Max: 100
+
+Metrics/BlockLength:
+  CountComments: false  # count full line comments?
+  Max: 25
+  Exclude:
+    - config/**/*
+    - spec/**/*
+    - app/admin/**/*
+
+Metrics/BlockNesting:
+  Max: 4
+
+Metrics/ClassLength:
+  CountComments: false  # count full line comments?
+  Max: 200
+
+# Avoid complex methods.
+Metrics/CyclomaticComplexity:
+  Max: 20
+
+Metrics/MethodLength:
+  CountComments: false  # count full line comments?
+  Max: 100
+
+Metrics/ModuleLength:
+  CountComments: false  # count full line comments?
+  Max: 200
+
+Metrics/LineLength:
+  Max: 120
+  # To make it possible to copy or click on URIs in the code, we allow lines
+  # containing a URI to be longer than Max.
+  AllowURI: true
+  URISchemes:
+    - http
+    - https
+
+Metrics/ParameterLists:
+  Max: 5
+  CountKeywordArgs: true
+
+Metrics/PerceivedComplexity:
+  Max: 12
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/ModuleFunction:
+  Enabled: false
+
+RequireNotFound:
+  Enabled: false
+
+RSpec/MultipleExpectations:
+  Max: 99
+
+RSpec/ExampleLength:
+  Max: 100
+
+Lint/BigDecimalNew:
+  Enabled: false
+
+
+RSpec/MessageSpies:
+  Enabled: false
+
+RSpec/AnyInstance:
+  Enabled: false
+
+RSpec/VerifiedDoubles:
+  Enabled: false

data/.solargraph.yml

@@ -0,0 +1,14 @@
+---
+include:
+- "**/*.rb"
+exclude:
+- spec/**/*
+- test/**/*
+- vendor/**/*
+- ".bundle/**/*"
+require: []
+domains: []
+reporters:
+- rubocop
+require_paths: []
+max_files: 5000

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    istox (0.1.79)
+    istox (0.1.79.pre.test1)
       binding_of_caller
       bunny (>= 2.12.0)
       graphlient
@@ -88,21 +88,21 @@ GEM
     ffi (1.11.1)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    google-protobuf (3.8.0-universal-darwin)
+    google-protobuf (3.9.1)
     googleapis-common-protos-types (1.0.4)
       google-protobuf (~> 3.0)
-    graphlient (0.3.5)
+    graphlient (0.3.6)
       faraday
       faraday_middleware
       graphql-client
-    graphql (1.9.7)
-    graphql-client (0.14.0)
-      activesupport (>= 3.0, < 6.0)
-      graphql (~> 1.6)
-    grpc (1.22.0-universal-darwin)
+    graphql (1.9.11)
+    graphql-client (0.15.0)
+      activesupport (>= 3.0)
+      graphql (~> 1.8)
+    grpc (1.23.0)
       google-protobuf (~> 3.8)
       googleapis-common-protos-types (~> 1.0)
-    grpc-tools (1.22.0)
+    grpc-tools (1.23.0)
     gruf (2.7.0)
       activesupport (> 4)
       concurrent-ruby (> 1)
@@ -227,4 +227,4 @@ DEPENDENCIES
   sqlite3 (~> 1.3.6)
 
 BUNDLED WITH
-   1.17.1
+   1.17.3

data/lib/istox/consumers/blockchain_status_handler.rb

@@ -14,26 +14,26 @@ module Istox
           return
         end
 
-        return if !(%w[failed confirmed].include?(transaction.status))
+        return unless %w[failed confirmed].include?(transaction.status)
+
         receipt.update!(status: transaction.status)
-        
+
         resource = begin
-          class_eval("::#{receipt.resource_name}").find(receipt.resource_id)
-        rescue => e
-          puts "Class not found, skipping..."
-          return
+          class_eval("::#{receipt.resource_name}", __FILE__, __LINE__).find(receipt.resource_id)
+                   rescue StandardError
+                     puts 'Class not found, skipping...'
+                     return
         end
 
         return if resource_handled?(receipt)
 
         if transaction.status == 'confirmed'
           resource.handle_confirm(receipt.resource_action)
-            
+
           mark_resource_handled(receipt)
           publish_to_frontend(resource, true, receipt, receipt.sid)
-        end
 
-        if transaction.status == 'failed'
+        elsif transaction.status == 'failed'
           resource.handle_fail(receipt.resource_action)
 
           mark_resource_handled(receipt)
@@ -61,22 +61,23 @@ module Istox
             purpose: receipt.activity
           }
         )
-      rescue => e
-        Rails.logger.error "Unable to publish to frontend for receipt #{receipt.inspect}, but will silently ignore the error"
+      rescue StandardError => e
+        Rails.logger.error "Unable to publish to frontend for receipt #{receipt.inspect},
+        but will silently ignore the error"
         Rails.logger.error e
       end
 
       def mark_resource_handled(receipt)
         receipt.update(resource_handled: true)
-      rescue => e
-        Rails.logger.error "Unable to update resource_handled for receipt #{receipt.inspect}, but will silently ignore the error"
+      rescue StandardError => e
+        Rails.logger.error "Unable to update resource_handled for receipt #{receipt.inspect},
+        but will silently ignore the error"
         Rails.logger.error e
       end
 
       def resource_handled?(receipt)
-        return receipt.resource_handled == true
+        receipt.resource_handled == true
       end
-
     end
   end
 end

data/lib/istox/helpers/blockchain_service.rb

@@ -1,66 +1,65 @@
 module Istox
-    class BlockchainService
-    
-        def self.init(blockchain_receipt_klass)
-            @@blockchain_receipt_klass = blockchain_receipt_klass
-        end
+  class BlockchainService
+    def self.init(blockchain_receipt_klass)
+      @@blockchain_receipt_klass = blockchain_receipt_klass
+    end
 
-        def self.get_blockchain_receipt_klass
-            @@blockchain_receipt_klass
-        end
+    def self.get_blockchain_receipt_klass
+      @@blockchain_receipt_klass
+    end
 
-        def self.request(sid:, action:, before:, execute:)
-            self.start(sid: sid, action: action, before: before, execute: execute, is_request: true)
-        end
+    def self.request(sid:, action:, before:, execute:)
+      start(sid: sid, action: action, before: before, execute: execute, is_request: true)
+    end
 
-        def self.run(sid:, action:, before:, execute:)
-            self.start(sid: sid, action: action, before: before, execute: execute)
-        end
+    def self.run(sid:, action:, before:, execute:)
+      start(sid: sid, action: action, before: before, execute: execute)
+    end
 
-        private
-        # before is the proc that will be executed before, must return the main model blockchain receipt will bind to
-        def self.start(sid:, action:, before:, execute:, is_request: false)
-            # create blockchain receipt first
-            klass = self.blockchain_receipt_class
-            uuid = :: SecureRandom.uuid
-            @receipt = klass.create!({
-                txid: uuid,
-                sid: sid,
-                is_request: is_request,
-                resource_action: action
-            })
+    private
 
-            ::ActiveRecord::Base.transaction do 
-                # execute before proc, and get the model that blockchain receipt should bind to
-                model = before.call(uuid)
+    # before is the proc that will be executed before, must return the main model blockchain receipt will bind to
+    def self.start(sid:, action:, before:, execute:, is_request: false)
+      # create blockchain receipt first
+      klass = blockchain_receipt_class
+      uuid = :: SecureRandom.uuid
+      @receipt = klass.create!(
+        txid: uuid,
+        sid: sid,
+        is_request: is_request,
+        resource_action: action
+      )
 
-                puts model
+      ::ActiveRecord::Base.transaction do
+        # execute before proc, and get the model that blockchain receipt should bind to
+        model = before.call(uuid)
 
-                 # delete the previous existing blockchain receipts
-                klass.where(resource_name: model.class.name, resource_id: model.id).destroy_all
+        puts model
 
-                # then update receipt
-                @receipt.update!(resource_id: model.id, resource_name: model.class.name)
+        # delete the previous existing blockchain receipts
+        klass.where(resource_name: model.class.name, resource_id: model.id).destroy_all
 
-                # execute the actual call to chainhub
-                result = execute.call(uuid)
-            end
-        rescue => e
-            @receipt.destroy if @receipt
-            raise e
-        end
+        # then update receipt
+        @receipt.update!(resource_id: model.id, resource_name: model.class.name)
 
-        def self.blockchain_receipt_class
-            raise "Have you forgetten to init blockchain receipt service?" if self.get_blockchain_receipt_klass == nil
+        # execute the actual call to chainhub
+        execute.call(uuid)
+      end
+    rescue StandardError => e
+      @receipt&.destroy
+      raise e
+    end
 
-            blockchain_receipt_klass = self.get_blockchain_receipt_klass
-            klass = class_eval("::#{blockchain_receipt_klass.name}")
-            unless klass <= ::Istox::BlockchainReceipt
-                raise RuntimeError, "#{blockchain_receipt_klass.name} does not inherit istox blockchain receipt"
-            end
+    def self.blockchain_receipt_class
+      raise 'Have you forgetten to init blockchain receipt service?' if get_blockchain_receipt_klass.nil?
 
-            return klass
-        end
+      blockchain_receipt_klass = get_blockchain_receipt_klass
+      klass = class_eval("::#{blockchain_receipt_klass.name}")
+      unless klass <= ::Istox::BlockchainReceipt
+        raise "#{blockchain_receipt_klass.name} does not inherit istox blockchain receipt"
+      end
 
+      klass
     end
-end
+  end
+end

data/lib/istox/models/concerns/blockchain_receipt_query.rb

@@ -1,34 +1,31 @@
 module Istox
   module BlockchainReceiptQuery
     extend ActiveSupport::Concern
-  
-    #overrideable, when blockchain transaction has confirmed
-    def handle_confirm(resource_action)
+
+    # overrideable, when blockchain transaction has confirmed
+    def handle_confirm(_resource_action)
       self
     end
 
-    #overrideable, when blockchain transaction has failed
-    def handle_fail(resource_action)
+    # overrideable, when blockchain transaction has failed
+    def handle_fail(_resource_action)
       self
     end
 
-    #overrideable, extra data that will be published back to frontend
+    # overrideable, extra data that will be published back to frontend
     def handle_extra
       nil
     end
 
     # outcome of the blockchain transaction, can be "pending" / "confirmed" / "failed"
     def outcome
-      blockchain_receipt = ::Istox::BlockchainReceipt.where(resource_id: self.id, resource_name: self.class.name).last
+      blockchain_receipt = ::Istox::BlockchainReceipt.where(resource_id: id, resource_name: self.class.name).first
 
-      return "confirmed" if blockchain_receipt.empty?
-  
-      return blockchain_receipt.status
-    end
+      return 'confirmed' unless blockchain_receipt.present?
 
-    def get_blockchain_receipt
-      ::Istox::BlockchainReceipt.where(resource_id: self.id, resource_name: self.class.name).last
-    end
+      return 'confirmed' if blockchain_receipt.status.blank?
 
+      blockchain_receipt.status
+    end
   end
 end

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = "0.1.79-test1"
+  VERSION = '0.1.79-test2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.79.pre.test1
+  version: 0.1.79.pre.test2
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-31 00:00:00.000000000 Z
+date: 2019-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -278,6 +278,8 @@ files:
 - ".idea/modules.xml"
 - ".idea/vcs.xml"
 - ".idea/workspace.xml"
+- ".rubocop.yml"
+- ".solargraph.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -323,8 +325,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: istox backend shared gem