marty 0.5.38 → 0.5.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d2c09a2a2c8901d33786fc13277047462dda37b
-  data.tar.gz: df69eb54ada158f959330b96a2be3e6231a66b30
+  metadata.gz: 1c7c49130696eaee7cf90daac35a2e8f7de5b4d4
+  data.tar.gz: d9c02183be57f6889d9071b27461315571278226
 SHA512:
-  metadata.gz: 824c8e5fe29067c3c9d5aa5093e01eb28c68acc22ac765d28283997db96fe08fb05f36dedf63974665b1be263c835e8afcbd284fb30090934d592ba5c3402cc4
-  data.tar.gz: 46ba58c67bb858427506a2de15d35a5dadab42cdc63595dfb53967b341049d9e421ea4c006c6ef949df111cef5d197802cbf0c4dd5374f075d381fa18d750ac9
+  metadata.gz: 49df1bf75aac668d3e2e2431a38826a55f75bbf51a68194b7fee998f19bfa58f3e98cb63b724866d6764d7a0cc8d179bb00ed9a483f91acb606ba7fafd3d6ba1
+  data.tar.gz: 73d88973b75a3291f77db255243f99927e2ea8dd6d46d6f34bdc088e5d12799c9058d5219452721d231f7465202a62f4e63ca7c3cdb70b51f328beaf207e2034

data/app/assets/stylesheets/marty/diagnostic.css

@@ -0,0 +1,34 @@
+body { margin: 0;
+       padding: 0;
+       border: 0;
+       background-color: #fff;
+       color: #333333;
+       text-align: left;
+       font-family: Arial, Helvetica, Verdana, sans-serif;
+       font-weight: normal;
+       font-size: 11pt; }
+table { border-width: 0px;
+        margin-left: auto;
+        margin-right: auto;
+        border-spacing: 1px;
+        width: 75% }
+th { padding: 9px;
+     background-color: #d6d6d6 }
+td { padding: 9px;
+     -moz-border-radius: 5px;
+     border-radius: 5px;
+     -webkit-border-radius: 5px;
+     border-style: solid;
+     border-width: 1px;
+     border-color: #999999; }
+tr.passed { background-color: #9ed515 }
+tr.warning { background-color: #ffdb58 }
+tr.failed { background-color: #ff5555 }
+td.desc { font-size: 10pt; }
+h1 { display: block;
+     margin: 0px auto 40px auto;
+     padding: 8px;
+     background-color: #3e2155;
+     font-size: 18pt;
+     color: #ffffff;
+     line-height: 1.5em; }

data/app/components/marty/script_grid.rb

@@ -3,7 +3,7 @@ class Marty::ScriptGrid < Marty::Grid
   create: [:dev],
   read: :any,
   update: [:dev],
-  delete: [] # [:dev]
+  delete: [:dev]
 
   def configure(c)
     super
@@ -29,7 +29,6 @@ class Marty::ScriptGrid < Marty::Grid
       # if there are no non-DEV tags we get an exception above
       ts = 'infinity'
     end
-
     tb = data_class.table_name
     data_class.where("#{tb}.obsoleted_dt >= ? AND #{tb}.created_dt < ?",
                      ts, ts).scoping do
@@ -37,6 +36,25 @@ class Marty::ScriptGrid < Marty::Grid
     end
   end
 
+  action :del do |a|
+    a.text     = I18n.t("script_grid.delete")
+    a.tooltip  = I18n.t("script_grid.delete")
+    a.icon     = :script_delete
+    a.disabled = config[:prohibit_delete]
+  end
+
+  endpoint :server_delete do |params, this|
+    return this.netzke_feedback("Permission Denied") if
+      config[:prohibit_delete]
+
+    tag = Marty::Tag.map_to_tag(root_sess[:selected_tag_id])
+
+    return this.netzke_feedback("Can only delete in DEV tag") unless
+      tag && tag.isdev?
+
+    super(params, this)
+  end
+
   # override the add_in_form endpoint.  Script creation needs to use
   # the create_script method.
   endpoint :add_window__add_form__netzke_submit do |params, this|
@@ -72,7 +90,7 @@ class Marty::ScriptGrid < Marty::Grid
   end
 
   def default_bbar
-    [:add_in_form]
+    [:add_in_form, :del]
   end
 
   def default_context_menu

data/app/controllers/marty/diagnostic_controller.rb

@@ -0,0 +1,66 @@
+module Marty
+  class DiagnosticController < ActionController::Base
+    layout 'marty/diagnostic'
+
+    def index
+      if action_methods.include?(params[:testop].to_s)
+        self.send(params[:testop])
+      else
+        render file: 'public/404', status: 404, layout: false
+      end
+    end
+
+    def version
+      diag_response git_details +
+        [Diagnostic.new('Marty Version', true, VERSION)]
+    end
+
+  private
+    def diag_response details
+      if @aggregate_diags
+        @aggregated_details += details
+      else
+        @details = details
+        respond_to do |format|
+          format.html { render 'diagnostic' }
+          format.json { render json: [{ error_count: error_count(details),
+                                       diag_count: details.count }] + details }
+        end
+      end
+    end
+
+    def aggregate_diags
+      begin
+        @aggregate_diags = true
+        @aggregated_details = []
+        yield
+      ensure
+        @aggregate_diags = false
+        diag_response @aggregated_details
+      end
+    end
+
+    def error_count details
+      details.count { |detail| !detail.status }
+    end
+
+    def git_details app_name = Rails.application.class.parent.to_s
+      [
+        Diagnostic.new("#{app_name} Git Version", true,
+                       `git describe 2>&1`.strip),
+        Diagnostic.new("#{app_name} Git Details", true,
+                       `git show --pretty=format:"sha: %h, %D" 2>&1`.strip)
+      ]
+    end
+
+    class Diagnostic < Struct.new(:name, :status, :description)
+      def status_css
+        status ? 'passed' : 'failed'
+      end
+
+      def status_text
+        status ? 'Passed' : 'Failed'
+      end
+    end
+  end
+end

data/app/models/marty/enum.rb

@@ -6,14 +6,9 @@ module Marty::Enum
 
     res = @LOOKUP_CACHE[index] ||= find_by_name(index)
 
-    return res if res
+    raise "no such #{self.name}: '#{index}'" unless res
 
-    raise "no such #{self.name}: '#{index}'"
-  end
-
-  def to_s
-    # FIXME: hacky since not all enums have name
-    self.name
+    res
   end
 
   def clear_lookup_cache!

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

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <title><%= Rails.application.class.parent %></title>
+  <%= stylesheet_link_tag 'marty/diagnostic' %>
+</head>
+<body>
+  <%= yield %>
+</body>
+</html>

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

@@ -0,0 +1,15 @@
+<h1><%= Rails.application.class.parent %> Diagnostics</h1>
+
+<table>
+  <th width=20%>Diagnostic Name</th>
+  <th width=10%>Status</th>
+  <th width=70%>Description</th>
+  <% @details.each do |d| %>
+  <tr class="<%= d.status_css %>">
+    <td><%= d.name %></td>
+    <td><%= d.status_text %></td>
+    <td class="desc"><%= d.description %></td>
+  </tr>
+  <% end %>
+</table>
+

data/config/locales/en.yml

@@ -43,6 +43,7 @@ en:
     name: Name
     tag: Associated Tag
     created_dt: Create Date/Time
+    delete: Delete Script
 
   user_grid:
     title: Users
@@ -64,6 +65,7 @@ en:
     discarded: Discarded
     checked_out: Checked out
     print: Print
+    delete: Delete
 
   script_tester:
     attributes: Compute Attributes

data/config/routes.rb

@@ -2,4 +2,6 @@ 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], "report(.:format)" => "report#index", as: :report
+  get  'diag/(:action)', controller: 'diagnostic'
+  get  'diagnostic/(:action)', controller: 'diagnostic'
 end

data/db/seeds.rb

@@ -26,7 +26,8 @@ Marty::Role.all.map { |role|
 }
 
 # Create default PostingType from configuration
-default_p_type = Rails.configuration.marty.default_posting_type.to_s
+default_p_type =  Rails.configuration.marty.default_posting_type
+
 Marty::PostingType.create(name: default_p_type)
 
 # Create NOW posting

data/lib/marty/engine.rb

@@ -9,5 +9,7 @@ module Marty
     config.generators do |g|
       g.test_framework :rspec, :view_specs => false
     end
+
+    config.assets.precompile << 'marty/diagnostic.css'
   end
 end

data/lib/marty/railtie.rb

@@ -1,5 +1,6 @@
 module Marty
   class Railtie < Rails::Railtie
     config.marty = ActiveSupport::OrderedOptions.new
+    config.marty.default_posting_type = 'BASE'
   end
 end

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "0.5.38"
+  VERSION = "0.5.39"
 end

data/spec/controllers/diagnostic_controller_spec.rb

@@ -0,0 +1,70 @@
+require 'spec_helper'
+
+module Marty
+  RSpec.describe DiagnosticController, type: :controller do
+    before(:each) { @routes = Marty::Engine.routes }
+    let(:json_response) { JSON.parse(response.body) }
+
+    describe 'GET #index' do
+      it 'returns http success' do
+        get :index, testop: :version
+
+        expect(response).to have_http_status(:success)
+      end
+
+      it 'returns the current version' do
+        get :index, testop: :version
+
+        aggregate_failures do
+          expect(assigns('details').count).to eq(3)
+          expect(assigns('details').third.methods)
+            .to include(:name, :status, :description)
+          expect(assigns('details').third.description).to eq(Marty::VERSION)
+        end
+      end
+
+      it 'returns the appropriate json' do
+        get :index, {format: :json, testop: :version}
+
+        aggregate_failures do
+          expect(json_response.first['diag_count']).to eq(3)
+          expect(json_response.first['error_count']).to eq(0)
+          expect(json_response
+                 .find { |d| d['name'] == 'Marty Version' }['description'])
+            .to eq(Marty::VERSION)
+        end
+      end
+    end
+
+    describe 'GET #version' do
+      it 'returns http success' do
+        get :version
+
+        expect(response).to have_http_status(:success)
+      end
+
+      it 'returns the current version' do
+        get :version
+
+        aggregate_failures do
+          expect(assigns('details').count).to eq(3)
+          expect(assigns('details').third.methods)
+            .to include(:name, :status, :description)
+          expect(assigns('details').third.description).to eq(Marty::VERSION)
+        end
+      end
+
+      it 'returns the appropriate json' do
+        get :version, format: :json
+
+        aggregate_failures do
+          expect(json_response.first['diag_count']).to eq(3)
+          expect(json_response.first['error_count']).to eq(0)
+          expect(json_response
+                 .find { |d| d['name'] == 'Marty Version' }['description'])
+            .to eq(Marty::VERSION)
+        end
+      end
+    end
+  end
+end

data/spec/dummy/config/application.rb

@@ -76,7 +76,7 @@ module Dummy
                           :viewer,
                           :user_manager,
                          ]
-    config.marty.default_posting_type = 'BASE'
+    #config.marty.default_posting_type = 'BASE'
     config.secret_key_base = "SECRET_KEY_BASE"
   end
 end

data/spec/features/scripting_spec.rb

@@ -178,6 +178,7 @@ feature 'under Applications menu, Scripting workflows', js: true do
       expect(row_count(sg)).to eq 0
       expect(row_count(tg)).to eq 0
       expect(btn_disabled?('New Script', sg)).to be_truthy
+      expect(btn_disabled?('Delete Script', sg)).to be_truthy
       expect(btn_disabled?('New Tag', tg)).to be_truthy
       log_out
     end
@@ -193,6 +194,7 @@ feature 'under Applications menu, Scripting workflows', js: true do
       select_row(1, tg)
       wait_for_ajax
       expect(btn_disabled?('New Script', sg)).to be_truthy
+      expect(btn_disabled?('Delete Script', sg)).to be_truthy
       expect(btn_disabled?('New Tag', tg)).to be_truthy
       select_row(4, tg)
       wait_for_ajax
@@ -305,4 +307,46 @@ feature 'under Applications menu, Scripting workflows', js: true do
       expect(find(:msg)).to have_content 'no save needed'
     end
   end
+
+  it 'deletes a script' do
+    log_in_as('dev1')
+    go_to_scripting
+
+    by 'select DEV tag' do
+      wait_for_ajax
+      select_row(1, tg)
+    end
+
+    and_by 'delete script' do
+      select_row(1, sg)
+      press('Delete Script')
+      find(:xpath, "//div[text()='Confirmation']", wait: 5)
+      press('Yes')
+    end
+
+    and_by 'script is gone' do
+      expect(row_count(sg)).to eq 4
+    end
+  end
+
+  it 'only allows delete on DEV tag' do
+    log_in_as('dev1')
+    go_to_scripting
+
+    by 'select not DEV tag' do
+      wait_for_ajax
+      select_row(2, tg)
+    end
+
+    and_by 'delete script' do
+      select_row(1, sg)
+      press('Delete Script')
+      find(:xpath, "//div[text()='Confirmation']", wait: 5)
+      press('Yes')
+    end
+
+    and_by 'delete did not work' do
+       expect(find(:msg)).to have_content 'Can only delete in DEV tag'
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 0.5.38
+  version: 0.5.39
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2016-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -158,8 +158,8 @@ files:
 - README.md
 - Rakefile
 - app/assets/images/marty/.gitkeep
-- app/assets/javascripts/marty/application.js
 - app/assets/stylesheets/marty/application.css
+- app/assets/stylesheets/marty/diagnostic.css
 - app/components/marty/api_auth_view.rb
 - app/components/marty/auth_app.rb
 - app/components/marty/auth_app/javascripts/auth_app.js
@@ -357,6 +357,7 @@ files:
 - app/components/marty/user_view.rb
 - app/controllers/marty/application_controller.rb
 - app/controllers/marty/components_controller.rb
+- app/controllers/marty/diagnostic_controller.rb
 - app/controllers/marty/job_controller.rb
 - app/controllers/marty/report_controller.rb
 - app/controllers/marty/rpc_controller.rb
@@ -384,6 +385,8 @@ files:
 - app/models/marty/user.rb
 - app/models/marty/user_role.rb
 - app/views/layouts/marty/application.html.erb
+- app/views/layouts/marty/diagnostic.html.erb
+- app/views/marty/diagnostic/diagnostic.html.erb
 - config/database.yml.travis
 - config/locales/en.yml
 - config/routes.rb
@@ -442,12 +445,12 @@ files:
 - marty.gemspec
 - script/rails
 - spec/controllers/application_controller_spec.rb
+- spec/controllers/diagnostic_controller_spec.rb
 - spec/controllers/job_controller_spec.rb
 - spec/controllers/rpc_controller_spec.rb
 - spec/controllers/rpc_import_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
-- spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/components_controller.rb

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

@@ -1,15 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
-//
-// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
-// GO AFTER THE REQUIRES BELOW.
-//
-//= require jquery
-//= require jquery_ujs
-//= require_tree .

data/spec/dummy/app/assets/javascripts/application.js

@@ -1,15 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
-//
-// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
-// GO AFTER THE REQUIRES BELOW.
-//
-//= require jquery
-//= require jquery_ujs
-//= require_tree .