six-updater-web 0.23.4 → 0.23.5

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'six-updater-web'
-  s.version = '0.23.4'
+  s.version = '0.23.5'
   s.has_rdoc = false
   #s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'

data/lib/six-updater-web/app/models/appsetting.rb

@@ -2,6 +2,8 @@ class Appsetting < ActiveRecord::Base
   has_many :sixconfigs
   six_guid
 
+  OVERRIDE_MODEL = Appsetting
+
   FOLDER = /(.*)\/(.*)/
 
   # Defaults to ArmA2 atm...

data/lib/six-updater-web/app/models/mod.rb

@@ -12,6 +12,7 @@ class Mod < ActiveRecord::Base
 
   six_guid
 
+  OVERRIDE_MODEL = Mod
 
   def all_dependentmods(mods = [])
     mods += [self]

data/lib/six-updater-web/app/models/system_setting.rb

@@ -73,17 +73,12 @@ class SystemSetting < ActiveRecord::Base
   def sync
     self.synchronized_at = Time.now
     self.save
-    Mod.delete_all("type IS NULL or name IS NULL")
-    Appsetting.delete_all("type IS NULL or name IS NULL")
-    content = nil
+    #Mod.delete_all("type IS NULL or name IS NULL")
+    #Appsetting.delete_all("type IS NULL or name IS NULL")
     l = self.synchronize
-    if l.size > 0
-      content = "Synchronized #{l.size} records with server-site!" #l.map {|e| e.to_json}.join(", ")
-    else
-      content = "WARNING: No objects received, possibly issue with connection (timeout?), or server site"
-    end
-    Mod.delete_all("type IS NULL or name IS NULL")
-    Appsetting.delete_all("type IS NULL or name IS NULL")
+    content = l.size > 0 ? "Synchronized #{l.size} records with server-site!" : "WARNING: No objects received, possibly issue with connection (timeout?), or server site" 
+    #Mod.delete_all("type IS NULL or name IS NULL")
+    #Appsetting.delete_all("type IS NULL or name IS NULL")
     content
   end
 end

data/lib/six-updater-web/config/six-updater-web.rb

@@ -22,7 +22,7 @@ case RUBY_VERSION
 end
 
 module SixUpdaterWeb
-  VERSION = "0.23.4"
+  VERSION = "0.23.5"
   COMPONENT = "six-updater-web"
 
   DEFAULT_IP = "127.0.0.1" unless defined?(DEFAULT_IP)

data/lib/six-updater-web/vendor/plugins/six-import/lib/six/import.rb

@@ -55,10 +55,17 @@ module Six
       end
 
       module ClassMethods
+
+        def override_class
+          defined?(self::OVERRIDE_MODEL) ? self::OVERRIDE_MODEL : self
+        end
+
         def blabla(h)
           l = []
           h.each_pair do |key, value|
             l << self.from_hash(value.merge({:type => key.camelize.singularize}))
+            # Officially??
+            # l << Object.const_get(key.camelize.singularize).from_hash(value.merge({:type => key.camelize.singularize}))
           end
           l
         end
@@ -80,10 +87,10 @@ module Six
           case h
             when Array
               h.each do |b|
-                k += blabla(b)
+                k += self.blabla(b)
               end
             when Hash
-              k += blabla h
+              k += self.blabla h
           end
           k
         end
@@ -106,7 +113,7 @@ module Six
             h.delete "id"
             r = nil
             begin
-              r = self.find(id)
+              r = self.override_class.find(id)
             rescue
             end
             if r

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 23
-  - 4
-  version: 0.23.4
+  - 5
+  version: 0.23.5
 platform: ruby
 authors: 
 - Sickboy