smartkiosk-client 0.1.2 → 0.1.3

data/app/controllers/terminal.rb

@@ -57,6 +57,10 @@ class Application
     json(:state => Terminal.state)
   end
 
+  post '/terminal/recalibrate' do
+    Terminal.recalibrate
+  end
+
   get '/terminal/test_connection' do
     begin
       uri = URI.parse(Terminal.config.host)

data/app/models/session_record.rb

@@ -0,0 +1,3 @@
+class SessionRecord < ActiveRecord::Base
+
+end

data/app/models/terminal.rb

@@ -68,6 +68,11 @@ class Terminal
     Smartguard::Client.reboot_async
   end
 
+  def self.recalibrate
+    Smartware.user_interface.delete_calibration
+    Smartware.user_interface.restart_ui
+  end
+
   #
   # CONDITON
   #

data/app/workers/ping_worker.rb

@@ -5,6 +5,7 @@ class PingWorker
 
   sidekiq_options :retry => false, :queue => :pings
 
+  DAY = 24 * 3600
   SEMAPHORE = ConnectionPool.new(:size => 1, :timeout => 5) { true }
 
   def perform
@@ -14,16 +15,49 @@ class PingWorker
 
         Sidekiq::Logging.logger.info "Requesting with updated_at: #{Terminal.providers_updated_at}"
 
+        sessions_per_day = {}
+        sessions = SessionRecord.all
+
+        sessions.each do |session|
+          next if session.time == 0
+
+          session_start = session.started_at
+          session_start -= session_start % DAY
+          session_end = session.started_at + session.time
+
+          session_start.step(session_end - 1, DAY) do |day|
+            day_time = [ day + DAY - 1, session.started_at + session.time ].min -
+                       [ day, session.started_at ].max
+
+            fraction = day_time / session.time
+
+            sessions_per_day[day] = {
+              upstream:   session.upstream * fraction,
+              downstream: session.downstream * fraction,
+              time:       session.time * fraction
+            }
+          end
+        end
+
+        sessions.each do |day, charges|
+          Sidekiq::Logging.logger.info "reporting #{charges.inspect} on #{day}"
+        end
+
         begin
           response = RestClient::Request.execute(
             :method       => :post,
             :url          => "#{Terminal.config.host}/terminal_pings",
             :timeout      => 40,
             :open_timeout => 60,
-            :payload      => {
+            :headers => {
+              "Content-Type" => "application/json",
+              "Accept"       => "application/json"
+            },
+            :payload => JSON.dump(
               :terminal => Terminal.keyword,
-              :terminal_ping => condition
-            }
+              :terminal_ping => condition,
+              :sessions => sessions_per_day
+            )
           )
         rescue Exception => e
           Sidekiq::Logging.logger.warn e.to_s
@@ -39,6 +73,10 @@ class PingWorker
 
         Sidekiq::Logging.logger.info "Response: #{response.inspect}"
 
+        ActiveRecord::Base.transaction do
+          sessions.each &:destroy
+        end
+
         #
         # PROFILE
         #

data/bin/smartkiosk-client

@@ -42,8 +42,19 @@ EventMachine.run do
     @front_orders.push ['modified_at', Terminal.modified_at].to_json
   end
 
-  Smartware.subscribe do |key, *value|
-    @front_orders.push ["smartware.#{key}", value].to_json
+  Smartware.subscribe do |message|
+    if message.key == "modem.accounting"
+      message.acknowlege
+
+      p message
+
+      SessionRecord.create(started_at: message[0],
+                           upstream: message[1],
+                           downstream: message[2],
+                           time: message[3])
+    else
+      @front_orders.push ["smartware.#{message.key}", message.args].to_json
+    end
   end
 
   EventMachine::WebSocket.run(:host => '0.0.0.0', :port => 3002) do |ws|

data/db/migrate/20130216114539_create_session_records.rb

@@ -0,0 +1,12 @@
+class CreateSessionRecords < ActiveRecord::Migration
+  def change
+    create_table :session_records do |t|
+      t.integer :started_at
+      t.integer :upstream
+      t.integer :downstream
+      t.integer :time
+
+      t.timestamps
+    end
+  end
+end

data/lib/smartkiosk/client/version.rb

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

data/smartkiosk-client.gemspec

@@ -49,7 +49,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'rubyzip',                   '0.9.9'
   gem.add_dependency 'pry',                       '0.9.10'
 
-  gem.add_dependency 'smartware',                 '0.4.4'
+  gem.add_dependency 'smartware',                 '0.4.9'
   gem.add_dependency 'smartguard',                '0.4.3'
 
   gem.add_dependency 'sidekiq',                   '2.6.5'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartkiosk-client
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-12 00:00:00.000000000 Z
+date: 2013-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -435,7 +435,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.4.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -443,7 +443,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.4.9
 - !ruby/object:Gem::Dependency
   name: smartguard
   requirement: !ruby/object:Gem::Requirement
@@ -538,6 +538,7 @@ files:
 - app/models/provider.rb
 - app/models/receipt.rb
 - app/models/receipt_template.rb
+- app/models/session_record.rb
 - app/models/terminal.rb
 - app/uploaders/icon_uploader.rb
 - app/views/banners.haml
@@ -577,6 +578,7 @@ files:
 - db/migrate/20130106181844_create_phone_ranges.rb
 - db/migrate/20130108110546_create_promotions.rb
 - db/migrate/20130110025256_create_banners.rb
+- db/migrate/20130216114539_create_session_records.rb
 - init.rb
 - lib/patches/sidekiq.rb
 - lib/pinger.rb
@@ -608,7 +610,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -233556075953690001
+      hash: 2149702848177027716
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -617,7 +619,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -233556075953690001
+      hash: 2149702848177027716
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24