marty 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bea1f7001c31f2ac05b9b5694618355e46661702
-  data.tar.gz: 6345a3b84a2319b1a25c2408dd134e371ff0eed1
+  metadata.gz: 0edc9e441abbe49be11548f8a599e027f5b8955b
+  data.tar.gz: d3d59324e902f21263c7a760d4e6503e9594ecc8
 SHA512:
-  metadata.gz: f4ac10c766f9e4532065c95b75abc71b0d9d79fea51a83a3c3a0c5ba1bed72a287441d84e2c30efa1186ac8d1cc5ed109e9489d3aa557529e2091be723182486
-  data.tar.gz: dc8397f83c0acfbe180e3d7a7228b473d4e13bef61c5faf094abdb45d5dcac7cbfa419aa8d93944de57807f365130c5c28b676494f95813c3b31b19ffcdd3e10
+  metadata.gz: 93e7d0a5e5a39a3b8c0c429a7b693789233e626e7d0707267cf7b6d5b122eda67de11a0373434f2773e61e93a10b25d922931e17903665fba421cb05a0f0709c
+  data.tar.gz: 712f567b179af8fe5debc25b4907b8eb5a3086a39f2f1d8d5f83d43a257560bad263a60a9a5874c9d5fbb42c7ed731baf7b0ec52c6d18a1331d65af87a11ec88

data/Gemfile.lock

@@ -1,16 +1,16 @@
 PATH
   remote: .
   specs:
-    marty (1.1.6)
+    marty (1.1.7)
       axlsx (= 2.1.0pre)
       coderay
       delorean_lang (~> 0.3.33)
       json-schema
       mcfly (= 0.0.19)
-      net-ldap (~> 0.12.0)
+      net-ldap (~> 0.16.1)
       netzke-basepack (~> 1.0.0)
       netzke-core (~> 1.0.0)
-      pg (~> 0.17)
+      pg (~> 0.21)
       rubyzip
       sqlite3
 
@@ -112,7 +112,7 @@ GEM
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
     minitest (5.10.3)
-    net-ldap (0.12.1)
+    net-ldap (0.16.1)
     netzke-basepack (1.0.1.0)
     netzke-core (1.0.1.0)
       execjs

data/app/components/marty/extras/layout.rb

@@ -80,7 +80,10 @@ module Layout
 
       # hacky: extjs has issues with forceSelection true and clearing combos
       store:          klass::VALUES + ['---'],
-      forceSelection: true,
+
+      # we can dynamically add enums (i.e. they're not in VALUES) --
+      # turn off forced selection.
+      # forceSelection: true,
     }
     c.merge!(
       column_config: { editor: editor_config },
@@ -105,8 +108,7 @@ module Layout
   end
 
   def enum_setter(name)
-    lambda {|r, v| r.send("#{name}=", v.nil? || v.empty? || v == '---' ?
-                                        nil : v)}
+    lambda {|r, v| r.send("#{name}=", v.blank? || v == '---' ? nil : v)}
   end
 
   ######################################################################

data/app/models/diagnostic/base_collection.rb

@@ -1,5 +1,5 @@
 # used to group separate diagnostics into one diagnostic
-class Diagnostic::Collection < Diagnostic::ByStatus
+class Diagnostic::Collection < Diagnostic::Base
   class_attribute :diagnostics
   self.diagnostics = []
 

data/app/models/marty/pg_enum.rb

@@ -1,7 +1,8 @@
 module Marty::PgEnum
 
-  def [](index)
-    index = index.to_s
+  def [](i0, i1=nil)
+    # if i1 is provided, then i0 is a pt and we ignore it.
+    index = (i1 || i0).to_s
 
     raise "no such #{self.name}: '#{index}'" unless
       self::VALUES.include?(index)
@@ -9,18 +10,15 @@ module Marty::PgEnum
     StringEnum.new(index)
   end
 
-  def get_all
+  def get_all(pt=nil)
     self::VALUES.map { |v| StringEnum.new(v) }
   end
 
-  GET_ALL_SIG = [0, 0]
-  LOOKUP_SIG = [1, 1]
-  FIND_BY_NAME_SIG = [1, 1]
   def self.extended(base)
     base.class_eval do
-      const_set :GET_ALL_SIG, Marty::PgEnum::GET_ALL_SIG
-      const_set :LOOKUP_SIG, Marty::PgEnum::LOOKUP_SIG
-      const_set :FIND_BY_NAME_SIG, Marty::PgEnum::FIND_BY_NAME_SIG
+      const_set :GET_ALL_SIG,      [0, 1]
+      const_set :LOOKUP_SIG,       [1, 2]
+      const_set :FIND_BY_NAME_SIG, [1, 2]
     end
   end
 

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "1.1.6"
+  VERSION = "1.1.7"
 end

data/marty.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files`.split($\)
   s.licenses    = ['MIT']
 
-  s.add_dependency "pg", "~> 0.17"
+  s.add_dependency "pg", "~> 0.21"
 
   s.add_dependency 'netzke-core', '~> 1.0.0'
   s.add_dependency 'netzke-basepack', '~> 1.0.0'
@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'mcfly', '0.0.19'
 
   s.add_dependency 'coderay'
-  s.add_dependency 'net-ldap', '~> 0.12.0'
+  s.add_dependency 'net-ldap', '~> 0.16.1'
   s.add_dependency 'rubyzip'
   s.add_dependency 'sqlite3'
   s.add_dependency 'json-schema'

data/spec/models/diagnostic/delayed_job_spec.rb

@@ -10,11 +10,8 @@ describe Diagnostic::DelayedJob do
     end
   end
 
-  before(:all) do
-    Marty::Script.load_scripts(nil, Date.today)
-  end
-
   before(:each) do
+    Marty::Script.load_scripts(nil, Date.today)
     allow(Diagnostic::DelayedJob).to receive(:scope).and_return(nil)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-28 00:00:00.000000000 Z
+date: 2018-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -22,14 +22,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '0.21'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: netzke-core
   requirement: !ruby/object:Gem::Requirement
@@ -134,14 +134,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.16.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.16.1
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement