jarvis-cli 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd5864b01fafb85e866cd02e13297b059ec71c4e
-  data.tar.gz: 3ea72ef6d38c31edd5d73890cd4597e8e937aa25
+  metadata.gz: c26b44a300bbc904164ecdbc1cd144df389f805c
+  data.tar.gz: 08857899933477e2adb38afca39c835d481d7bdb
 SHA512:
-  metadata.gz: 26e0cb3e4a1d584e15979474559b737da87224a7f1ae955a84d0eb63808d62ad519d5578daa31a4022621d4f8f4bc5c64e730cf60ff1e9359ff40083b40b2133
-  data.tar.gz: ac63c5acf2a562c52575e1edb95f87ba3532412c7a5177b6b086b07d38a8e05a8fc5cad3b89ea5448231020775f978672340a47bbf5b001441aa74ddce0d2978
+  metadata.gz: b0974d434a5b97a70a03d8541beed904b3c45657f75574f8ddf0e91ff6b39eea320408e395ce90963f7a1fa71a34eb42b76078a4886419b16288cc09db3f73cc
+  data.tar.gz: c66896af2af9037b620aa5fc9425fa7e8c735ac01579b864b3b5349eb7c6980834ecc1ec257823277dd38895b3183bd4728df6b491d6ae2b1cfe4f3276060d69

data/README.md

@@ -58,11 +58,11 @@ There are two ways to tell Jarvis to send a given message to a particular servic
 
 ```ruby
 class ImgFlip < Jarvis::Service
-  phrases = "success kid", "overly attached girlfriend"
+  phrases "success kid", "overly attached girlfriend"
   # will converted to a pattern that looks like /success kid|overly attached girlfriend/i
 end
 class SortingHat < Jarvis::Service
-  interpreter_pattern = /sorting hat|where do I belong/i
+  interpreter_pattern /sorting hat|where do I belong/i
 end
 ```
 

data/features/step_definitions/server_steps.rb

@@ -1,3 +1,3 @@
 Given(/^a server is running with the (.+) service enabled$/) do |service|
-  Jarvis.register_services service.to_sym
+  Server.register_services service.to_sym
 end

data/lib/jarvis/interpreter.rb

@@ -17,7 +17,7 @@ private
       Jarvis.services.each do |service|
         constant = service.constantize
         determine_service += <<-code
-          when #{constant.interpreter_pattern.inspect} then #{constant}
+          when #{constant.pattern.inspect} then #{constant}
         code
       end
       determine_service += <<-code

data/lib/jarvis/server.rb

@@ -1,15 +1,17 @@
 require 'sinatra'
 require "sinatra/json"
+require "sinatra/multi_route"
 require 'json'
 
 module Jarvis
   class Server < Sinatra::Base
+    register Sinatra::MultiRoute
 
     get "/" do
       json text: "Hello, I'm Jarvis"
     end
 
-    post "/jarvis" do
+    route :get, :post, "/jarvis" do
       message = Slack::Message.new(params)
       service = Jarvis::Interpreter.new(message).determine_service.new(message)
       begin
@@ -21,6 +23,10 @@ module Jarvis
       end
     end
 
+    def self.register_services(*args)
+      Jarvis.register_services *args
+    end
+
 private
 
     def run_service(service)

data/lib/jarvis/service.rb

@@ -25,58 +25,64 @@ module Jarvis
 
     # Class Methods
     class << self
-      attr_accessor :required_environment_variables, :interpreter_pattern, :phrases, :invoker
+      attr_accessor :required_environment_variables, :pattern, :interpreter_phrases, :invoker
+    end
 
-      def phrases=(*args)
-        @phrases = args
-        reset_interpreter_pattern
-      end
+    def self.phrases(*args)
+      @interpreter_phrases = args
+      reset_interpreter_pattern
+    end
 
-      def required_environment_variables
-        @required_environment_variables ||= []
-      end
+    def self.required_environment_variables
+      @required_environment_variables ||= []
+    end
 
-      def environment(*args)
-        args.each do |sym|
-          str = sym.to_s.upcase
-          send :define_method, sym do
-            ENV[str] || ENV[str.downcase]
-          end
-          required_environment_variables << str
+    def self.environment(*args)
+      args.each do |sym|
+        str = sym.to_s.upcase
+        send :define_method, sym do
+          ENV[str] || ENV[str.downcase]
         end
+        required_environment_variables << str
       end
+    end
 
-      def interpreter_pattern
-        @interpreter_pattern ||= concatenate_phrases_into_regex
-      end
-      # class MyService < Jarvis::Service
-      #   invoke_with :post_tweet
-      #
-      # end
-      def invoke_with(method_name)
-        send :define_method, :invoke do
-          run_hook :before_invoke
-          response = send method_name
-          run_hook :after_invoke
-          response
-        end
-      end
 
+    def self.interpreter_pattern(pattern)
+      @pattern = pattern
+    end
 
-      private
+    def self.pattern
+      @pattern ||= concatenate_phrases_into_regex
+    end
 
-      def concatenate_phrases_into_regex
-        case self.phrases
-        when Array then /#{self.phrases.join("|")}/i
-        when String then /#{self.phrases}/i
-        end
+    # class MyService < Jarvis::Service
+    #   invoke_with :post_tweet
+    #
+    # end
+    def self.invoke_with(method_name)
+      send :define_method, :invoke do
+        run_hook :before_invoke
+        response = send method_name
+        run_hook :after_invoke
+        response
       end
+    end
 
-      def reset_interpreter_pattern
-        @interpreter_pattern = nil
+
+    private
+
+    def self.concatenate_phrases_into_regex
+      case self.interpreter_phrases
+      when Array then /#{self.interpreter_phrases.join("|")}/i
+      when String then /#{self.interpreter_phrases}/i
       end
     end
 
+    def self.reset_interpreter_pattern
+      @pattern = nil
+    end
+
     invoke_with :run
     define_hooks :before_invoke, :after_invoke
   end

data/lib/jarvis/services/dice.rb

@@ -1,6 +1,6 @@
 class Dice < Jarvis::Service
   attr_accessor :dice_result
-  phrases = "roll", "dice"
+  phrases "roll", "dice"
   before_invoke :perform_roll
 
   def run

data/lib/jarvis/services/eightball.rb

@@ -1,6 +1,6 @@
 class Eightball < Jarvis::Service
 
-  interpreter_pattern = /\?$/
+  interpreter_pattern /\?$/
 
   def run
     responses.sample

data/lib/jarvis/services/fact.rb

@@ -1,5 +1,5 @@
 class Fact < Jarvis::Service
-  self.phrases = "fact"
+  phrases "fact"
 
   def run
     Jarvis.get("http://numbersapi.com/random").parsed_response

data/lib/jarvis/version.rb

@@ -1,3 +1,3 @@
 module Jarvis
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/jarvis/interpreter_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe Jarvis::Interpreter do
   end
 
   describe "Routes Services based on the registered services phrases" do
-    before { service.phrases = "success kid" }
+    before { service.phrases "success kid" }
     before { Jarvis.register_services :test_service }
     context "A Match" do
       subject { described_class.new(message text: "success kid") }
@@ -27,7 +27,7 @@ RSpec.describe Jarvis::Interpreter do
       it { expect(subject.determine_service).to eq service}
     end
     context "Multiple phrases route correctly" do
-      before(:each) { other_service.phrases = "overly attached bot", "hello world" }
+      before(:each) { other_service.phrases "overly attached bot", "hello world" }
       before { Jarvis.register_services :other_test_service }
       it { expect(described_class.new(message text: "hello world").determine_service).to eq other_service }
       it { expect(described_class.new(message text: "overly attached bot").determine_service).to eq other_service }
@@ -35,7 +35,7 @@ RSpec.describe Jarvis::Interpreter do
   end
 
   describe "Routes services based on the registered interpreter pattern" do
-    before { service.interpreter_pattern = /success kid/i }
+    before { service.interpreter_pattern /success kid/i }
     before { Jarvis.register_services :test_service }
     context "A Match" do
       subject { described_class.new(message text: "success kid") }
@@ -50,8 +50,8 @@ RSpec.describe Jarvis::Interpreter do
   describe "Routes to the correct service" do
     let(:correct_service) { service }
     let(:incorrect_service) { other_service }
-    before { correct_service.interpreter_pattern = /success kid/i }
-    before { incorrect_service.interpreter_pattern = /overly attached chatbot/i }
+    before { correct_service.interpreter_pattern /success kid/i }
+    before { incorrect_service.interpreter_pattern /overly attached chatbot/i }
     before { Jarvis.register_services :test_service, :other_test_service }
     context "Routes to Test Service" do
       subject { described_class.new(message text: "success kid hello, world") }

data/spec/jarvis/server_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe Jarvis::Server do
   describe "unfit environment" do
     let(:slack_message) { slack_outgoing_message(text: "Jarvis, success kid blah blah blah") }
     before { service.environment :blah }
-    before { service.phrases = "success kid" }
+    before { service.phrases "success kid" }
     before { Jarvis.register_services :test_service }
     before { post "/jarvis", slack_message }
     it { expect(message).to eq "I'm really sorry, but that sevice needs to be configured" }

data/spec/jarvis/service_spec.rb

@@ -29,19 +29,19 @@ RSpec.describe Jarvis::Service do
   end
 
   describe "Expose Pattern For the Service to be Interpreted" do
-    before { service.interpreter_pattern = /are you up/i }
-    it { expect(service.interpreter_pattern).to eq /are you up/i }
+    before { service.interpreter_pattern /are you up/i }
+    it { expect(service.pattern).to eq /are you up/i }
   end
 
   describe "Allow the Developer to make a list of phrases to be concatenated into the interpreter pattern" do
     context "Accepts a single phrase" do
-      before { service.phrases = "success kid" }
-      it { expect(service.interpreter_pattern ).to eq /success kid/i }
+      before { service.phrases "success kid" }
+      it { expect(service.pattern ).to eq /success kid/i }
     end
 
     context "Multiple Phrases" do
-      before { service.phrases = "success kid", "hello world" }
-      it { expect(service.interpreter_pattern).to eq /success kid|hello world/i }
+      before { service.phrases "success kid", "hello world" }
+      it { expect(service.pattern).to eq /success kid|hello world/i }
 
     end
   end

data/templates/project/app/server.rb

@@ -1,2 +1,6 @@
 class Server < Jarvis::Server
+  # Use `register_services` to enable services in your Jarvis Bot. Available built-in services are:
+  # :dice, :eightball, :fact
+  # You can make your own services with `jarvis generate service my_service`
+  register_services :fact
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jarvis-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - DVG