marty 2.5.2 → 2.5.4

data/spec/support/shared_connection.rb

@@ -20,12 +20,12 @@ module Marty; module RSpec; module SharedConnection
     def self.connection
       EXCL_LAMBDA.call.include?(model_name) ? orig_connection :
         @@shared_connection ||
-        ConnectionPool::Wrapper.new(:size => 1) {retrieve_connection}
+        ConnectionPool::Wrapper.new(:size => 1) { retrieve_connection }
     end
 
     def self.reset_shared_connection
       @@shared_connection = ConnectionPool::Wrapper.
-                              new(:size => 1) {retrieve_connection}
+                              new(:size => 1) { retrieve_connection }
     end
   end
 end end end

data/spec/support/structure_compare.rb

@@ -1,27 +1,29 @@
 module Marty::RSpec::StructureCompare
-  def self.struct_compare_all(v1raw, v2raw, key=nil, cmp_opts={}, path=[], errs=[])
+  def self.struct_compare_all(v1raw, v2raw, key = nil, cmp_opts = {}, path = [], errs = [])
     pathstr = path.map(&:to_s).join
-    v1,v2 = [v1raw, v2raw].map { |v| v.class == ActiveSupport::TimeWithZone ?
-                                   DateTime.parse(v.to_s) : v }
+    v1, v2 = [v1raw, v2raw].map do |v|
+              v.class == ActiveSupport::TimeWithZone ?
+                                   DateTime.parse(v.to_s) : v
+    end
 
-    return errs + [v1["error"]] if
-      v1.class != v2.class && v1.class == Hash && v1["error"]
+    return errs + [v1['error']] if
+      v1.class != v2.class && v1.class == Hash && v1['error']
 
-    return errs + [v2["error"]] if
-      v1.class != v2.class && v2.class == Hash && v2["error"]
+    return errs + [v2['error']] if
+      v1.class != v2.class && v2.class == Hash && v2['error']
 
     return errs + ["path=#{pathstr} class mismatch #{v1.class} #{v2.class}"] unless
       v1.class == v2.class ||
-      (!cmp_opts["float_int_nomatch"] &&
-       [v1,v2].map(&:class).to_set == Set.new([Integer, Float]))
+      (!cmp_opts['float_int_nomatch'] &&
+       [v1, v2].map(&:class).to_set == Set.new([Integer, Float]))
 
-    override = (cmp_opts["ignore"]||[]).include?(key)
+    override = (cmp_opts['ignore'] || []).include?(key)
     case v1
     when String
       return errs + ["path=#{pathstr} #{v1} != #{v2}"] unless
         v1 == v2 ||
-        Regexp.new('\A'+v1+'\z').match(v2) ||
-        Regexp.new('\A'+v2+'\z').match(v1) ||
+        Regexp.new('\A' + v1 + '\z').match(v2) ||
+        Regexp.new('\A' + v2 + '\z').match(v1) ||
         override
     when Integer, DateTime, TrueClass, FalseClass, NilClass
       return errs + ["path=#{pathstr} #{v1} != #{v2}"] if v1 != v2 && !override
@@ -29,7 +31,7 @@ module Marty::RSpec::StructureCompare
       return errs + ["path=#{pathstr} #{v1} != #{v2}"] if
         v1.round(6) != v2.round(6) && !override
     when Hash
-      v1_v2, v2_v1 = v1.keys-v2.keys, v2.keys-v1.keys
+      v1_v2, v2_v1 = v1.keys - v2.keys, v2.keys - v1.keys
 
       errs.append("path=#{pathstr} hash extra keys #{v1_v2}") unless v1_v2.empty?
       errs.append("path=#{pathstr} hash extra keys #{v2_v1}") unless v2_v1.empty?
@@ -42,7 +44,7 @@ module Marty::RSpec::StructureCompare
       errs.append(
         "path=#{pathstr} array size mismatch #{v1.size} != #{v2.size}") if
         v1.size != v2.size
-      return errs + v1.each_with_index.map do |childval,index|
+      return errs + v1.each_with_index.map do |childval, index|
         struct_compare_all(childval, v2[index], nil, cmp_opts, path + [[index]],
                            [])
       end.flatten
@@ -53,19 +55,16 @@ module Marty::RSpec::StructureCompare
   end
 end
 
-def struct_compare(v1raw, v2raw, cmp_opts={})
-  begin
+def struct_compare(v1raw, v2raw, cmp_opts = {})
     res = Marty::RSpec::StructureCompare.struct_compare_all(v1raw, v2raw, nil,
                                                             cmp_opts).first
-  rescue => e
+rescue StandardError => e
     e.message
-  end
 end
-def struct_compare_all(v1raw, v2raw, cmp_opts={})
-  begin
+
+def struct_compare_all(v1raw, v2raw, cmp_opts = {})
     Marty::RSpec::StructureCompare.struct_compare_all(v1raw, v2raw, nil,
                                                       cmp_opts)
-  rescue => e
+rescue StandardError => e
     e.message
-  end
 end

data/spec/support/suite.rb

@@ -12,8 +12,7 @@ relative = Pathname.new(__FILE__).parent.to_s
  'performance_helper',
  'structure_compare',
  'custom_matchers',
- 'custom_selectors',
-].each {|f| require (relative + '/' + f)}
+ 'custom_selectors',].each { |f| require (relative + '/' + f) }
 
 module Marty; module RSpec; module Suite
   include Marty::RSpec::Setup

data/spec/support/users.rb

@@ -1,7 +1,7 @@
 module Marty; module RSpec; module Users
   def populate_test_users
-    (1..2).each { |i|
-      Rails.configuration.marty.roles.each { |role_name|
+    (1..2).each do |i|
+      Rails.configuration.marty.roles.each do |role_name|
         username = "#{role_name}#{i}"
         next if Marty::User.find_by_login(username)
 
@@ -19,12 +19,12 @@ module Marty; module RSpec; module Users
         user_role.user = user
         user_role.role = role
         user_role.save!
-      }
-    }
+      end
+    end
 
     # also create an anon user
     user = Marty::User.new
-    user.login = user.firstname = user.lastname = "anon"
+    user.login = user.firstname = user.lastname = 'anon'
     user.active = true
     user.save
   end
@@ -38,6 +38,5 @@ module Marty; module RSpec; module Users
                                    firstname: name,
                                    lastname: 'test',
                                    active: true)
-
   end
 end end end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.5.4
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-25 00:00:00.000000000 Z
+date: 2019-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -101,35 +101,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: net-ldap
+  name: json-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubyzip
+  name: net-ldap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.16.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.16.1
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -143,7 +143,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json-schema
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -177,33 +177,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.2
 - !ruby/object:Gem::Dependency
-  name: delayed_job_active_record
+  name: daemons
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
-  name: daemons
+  name: delayed_job_active_record
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '0'
 description: Marty is a framework for viewing and reporting on versioned data.
 email:
 - arman.bostani@pnmac.com
@@ -380,8 +380,11 @@ files:
 - db/migrate/411_create_vw_promises.rb
 - db/migrate/500_add_api_class_to_marty_api_config.rb
 - db/seeds.rb
+- delorean/blame_report.dl
 - delorean/diagnostics.dl
+- delorean/marty_fields.dl
 - delorean/script_report.dl
+- delorean/table_report.dl
 - docker-compose.dummy.yml
 - gemini_deprecations.md
 - lib/marty.rb
@@ -520,8 +523,9 @@ files:
 - spec/dummy/delorean/base_code.dl
 - spec/dummy/delorean/blame_report.dl
 - spec/dummy/delorean/data_report.dl
-- spec/dummy/delorean/fields.dl
+- spec/dummy/delorean/marty_fields.dl
 - spec/dummy/delorean/styles.dl
+- spec/dummy/delorean/table_report.dl
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/lib/class_list.rb
 - spec/dummy/lib/gemini/my_rule_script_set.rb
@@ -1557,6 +1561,7 @@ files:
 - spec/fixtures/scripts/load_tests/script1.dl
 - spec/fixtures/scripts/load_tests/script2.dl
 - spec/job_helper.rb
+- spec/lib/data_blame_spec.rb
 - spec/lib/data_exporter_spec.rb
 - spec/lib/data_importer_spec.rb
 - spec/lib/delorean_query_spec.rb
@@ -1566,6 +1571,7 @@ files:
 - spec/lib/migrations/vw_marty_postings.sql.expected
 - spec/lib/migrations_spec.rb
 - spec/lib/struct_compare_spec.rb
+- spec/lib/table_report_spec.rb
 - spec/lib/xl_spec.rb
 - spec/lib/xl_styles_spec.rb
 - spec/models/api_auth_spec.rb
@@ -1624,7 +1630,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A framework for working with versioned data