smartkiosk-server 0.9.1 → 0.9.2

data/.gitignore

@@ -5,6 +5,7 @@
 #   git config --global core.excludesfile ~/.gitignore_global
 
 .DS_Store
+/pkg/*
 
 # Ignore bundler config
 /.bundle

data/Gemfile

@@ -68,4 +68,4 @@ group :development do
   gem 'i18n_yaml_sorter'
 end
 
-gem 'iso8583-mkb', :git => 'git://github.com/smartkiosk/iso8583-mkb.git'
+gem 'iso8583-mkb', '0.0.1'

data/Gemfile.lock

@@ -1,11 +1,3 @@
-GIT
-  remote: git://github.com/smartkiosk/iso8583-mkb.git
-  revision: dbeffaa276e763ddff20651a87e930e360f88640
-  specs:
-    iso8583-mkb (0.0.1)
-      eventmachine
-      iso8583
-
 GIT
   remote: https://github.com/guard/guard-spork.git
   revision: dbaa8531850347474d5a7ee626a9a2a64f7e653c
@@ -177,6 +169,9 @@ GEM
       has_scope (~> 0.5.0)
       responders (~> 0.6)
     iso8583 (0.1.4)
+    iso8583-mkb (0.0.1)
+      eventmachine
+      iso8583
     jdbc-postgres (9.2.1002)
     jdbc-sqlite3 (3.7.2)
     journey (1.0.4)
@@ -402,7 +397,7 @@ DEPENDENCIES
   guard-spork!
   haml
   i18n_yaml_sorter
-  iso8583-mkb!
+  iso8583-mkb (= 0.0.1)
   jquery-rails
   jruby-openssl
   liquid

data/app/models/terminal_profile.rb

@@ -16,14 +16,11 @@ class TerminalProfile < ActiveRecord::Base
   accepts_nested_attributes_for :terminal_profile_provider_groups
 
   def actualize_links!
-    group_ids = [-1] + terminal_profile_provider_groups.map{|x| x.provider_group_id}
-    prov_ids  = [-1] + terminal_profile_providers.map{|x| x.provider_id}
-
-    ProviderGroup.where(ProviderGroup.arel_table[:id].not_in group_ids).each do |pg|
+    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)
     end
 
-    Provider.where(Provider.arel_table[:id].not_in prov_ids).each do |p|
+    Provider.where(Provider.arel_table[:id].not_in TerminalProfileProvider.arel_table.project(:provider_id)).each do |p|
       terminal_profile_providers << TerminalProfileProvider.new(:provider_id => p.id, :terminal_profile_id => id)
     end
   end

data/lib/smartkiosk/server/version.rb

@@ -1,5 +1,5 @@
 module Smartkiosk
   module Server
-    VERSION = '0.9.1'
+    VERSION = '0.9.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartkiosk-server
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70109942827260 !ruby/object:Gem::Requirement
+  requirement: &70341322666080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.11
   type: :runtime
   prerelease: false
-  version_requirements: *70109942827260
+  version_requirements: *70341322666080
 - !ruby/object:Gem::Dependency
   name: matrioshka
-  requirement: &70109942826720 !ruby/object:Gem::Requirement
+  requirement: &70341322665540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70109942826720
+  version_requirements: *70341322665540
 description: Smartkiosk server application
 email:
 - boris@roundlake.ru
@@ -307,16 +307,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3459367265776858922
+      hash: -3398683662999276899
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3459367265776858922
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15