smartkiosk-server 0.9.3 → 0.10.0

data/app/controllers/terminal_pings_controller.rb

@@ -3,43 +3,54 @@ class TerminalPingsController < ApplicationController
 
   def create
     begin
-      ping_data = params[:terminal_ping]
-      providers = ping_data[:providers]
+      profile = @terminal.terminal_profile
 
-      remote_timestamp = providers[:updated_at].blank? ? nil : DateTime.parse(providers[:updated_at])
-      local_timestamp  = [
-        Provider.timestamp.value || DateTime.civil(0, 1, 1),
-        ProviderGroup.timestamp.value || DateTime.civil(0, 1, 1),
-        TerminalProfilePromotion.timestamp.value || DateTime.civil(0, 1, 1)
-      ].max
+      ping_data = params[:terminal_ping]
+      remote_timestamp = ping_data[:providers_updated_at].blank? ? nil : DateTime.parse(ping_data[:providers_updated_at])
+      local_timestamp = nil
+      profile.cached_providers_lock.lock { local_timestamp = profile.actual_timestamp }
 
       @terminal.ping!(TerminalPing.new ping_data)
 
       response = {
         :time => DateTime.now,
         :profile => {
-          :support_phone => @terminal.terminal_profile.support_phone,
-          :logo          => @terminal.terminal_profile.logo.url,
-          :modified_at   => @terminal.terminal_profile.updated_at
+          :support_phone => profile.support_phone,
+          :logo          => profile.logo.url,
+          :modified_at   => profile.updated_at
         },
         :orders => @terminal.terminal_orders.unsent.as_json(:only => [:id, :keyword, :args, :created_at]),
-        :providers => {}
+        :update_providers => remote_timestamp.blank? || local_timestamp.to_i > remote_timestamp.to_i # to drop microseconds
       }
 
-      unless providers[:ids].blank?
-        response[:providers][:remove] = providers[:ids].map{|x| x.to_i} - Provider.select(:id).map(&:id)
-      end
-
-      if remote_timestamp.blank? || local_timestamp > remote_timestamp
-        response[:providers][:update] = @terminal.providers_dump remote_timestamp
-        response[:providers][:groups] = @terminal.provider_groups_dump
-        response[:providers][:promotions] = @terminal.promotions_dump
-        response[:providers][:updated_at] = local_timestamp.strftime('%Y-%m-%dT%H:%M:%S.%9N%z')
-      end
-
       render :json => response
     rescue ActiveRecord::RecordInvalid
       render :text => nil, :status => 400
     end
   end
-end
+
+  def providers
+    profile = @terminal.terminal_profile
+
+    providers = nil
+    profile.cached_providers_lock.lock do
+      providers = profile.cached_providers.value
+
+      if providers.nil?
+        ActiveRecord::Base.transaction do
+          providers = {
+            :providers  => profile.providers_dump,
+            :groups     => profile.provider_groups_dump,
+            :promotions => profile.promotions_dump,
+            :updated_at => profile.actual_timestamp
+          }
+        end
+
+        providers = ActiveSupport::Gzip.compress(ActiveSupport::JSON.encode(providers))
+        profile.cached_providers.value = providers
+      end
+    end
+
+    send_data providers, :type => 'application/gzip', :disposition => 'inline'
+  end
+end

data/app/models/agent.rb

@@ -19,6 +19,6 @@ class Agent < ActiveRecord::Base
   #
   # VALIDATIONS
   #
-  validates :title, :presence => true
+  validates :title, :presence => true, :uniqueness => true
 
 end

data/app/models/provider.rb

@@ -1,19 +1,17 @@
 class Provider < ActiveRecord::Base
   include Redis::Objects::RMap
 
-  value :timestamp, :global => true, :marshal => true
-
   has_rmap({:id => lambda{|x| x.to_s}}, :title)
   has_paper_trail
 
   mount_uploader :icon, IconUploader
 
   after_save do
-    self.class.timestamp = updated_at
+    TerminalProfile.invalidate_all_cached_providers!
   end
 
   after_destroy do
-    self.class.timestamp = DateTime.now
+    TerminalProfile.invalidate_all_cached_providers!
   end
 
   #
@@ -37,8 +35,8 @@ class Provider < ActiveRecord::Base
   scope :gateway_ids_eq, lambda{|x| includes(:gateways).where(:gateways => {:id => x})}
   search_method :gateway_ids_eq
 
-  scope :after, lambda{|x| 
-    x.blank? ? scoped 
+  scope :after, lambda{|x|
+    x.blank? ? scoped
              : where(arel_table[:updated_at].gt x)
   }
 

data/app/models/provider_group.rb

@@ -3,14 +3,12 @@ class ProviderGroup < ActiveRecord::Base
 
   mount_uploader :icon, IconUploader
 
-  value :timestamp, :global => true, :marshal => true
-
   after_save do
-    self.class.timestamp = updated_at
+    TerminalProfile.invalidate_all_cached_providers!
   end
 
   after_destroy do
-    self.class.timestamp = DateTime.now
+    TerminalProfile.invalidate_all_cached_providers!
   end
 
   belongs_to :provider_group

data/app/models/provider_profile.rb

@@ -6,4 +6,6 @@ class ProviderProfile < ActiveRecord::Base
   has_many :providers
   has_many :limits
   has_many :commissions
+
+  validates :title, :presence => true, :uniqueness => true
 end

data/app/models/terminal.rb

@@ -35,61 +35,6 @@ class Terminal < ActiveRecord::Base
   #
   # METHODS
   #
-  def providers_dump(after=nil)
-    providers = Provider.includes(:provider_fields).after(after)
-
-    return [] if providers.blank?
-
-    overload  = Hash[*terminal_profile.terminal_profile_providers.map{|x| [x.provider_id, x]}.flatten]
-
-    providers.map do |x|
-      icon = overload[x.id].icon rescue nil
-
-      if icon.blank?
-        icon = x.icon.try(:url)
-      else
-        icon = icon.url
-      end
-
-      {
-        :id             => x.id,
-        :title          => x.title,
-        :keyword        => x.keyword,
-        :icon           => icon,
-        :priority       => overload[x.id].try(:priority),
-        :fields         => x.fields_dump,
-        :group_id       => x.provider_group_id,
-        :requires_print => x.requires_print
-      }
-    end
-  end
-
-  def promotions_dump
-    terminal_profile.terminal_profile_promotions.map{|x| x.provider_id}
-  end
-
-  def provider_groups_dump
-    overload = Hash[*terminal_profile.terminal_profile_provider_groups.map{|x| [x.provider_group_id, x]}.flatten]
-
-    ProviderGroup.all.map do |x|
-      icon = overload[x.id].icon rescue nil
-
-      if icon.blank?
-        icon = x.icon.try(:url)
-      else
-        icon = icon.url
-      end
-
-      {
-        :id        => x.id,
-        :title     => x.title,
-        :icon      => icon,
-        :priority  => overload[x.id].try(:priority),
-        :parent_id => x.provider_group_id
-      }
-    end
-  end
-
   def title
     keyword
   end

data/app/models/terminal_profile.rb

@@ -1,9 +1,13 @@
 class TerminalProfile < ActiveRecord::Base
   include Redis::Objects::RMap
 
-  has_rmap({:id => lambda{|x| x.to_s}}, :keyword)
+  has_rmap({:id => lambda{|x| x.to_s}}, :title)
   has_paper_trail
 
+  value :cached_providers
+  value :cached_providers_timestamp, :marshal => true
+  lock  :cached_providers, :expiration => 15
+
   has_many :terminals, :conditions => "terminal_profile_id IS NOT NULL"
   has_many :terminal_profile_promotions, :dependent => :destroy, :order => :priority
   has_many :terminal_profile_providers, :dependent => :destroy, :order => :priority
@@ -15,6 +19,8 @@ class TerminalProfile < ActiveRecord::Base
   accepts_nested_attributes_for :terminal_profile_providers
   accepts_nested_attributes_for :terminal_profile_provider_groups
 
+  validates :title, :presence => true, :uniqueness => true
+
   def actualize_links!
     ProviderGroup.where(ProviderGroup.arel_table[:id].not_in TerminalProfileProviderGroup.arel_table.project(:provider_group_id)).each do |pg|
       terminal_profile_provider_groups << TerminalProfileProviderGroup.new(:provider_group_id => pg.id, :terminal_profile_id => id)
@@ -24,4 +30,81 @@ class TerminalProfile < ActiveRecord::Base
       terminal_profile_providers << TerminalProfileProvider.new(:provider_id => p.id, :terminal_profile_id => id)
     end
   end
+
+  def self.invalidate_all_cached_providers!
+    TerminalProfile.all.each(&:invalidate_cached_providers!)
+  end
+
+  def invalidate_cached_providers!
+    self.cached_providers_lock.lock do
+      self.cached_providers.value = nil
+      self.cached_providers_timestamp.value = DateTime.now
+    end
+  end
+  
+  def actual_timestamp
+    local_timestamp = self.cached_providers_timestamp.value
+    
+    if local_timestamp.nil? # Redis is not populated yet
+      self.cached_providers_timestamp.value = local_timestamp = DateTime.now
+    end
+    
+    local_timestamp
+  end
+  
+  def providers_dump
+    providers = Provider.includes(:provider_fields)
+
+    return [] if providers.blank?
+
+    overload  = Hash[self.terminal_profile_providers.map{|x| [x.provider_id, x]}]
+
+    providers.map do |x|
+      icon = overload[x.id].icon rescue nil
+
+      if icon.blank?
+        icon = x.icon.try(:url)
+      else
+        icon = icon.url
+      end
+
+      {
+        :id             => x.id,
+        :title          => x.title,
+        :keyword        => x.keyword,
+        :icon           => icon,
+        :priority       => overload[x.id].try(:priority),
+        :fields         => x.fields_dump,
+        :group_id       => x.provider_group_id,
+        :requires_print => x.requires_print
+      }
+    end
+  end
+
+  def promotions_dump
+    self.terminal_profile_promotions.map &:provider_id
+  end
+
+  def provider_groups_dump
+    overload = Hash[self.terminal_profile_provider_groups.map{|x| [x.provider_group_id, x]}]
+
+    ProviderGroup.all.map do |x|
+      icon = overload[x.id].icon rescue nil
+
+      if icon.blank?
+        icon = x.icon.try(:url)
+      else
+        icon = icon.url
+      end
+
+      {
+        :id        => x.id,
+        :title     => x.title,
+        :icon      => icon,
+        :priority  => overload[x.id].try(:priority),
+        :parent_id => x.provider_group_id
+      }
+    end
+  end
+
 end

data/app/models/terminal_profile_promotion.rb

@@ -1,18 +1,16 @@
 class TerminalProfilePromotion < ActiveRecord::Base
   include Redis::Objects::RMap
 
-  value :timestamp, :global => true, :marshal => true
-
   belongs_to :terminal_profile
   belongs_to :provider
 
   validates :provider, :presence => true
 
   after_save do
-    self.class.timestamp = updated_at
+    self.terminal_profile.invalidate_cached_providers!
   end
 
   after_destroy do
-    self.class.timestamp = DateTime.now
+    self.terminal_profile.invalidate_cached_providers!
   end
 end

data/app/models/terminal_profile_provider.rb

@@ -8,4 +8,12 @@ class TerminalProfileProvider < ActiveRecord::Base
   validates :provider_id, :uniqueness => {:scope => :terminal_profile_id}
   validates :provider, :presence => true
   validates :terminal_profile, :presence => true
+
+  after_save do
+    self.terminal_profile.invalidate_cached_providers!
+  end
+
+  after_destroy do
+    self.terminal_profile.invalidate_cached_providers!
+  end
 end

data/app/models/terminal_profile_provider_group.rb

@@ -12,4 +12,12 @@ class TerminalProfileProviderGroup < ActiveRecord::Base
   validates :terminal_profile, :presence => true
 
   delegate :title, :to => :terminal_profile
+
+  after_save do
+    self.terminal_profile.invalidate_cached_providers!
+  end
+
+  after_destroy do
+    self.terminal_profile.invalidate_cached_providers!
+  end
 end

data/config/routes.rb

@@ -7,8 +7,8 @@ Rails.application.class.routes.draw do
 
   devise_for :users, ActiveAdmin::Devise.config
 
-  constraints lambda { |request| 
-    request.env["warden"].authenticate? and request.env['warden'].user.root? 
+  constraints lambda { |request|
+    request.env["warden"].authenticate? and request.env['warden'].user.root?
   } do
     mount Sidekiq::Web => '/sidekiq'
   end
@@ -20,7 +20,13 @@ Rails.application.class.routes.draw do
     :log_to => Rails.root.join('log/webdav.log').to_s
   ) => '/builds/'
 
-  resources :terminal_pings
+  resources :terminal_pings do
+    collection do
+      get :providers
+    end
+  end
+
+
   resources :collections
   resources :system_receipt_templates
 

data/lib/smartkiosk/server/version.rb

@@ -1,5 +1,5 @@
 module Smartkiosk
   module Server
-    VERSION = '0.9.3'
+    VERSION = '0.10.0'
   end
 end

metadata

@@ -1,48 +1,38 @@
 --- !ruby/object:Gem::Specification
 name: smartkiosk-server
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 0.9.3
+  version: 0.10.0
+  prerelease: 
 platform: ruby
 authors:
 - Boris Staal
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.2.11
+  requirement: &70123420824880 !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 3.2.11
-    none: false
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *70123420824880
 - !ruby/object:Gem::Dependency
   name: matrioshka
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.1
+  requirement: &70123420824340 !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.1
-    none: false
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *70123420824340
 description: Smartkiosk server application
 email:
 - boris@roundlake.ru
@@ -50,8 +40,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
+- .gitignore
+- .rspec
 - Capfile
 - Gemfile
 - Gemfile.lock
@@ -310,26 +300,24 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
+      version: '0'
       segments:
       - 0
-      hash: 2
-      version: !binary |-
-        MA==
-  none: false
+      hash: 4534525538031660803
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
-  none: false
+      version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 1.8.24
-signing_key:
+rubyforge_project: 
+rubygems_version: 1.8.15
+signing_key: 
 specification_version: 3
 summary: Smartkiosk server application
 test_files: