chatops-controller 3.1.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfa9aaf207f8e2c9d248c44161d4cdcfeb40b3d57d7615118225b05764d0f376
-  data.tar.gz: 705859bc646744e42768e68798a70221f38c3b7e03bac19920d8faa23b8473db
+  metadata.gz: 8597b8cef3aa55e16d0ed7f906dafaa1a0bd696de64f242e0ea3c41198b3be1a
+  data.tar.gz: 596ace61f59f6839ed2da67f8567fbe2d0ef02782652a6824ec2e3d584b8b0c5
 SHA512:
-  metadata.gz: 660ac4d838d2cbc0277cba86c0dccf405165b63ab01a9f732d78be1d3807aa923432110486fba0f3bb11fc9e1bc65eb82997cb69842e3c49dfef49431046e9f1
-  data.tar.gz: 2ecef6d65a13c27a6b1d7f287b4967893761aa520ce58dc5e37884e880427e3f0c9cfc04a4ac4a8029728572cd2adfdd8b2a7cc7ff1ff2cb0372731a4e3a8cf3
+  metadata.gz: ca8640d6f9531fa1af6887a0725e3237e3d52d9837d19d1ccfe542e8216525cfb187d2b794314ce9e53e9794c460016d6a5b1f7058abe374ac8ccde50d11ca9b
+  data.tar.gz: d1a43adf71fb993fea5b2678dfc96029031c953053237c6bf3203569ef181a61f26708ebd0283868dae8684bb83c060c3457da0b7ce1077463d0e6c10651a316

data/lib/chatops/controller.rb

@@ -27,10 +27,7 @@ module Chatops
     end
 
     def process(*args)
-      scrubbed_params = jsonrpc_params.except(
-        :user, :mention_slug, :method, :controller, :action, :params, :room_id)
-
-      scrubbed_params.each { |k, v| params[k] = v }
+      setup_params!
 
       if params[:chatop].present?
         params[:action] = params[:chatop]
@@ -40,7 +37,7 @@ module Chatops
         end
       end
 
-      super *args
+      super(*args)
     rescue AbstractController::ActionNotFound
       return jsonrpc_method_not_found
     end
@@ -52,8 +49,27 @@ module Chatops
 
     protected
 
+    def setup_params!
+      json_body.each do |key, value|
+        next if params.has_key? key
+        params[key] = value
+      end
+
+      @jsonrpc_params = params.delete(:params) if params.has_key? :params
+
+      self.params = params.permit(:action, :chatop, :controller, :id, :mention_slug, :method, :room_id, :user)
+    end
+
     def jsonrpc_params
-      params["params"] || {}
+      @jsonrpc_params ||= ActionController::Parameters.new
+    end
+
+    def json_body
+      hash = {}
+      if request.content_type =~ %r/\Aapplication\/json\Z/i
+        hash = ActiveSupport::JSON.decode(request.raw_post) || {}
+      end
+      hash.with_indifferent_access
     end
 
     # `options` supports any of the optional fields documented

data/lib/chatops/controller/test_case_helpers.rb

@@ -50,14 +50,14 @@ module Chatops::Controller::TestCaseHelpers
 
     named_params, command = extract_named_params(message)
 
-    matcher = matchers.find { |matcher| matcher["regex"].match(command) }
+    matcher = matchers.find { |m| m["regex"].match(command) }
 
     raise NoMatchingCommandRegex.new("No command matches '#{command}'") unless matcher
 
     match_data = matcher["regex"].match(command)
     jsonrpc_params = named_params.dup
     matcher["params"].each do |param|
-      jsonrpc_params[param] = match_data[param.to_sym]
+      jsonrpc_params[param] ||= match_data[param.to_sym]
     end
     jsonrpc_params.merge!(user: user, room_id: room_id, mention_slug: user)
     chatop matcher["name"].to_sym, jsonrpc_params

data/lib/chatops/controller/version.rb

@@ -1,3 +1,3 @@
 module ChatopsController
-  VERSION = "3.1.1"
+  VERSION = "4.0.0"
 end

data/spec/lib/chatops/controller_spec.rb

@@ -14,8 +14,8 @@ describe ActionController::Base, type: :controller do
     chatop :wcid,
     /(?:where can i deploy|wcid)(?: (?<app>\S+))?/,
     "where can i deploy?" do
-      return jsonrpc_invalid_params("I need nope, sorry") if params[:app] == "nope"
-      jsonrpc_success "You can deploy #{params["app"]} just fine."
+      return jsonrpc_invalid_params("I need nope, sorry") if jsonrpc_params[:app] == "nope"
+      jsonrpc_success "You can deploy #{jsonrpc_params["app"]} just fine."
     end
 
     chatop :foobar,
@@ -35,7 +35,7 @@ describe ActionController::Base, type: :controller do
     end
 
     def ensure_app_given
-      return jsonrpc_invalid_params("I need an app, every time") unless params[:app].present?
+      return jsonrpc_invalid_params("I need an app, every time") unless jsonrpc_params[:app].present?
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chatops-controller
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Ben Lavender
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-14 00:00:00.000000000 Z
+date: 2018-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails