muzang-plugins 1.1.1 → 1.1.2

data/README.md

@@ -39,7 +39,7 @@ class PluginsClass
       connnection.msg(message.channel, "Pong: #{message.message}")
 
       match(message, /^bot/) do |match|
-        contributed.msg(message.channel, "Match! #{match[0]}"
+        connnection.msg(message.channel, "Match! #{match[0]}"
       end
     end
   end

data/lib/muzang-plugins/muzang-meme.rb

@@ -1,19 +1,24 @@
 require "em-http-request"
 require "json"
+require "memetron"
 
 class Meme
   include Muzang::Plugins::Helpers
 
+
+
   MEMES = {
-    "idont" =>  { :image_id => 2485, :generator => 74 },
-    "yuno"  =>  { :image_id => 166088, :generator => 2 },
-    "orly"  =>  { :image_id => 117049, :generator => 920 },
-    "suc"   =>  { :image_id => 1031, :generator => 121 },
-    "all"   =>  { :image_id => 1121885, :generator => 6013 }
+    dos_equis:    { image_id: 2485,     generator: 74   },
+    y_u_no?:      { image_id: 166088,   generator: 2    },
+    bear_grylls:  { image_id: 89714,    generator: 92   },
+    fry:          { image_id: 84688,    generator: 305  },
+    orly:         { image_id: 117049,   generator: 920  },
+    all:          { image_id: 1121885,  generator: 6013 }
   }
 
   def initialize(bot)
-    @bot = bot
+    @bot      = bot
+    @matcher  = Memetron::Matcher.new
   end
 
   def call(connection, message)
@@ -22,7 +27,7 @@ class Meme
       connection.msg("#{@bot.channels.first}", "Available memes: #{MEMES.keys.join(" ")}")
     end
     message.message.match(/^meme (.*?) "(.*?)"( "(.*?)")?$/) do |m|
-      if meme_ids = MEMES[m[1]]
+      if meme_ids = MEMES[m[1].to_sym]
         @generator = meme_ids[:generator]
         @image_id  = meme_ids[:image_id]
       else
@@ -31,21 +36,57 @@ class Meme
 
       @text0 = m[2]
       @text1 = m[4]
-
-      http = EventMachine::HttpRequest.new('http://version1.api.memegenerator.net/Instance_Create')
-             .get(:query => {:username => 'drug-bot',
-                             :password => 'drug-bot',
-                             :languageCode => 'en',
-                             :generatorID => @generator,
-                             :imageID => @image_id,
-                             :text0 => @text0,
-                             :text1 => @text1})
-
-      http.callback {
-        meme = JSON.parse(http.response)
-        url = "http://version1.api.memegenerator.net#{meme['result']['instanceImageUrl']}"
-        connection.msg("#{@bot.channels.first}", "Meme: #{url}")
-      }
+      
+      create_instance(connection)
     end
+  
+    on_channel(message) do
+      if meme = @matcher.match_and_parse(message.message)
+        @generator = MEMES[meme.first][:generator]
+        @image_id  = MEMES[meme.first][:image_id]
+
+        case meme.first
+          when :dos_equis
+            @text0 = "I don't always #{meme[1][0]}"
+            @text1 = "but when I do #{meme[1][1]}"
+          when :y_u_no?
+            @text0 = "Y U NO"
+            @text1 = meme[1][1]
+          when :bear_grylls
+            @text0 = meme[1][0]
+            @text1 = "better drink my own piss"
+          when :fry
+            @text0 = "not sure if #{meme[1][1]}"
+            @text1 = "or #{meme[1][2]}"
+          when :orly
+            @text0 = meme[1][0]
+            @text1 = "ORLY?"
+          when :all
+            @text0 = meme[1][0]
+            @text1 = "all the things!"
+          else
+            @text0 = meme[1][0]
+            @text1 = meme[1][1]
+        end
+          create_instance(connection)
+        end
+    end 
+  end
+
+  def create_instance(connection)
+    http = EventMachine::HttpRequest.new('http://version1.api.memegenerator.net/Instance_Create')
+           .get(:query => {:username => 'drug-bot',
+                           :password => 'drug-bot',
+                           :languageCode => 'en',
+                           :generatorID => @generator,
+                           :imageID => @image_id,
+                           :text0 => @text0,
+                           :text1 => @text1})
+
+    http.callback {
+      meme = JSON.parse(http.response)
+      url = "http://version1.api.memegenerator.net#{meme['result']['instanceImageUrl']}"
+      connection.msg("#{@bot.channels.first}", "Meme: #{url}")
+    }
   end
-end
+end

data/lib/muzang-plugins/version.rb

@@ -1,5 +1,5 @@
 module Muzang
   module Plugins
-    VERSION = "1.1.1"
+    VERSION = "1.1.2"
   end
 end

data/muzang-plugins.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "em-http-request"
   gem.add_dependency "muzang", "~> 1.0.0"
+  gem.add_dependency "memetron", "~> 0.1.1"
 
   gem.add_development_dependency "em-ventually",  "~> 0.1.2"
   gem.add_development_dependency "rspec",         "~> 2.6.0"

data/spec/meme_spec.rb

@@ -25,7 +25,7 @@ describe "Meme" do
   end
 
   it "should create meme and send message" do
-    @message.message = "meme yuno \"hi0\" \"hi1\""
+    @message.message = "meme y_u_no? \"hi0\" \"hi1\""
     EM.run do
       @meme.call(@connection, @message)
       eventually(1) { @connection.message_count }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: muzang-plugins
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-07 00:00:00.000000000 Z
+date: 2012-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &17221340 !ruby/object:Gem::Requirement
+  requirement: &23409700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17221340
+  version_requirements: *23409700
 - !ruby/object:Gem::Dependency
   name: muzang
-  requirement: &17242620 !ruby/object:Gem::Requirement
+  requirement: &23409200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,21 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *17242620
+  version_requirements: *23409200
+- !ruby/object:Gem::Dependency
+  name: memetron
+  requirement: &23425080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *23425080
 - !ruby/object:Gem::Dependency
   name: em-ventually
-  requirement: &17240840 !ruby/object:Gem::Requirement
+  requirement: &23424620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +54,10 @@ dependencies:
         version: 0.1.2
   type: :development
   prerelease: false
-  version_requirements: *17240840
+  version_requirements: *23424620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &17238980 !ruby/object:Gem::Requirement
+  requirement: &23424160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +65,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *17238980
+  version_requirements: *23424160
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &17238380 !ruby/object:Gem::Requirement
+  requirement: &23423780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17238380
+  version_requirements: *23423780
 description: Plugins for Muzang IRC bot
 email:
 - piotr.nielacny@gmail.com
@@ -273,3 +284,4 @@ signing_key:
 specification_version: 3
 summary: Basic plugins for Muzang IRC bot
 test_files: []
+has_rdoc: