cinch-yaml-keywords 1.1.0 → 1.2.0

data/lib/cinch/plugins/yamlkeywords.rb

@@ -8,15 +8,15 @@ module Cinch
       def initialize(*args)
         super
         if File.exist?('keywords.yaml')
-          @keywords = YAML.load_file('keywords.yaml')
-        else
-          @keywords = {}
+        then @keywords = YAML.load_file('keywords.yaml')
+        else @keywords = {}
         end
       end
 
-      match(/keywords/, method: :keywords)
       def keywords(m)
-        if @keywords.size > 0
+        if
+          @keywords.size > 0
+        then
           m.reply "Keywords start:"
           @keywords.each{|k,v| m.reply "'#{k}': '#{v}'." }
           m.reply "Keywords end."
@@ -25,20 +25,15 @@ module Cinch
         end
       end
 
-      match(/keyword '(.*)' (.+)$/, group: :define, method: :keyword_define)
-      match(/keyword "(.*)" (.+)$/, group: :define, method: :keyword_define)
-      match(/keyword (\S+) (.+)$/,  group: :define, method: :keyword_define)
       def keyword_define(m, keyword, definition)
         if @keywords[keyword]
-          m.reply "Redefining '#{keyword}' from: '#{@keywords[keyword]}' to: '#{definition}'."
-        else
-          m.reply "Defining '#{keyword}' with: '#{definition}'."
+        then m.reply "Redefining '#{keyword}' from: '#{@keywords[keyword]}' to: '#{definition}'."
+        else m.reply "Defining '#{keyword}' with: '#{definition}'."
         end
         @keywords[keyword] = definition
         update_store
       end
 
-      match(/keyword (\S+)$/, method: :keyword_check)
       def keyword_check(m, keyword)
         if @keywords[keyword]
           m.reply "'#{keyword}' is defined as: '#{@keywords[keyword]}'."
@@ -47,9 +42,10 @@ module Cinch
         end
       end
 
-      match(/forget (\S+)$/, method: :keyword_forget)
       def keyword_forget(m, keyword)
-        if @keywords[keyword]
+        if
+          @keywords[keyword]
+        then
           m.reply "'#{keyword}' was defined as: '#{@keywords[keyword]}'."
           @keywords.delete(keyword)
           update_store
@@ -58,11 +54,26 @@ module Cinch
         end
       end
 
+      def find_keyword(m)
+        if keyword = @keywords.keys.find{|k| Regexp.new(k).match(m.message) }
+        then m.reply @keywords[keyword]
+        end
+      end
+
       listen_to :channel
       def listen(m)
-        if keyword = @keywords.keys.find{|k| Regexp.new(k).match(m.message) }
-        then
-          m.reply @keywords[keyword]
+        case
+          m.message
+        when /^!keywords/
+          keywords(m)
+        when /keyword '(.*)' (.+)$/, /keyword "(.*)" (.+)$/, /keyword (\S+) (.+)$/
+          keyword_define(m, $1, $2)
+        when /keyword (\S+)$/, /keyword\? (\S+)$/
+          keyword_check(m, $1)
+        when /forget (\S+)$/
+          keyword_forget(m, $1)
+        else
+          find_keyword(m)
         end
       end
 
@@ -73,6 +84,7 @@ module Cinch
           end
         end
       end
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cinch-yaml-keywords
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-20 00:00:00.000000000 Z
+date: 2013-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cinch
@@ -58,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A Cinch plugin to define keywords and display description when keyword matches,