smartkiosk-client 0.0.21 → 0.0.22

data/app/controllers/payments.rb

@@ -7,7 +7,15 @@ class Application
 
   post '/payments/:id/open_cash_acceptor' do
     payment = Payment.find(params[:id])
-    Smartware.cash_acceptor.open(payment.limit.try('[]', :min), payment.limit.try('[]', :max))
+    min = nil
+    max = nil
+
+    if payment.limit.include? :min
+      min = payment.limit[:min].to_i
+      max = payment.limit[:max].to_i
+    end
+
+    Smartware.cash_acceptor.open min, max
 
     json Smartware.cash_acceptor.error.blank?
   end

data/app/models/payment.rb

@@ -10,7 +10,7 @@ class Payment < ActiveRecord::Base
   scope :cashless, where(arel_table[:payment_type].not_eq 0)
 
   serialize :fields
-  serialize :limits
+  serialize :limit
   serialize :commissions
   serialize :banknotes
 
@@ -30,7 +30,7 @@ class Payment < ActiveRecord::Base
   after_save do
     if checked?
       r = Receipt.find_or_create_by_document_id_and_document_type(id, self.class.name)
-      r.update_attributes :template => self.receipt_template, 
+      r.update_attributes :template => self.receipt_template,
         :keyword => 'payment',
         :fields => {
           :recipient => title,

data/app/workers/sync/receipt_templates_worker.rb

@@ -15,6 +15,8 @@ module Sync
       templates = JSON.parse(response.to_s, :symbolize_names => true)
 
       templates.each do |entry|
+        Sidekiq::Logging.logger.info "Got #{entry[:keyword]} receipt template"
+
         ReceiptTemplate.find_or_create_by_keyword(entry[:keyword]).
           update_attributes :template => entry[:template]
       end

data/lib/pinger.rb

@@ -3,7 +3,7 @@ class Pinger
     result = true
 
     begin
-      RestClient.get uri
+      RestClient::Resource.new(uri, :timeout => 5, :open_timeout => 5).get
     rescue RestClient::Forbidden
     rescue Exception => e
       result = e.to_s

data/lib/smartkiosk/client/version.rb

@@ -2,6 +2,6 @@ require 'sinatra/base'
 
 module Smartkiosk
   class Client < Sinatra::Base
-    VERSION = '0.0.21'
+    VERSION = '0.0.22'
   end
 end

data/lib/tasks/scheduler.rb

@@ -13,7 +13,7 @@ task :schedule do
     Terminal.ping
   end
 
-  scheduler.every '3h' do
+  scheduler.every '3h', :first_in => '1s' do
     logger.debug "Receipt Templates sync"
     Sync::ReceiptTemplatesWorker.perform_async
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartkiosk-client
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2013-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70135708431800 !ruby/object:Gem::Requirement
+  requirement: &70268526276460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -22,10 +22,10 @@ dependencies:
         version: 10.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70135708431800
+  version_requirements: *70268526276460
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70135708430840 !ruby/object:Gem::Requirement
+  requirement: &70268526290640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -33,10 +33,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70135708430840
+  version_requirements: *70268526290640
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70135708451140 !ruby/object:Gem::Requirement
+  requirement: &70268526289720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -44,10 +44,10 @@ dependencies:
         version: 1.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *70135708451140
+  version_requirements: *70268526289720
 - !ruby/object:Gem::Dependency
   name: sinatra-activerecord
-  requirement: &70135708449180 !ruby/object:Gem::Requirement
+  requirement: &70268526288340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -55,10 +55,10 @@ dependencies:
         version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70135708449180
+  version_requirements: *70268526288340
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
-  requirement: &70135708447300 !ruby/object:Gem::Requirement
+  requirement: &70268526287160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -66,10 +66,10 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70135708447300
+  version_requirements: *70268526287160
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70135708444320 !ruby/object:Gem::Requirement
+  requirement: &70268526284900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -77,10 +77,10 @@ dependencies:
         version: 3.1.7
   type: :runtime
   prerelease: false
-  version_requirements: *70135708444320
+  version_requirements: *70268526284900
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70135708466040 !ruby/object:Gem::Requirement
+  requirement: &70268526308560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -88,10 +88,10 @@ dependencies:
         version: 3.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *70135708466040
+  version_requirements: *70268526308560
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70135708464820 !ruby/object:Gem::Requirement
+  requirement: &70268526305460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -99,10 +99,10 @@ dependencies:
         version: 2.8.2
   type: :runtime
   prerelease: false
-  version_requirements: *70135708464820
+  version_requirements: *70268526305460
 - !ruby/object:Gem::Dependency
   name: sprockets-sass
-  requirement: &70135708463260 !ruby/object:Gem::Requirement
+  requirement: &70268526304880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -110,10 +110,10 @@ dependencies:
         version: 0.9.1
   type: :runtime
   prerelease: false
-  version_requirements: *70135708463260
+  version_requirements: *70268526304880
 - !ruby/object:Gem::Dependency
   name: sprockets-helpers
-  requirement: &70135708461860 !ruby/object:Gem::Requirement
+  requirement: &70268526304060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -121,10 +121,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70135708461860
+  version_requirements: *70268526304060
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70135708459680 !ruby/object:Gem::Requirement
+  requirement: &70268526302940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -132,10 +132,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70135708459680
+  version_requirements: *70268526302940
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70135708477580 !ruby/object:Gem::Requirement
+  requirement: &70268526324000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -143,10 +143,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70135708477580
+  version_requirements: *70268526324000
 - !ruby/object:Gem::Dependency
   name: em-websocket
-  requirement: &70135708476120 !ruby/object:Gem::Requirement
+  requirement: &70268526320020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -154,10 +154,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70135708476120
+  version_requirements: *70268526320020
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70135708474900 !ruby/object:Gem::Requirement
+  requirement: &70268526317780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -165,10 +165,10 @@ dependencies:
         version: 3.2.11
   type: :runtime
   prerelease: false
-  version_requirements: *70135708474900
+  version_requirements: *70268526317780
 - !ruby/object:Gem::Dependency
   name: smartkiosk-common
-  requirement: &70135708473460 !ruby/object:Gem::Requirement
+  requirement: &70268526332520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -176,10 +176,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70135708473460
+  version_requirements: *70268526332520
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70135708472200 !ruby/object:Gem::Requirement
+  requirement: &70268526331060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -187,10 +187,10 @@ dependencies:
         version: 1.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *70135708472200
+  version_requirements: *70268526331060
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &70135708471500 !ruby/object:Gem::Requirement
+  requirement: &70268526329760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -198,10 +198,10 @@ dependencies:
         version: 0.14.1
   type: :runtime
   prerelease: false
-  version_requirements: *70135708471500
+  version_requirements: *70268526329760
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70135708470640 !ruby/object:Gem::Requirement
+  requirement: &70268526327660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -209,10 +209,10 @@ dependencies:
         version: 3.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70135708470640
+  version_requirements: *70268526327660
 - !ruby/object:Gem::Dependency
   name: redis-objects
-  requirement: &70135708488740 !ruby/object:Gem::Requirement
+  requirement: &70268526326240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -220,10 +220,10 @@ dependencies:
         version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70135708488740
+  version_requirements: *70268526326240
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &70135708486840 !ruby/object:Gem::Requirement
+  requirement: &70268526324640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -231,10 +231,10 @@ dependencies:
         version: 0.7.1
   type: :runtime
   prerelease: false
-  version_requirements: *70135708486840
+  version_requirements: *70268526324640
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70135708484300 !ruby/object:Gem::Requirement
+  requirement: &70268526342220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -242,10 +242,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70135708484300
+  version_requirements: *70268526342220
 - !ruby/object:Gem::Dependency
   name: recursive-open-struct
-  requirement: &70135708483220 !ruby/object:Gem::Requirement
+  requirement: &70268526337400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -253,10 +253,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70135708483220
+  version_requirements: *70268526337400
 - !ruby/object:Gem::Dependency
   name: liquid
-  requirement: &70135708482000 !ruby/object:Gem::Requirement
+  requirement: &70268526351520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -264,10 +264,10 @@ dependencies:
         version: 2.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70135708482000
+  version_requirements: *70268526351520
 - !ruby/object:Gem::Dependency
   name: file-tail
-  requirement: &70135708481120 !ruby/object:Gem::Requirement
+  requirement: &70268526367940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -275,10 +275,10 @@ dependencies:
         version: 1.0.12
   type: :runtime
   prerelease: false
-  version_requirements: *70135708481120
+  version_requirements: *70268526367940
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70135708496060 !ruby/object:Gem::Requirement
+  requirement: &70268526365100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -286,10 +286,10 @@ dependencies:
         version: 0.9.9
   type: :runtime
   prerelease: false
-  version_requirements: *70135708496060
+  version_requirements: *70268526365100
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70135708493560 !ruby/object:Gem::Requirement
+  requirement: &70268526396840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -297,10 +297,10 @@ dependencies:
         version: 0.9.10
   type: :runtime
   prerelease: false
-  version_requirements: *70135708493560
+  version_requirements: *70268526396840
 - !ruby/object:Gem::Dependency
   name: smartware
-  requirement: &70135708492040 !ruby/object:Gem::Requirement
+  requirement: &70268526394660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -308,10 +308,10 @@ dependencies:
         version: 0.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *70135708492040
+  version_requirements: *70268526394660
 - !ruby/object:Gem::Dependency
   name: smartguard
-  requirement: &70135708489420 !ruby/object:Gem::Requirement
+  requirement: &70268526393420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -319,10 +319,10 @@ dependencies:
         version: 0.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *70135708489420
+  version_requirements: *70268526393420
 - !ruby/object:Gem::Dependency
   name: sidekiq
-  requirement: &70135708511280 !ruby/object:Gem::Requirement
+  requirement: &70268526392500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -330,10 +330,10 @@ dependencies:
         version: 2.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *70135708511280
+  version_requirements: *70268526392500
 - !ruby/object:Gem::Dependency
   name: slim
-  requirement: &70135708510600 !ruby/object:Gem::Requirement
+  requirement: &70268526390880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -341,10 +341,10 @@ dependencies:
         version: 1.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *70135708510600
+  version_requirements: *70268526390880
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &70135708509040 !ruby/object:Gem::Requirement
+  requirement: &70268526411920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -352,7 +352,7 @@ dependencies:
         version: 2.0.17
   type: :runtime
   prerelease: false
-  version_requirements: *70135708509040
+  version_requirements: *70268526411920
 description: Smartkiosk client application
 email:
 - boris@roundlake.ru
@@ -452,7 +452,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1891922174974161719
+      hash: -3780821335239314671
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -461,7 +461,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1891922174974161719
+      hash: -3780821335239314671
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15