smartkiosk-server 0.10.1 → 0.10.2

data/Gemfile

@@ -24,7 +24,7 @@ gem 'redis-objects', :require => 'redis/objects'
 gem 'redis-objects-rmap'
 gem 'active_attr'
 
-gem 'payzilla', '0.0.2'
+gem 'payzilla', '0.0.4'
 
 gem 'haml'
 gem 'coffee-filter'

data/Gemfile.lock

@@ -219,7 +219,7 @@ GEM
     paper_trail (2.7.0)
       activerecord (~> 3.0)
       railties (~> 3.0)
-    payzilla (0.0.2)
+    payzilla (0.0.4)
       crack
       cyberplat_pki
       gpgme-ffi
@@ -406,7 +406,7 @@ DEPENDENCIES
   meta_search (>= 1.1.0)
   money
   paper_trail
-  payzilla (= 0.0.2)
+  payzilla (= 0.0.4)
   pg
   pry
   rails (= 3.2.11)

data/lib/smartkiosk/server/version.rb

@@ -1,5 +1,5 @@
 module Smartkiosk
   module Server
-    VERSION = '0.10.1'
+    VERSION = '0.10.2'
   end
 end

data/spec/controllers/terminal_pings_controller_spec.rb

@@ -19,13 +19,72 @@ describe TerminalPingsController do
       :cash_acceptor => {
         'error' => '-1'
       },
-      :providers => {
-        :updated_at => DateTime.now,
-        :ids => [1, 2, 3]
-      }
+      :providers_updated_at => DateTime.now,
     }
-    @terminal.pings.count.should == 1
+    @terminal.pings.count.should >= 1
     @terminal.pings.first.cash_sum.should == 1140
     @terminal.pings.first.ip.should == '127.0.0.1'
   end
+
+  it "updates outdated providers" do
+    post :create, :terminal => 'test', :terminal_ping => {
+      :providers_updated_at => nil
+    }
+
+    body = ActiveSupport::JSON.decode response.body
+    body["update_providers"].should == true
+  end
+
+  it "properly handles actual providers" do
+    post :create, :terminal => 'test', :terminal_ping => {
+      :providers_updated_at => DateTime.now,
+    }
+
+    body = ActiveSupport::JSON.decode response.body
+    body["update_providers"].should == false
+  end
+
+  it "delivers correct data" do
+    get :providers, :terminal => 'test'
+
+    body = ActiveSupport::JSON.decode ActiveSupport::Gzip.decompress(response.body)
+    DateTime.parse(body["updated_at"]).to_i.should == @terminal.terminal_profile.actual_timestamp.to_i
+  end
+
+  it "properly handles update scenario" do
+    initial_stamp = @terminal.terminal_profile.actual_timestamp
+
+    post :create, :terminal => 'test', :terminal_ping => {
+      :providers_updated_at => initial_stamp
+      }
+
+    body = ActiveSupport::JSON.decode response.body
+    body["update_providers"].should == false
+
+    sleep 1
+
+    @terminal.terminal_profile.invalidate_cached_providers!
+
+    post :create, :terminal => 'test', :terminal_ping => {
+      :providers_updated_at => initial_stamp
+    }
+
+    body = ActiveSupport::JSON.decode response.body
+    body["update_providers"].should == true
+
+    get :providers, :terminal => 'test'
+
+    body = ActiveSupport::JSON.decode ActiveSupport::Gzip.decompress(response.body)
+    new_stamp = DateTime.parse(body["updated_at"])
+    new_stamp.should > initial_stamp
+    new_stamp.to_i.should == @terminal.terminal_profile.actual_timestamp.to_i
+
+    post :create, :terminal => 'test', :terminal_ping => {
+      :providers_updated_at => new_stamp
+    }
+
+    body = ActiveSupport::JSON.decode response.body
+    body["update_providers"].should == false
+
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartkiosk-server
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70321654852100 !ruby/object:Gem::Requirement
+  requirement: &70304215974320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.11
   type: :runtime
   prerelease: false
-  version_requirements: *70321654852100
+  version_requirements: *70304215974320
 - !ruby/object:Gem::Dependency
   name: matrioshka
-  requirement: &70321654851200 !ruby/object:Gem::Requirement
+  requirement: &70304215984260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70321654851200
+  version_requirements: *70304215984260
 description: Smartkiosk server application
 email:
 - boris@roundlake.ru
@@ -307,7 +307,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2870529153465256155
+      hash: -3230117856390650885
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: