meme_generator 1.8 → 1.9

data/History.txt

@@ -1,3 +1,14 @@
+=== 1.9 / 2010-03-28
+
+* Minor Enhancements
+  * meme_generator will use pasteboard if it is installed.  This allows memes
+    to easily be used in any OS X app which handles image data.
+  * Added Challenge Accepted.  Pull Request #27 by Mark Turner.
+
+* Bug Fix
+  * Only add the default line when it is present.  Pull Request #26 by Matt
+    Margolis.
+
 === 1.8 / 2011-03-22
 
 * Minor Enhancements

data/lib/meme.rb

@@ -16,7 +16,7 @@ class Meme
   ##
   # Every meme generator needs a version
 
-  VERSION = '1.8'
+  VERSION = '1.9'
 
   ##
   # For statistics!
@@ -52,43 +52,44 @@ class Meme
   end
 
   # keep generators in alphabetical order
-  advice_dog 'ANTEATER',          41191,  'anteater'
-  advice_dog 'A_DODSON',          106375, 'Antoine-Dodson'
-  advice_dog 'A_DOG',             940,    'Advice-Dog'
-  advice_dog 'A_FATHER',          1436,   'High-Expectations-Asian-Father'
-  advice_dog 'BEAR-GRYLLS',       89714,  'Bear-Grylls'
-  advice_dog 'BUTTHURT_DWELLER',  1438,   'Butthurt-Dweller'
-  advice_dog 'B_FROG',            1211,   'Foul-Bachelorette-Frog'
-  advice_dog 'B_FROG2',           1045,   'Foul-Bachelor-Frog'
-  advice_dog 'COOL_STORY_HOUSE',  16948,  'cool-story-bro-house'
-  advice_dog 'CREEPER',           173501, 'Minecraft-Creeper'
-  advice_dog 'C_WOLF',            931,    'Courage-Wolf'
-  advice_dog 'F_FRY',             84688,  'Futurama-Fry'
-  advice_dog 'G_GRANDPA',         185650, 'Grumpy-Grandpa'
-  advice_dog 'H_MERMAID',         405224, 'Hipster-Mermaid'
-  advice_dog 'I_DONT_ALWAYS',     38926,  'The-Most-Interesting-Man-in-the-World'
-  advice_dog 'I_WOLF',            926,    'Insanity-Wolf'
-  advice_dog 'J_DUCREUX',         1356,   'Joseph-Ducreux'
-  advice_dog 'KEANU',             47718,  'Keanu-reeves'
-  advice_dog 'MINECRAFT',         122309, 'Minecraft'
-  advice_dog 'O-RLY-OWL',         117041, 'O-RLY-OWL', 'ORLY???'
-  advice_dog 'OBAMA',             1332,   'Obama-'
-  advice_dog 'PHILOSORAPTOR',     984,    'Philosoraptor'
-  advice_dog 'P_OAK',             24321,  'Professor-Oak'
-  advice_dog 'SCUMBAG',           364688, 'Scumbag-Steve'
-  advice_dog 'SERIOUS_FISH',      6374627,'Spongebob-Serious-Fish'
-  advice_dog 'SNOB',              2994,   'Snob'
-  advice_dog 'SPARTA',            1013,   'sparta'
-  advice_dog 'SPIDERMAN',         1037,   'Question-Spiderman'
-  advice_dog 'SWEDISH_CHEF',      186651, 'Swedish-Chef'
-  advice_dog 'S_AWKWARD_PENGUIN', 983,    'Socially-Awkward-Penguin'
-  advice_dog 'TOWNCRIER',         434537, 'Towncrier'
-  advice_dog 'TROLLFACE',         1030,   'Troll-Face'
-  advice_dog 'UNICORN_BOY',       57022,  'unicorn-boy'
-  advice_dog 'US_POINT',          131083, 'Uncle-Sam-Point', 'I WANT YOU'
-  advice_dog 'V_BABY',            11140,  'Victory-Baby'
-  advice_dog 'XZIBIT',            3114,   'XZIBIT'
-  advice_dog 'Y_U_NO',            165241, 'Y-U-NO', 'Y U NO'
+  advice_dog 'ANTEATER',           41191,  'anteater'
+  advice_dog 'A_DODSON',           106375, 'Antoine-Dodson'
+  advice_dog 'A_DOG',              940,    'Advice-Dog'
+  advice_dog 'A_FATHER',           1436,   'High-Expectations-Asian-Father'
+  advice_dog 'BEAR-GRYLLS',        89714,  'Bear-Grylls'
+  advice_dog 'BUTTHURT_DWELLER',   1438,   'Butthurt-Dweller'
+  advice_dog 'B_FROG',             1211,   'Foul-Bachelorette-Frog'
+  advice_dog 'B_FROG2',            1045,   'Foul-Bachelor-Frog'
+  advice_dog 'CHALLENGE_ACCEPTED', 275025, 'Challenge-Accepted'
+  advice_dog 'COOL_STORY_HOUSE',   16948,  'cool-story-bro-house'
+  advice_dog 'CREEPER',            173501, 'Minecraft-Creeper'
+  advice_dog 'C_WOLF',             931,    'Courage-Wolf'
+  advice_dog 'F_FRY',              84688,  'Futurama-Fry'
+  advice_dog 'G_GRANDPA',          185650, 'Grumpy-Grandpa'
+  advice_dog 'H_MERMAID',          405224, 'Hipster-Mermaid'
+  advice_dog 'I_DONT_ALWAYS',      38926,  'The-Most-Interesting-Man-in-the-World'
+  advice_dog 'I_WOLF',             926,    'Insanity-Wolf'
+  advice_dog 'J_DUCREUX',          1356,   'Joseph-Ducreux'
+  advice_dog 'KEANU',              47718,  'Keanu-reeves'
+  advice_dog 'MINECRAFT',          122309, 'Minecraft'
+  advice_dog 'O-RLY-OWL',          117041, 'O-RLY-OWL', 'ORLY???'
+  advice_dog 'OBAMA',              1332,   'Obama-'
+  advice_dog 'PHILOSORAPTOR',      984,    'Philosoraptor'
+  advice_dog 'P_OAK',              24321,  'Professor-Oak'
+  advice_dog 'SCUMBAG',            364688, 'Scumbag-Steve'
+  advice_dog 'SERIOUS_FISH',       6374627,'Spongebob-Serious-Fish'
+  advice_dog 'SNOB',               2994,   'Snob'
+  advice_dog 'SPARTA',             1013,   'sparta'
+  advice_dog 'SPIDERMAN',          1037,   'Question-Spiderman'
+  advice_dog 'SWEDISH_CHEF',       186651, 'Swedish-Chef'
+  advice_dog 'S_AWKWARD_PENGUIN',  983,    'Socially-Awkward-Penguin'
+  advice_dog 'TOWNCRIER',          434537, 'Towncrier'
+  advice_dog 'TROLLFACE',          1030,   'Troll-Face'
+  advice_dog 'UNICORN_BOY',        57022,  'unicorn-boy'
+  advice_dog 'US_POINT',           131083, 'Uncle-Sam-Point', 'I WANT YOU'
+  advice_dog 'V_BABY',             11140,  'Victory-Baby'
+  advice_dog 'XZIBIT',             3114,   'XZIBIT'
+  advice_dog 'Y_U_NO',             165241, 'Y-U-NO', 'Y U NO'
 
   vertical 'BATMAN',    148359, 'batman-panal-ryan'
   vertical 'INCEPTION', 107949, 'Inception'
@@ -162,10 +163,11 @@ class Meme
     res = nil
     location = nil
 
-    # Put the default line in front unless theres more than 1 text input.
-    args.unshift(@default_line) unless args.size > 1
+    # Prepend the default line if this meme has one and we only had 1 text input
+    args.unshift @default_line if @default_line and args.size <= 1
 
-    raise Error, "two lines are required for #{@generator_name}" unless args.size > 1
+    raise Error, "two lines are required for #{@generator_name}" unless
+      args.size > 1
 
     post_data = { 'templateType'  => @template_type,
                   'templateID'    => @template_id,
@@ -212,6 +214,14 @@ class Meme
   # clipboard.
 
   def paste link
+    require 'pasteboard'
+
+    clipboard = Pasteboard.new
+
+    jpeg = fetch link
+
+    clipboard.put_jpeg_url jpeg, link
+  rescue LoadError
     clipboard = %w{
       /usr/bin/pbcopy
       /usr/bin/xclip

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: meme_generator
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
-  - 8
-  version: "1.8"
+  - 9
+  version: "1.9"
 platform: ruby
 authors: 
 - Eric Hodel
@@ -35,7 +35,7 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2011-03-22 00:00:00 -07:00
+date: 2011-03-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency