marty 1.2.9 → 2.0.0

data/app/models/marty/config.rb

@@ -2,7 +2,7 @@ class Marty::Config < Marty::Base
   class ConfigValidator < ActiveModel::Validator
     def validate(entry)
       v = entry.get_value
-      entry.errors[:base] = "bad JSON value" if v.nil?
+      entry.errors[:base] << "bad JSON value" if v.nil?
       v
     end
   end

data/app/models/marty/data_grid.rb

@@ -15,19 +15,19 @@ class Marty::DataGrid < Marty::Base
   class DataGridValidator < ActiveModel::Validator
     def validate(dg)
 
-      dg.errors[:base] = "'#{dg.data_type}' not a defined type or class" unless
+      dg.errors.add(:base, "'#{dg.data_type}' not a defined type or class") unless
         Marty::DataGrid.convert_data_type(dg.data_type)
 
-      dg.errors[:base] = "data must be array of arrays" unless
+      dg.errors.add(:base, "data must be array of arrays") unless
         dg.data.is_a?(Array) && dg.data.all? {|a| a.is_a? Array}
 
-      dg.errors[:base] = "metadata must be an array of hashes" unless
+      dg.errors.add(:base, "metadata must be an array of hashes") unless
         dg.metadata.is_a?(Array) && dg.metadata.all? {|a| a.is_a? Hash}
 
-      dg.errors[:base] = "metadata must contain only h/v dirs" unless
+      dg.errors.add(:base, "metadata must contain only h/v dirs") unless
         dg.metadata.all? {|h| ["h", "v"].member? h["dir"]}
 
-      dg.errors[:base] = "metadata item attrs must be unique" unless
+      dg.errors.add(:base, "metadata item attrs must be unique") unless
         dg.metadata.map {|h| h["attr"]}.uniq.length == dg.metadata.length
 
       dg.metadata.each do
@@ -39,22 +39,22 @@ class Marty::DataGrid < Marty::Base
         unless rs_keep.nil? || rs_keep.empty?
           m = /\A *(<|<=|>|>=)? *([a-z_]+) *\z/.match(rs_keep)
           unless m
-            dg.errors[:base] = "invalid grid modifier expression: #{rs_keep}"
+            dg.errors.add(:base, "invalid grid modifier expression: #{rs_keep}")
             next
           end
         end
 
-        dg.errors[:base] = "metadata elements must have attr/type/keys" unless
+        dg.errors.add(:base, "metadata elements must have attr/type/keys") unless
           attr && type && keys
 
         # enforce Delorean attr syntax (a bit Draconian)
-        dg.errors[:base] = "bad attribute '#{attr}'" unless
+        dg.errors.add(:base, "bad attribute '#{attr}'") unless
           attr =~ /^[a-z][A-Za-z0-9_]*$/
 
-        dg.errors[:base] = "unknown metadata type #{type}" unless
+        dg.errors.add(:base, "unknown metadata type #{type}") unless
           Marty::DataGrid.type_to_index(type)
 
-        dg.errors[:base] = "bad metadata keys" unless
+        dg.errors.add(:base, "bad metadata keys") unless
           keys.is_a?(Array) && keys.length>0
       end
 
@@ -68,10 +68,10 @@ class Marty::DataGrid < Marty::Base
       v_zip_keys = v_keys.empty? ? [] : v_keys[0].zip(*v_keys[1..-1])
       h_zip_keys = h_keys.empty? ? [] : h_keys[0].zip(*h_keys[1..-1])
 
-      dg.errors[:base] = "duplicate horiz. key combination" unless
+      dg.errors.add(:base, "duplicate horiz. key combination") unless
         h_zip_keys.uniq.length == h_zip_keys.length
 
-      dg.errors[:base] = "duplicate vertical key combination" unless
+      dg.errors.add(:base, "duplicate vertical key combination") unless
         v_zip_keys.uniq.length == v_zip_keys.length
     end
   end
@@ -589,7 +589,7 @@ class Marty::DataGrid < Marty::Base
     self.data       = data
     self.data_type  = data_type
     self.lenient    = !!lenient
-    self.metadata   = metadata
+    self.metadata   = metadata unless self.metadata == metadata # Otherwise changed will depend on order in hashes
     self.created_dt = created_dt if created_dt
     save!
   end

data/app/models/marty/delorean_rule.rb

@@ -5,7 +5,7 @@ class Marty::DeloreanRule < Marty::BaseRule
 
   def validate
     super
-    return errors[:base] = "Start date must be before end date" if
+    return errors[:base] << "Start date must be before end date" if
       start_dt && end_dt && start_dt >= end_dt
 
     if computed_guards.present? || results.present?
@@ -13,7 +13,7 @@ class Marty::DeloreanRule < Marty::BaseRule
         eclass = engine && engine.constantize || Marty::RuleScriptSet
         eng = eclass.new('infinity').get_engine(self_as_hash)
       rescue => e
-        return errors[:computed] = "- " + e.message
+        return errors[:computed] << "- " + e.message
       end
     end
   end

data/app/models/marty/event.rb

@@ -2,7 +2,7 @@ class Marty::Event < Marty::Base
 
   class EventValidator < ActiveModel::Validator
     def validate(event)
-      event.errors[:base] = "Must have promise_id or start_dt" unless
+      event.errors[:base] << "Must have promise_id or start_dt" unless
         event.promise_id || event.start_dt
     end
   end

data/app/models/marty/import_type.rb

@@ -4,7 +4,7 @@ class Marty::ImportType < Marty::Base
       klass = entry.get_model_class
 
       unless klass.is_a?(Class) && klass < ActiveRecord::Base
-        entry.errors[:base] = "bad model name"
+        entry.errors.add :base, "bad model name"
         return
       end
 
@@ -13,7 +13,7 @@ class Marty::ImportType < Marty::Base
         entry.validation_function,
         entry.preprocess_function,
       ].each { |func|
-        entry.errors[:base] = "unknown class method #{func}" if
+        entry.errors.add(:base, "unknown class method #{func}") if
         func && !klass.respond_to?(func.to_sym)
       }
     end

data/app/models/marty/name_validator.rb

@@ -8,7 +8,7 @@ class Marty::NameValidator < ActiveModel::Validator
 
     # disallow leading, trailing, >1 internal spaces, special chars (|)
     if value =~ /\A\s|\s\z|\A.*\s\s.*\z|.*\|.*/
-      entry.errors[field] =
+      entry.errors[field] <<
         I18n.t("activerecord.errors.messages.extraneous_spaces")
     end
   end

data/app/models/marty/posting.rb

@@ -93,9 +93,4 @@ class Marty::Posting < Marty::Base
     q = q.where(posting_type_id: posting_type.id) if posting_type
     q.order("created_dt DESC").first
   end
-
-  delorean_fn :is_today, sig: 1 do
-    |posting|
-    posting.created_dt.to_date == Date.today
-  end
 end

data/app/models/marty/user.rb

@@ -137,6 +137,6 @@ private
     errors.add :base,
     "Users cannot be deleted - set 'Active' to false to disable the account"
 
-    errors.blank?
+    throw :abort unless errors.blank?
   end
 end

data/app/views/marty/diagnostic/diag.html.erb

@@ -26,5 +26,3 @@
     <% end %>
   </table>
 </div>
-
-<%= display_alert_message if fatal? %>

data/config/routes.rb

@@ -3,8 +3,8 @@ Rails.application.routes.draw do
 end
 
 Marty::Engine.routes.draw do
-  match via: [:get, :post], "rpc/:action(.:format)" => "rpc", as: :rpc
-  get "job/:action" => "job", as: :job
+  match via: [:get, :post], "rpc/evaluate(.:format)" => "rpc", as: :rpc
   match via: [:get, :post], "report(.:format)" => "report#index", as: :report
+  get  'job/download' => 'job', as: :job
   get  'diag', to: 'diagnostic/#op'
 end

data/db/migrate/003_create_marty_users.rb

@@ -1,4 +1,4 @@
-class CreateMartyUsers < ActiveRecord::Migration
+class CreateMartyUsers < ActiveRecord::Migration[4.2]
   def change
     create_table :marty_users do |t|
       t.timestamps null: false

data/db/migrate/004_create_marty_roles.rb

@@ -1,4 +1,4 @@
-class CreateMartyRoles < ActiveRecord::Migration
+class CreateMartyRoles < ActiveRecord::Migration[4.2]
   def change
     create_table :marty_roles do |t|
       t.string :name, null: false, limit: 255

data/db/migrate/005_create_marty_user_roles.rb

@@ -1,4 +1,4 @@
-class CreateMartyUserRoles < ActiveRecord::Migration
+class CreateMartyUserRoles < ActiveRecord::Migration[4.2]
   include Marty::Migrations
 
   def change

data/db/migrate/006_create_marty_tokens.rb

@@ -1,4 +1,4 @@
-class CreateMartyTokens < ActiveRecord::Migration
+class CreateMartyTokens < ActiveRecord::Migration[4.2]
   include Marty::Migrations
 
   def change

data/db/migrate/008_create_marty_posting_types.rb

@@ -1,4 +1,4 @@
-class CreateMartyPostingTypes < ActiveRecord::Migration
+class CreateMartyPostingTypes < ActiveRecord::Migration[4.2]
   def change
     create_table :marty_posting_types do |t|
       t.string :name, null: false, limit: 255

data/db/migrate/068_create_marty_import_types.rb

@@ -1,4 +1,4 @@
-class CreateMartyImportTypes < ActiveRecord::Migration
+class CreateMartyImportTypes < ActiveRecord::Migration[4.2]
   def change
     create_table :marty_import_types do |t|
       t.timestamps null: false

data/db/migrate/069_create_marty_import_synonyms.rb

@@ -1,4 +1,4 @@
-class CreateMartyImportSynonyms < ActiveRecord::Migration
+class CreateMartyImportSynonyms < ActiveRecord::Migration[4.2]
   include Marty::Migrations
 
   def change

data/db/migrate/070_create_versions.rb

@@ -1,4 +1,4 @@
-class CreateVersions < ActiveRecord::Migration
+class CreateVersions < ActiveRecord::Migration[4.2]
   def self.up
     create_table :versions do |t|
       t.string   :item_type, null: false, limit: 255

data/db/migrate/071_add_object_changes_column_to_versions.rb

@@ -1,4 +1,4 @@
-class AddObjectChangesColumnToVersions < ActiveRecord::Migration
+class AddObjectChangesColumnToVersions < ActiveRecord::Migration[4.2]
   def self.up
     add_column :versions, :object_changes, :text
   end

data/db/migrate/072_add_validation_function_to_import_types.rb

@@ -1,4 +1,4 @@
-class AddValidationFunctionToImportTypes < ActiveRecord::Migration
+class AddValidationFunctionToImportTypes < ActiveRecord::Migration[4.2]
   def change
     add_column :marty_import_types, :validation_function, :string, limit: 255
     drop_table :marty_import_synonyms

data/db/migrate/073_add_preprocess_function_to_import_types.rb

@@ -1,4 +1,4 @@
-class AddPreprocessFunctionToImportTypes < ActiveRecord::Migration
+class AddPreprocessFunctionToImportTypes < ActiveRecord::Migration[4.2]
   def change
     add_column :marty_import_types, :preprocess_function, :string, limit: 255
   end

data/db/migrate/090_create_delayed_jobs.rb

@@ -1,4 +1,4 @@
-class CreateDelayedJobs < ActiveRecord::Migration
+class CreateDelayedJobs < ActiveRecord::Migration[4.2]
   def self.up
     create_table :delayed_jobs, :force => true do |table|
       table.integer  :priority, :default => 0, :null => false # Allows some jobs to jump to the front of the queue

data/db/migrate/091_create_marty_promises.rb

@@ -1,4 +1,4 @@
-class CreateMartyPromises < ActiveRecord::Migration
+class CreateMartyPromises < ActiveRecord::Migration[4.2]
   include Marty::Migrations
 
   def change(*args)

data/db/migrate/096_add_user_roles_to_import_types.rb

@@ -1,4 +1,4 @@
-class AddUserRolesToImportTypes < ActiveRecord::Migration
+class AddUserRolesToImportTypes < ActiveRecord::Migration[4.2]
   include Marty::Migrations
 
   def change

data/db/migrate/097_drop_versions.rb

@@ -1,4 +1,4 @@
-class DropVersions < ActiveRecord::Migration
+class DropVersions < ActiveRecord::Migration[4.2]
   def self.up
     drop_table :versions
   end

data/db/migrate/099_create_marty_configs.rb

@@ -1,4 +1,4 @@
-class CreateMartyConfigs < ActiveRecord::Migration
+class CreateMartyConfigs < ActiveRecord::Migration[4.2]
   def change
     create_table :marty_configs do |t|
       t.timestamps null: false

data/db/migrate/101_create_marty_grid_index_numranges.rb

@@ -1,4 +1,4 @@
-class CreateMartyGridIndexNumranges < ActiveRecord::Migration
+class CreateMartyGridIndexNumranges < ActiveRecord::Migration[4.2]
   include Marty::Migrations
 
   def change

data/db/migrate/102_create_marty_grid_index_int4ranges.rb

@@ -1,4 +1,4 @@
-class CreateMartyGridIndexInt4ranges < ActiveRecord::Migration
+class CreateMartyGridIndexInt4ranges < ActiveRecord::Migration[4.2]
   include Marty::Migrations
 
   def change

data/db/migrate/103_create_marty_grid_index_integers.rb

@@ -1,4 +1,4 @@
-class CreateMartyGridIndexIntegers < ActiveRecord::Migration
+class CreateMartyGridIndexIntegers < ActiveRecord::Migration[4.2]
   include Marty::Migrations
 
   def change

data/db/migrate/104_create_marty_grid_index_strings.rb

@@ -1,4 +1,4 @@
-class CreateMartyGridIndexStrings < ActiveRecord::Migration
+class CreateMartyGridIndexStrings < ActiveRecord::Migration[4.2]
   include Marty::Migrations
 
   def change

data/db/migrate/105_create_marty_grid_index_booleans.rb

@@ -1,4 +1,4 @@
-class CreateMartyGridIndexBooleans < ActiveRecord::Migration
+class CreateMartyGridIndexBooleans < ActiveRecord::Migration[4.2]
   include Marty::Migrations
 
   def change

data/db/migrate/106_make_grid_indexes_nullable.rb

@@ -1,4 +1,4 @@
-class MakeGridIndexesNullable < ActiveRecord::Migration
+class MakeGridIndexesNullable < ActiveRecord::Migration[4.2]
   include Marty::Migrations
 
   def change

data/db/migrate/200_create_marty_event_operation_enum.rb

@@ -1,4 +1,4 @@
-class CreateMartyEventOperationEnum < ActiveRecord::Migration
+class CreateMartyEventOperationEnum < ActiveRecord::Migration[4.2]
   def change
       values = Marty::EnumEventOperation::VALUES
       str_values = values.map {|v| ActiveRecord::Base.connection.quote v}.join ','

data/db/migrate/201_create_marty_events.rb

@@ -1,4 +1,4 @@
-class CreateMartyEvents < ActiveRecord::Migration
+class CreateMartyEvents < ActiveRecord::Migration[4.2]
   def change(*args)
     # Giant hack to monkey patch connection so that we can create an
     # UNLOGGED table in PostgreSQL.

data/db/migrate/202_add_completion_status_to_event.rb

@@ -1,4 +1,4 @@
-class AddCompletionStatusToEvent < ActiveRecord::Migration
+class AddCompletionStatusToEvent < ActiveRecord::Migration[4.2]
   def change
     add_column :marty_events, :error, :boolean, null: true
     execute "update marty_events set error = 'f'"

data/db/migrate/300_create_marty_api_configs.rb

@@ -1,4 +1,4 @@
-class CreateMartyApiConfigs < ActiveRecord::Migration
+class CreateMartyApiConfigs < ActiveRecord::Migration[4.2]
   def change
     create_table :marty_api_configs do |t|
       t.timestamps null: false

data/db/migrate/301_create_marty_api_log.rb

@@ -1,4 +1,4 @@
-class CreateMartyApiLog < ActiveRecord::Migration
+class CreateMartyApiLog < ActiveRecord::Migration[4.2]
   def change
     create_table :marty_api_logs do |t|
       t.string :script, null: false

data/db/migrate/302_add_api_configs_validate_result.rb

@@ -1,4 +1,4 @@
-class AddApiConfigsValidateResult < ActiveRecord::Migration
+class AddApiConfigsValidateResult < ActiveRecord::Migration[4.2]
   def change
     rename_column :marty_api_configs, :validated, :input_validated
     add_column :marty_api_configs, :output_validated, :boolean, null: false,

data/db/migrate/303_create_marty_logs.rb

@@ -1,4 +1,4 @@
-class CreateMartyLogs < ActiveRecord::Migration
+class CreateMartyLogs < ActiveRecord::Migration[4.2]
   def change
     create_table :marty_logs do |t|
       t.string :message_type, null: false

data/db/migrate/304_drop_marty_api_logs.rb

@@ -1,4 +1,4 @@
-class DropMartyApiLogs < ActiveRecord::Migration
+class DropMartyApiLogs < ActiveRecord::Migration[4.2]
   def self.up
     drop_table :marty_api_logs
   end

data/db/migrate/400_create_dg_plv8_v1_fns.rb

@@ -1,4 +1,4 @@
-class CreateDgPlv8V1Fns < ActiveRecord::Migration
+class CreateDgPlv8V1Fns < ActiveRecord::Migration[4.2]
   def change
     connection.execute <<-SQL
       -- required to utilize plv8 extension

data/lib/marty/migrations.rb

@@ -70,7 +70,7 @@ module Marty::Migrations
                     fk_opts(from_table,
                             to_table,
                             options[:column]).update(options),
-                    )
+                   )
   end
 
   # created_dt/obsoleted_dt need to be indexed since they appear in
@@ -101,11 +101,10 @@ module Marty::Migrations
               attrs,
               unique: true,
               name: unique_index_name(klass)
-              ) unless index_exists?(klass.table_name.to_sym,
-                                     attrs,
-                                     name: unique_index_name(klass),
-                                     unique: true)
-
+             ) unless index_exists?(klass.table_name.to_sym,
+                                    attrs,
+                                    name: unique_index_name(klass),
+                                    unique: true)
   end
 
   def remove_mcfly_unique_index(klass)
@@ -231,7 +230,7 @@ EOSQL
       # before EOL.  GO in comments could trigger this and will cause an error
       File.open(mig_name, "w") do |f|
         f.print <<OUT
-class #{klass.camelcase} < ActiveRecord::Migration
+class #{klass.camelcase} < ActiveRecord::Migration[4.2]
 
   def up
     path = #{sql_snap_call}
@@ -257,7 +256,7 @@ OUT
     ActiveRecord::Base.
                connection.execute(<<-SQL).to_a.first.try{|v| v['id']}
       select id from #{klass.table_name} where name =
-         #{ActiveRecord::Base.sanitize(name)}
+         #{ActiveRecord::Base.connection.quote(name)}
     SQL
   end