meme_generator 1.0 → 1.1

data/History.txt

@@ -1,6 +1,12 @@
-=== 1.0.0 / 2011-02-08
+=== 1.1 / 2011-02-09
 
-* 1 major enhancement
+* Minor enhancements
+  * Added 13 new templates.  Pull Request #4 by Josep M. Bach.
+  * Meme::run now returns the link.  Pull Request #2 by Josep M. Bach.
+  * Better template lookup.  Patch by James Tucker.
 
+=== 1.0 / 2011-02-08
+
+* Major enhancements
   * Birthday!
 

data/README.txt

@@ -1,4 +1,4 @@
-= meme
+= meme_generator
 
 * http://github.com/drbrain/meme
 * http://docs.seattlerb.org/meme_generator
@@ -9,12 +9,18 @@ Generate meme images using http://memegenerator.net!  Save yourself some time!
 
 == FEATURES/PROBLEMS:
 
-* Only has a static list of three meme images
+* Only has a static list of sixteen meme images
 * No tests
 
 == SYNOPSIS:
 
-  meme Y-U-NO 'write tests?'
+Generate a Y U NO meme:
+
+  $ meme Y_U_NO 'write tests?'
+
+See a list of available generators
+
+  $ meme --list
 
 You can also drive it like an API.
 

data/lib/meme.rb

@@ -16,7 +16,7 @@ class Meme
   ##
   # Every meme generator needs a version
 
-  VERSION = '1.0'
+  VERSION = '1.1'
 
   ##
   # For statistics!
@@ -30,9 +30,33 @@ class Meme
     raise Error, "unknown generator #{k}"
   end
 
-  GENERATORS['Y_U_NO']        = [165241, 'Y-U-NO', 'Y U NO']
-  GENERATORS['B_FROG']        = [1211,   'Foul-Bachelorette-Frog']
-  GENERATORS['PHILOSORAPTOR'] = [984,    'Philosoraptor']
+  GENERATORS['Y_U_NO']            = [165241, 'Y-U-NO', 'Y U NO']
+  GENERATORS['B_FROG']            = [1211,   'Foul-Bachelorette-Frog']
+  GENERATORS['B_FROG2']           = [1045,   'Foul-Bachelor-Frog']
+  GENERATORS['PHILOSORAPTOR']     = [984,    'Philosoraptor']
+  GENERATORS['I_WOLF']            = [926,    'Insanity-Wolf']
+  GENERATORS['G_GRANDPA']         = [185650, 'Grumpy-Grandpa']
+  GENERATORS['S_AWKWARD_PENGUIN'] = [983,    'Socially-Awkward-Penguin']
+  GENERATORS['A_DOG']             = [940,    'Advice-Dog']
+  GENERATORS['J_DUCREUX']         = [1356,   'Joseph-Ducreux']
+  GENERATORS['XZIBIT']            = [3114,   'XZIBIT']
+  GENERATORS['TROLLFACE']         = [1030,   'Troll-Face']
+  GENERATORS['A_DODSON']          = [106375, 'Antoine-Dodson']
+  GENERATORS['P_OAK']             = [24321,  'Professor-Oak']
+  GENERATORS['OBAMA']             = [1332,   'Obama-']
+  GENERATORS['SPARTA']            = [1013,   'sparta']
+  GENERATORS['TOWNCRIER']         = [434537, 'Towncrier']
+
+  ##
+  # Looks up generator name
+
+  def GENERATORS.match(name)
+    # TODO  meme Y U NO DEMETAPHONE?
+    return self[name] if has_key? name
+    matcher = Regexp.new(name, Regexp::IGNORECASE)
+    _, generator = find { |k,v| matcher =~ k || v.grep(matcher).any? }
+    generator || self[name] # raises the error if generator is nil
+  end
 
   ##
   # Interface for the executable
@@ -53,7 +77,7 @@ class Meme
     line1     = ARGV.shift
     line2     = ARGV.shift
 
-    abort "#{$0} GENERATOR LINE [LINE]" unless line1
+    abort "#{$0} [GENERATOR|--list] LINE [LINE]" unless line1
 
     meme = new generator
     link = meme.generate line1, line2
@@ -61,13 +85,14 @@ class Meme
     meme.paste link
 
     puts link
+    link
   end
 
   ##
   # Generates links for +generator+
 
   def initialize generator
-    @template_id, @generator_name, @default_line = GENERATORS[generator]
+    @template_id, @generator_name, @default_line = GENERATORS.match generator
   end
 
   ##

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: meme_generator
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 1
-  - 0
-  version: "1.0"
+  - 1
+  version: "1.1"
 platform: ruby
 authors: 
 - Eric Hodel
@@ -35,7 +35,7 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2011-02-08 00:00:00 -08:00
+date: 2011-02-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency