meme_generator 1.5 → 1.6

data/History.txt

@@ -1,3 +1,25 @@
+=== 1.6 / 2011-03-17
+
+* Minor enhancements
+  * <tt>meme --list</tt> is now sorted.
+  * +meme+ now accepts multiple lines.  Not every generator accepts multiple
+    lines so use with care.  Pull Request #18 by Arthur Chiu.
+  * Added Anteater.  Pull Request #14 by Aaron Patterson.
+  * Added Cool Story House.  Pull Request #16 by Dean Strelau.
+  * Added Creeper.  Pull Request #15 by Aaron Patterson.
+  * Added Futurama Fry.  Pull Request #16 by Dean Strelau.
+  * Added High Expectations Asian Father.  Pull Request #18 by Arthur Chiu.
+  * Added Inception.  Pull Request #18 by Arthur Chiu.
+  * Added Keanu.  Pull Request #16 by Dean Strelau.
+  * Added Minecraft.  Pull Request #15 by Aaron Patterson.
+  * Added ORLY Owl.  Pull Request #18 by Arthur Chiu.
+  * Added Spiderman.  Pull Request #18 by Arthur Chiu.
+  * Added Uncle Sam Points.  Pull Request #13 by Aaron Patteron.
+  * Added Unicorn Boy.  Pull Request #19 by Aaron Patterson.
+  * Added Victory Baby.  Pull Request #16 by Dean Strelau.
+  * GENERATORS hash additions are now aligned.  Pull Request #16 by Dean
+    Strelau.
+
 === 1.5 / 2011-03-16
 
 * Minor enhancement

data/lib/meme.rb

@@ -16,7 +16,7 @@ class Meme
   ##
   # Every meme generator needs a version
 
-  VERSION = '1.5'
+  VERSION = '1.6'
 
   ##
   # For statistics!
@@ -32,26 +32,39 @@ class Meme
 
   # keep generators in alphabetical order
 
+  GENERATORS['ANTEATER']          = [41191,  'anteater']
   GENERATORS['A_DODSON']          = [106375, 'Antoine-Dodson']
   GENERATORS['A_DOG']             = [940,    'Advice-Dog']
-  GENERATORS['BUTTHURT_DWELLER']  = [1438, 'Butthurt-Dweller']
+  GENERATORS['A_FATHER']          = [1436,   'High-Expectations-Asian-Father']
+  GENERATORS['BUTTHURT_DWELLER']  = [1438,   'Butthurt-Dweller']
   GENERATORS['B_FROG']            = [1211,   'Foul-Bachelorette-Frog']
   GENERATORS['B_FROG2']           = [1045,   'Foul-Bachelor-Frog']
+  GENERATORS['COOL_STORY_HOUSE']  = [16948,  'cool-story-bro-house']
+  GENERATORS['CREEPER']           = [173501, 'Minecraft-Creeper']
   GENERATORS['C_WOLF']            = [931,    'Courage-Wolf']
+  GENERATORS['F_FRY']             = [84688,  'Futurama-Fry']
   GENERATORS['G_GRANDPA']         = [185650, 'Grumpy-Grandpa']
   GENERATORS['H_MERMAID']         = [405224, 'Hipster-Mermaid']
   GENERATORS['I_DONT_ALWAYS']     = [38926,  'The-Most-Interesting-Man-in-the-World']
   GENERATORS['I_WOLF']            = [926,    'Insanity-Wolf']
+  GENERATORS['INCEPTION']         = [107949, 'Inception']
   GENERATORS['J_DUCREUX']         = [1356,   'Joseph-Ducreux']
+  GENERATORS['KEANU']             = [47718,  'Keanu-reeves']
+  GENERATORS['MINECRAFT']         = [122309, 'Minecraft']
+  GENERATORS['O-RLY-OWL']         = [117041, 'O-RLY-OWL', 'ORLY???']
   GENERATORS['OBAMA']             = [1332,   'Obama-']
   GENERATORS['PHILOSORAPTOR']     = [984,    'Philosoraptor']
   GENERATORS['P_OAK']             = [24321,  'Professor-Oak']
   GENERATORS['SCUMBAG']           = [364688, 'Scumbag-Steve']
   GENERATORS['SPARTA']            = [1013,   'sparta']
-  GENERATORS['S_AWKWARD_PENGUIN'] = [983,    'Socially-Awkward-Penguin']
+  GENERATORS['SPIDERMAN']         = [1037,   'Question-Spiderman']
   GENERATORS['SWEDISH_CHEF']      = [186651, 'Swedish-Chef']
+  GENERATORS['S_AWKWARD_PENGUIN'] = [983,    'Socially-Awkward-Penguin']
   GENERATORS['TOWNCRIER']         = [434537, 'Towncrier']
   GENERATORS['TROLLFACE']         = [1030,   'Troll-Face']
+  GENERATORS['UNICORN_BOY']       = [57022,  'unicorn-boy']
+  GENERATORS['US_POINT']          = [131083, 'Uncle-Sam-Point', 'I WANT YOU']
+  GENERATORS['V_BABY']            = [11140,  'Victory-Baby']
   GENERATORS['XZIBIT']            = [3114,   'XZIBIT']
   GENERATORS['Y_U_NO']            = [165241, 'Y-U-NO', 'Y U NO']
 
@@ -77,20 +90,17 @@ class Meme
     if generator == '--list' then
       width = GENERATORS.keys.map { |command| command.length }.max
 
-      GENERATORS.each do |command, (id, name, _)|
-        puts "%-*s    %s" % [width, command, name]
+      GENERATORS.sort.each do |command, (id, name, _)|
+        puts "%-*s  %s" % [width, command, name]
       end
 
       exit
     end
 
-    line1     = ARGV.shift
-    line2     = ARGV.shift
-
-    abort "#{$0} [GENERATOR|--list] LINE [LINE]" unless line1
+    abort "#{$0} [GENERATOR|--list] LINE [ADDITONAL_LINES]" if ARGV.empty?
 
     meme = new generator
-    link = meme.generate line1, line2
+    link = meme.generate *ARGV
 
     meme.paste link
 
@@ -120,26 +130,27 @@ class Meme
   # have to supply one line because the first line is defaulted for you.
   # Isn't that great?
 
-  def generate line1, line2 = nil
+  def generate *args
     url = URI.parse 'http://memegenerator.net/Instance/CreateOrEdit'
     res = nil
     location = nil
 
-    unless line2 then
-      line2 = line1
-      line1 = @default_line
-    end
+    # Put the default line in front unless theres more than 1 text input.
+    args.unshift(@default_line) unless args.size > 1
+
+    raise Error, "two lines are required for #{@generator_name}" unless args.size > 1
+
+    post_data = { 'templateType'  => 'AdviceDogSpinoff',
+                  'templateID'    => @template_id,
+                  'generatorName' => @generator_name }
 
-    raise Error, "two lines are required for #{@generator_name}" unless line1
+    # go through each argument and add it back into the post data as textN
+    (0..args.size).map {|num| post_data.merge! "text#{num}" => args[num] }
 
     Net::HTTP.start url.host do |http|
       post = Net::HTTP::Post.new url.path
       post['User-Agent'] = USER_AGENT
-      post.set_form_data('templateType'  => 'AdviceDogSpinoff',
-                         'text0'         => line1,
-                         'text1'         => line2,
-                         'templateID'    => @template_id,
-                         'generatorName' => @generator_name)
+      post.set_form_data post_data
 
       res = http.request post
 

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: meme_generator
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 1
-  - 5
-  version: "1.5"
+  - 6
+  version: "1.6"
 platform: ruby
 authors: 
 - Eric Hodel
@@ -35,7 +35,7 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2011-03-16 00:00:00 -07:00
+date: 2011-03-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency