kafka_command 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a39a1fa497e932e30fe3d92dddccfc9f4982b89e0008f7113d464a89bf44453c
-  data.tar.gz: bb5fe1f4e5b050564c10e46cbeb87737c46ea730eda381a0a6e611b1df2c0c0d
+  metadata.gz: 200ff362598df84d5179f31ab49ad601ec8786f0efb6347aa433a1a3d52b346b
+  data.tar.gz: 55dea58cb3db1f2f12d4b55ae1c97dbd46fbd1aed257a3e13405b0d7764749a8
 SHA512:
-  metadata.gz: 1b002a49cc861c6a37c7a9c39dbe6b4a46bef1881ec7327976ee88dc03f279fe4f777f7288f71ead5fc7621bc70de64bd434c307157a1fca226a69460447e4a3
-  data.tar.gz: c475d5ebf6669314eea5aeb2043c0e978c0f2e4ccf05917b01e48874a43bf58fb473f9f7575e07fe50886df9f7fcfd3eb4f9b2fa0e800cdd77164fc4e6da7866
+  metadata.gz: 2439e52c4d80c00bfa8908e48368142fed51087b7703efde7b041f4a0a738abe9fedf5165d29276bd71612a59ffacb0cc93c4845e7b1fd143c734d6dc33c9096
+  data.tar.gz: 0f072d7e529f3cc5997f238d48afa461662f574be785d4a08875cd3d24d18ec8648ec9ec06ee1e761a0926ba30d715435b91cdf96a5c2e71f16be733160d7e3a

data/.gitignore

@@ -30,6 +30,8 @@
 # ignore spec examples
 /spec/examples.txt
 
+Gemfile.lock
+
 .env.local
 .env.test.local
 

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+# Changelog
+
+Changes and additions to the library will be listed here.
+
+## 0.0.2
+- Fix redirect loops with kafka connection errors
+- Display a proper error message when no configuration is present
+
+## 0.0.1
+
+- Initial release

data/app/controllers/kafka_command/application_controller.rb

@@ -8,43 +8,30 @@ module KafkaCommand
     rescue_from Kafka::ClusterAuthorizationFailed, with: :kafka_authorization_error
     rescue_from UnsupportedApiError, with: :unsupported_api_error
 
-    before_action do
-      unless KafkaCommand.config.valid?
-        flash[:error] = KafkaCommand.config.errors.join("\n")
-        render 'kafka_command/configuration_error'
-      end
-    end
+    before_action :check_config
 
     protected
 
       def unsupported_api_error(exception)
-        render_error(exception.message, status: 422, flash: { error: exception.message })
+        render_error(exception.message, status: 422)
       end
 
       def record_not_found
         render_error('Not Found', status: :not_found)
       end
 
+      # Handle this error separately
       def kafka_connection_error
-        error_msg = 'Could not connect to Kafka with the specified brokers'
-        render_error(
-          error_msg,
-          status: 500,
-          flash: { error: error_msg }
-        )
+        flash[:error] = 'Could not connect to Kafka with the specified brokers'
+        render 'kafka_command/application/error', status: 500
       end
 
       def kafka_authorization_error
-        error_msg = 'You are not authorized to perform that action'
-        render_error(
-          error_msg,
-          status: 401,
-          flash: { error: error_msg }
-        )
+        render_error('You are not authorized to perform that action', status: 401)
       end
 
       def serialize_json(data, **kwargs)
-        if data.is_a?(ActiveRecord::Relation) || data.is_a?(Array)
+        if data.is_a?(Array)
           return {
             data: data.map { |d| d.as_json(**kwargs) }
           }
@@ -69,18 +56,16 @@ module KafkaCommand
         end
       end
 
-      def render_error(data, status: :unprocessible_entity, flash: {})
+      def render_error(data, status: :unprocessible_entity)
         respond_to do |format|
           format.html do
-            redirect_back(fallback_location: root_path, flash: flash) && (return) if flash.present?
-
-            case status
-            when :not_found, 404
-              render json: '404 Not Found', status: status, layout: false
+            if Rails::VERSION::MAJOR >= 5
+              redirect_back(fallback_location: error_path, flash: { error: data })
             else
-              render json: '500 Internal Server Error', status: status, layout: false
+              redirect_to :back, flash: { error: data }
             end
           end
+
           format.json { render_json_errors(data, status: status) }
         end
       end
@@ -92,5 +77,18 @@ module KafkaCommand
       def render_json_errors(errors, status: :unprocessible_entity)
         render json: errors, status: status
       end
+
+      def check_config
+        if KafkaCommand.config.blank?
+          flash[:error] = 'Kafka command is not configured'
+          render 'kafka_command/configuration_error'
+          return
+        end
+
+        unless KafkaCommand.config.valid?
+          flash[:error] = KafkaCommand.config.errors.join("\n")
+          render 'kafka_command/configuration_error'
+        end
+      end
   end
 end

data/app/controllers/kafka_command/clusters_controller.rb

@@ -17,8 +17,7 @@ module KafkaCommand
         end
       end
 
-      redirection_path = new_cluster_path if Cluster.none?
-      render_success(@clusters, redirection_path: redirection_path, flash: flash.to_hash)
+      render_success(@clusters, flash: flash.to_hash)
     end
 
     # GET /clusters/:id

data/app/controllers/kafka_command/topics_controller.rb

@@ -129,59 +129,30 @@ module KafkaCommand
       end
 
       def invalid_partitions
-        error_msg = 'Num partitions must be > 0 or > current number of partitions'
-
-        render_error(
-          error_msg,
-          status: 422,
-          flash: { error: error_msg }
-        )
+        render_error('Num partitions must be > 0 or > current number of partitions', status: 422)
       end
 
       def invalid_replication_factor
-        error_msg = 'Replication factor must be > 0 and < total number of brokers'
-
-        render_error(
-          error_msg,
-          status: 422,
-          flash: { error: error_msg }
-        )
+        render_error('Replication factor must be > 0 and < total number of brokers', status: 422)
       end
 
       def invalid_topic_name
-        error_msg = 'Topic must have a name'
-        render_error(
-          error_msg,
-          status: 422,
-          flash: { error: error_msg }
-        )
+        render_error('Topic must have a name', status: 422)
       end
 
       def topic_already_exists
-        error_msg = 'Topic already exists'
-        render_error(
-          error_msg,
-          status: 422,
-          flash: { error: error_msg }
-        )
+        render_error('Topic already exists', status: 422)
       end
 
       def unknown_error
-        error_msg = 'An unknown error occurred with the request to Kafka. Check any request parameters.'
-
         render_error(
-          error_msg,
-          status: 422,
-          flash: { error: error_msg }
+          'An unknown error occurred with the request to Kafka. Check any request parameters.',
+          status: 422
         )
       end
 
       def topic_deletion_error(exception)
-        render_error(
-          exception.message,
-          status: 422,
-          flash: { error: exception.message }
-        )
+        render_error(exception.message, status: 422)
       end
   end
 end

data/app/views/kafka_command/application/error.html.erb

@@ -0,0 +1 @@
+<%= render partial: 'kafka_command/shared/title', locals: { title: 'Woops', subtitle: 'An error has occurred.' } %>

data/app/views/kafka_command/configuration_error.html.erb

@@ -1 +1 @@
-<%= render partial: 'kafka_command/shared/title', locals: { title: 'Configuration Error', subtitle: 'Kafka Command is improperly configured' } %>
+<%= render partial: 'kafka_command/shared/title', locals: { title: 'Woops', subtitle: 'Configuration error' } %>

data/app/views/layouts/kafka_command/application.html.erb

@@ -16,7 +16,9 @@
       <div class="container">
         <div class="navbar-brand kafka-logo">
           <p class="navbar-item is-paddingless">
-            <%= image_tag('kafka_command/kafka.png', alt: '') %>
+            <%= link_to root_path do %>
+              <%= image_tag('kafka_command/kafka.png', alt: '') %>
+            <% end %>
           </p>
         </div>
         <div class="navbar-start">

data/config/routes.rb

@@ -2,6 +2,7 @@
 
 KafkaCommand::Engine.routes.draw do
   root 'clusters#index'
+  get '/error', to: 'application#error'
 
   resources :clusters, only: [:index, :show] do
     resources :brokers, only: [:index, :show]

data/lib/kafka_command/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KafkaCommand
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kafka_command
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - jasondoc3
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2018-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,8 +66,8 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
+- CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -99,6 +99,7 @@ files:
 - app/models/kafka_command/group_member.rb
 - app/models/kafka_command/partition.rb
 - app/models/kafka_command/topic.rb
+- app/views/kafka_command/application/error.html.erb
 - app/views/kafka_command/brokers/index.html.erb
 - app/views/kafka_command/clusters/_tabs.html.erb
 - app/views/kafka_command/clusters/index.html.erb
@@ -181,6 +182,7 @@ files:
 - spec/dummy/config/ssl/test_client_cert
 - spec/dummy/config/ssl/test_client_cert_key
 - spec/dummy/config/storage.yml
+- spec/dummy/db/development.sqlite3
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/log/development.log
@@ -310,6 +312,7 @@ test_files:
 - spec/dummy/bin/yarn
 - spec/dummy/bin/bundle
 - spec/dummy/db/test.sqlite3
+- spec/dummy/db/development.sqlite3
 - spec/dummy/db/schema.rb
 - spec/spec_helper.rb
 - spec/lib/kafka_command/configuration_spec.rb

data/Gemfile.lock

@@ -1,194 +0,0 @@
-PATH
-  remote: .
-  specs:
-    kafka_command (0.0.1)
-      rails (>= 4)
-      rails-ujs
-      ruby-kafka (> 0.6.3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (5.2.1)
-      actionpack (= 5.2.1)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailer (5.2.1)
-      actionpack (= 5.2.1)
-      actionview (= 5.2.1)
-      activejob (= 5.2.1)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.2.1)
-      actionview (= 5.2.1)
-      activesupport (= 5.2.1)
-      rack (~> 2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.1)
-      activesupport (= 5.2.1)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.1)
-      activesupport (= 5.2.1)
-      globalid (>= 0.3.6)
-    activemodel (5.2.1)
-      activesupport (= 5.2.1)
-    activerecord (5.2.1)
-      activemodel (= 5.2.1)
-      activesupport (= 5.2.1)
-      arel (>= 9.0)
-    activestorage (5.2.1)
-      actionpack (= 5.2.1)
-      activerecord (= 5.2.1)
-      marcel (~> 0.3.1)
-    activesupport (5.2.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (9.0.0)
-    ast (2.4.0)
-    builder (3.2.3)
-    byebug (10.0.2)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.3)
-    crass (1.0.4)
-    diff-lcs (1.3)
-    digest-crc (0.4.1)
-    dotenv (2.5.0)
-    dotenv-rails (2.5.0)
-      dotenv (= 2.5.0)
-      railties (>= 3.2, < 6.0)
-    erubi (1.7.1)
-    globalid (0.4.1)
-      activesupport (>= 4.2.0)
-    i18n (1.1.1)
-      concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.1)
-    loofah (2.2.3)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
-    method_source (0.9.2)
-    mimemagic (0.3.2)
-    mini_mime (1.0.1)
-    mini_portile2 (2.3.0)
-    minitest (5.11.3)
-    nio4r (2.3.1)
-    nokogiri (1.8.5)
-      mini_portile2 (~> 2.3.0)
-    parallel (1.12.1)
-    parser (2.5.3.0)
-      ast (~> 2.4.0)
-    powerpack (0.1.2)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
-      pry (~> 0.10)
-    pry-rails (0.3.7)
-      pry (>= 0.10.4)
-    rack (2.0.6)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (5.2.1)
-      actioncable (= 5.2.1)
-      actionmailer (= 5.2.1)
-      actionpack (= 5.2.1)
-      actionview (= 5.2.1)
-      activejob (= 5.2.1)
-      activemodel (= 5.2.1)
-      activerecord (= 5.2.1)
-      activestorage (= 5.2.1)
-      activesupport (= 5.2.1)
-      bundler (>= 1.3.0)
-      railties (= 5.2.1)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    rails-ujs (0.1.0)
-      railties (>= 3.1)
-    railties (5.2.1)
-      actionpack (= 5.2.1)
-      activesupport (= 5.2.1)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
-    rainbow (3.0.0)
-    rake (12.3.1)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-rails (3.8.1)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    rubocop (0.60.0)
-      jaro_winkler (~> 1.5.1)
-      parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 4.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.4.0)
-    rubocop-rails_config (0.2.6)
-      railties (>= 3.0)
-      rubocop (~> 0.56)
-    rubocop-rspec (1.30.1)
-      rubocop (>= 0.60.0)
-    ruby-kafka (0.7.4)
-      digest-crc
-    ruby-progressbar (1.10.0)
-    sprockets (3.7.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    sqlite3 (1.3.13)
-    thor (0.20.3)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.4.0)
-    websocket-driver (0.7.0)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  dotenv-rails
-  kafka_command!
-  pry-byebug
-  pry-rails
-  rspec-rails
-  rubocop-rails_config
-  rubocop-rspec
-  sqlite3
-
-BUNDLED WITH
-   1.16.1