integration_pal 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 057d3d1f623ec6a6a396c15c336a5ac820dbacba
-  data.tar.gz: 5872559eb6642a98f9474744f2e1b0eca697fddd
+  metadata.gz: bfbfcca9a652c0832d296463732c575fda9c8348
+  data.tar.gz: a6d1460f68931dbdadee4e125fcfc9c246d42d2e
 SHA512:
-  metadata.gz: 7b96132564133e039cabcefabd7999fc873435928362bf2dc5b65fd0c065427d3e1b0d2d4f3730be4082a040d264f1237a9a63fabeb353df6b342b0ba2ca5674
-  data.tar.gz: 2c518f10f519f3d1c6086c117e5e4dce7425f771566db84bc22b8929866c886844c1d199791e689570cbe433ab5ad71f84dff8cf228a53c52c92f0fb8c033d81
+  metadata.gz: e28e45c019820d871f79e579da88fa1c812712488b2f55cb527c78678ec85817822c70929f349deefc7c68a4c35e606ce3969c0f5104b3bbc14f7195e24f7aaf
+  data.tar.gz: 8bd163df2013969c62cc1e9bebf4f5a309d9b7afa564dce60f85bd6cd754c6fec0f7154e9653983f2916f43e7d5ea72b8d7f87d2a3afee293a25a85d7e2341e4

data/app/assets/javascripts/integration_pal/application.js

@@ -10,4 +10,6 @@
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
+//= require jquery
+//= require jquery_ujs
 //= require_tree .

data/app/assets/javascripts/integration_pal/workers.coffee

@@ -0,0 +1,33 @@
+class WorkerForm
+  constructor: ->
+    $('#new_setting_button').on 'click', (event) ->
+      event.preventDefault()
+      key = $('#new_setting_key').val()
+      value = $('#new_setting_value').val()
+      return if key.length < 1 || value.length < 1
+      formElement = """
+        <div id="setting_#{key}">
+          <label>#{key}</label>
+          <div class='row'>
+            <div class="col-sm-10">
+              <input class='form-control' name="worker[settings][#{key}]" type="text" value="#{value}" />
+            </div>
+            <div class='col-sm-2'>
+              <button class='remove_setting btn btn-danger' data-key="#{key}">Remove</button>
+            </div>
+          </div>
+        </div>
+      """
+      $('#worker_settings').append(formElement)
+
+    $(document).on 'click', '.remove_setting', (event) ->
+      event.preventDefault()
+      key = $(event.target).data('key')
+      name = "worker[settings][#{key}]"
+      $("input[name='#{name}']").remove()
+      $("#setting_#{key}").hide()
+
+$ ->
+  new WorkerForm() if $('#worker_form').length > 0
+
+

data/app/controllers/integration_pal/workers_controller.rb

@@ -25,6 +25,7 @@ module IntegrationPal
     # POST /workers
     def create
       @worker = Worker.new(worker_params)
+      @worker.settings = params[:worker][:settings] || {}
 
       if @worker.save
         redirect_to @worker, notice: 'Worker was successfully created.'
@@ -35,6 +36,7 @@ module IntegrationPal
 
     # PATCH/PUT /workers/1
     def update
+      @worker.settings = params[:worker][:settings] || {}
       if @worker.update(worker_params)
         redirect_to @worker, notice: 'Worker was successfully updated.'
       else
@@ -56,7 +58,10 @@ module IntegrationPal
 
       # Only allow a trusted parameter "white list" through.
       def worker_params
-        params.require(:worker).permit(:name, :access_id, :secret_key, :job_type, settings: params[:worker][:settings].keys)
+        params[:worker] ||= {}
+        params[:worker][:settings] ||= {}
+        params[:worker][:settings].permit!
+        params.require(:worker).permit(:name, :access_id, :secret_key, :job_type, :settings, settings: params[:worker][:settings].keys)
       end
   end
 end

data/app/models/integration_pal/worker.rb

@@ -5,7 +5,7 @@ module IntegrationPal
     attr_encrypted :settings, key: ENV['ENCRYPTION_KEY'], salt: ENV['SALT_KEY'], marshal: true
 
     validates :name, presence: true
-    validates :access_id, presence: true
+    validates :access_id, presence: true, uniqueness: true
     validates :secret_key, presence: true
     validates :job_type, presence: true
 
@@ -16,7 +16,7 @@ module IntegrationPal
       ApiAuth.generate_secret_key
     end
 
-    after_initialize do |user|
+    after_initialize do |worker|
       self.settings ||= {}
       self.secret_key ||= ApiAuth.generate_secret_key
     end

data/app/views/integration_pal/workers/_form.html.erb

@@ -1,4 +1,4 @@
-<%= form_with(model: worker, local: true) do |form| %>
+<%= form_with(model: worker, local: true, id: 'worker_form') do |form| %>
   <% if worker.errors.any? %>
     <div id="error_explanation">
       <h2><%= pluralize(worker.errors.count, "error") %> prohibited this worker from being saved:</h2>
@@ -31,17 +31,38 @@
     <%= form.select :job_type, JOB_TYPES, {}, class: 'form-control' %>
   </div>
 
-  <% if worker.settings.present? %>
-    <hr />
-    <h4>Settings</h4>
-    <hr />
-    <div class="form-group">
-      <% worker.settings.each do |key, value| %>
+  <hr />
+  <h4>Settings</h4>
+  <hr />
+
+  <div id='worker_settings' class="form-group">
+    <% worker.settings.each do |key, value| %>
+      <div id="setting_<%= key %>">
         <%= form.label key, "#{key}" %>
-        <input class='form-control' name="worker[settings][<%= key %>]" type="text" value="<%= value %>" />
-      <% end %>
-    </div>
-  <% end %>
+        <div class='row'>
+          <div class="col-sm-10">
+            <input class='form-control' name="worker[settings][<%= key %>]" type="text" value="<%= value %>" />
+          </div>
+          <div class='col-sm-2'>
+            <button class='remove_setting btn btn-danger' data-key="<%= key %>">Remove</button>
+          </div>
+        </div>
+      </div>
+    <% end %>
+  </div>
+
+  <br />
+
+  <div class="form-group">
+    <h6>Add Setting</h6>
+    <%= label_tag :key %>
+    <%= text_field_tag :key, nil, id: 'new_setting_key' %>
+    <%= label_tag :value %>
+    <%= text_field_tag :value, nil, id: 'new_setting_value' %>
+    <%= button_tag "Add Setting", id: 'new_setting_button' %>
+  </div>
+
+  <br />
 
   <div class="actions">
     <%= form.submit 'Update Worker', class: 'btn btn-primary' %>

data/lib/integration_pal/engine.rb

@@ -4,6 +4,7 @@ module IntegrationPal
     require 'rack-cas'
     require 'rack-cas-rails'
     require 'attr_encrypted'
+    require 'jquery-rails'
 
     cattr_accessor :mounted_path
 

data/lib/integration_pal/version.rb

@@ -1,3 +1,3 @@
 module IntegrationPal
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: integration_pal
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Cody Tanner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2017-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.1
+- !ruby/object:Gem::Dependency
+  name: jquery-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.3.1
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -191,6 +205,7 @@ files:
 - Rakefile
 - app/assets/config/integration_pal_manifest.js
 - app/assets/javascripts/integration_pal/application.js
+- app/assets/javascripts/integration_pal/workers.coffee
 - app/assets/stylesheets/integration_pal/application.css
 - app/controllers/integration_pal/api/v1/jobs_controller.rb
 - app/controllers/integration_pal/api_controller.rb
@@ -200,6 +215,22 @@ files:
 - app/helpers/integration_pal/application_helper.rb
 - app/jobs/integration_pal/application_job.rb
 - app/mailers/integration_pal/application_mailer.rb
+- app/models/canvas/client.rb
+- app/models/canvas/models/account.rb
+- app/models/canvas/models/base_model.rb
+- app/models/canvas/models/course.rb
+- app/models/canvas/models/enrollment.rb
+- app/models/canvas/models/file.rb
+- app/models/canvas/models/folder.rb
+- app/models/canvas/models/group.rb
+- app/models/canvas/models/group_membership.rb
+- app/models/canvas/models/section.rb
+- app/models/canvas/models/term.rb
+- app/models/canvas/models/user.rb
+- app/models/canvas/models/user_observer.rb
+- app/models/canvas/models/x_list.rb
+- app/models/canvas/utils/csv.rb
+- app/models/canvas/utils/sis.rb
 - app/models/integration_pal/application_record.rb
 - app/models/integration_pal/job.rb
 - app/models/integration_pal/worker.rb
@@ -222,22 +253,6 @@ files:
 - db/migrate/20170524203831_create_integration_pal_workers.rb
 - db/migrate/20170525153603_create_integration_pal_jobs.rb
 - db/migrate/20170531201218_add_error_fields_to_jobs.rb
-- lib/canvas/client.rb
-- lib/canvas/models/account.rb
-- lib/canvas/models/base_model.rb
-- lib/canvas/models/course.rb
-- lib/canvas/models/enrollment.rb
-- lib/canvas/models/file.rb
-- lib/canvas/models/folder.rb
-- lib/canvas/models/group.rb
-- lib/canvas/models/group_membership.rb
-- lib/canvas/models/section.rb
-- lib/canvas/models/term.rb
-- lib/canvas/models/user.rb
-- lib/canvas/models/user_observer.rb
-- lib/canvas/models/x_list.rb
-- lib/canvas/utils/csv.rb
-- lib/canvas/utils/sis.rb
 - lib/concerns/integration_pal/base_job.rb
 - lib/generators/integration_pal/install/USAGE
 - lib/generators/integration_pal/install/install_generator.rb