smartkiosk-client 0.0.20 → 0.0.21

data/app/workers/payments/check_worker.rb

@@ -18,17 +18,17 @@ module Payments
                     :session_id => payment.id
                   }
 
+      Sidekiq::Logging.logger.debug "Check response: #{response.to_s}"
+
       answer = JSON.parse(response.to_s, :symbolize_names => true)
 
       unless answer[:id].nil?
         payment.update_attributes :foreign_id       => answer[:id],
-                                  :limit            => answer[:limits].sort_by(&:weight).last,
+                                  :limit            => answer[:limits].sort_by{|x| x[:weight]}.last,
                                   :commissions      => (answer[:commissions].empty? ? nil : answer[:commissions]),
                                   :receipt_template => answer[:receipt_template],
                                   :checked          => true
       end
-    rescue => e
-      Payment.find(payment_id).update_attributes :error => true
     end
   end
 end

data/config/boot.rb

@@ -33,6 +33,16 @@ module Smartkiosk
 
       ActiveRecord::Base.include_root_in_json = false
       ActiveRecord::Migrator.migrations_paths = [root.join('db/migrate')]
+
+      error do
+        error = env['sinatra.error']
+        logger.error "Uncaught error: #{error.message}"
+        error.backtrace.each { |l| logger.error l }
+
+        send_file "public/500.html",
+                :type => 'text/html; charset=utf-8',
+                :status => 500
+      end
     end
 
     configure :development do
@@ -50,6 +60,8 @@ module Smartkiosk
         config.expand = false
         config.digest = true
       end
+
+      disable :dump_errors
     end
 
     def find_template(views, name, engine, &block)

data/lib/smartkiosk/client/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartkiosk-client
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
   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: &70317900040320 !ruby/object:Gem::Requirement
+  requirement: &70135708431800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -22,10 +22,10 @@ dependencies:
         version: 10.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70317900040320
+  version_requirements: *70135708431800
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70317900038100 !ruby/object:Gem::Requirement
+  requirement: &70135708430840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -33,10 +33,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70317900038100
+  version_requirements: *70135708430840
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70317900036700 !ruby/object:Gem::Requirement
+  requirement: &70135708451140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -44,10 +44,10 @@ dependencies:
         version: 1.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *70317900036700
+  version_requirements: *70135708451140
 - !ruby/object:Gem::Dependency
   name: sinatra-activerecord
-  requirement: &70317900035560 !ruby/object:Gem::Requirement
+  requirement: &70135708449180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -55,10 +55,10 @@ dependencies:
         version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70317900035560
+  version_requirements: *70135708449180
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
-  requirement: &70317900034460 !ruby/object:Gem::Requirement
+  requirement: &70135708447300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -66,10 +66,10 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70317900034460
+  version_requirements: *70135708447300
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70317900049840 !ruby/object:Gem::Requirement
+  requirement: &70135708444320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -77,10 +77,10 @@ dependencies:
         version: 3.1.7
   type: :runtime
   prerelease: false
-  version_requirements: *70317900049840
+  version_requirements: *70135708444320
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70317900045220 !ruby/object:Gem::Requirement
+  requirement: &70135708466040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -88,10 +88,10 @@ dependencies:
         version: 3.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *70317900045220
+  version_requirements: *70135708466040
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70317900043420 !ruby/object:Gem::Requirement
+  requirement: &70135708464820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -99,10 +99,10 @@ dependencies:
         version: 2.8.2
   type: :runtime
   prerelease: false
-  version_requirements: *70317900043420
+  version_requirements: *70135708464820
 - !ruby/object:Gem::Dependency
   name: sprockets-sass
-  requirement: &70317900057960 !ruby/object:Gem::Requirement
+  requirement: &70135708463260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -110,10 +110,10 @@ dependencies:
         version: 0.9.1
   type: :runtime
   prerelease: false
-  version_requirements: *70317900057960
+  version_requirements: *70135708463260
 - !ruby/object:Gem::Dependency
   name: sprockets-helpers
-  requirement: &70317900057380 !ruby/object:Gem::Requirement
+  requirement: &70135708461860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -121,10 +121,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70317900057380
+  version_requirements: *70135708461860
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70317900056580 !ruby/object:Gem::Requirement
+  requirement: &70135708459680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -132,10 +132,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70317900056580
+  version_requirements: *70135708459680
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70317900054860 !ruby/object:Gem::Requirement
+  requirement: &70135708477580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -143,10 +143,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70317900054860
+  version_requirements: *70135708477580
 - !ruby/object:Gem::Dependency
   name: em-websocket
-  requirement: &70317900053320 !ruby/object:Gem::Requirement
+  requirement: &70135708476120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -154,10 +154,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70317900053320
+  version_requirements: *70135708476120
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70317900051460 !ruby/object:Gem::Requirement
+  requirement: &70135708474900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -165,10 +165,10 @@ dependencies:
         version: 3.2.11
   type: :runtime
   prerelease: false
-  version_requirements: *70317900051460
+  version_requirements: *70135708474900
 - !ruby/object:Gem::Dependency
   name: smartkiosk-common
-  requirement: &70317900050900 !ruby/object:Gem::Requirement
+  requirement: &70135708473460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -176,10 +176,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70317900050900
+  version_requirements: *70135708473460
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70317900066220 !ruby/object:Gem::Requirement
+  requirement: &70135708472200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -187,10 +187,10 @@ dependencies:
         version: 1.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *70317900066220
+  version_requirements: *70135708472200
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &70317900064240 !ruby/object:Gem::Requirement
+  requirement: &70135708471500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -198,10 +198,10 @@ dependencies:
         version: 0.14.1
   type: :runtime
   prerelease: false
-  version_requirements: *70317900064240
+  version_requirements: *70135708471500
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70317900062220 !ruby/object:Gem::Requirement
+  requirement: &70135708470640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -209,10 +209,10 @@ dependencies:
         version: 3.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70317900062220
+  version_requirements: *70135708470640
 - !ruby/object:Gem::Dependency
   name: redis-objects
-  requirement: &70317900060280 !ruby/object:Gem::Requirement
+  requirement: &70135708488740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -220,10 +220,10 @@ dependencies:
         version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70317900060280
+  version_requirements: *70135708488740
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &70317900058920 !ruby/object:Gem::Requirement
+  requirement: &70135708486840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -231,10 +231,10 @@ dependencies:
         version: 0.7.1
   type: :runtime
   prerelease: false
-  version_requirements: *70317900058920
+  version_requirements: *70135708486840
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70317900073320 !ruby/object:Gem::Requirement
+  requirement: &70135708484300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -242,10 +242,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70317900073320
+  version_requirements: *70135708484300
 - !ruby/object:Gem::Dependency
   name: recursive-open-struct
-  requirement: &70317900072580 !ruby/object:Gem::Requirement
+  requirement: &70135708483220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -253,10 +253,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70317900072580
+  version_requirements: *70135708483220
 - !ruby/object:Gem::Dependency
   name: liquid
-  requirement: &70317900071800 !ruby/object:Gem::Requirement
+  requirement: &70135708482000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -264,10 +264,10 @@ dependencies:
         version: 2.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70317900071800
+  version_requirements: *70135708482000
 - !ruby/object:Gem::Dependency
   name: file-tail
-  requirement: &70317900071200 !ruby/object:Gem::Requirement
+  requirement: &70135708481120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -275,10 +275,10 @@ dependencies:
         version: 1.0.12
   type: :runtime
   prerelease: false
-  version_requirements: *70317900071200
+  version_requirements: *70135708481120
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70317900070440 !ruby/object:Gem::Requirement
+  requirement: &70135708496060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -286,10 +286,10 @@ dependencies:
         version: 0.9.9
   type: :runtime
   prerelease: false
-  version_requirements: *70317900070440
+  version_requirements: *70135708496060
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70317900069760 !ruby/object:Gem::Requirement
+  requirement: &70135708493560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -297,10 +297,10 @@ dependencies:
         version: 0.9.10
   type: :runtime
   prerelease: false
-  version_requirements: *70317900069760
+  version_requirements: *70135708493560
 - !ruby/object:Gem::Dependency
   name: smartware
-  requirement: &70317900068880 !ruby/object:Gem::Requirement
+  requirement: &70135708492040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -308,10 +308,10 @@ dependencies:
         version: 0.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *70317900068880
+  version_requirements: *70135708492040
 - !ruby/object:Gem::Dependency
   name: smartguard
-  requirement: &70317900067900 !ruby/object:Gem::Requirement
+  requirement: &70135708489420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -319,10 +319,10 @@ dependencies:
         version: 0.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *70317900067900
+  version_requirements: *70135708489420
 - !ruby/object:Gem::Dependency
   name: sidekiq
-  requirement: &70317900066480 !ruby/object:Gem::Requirement
+  requirement: &70135708511280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -330,10 +330,10 @@ dependencies:
         version: 2.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *70317900066480
+  version_requirements: *70135708511280
 - !ruby/object:Gem::Dependency
   name: slim
-  requirement: &70317900080280 !ruby/object:Gem::Requirement
+  requirement: &70135708510600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -341,10 +341,10 @@ dependencies:
         version: 1.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *70317900080280
+  version_requirements: *70135708510600
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &70317900119200 !ruby/object:Gem::Requirement
+  requirement: &70135708509040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -352,7 +352,7 @@ dependencies:
         version: 2.0.17
   type: :runtime
   prerelease: false
-  version_requirements: *70317900119200
+  version_requirements: *70135708509040
 description: Smartkiosk client application
 email:
 - boris@roundlake.ru
@@ -452,7 +452,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1210542329242459293
+      hash: -1891922174974161719
 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: -1210542329242459293
+      hash: -1891922174974161719
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15