straight-server 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8610bd49c87e428c82c658ecdc0a1f0e2299bfb
-  data.tar.gz: e046d7b179cafead65d803e4fb30e52d11a8bc11
+  metadata.gz: 833d00355a560e1e82ce97ef09a53b0f96bdd0b0
+  data.tar.gz: 96c715dbdd8718aaaded9810738df8ce64e8b13c
 SHA512:
-  metadata.gz: 0fda4cd1ecb67821380631da86fd6c2d4864c57ed5f0200b1b6d45508190a07b06e8c66e5e72a1b501df477b8da6c7f385ad4c7b059d50c51ce1f1176e570ef8
-  data.tar.gz: edb15d2d84f5de98901a3d0d3e18f7a2fb5279c6a9ed19418c9c8b400a9e6b006a3cf5b9d9d42cbcd82a7ae32861a32644048e2e0e851f32a0c09a5d71b79bae
+  metadata.gz: 7b3a8d3401e5d2116f35692996dc188bbc8adcbaad4b79d5b22ba2fcd862b3610f8a62ac5dbc022add0f1880bd5babd31a804f088060731a8ccdbcadee7a94ba
+  data.tar.gz: 1d611882cc686cb3d5e6905630ef3ec2fd708712bcaaa1dcbbacb83eca37965ff39f29570ad4000ab0a5aa14e2f1f5a66626238b074b5a215e53bf4deab2b4f9

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem "straight"
+gem "straight", "0.2.2"
 gem "satoshi-unit"
 gem "goliath"
 gem "faye-websocket"

data/Gemfile.lock

@@ -115,7 +115,7 @@ GEM
     satoshi-unit (0.1.7)
     sequel (4.22.0)
     sqlite3 (1.3.10)
-    straight (0.1.0)
+    straight (0.2.2)
       httparty
       money-tree
       satoshi-unit
@@ -145,4 +145,4 @@ DEPENDENCIES
   satoshi-unit
   sequel
   sqlite3
-  straight
+  straight (= 0.2.2)

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/straight-server/config.rb

@@ -3,7 +3,18 @@ module StraightServer
   class Config
 
     class << self
-      attr_accessor :db, :gateways_source, :gateways, :logmaster, :server_secret, :count_orders, :environment, :redis, :check_order_status_in_db_first, :port, :blockchain_adapters
+      attr_accessor :db,
+                    :gateways_source,
+                    :gateways,
+                    :logmaster,
+                    :server_secret,
+                    :count_orders,
+                    :environment,
+                    :redis,
+                    :check_order_status_in_db_first,
+                    :port,
+                    :blockchain_adapters,
+                    :expiration_overtime
     end
 
   end

data/lib/straight-server/gateway.rb

@@ -9,7 +9,7 @@ module StraightServer
     @@websockets = {}
     
     def fetch_transactions_for(address)
-      try_adapters(@blockchain_adapters) { |b| b.fetch_transactions_for(address) }
+      try_adapters(@blockchain_adapters, type: 'blockchain') { |b| b.fetch_transactions_for(address) }
     end
 
     class InvalidSignature           < Exception; end
@@ -52,7 +52,7 @@ module StraightServer
     #
     def initialize_exchange_rate_adapters
       @exchange_rate_adapters ||= []
-      if self.exchange_rate_adapter_names
+      if self.exchange_rate_adapter_names.kind_of?(Array) && self.exchange_rate_adapter_names
         self.exchange_rate_adapter_names.each do |adapter|
           begin
             @exchange_rate_adapters << Straight::ExchangeRate.const_get("#{adapter}Adapter").instance

data/lib/straight-server/order.rb

@@ -68,7 +68,8 @@ module StraightServer
 
     def validate
       super # calling Sequel::Model validator
-      errors.add(:amount,     "is invalid") if !amount.kind_of?(Numeric)     || amount <= 0
+      errors.add(:amount,     "is not numeric") if !amount.kind_of?(Numeric)
+      errors.add(:amount,     "should be more than 0") if amount && amount <= 0
       errors.add(:gateway_id, "is invalid") if !gateway_id.kind_of?(Numeric) || gateway_id <= 0
       errors.add(:description, "should be shorter than 255 charachters") if description.kind_of?(String) && description.length > 255
       errors.add(:gateway, "is inactive, cannot create order for inactive gateway") unless gateway.active
@@ -104,8 +105,8 @@ module StraightServer
     # Order#created_at into account now, so that we don't start checking on
     # an order that is already expired. Or, if it's not expired yet,
     # we make sure to stop all checks as soon as it expires, but not later.
-    def start_periodic_status_check(duration: gateway.orders_expiration_period)
-      StraightServer.logger.info "Starting periodic status checks of order #{self.id}"
+    def start_periodic_status_check(duration: nil)
+      StraightServer.logger.info "Starting periodic status checks of order #{self.id} (expires in #{duration} seconds)"
       if (t = time_left_before_expiration) > 0
         check_status_on_schedule(duration: t)
       end
@@ -117,9 +118,9 @@ module StraightServer
       super
     end
 
-    def time_left_before_expiration(duration: gateway.orders_expiration_period)
+    def time_left_before_expiration
       time_passed_after_creation = (Time.now - created_at).to_i
-      gateway.orders_expiration_period-time_passed_after_creation
+      gateway.orders_expiration_period+(StraightServer::Config.expiration_overtime || 0) - time_passed_after_creation
     end
 
   end

data/lib/straight-server/orders_controller.rb

@@ -20,20 +20,29 @@ module StraightServer
       end
 
       begin
-        order = @gateway.create_order(
+        order_data = {
           amount:           @params['amount'], # this is satoshi
           currency:         @params['currency'],
           btc_denomination: @params['btc_denomination'],
           id:               @params['order_id'],
           signature:        @params['signature'],
           data:             @params['data']
-        )
+        }
+        order = @gateway.create_order(order_data)
         StraightServer::Thread.new do
-          order.start_periodic_status_check
+          # Because this is a new thread, we have to wrap the code inside in #watch_exceptions
+          # once again. Otherwise, not watching is done. Oh, threads!
+          StraightServer.logger.watch_exceptions do
+            order.start_periodic_status_check
+          end
         end
         [200, {}, order.to_json ]
       rescue Sequel::ValidationFailed => e
-        StraightServer.logger.warn "validation errors in order, cannot create it."
+        StraightServer.logger.warn(
+          "VALIDATION ERRORS in order, cannot create it:\n" +
+          "#{e.message.split(",").each_with_index.map { |e,i| "#{i+1}. #{e.lstrip}"}.join("\n") }\n" + 
+          "Order data: #{order_data.inspect}\n"
+        )
         [409, {}, "Invalid order: #{e.message}" ]
       rescue StraightServer::GatewayModule::InvalidSignature
         [409, {}, "Invalid signature for id: #{@params['order_id']}" ]

data/spec/.straight/config.yml

@@ -3,6 +3,7 @@
 gateways_source: config
 environment: test
 count_orders: true
+expiration_overtime: 0
 
 gateways:
 

data/spec/lib/initializer_spec.rb

@@ -54,12 +54,6 @@ RSpec.describe StraightServer::Initializer do
     end
   end
 
-  it "reads config" do
-    create_config_files
-    @initializer.read_config_file
-    expect(StraightServer::Config.blockchain_adapters).to eq(["BlockchainInfo", "Mycelium"])
-  end
-
   it "connects to the database" do
     StraightServer::Config.db = { 
       adapter: 'sqlite',

data/spec/lib/orders_controller_spec.rb

@@ -21,7 +21,7 @@ RSpec.describe StraightServer::OrdersController do
     it "renders 409 error when an order cannot be created due to some validation errors" do
       send_request "POST", '/gateways/2/orders', amount: 0
       expect(response[0]).to eq(409)
-      expect(response[2]).to eq("Invalid order: amount is invalid")
+      expect(response[2]).to eq("Invalid order: amount should be more than 0")
     end
 
     it "starts tracking the order status in a separate thread" do

data/spec/spec_helper.rb

@@ -63,6 +63,9 @@ RSpec.configure do |config|
     [:debug, :info, :warn, :fatal, :unknown, :blank_lines].each do |e|
       allow(logger_mock).to receive(e)
     end
+
+    allow(logger_mock).to receive(:watch_exceptions).and_yield
+
     StraightServer.logger = logger_mock
     StraightServer::GatewayOnConfig.class_variable_get(:@@gateways).each do |g|
       g.last_keychain_id = 0

data/straight-server.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: straight-server 0.2.0 ruby lib
+# stub: straight-server 0.2.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "straight-server"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Roman Snitko"]
-  s.date = "2015-05-05"
+  s.date = "2015-05-07"
   s.description = "Accepts orders via http, returns payment info via http or streams updates via websockets, stores orders in a DB"
   s.email = "roman.snitko@gmail.com"
   s.executables = ["goliath.log", "goliath.log_stdout.log", "straight-console", "straight-server", "straight-server-benchmark"]
@@ -87,7 +87,7 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<straight>, [">= 0"])
+      s.add_runtime_dependency(%q<straight>, ["= 0.2.2"])
       s.add_runtime_dependency(%q<satoshi-unit>, [">= 0"])
       s.add_runtime_dependency(%q<goliath>, [">= 0"])
       s.add_runtime_dependency(%q<faye-websocket>, [">= 0"])
@@ -99,7 +99,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
       s.add_development_dependency(%q<github_api>, ["= 0.11.3"])
     else
-      s.add_dependency(%q<straight>, [">= 0"])
+      s.add_dependency(%q<straight>, ["= 0.2.2"])
       s.add_dependency(%q<satoshi-unit>, [">= 0"])
       s.add_dependency(%q<goliath>, [">= 0"])
       s.add_dependency(%q<faye-websocket>, [">= 0"])
@@ -112,7 +112,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<github_api>, ["= 0.11.3"])
     end
   else
-    s.add_dependency(%q<straight>, [">= 0"])
+    s.add_dependency(%q<straight>, ["= 0.2.2"])
     s.add_dependency(%q<satoshi-unit>, [">= 0"])
     s.add_dependency(%q<goliath>, [">= 0"])
     s.add_dependency(%q<faye-websocket>, [">= 0"])

data/templates/config.yml

@@ -9,6 +9,13 @@ environment: development
 # redis-server connection details below.
 count_orders: false
 
+# When you display a payment window to a user, he has some time to pay. But what if a
+# transaction has been made in the last seconds and Straight didn't have time to detect it?
+# This just adds a little bit more time to each expiration period.
+# So technically, you can tell your customer he's got 900 seconds to pay, yet wait additional
+# 30 seconds (default value) to be able to detect a late transaction 
+expiration_overtime: 30
+
 # Uncomment this if you want to use Gateway's order counters feature
 # It requires redis.
 #redis:

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: straight-server
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Roman Snitko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-05 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: straight
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: satoshi-unit
   requirement: !ruby/object:Gem::Requirement