meminator 0.0.1 → 0.0.2

data/README.md

@@ -12,8 +12,13 @@ stupid things that it shouldn't. I intend to fix them at some point.
 
 ```ruby
 
-meme_generator = Meminator::Meminator.new
-meme_generator.get_url("I_WOLF", "Patient stubbed toe", "Put him down") # => returns a url for the new meme
+require 'meminator'
+Meminator.username = 'richo' # USERNAME GOES HERE
+Meminator.password = 'password' # PASSWORD GOES HERE
+
+memer = Meminator::Meminator.new
+
+puts memer.get_url("I_WOLF", "Patient stubbed his toe", "Had to put him down")
 
 ```
 

data/demo.rb

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+#
+require 'meminator'
+Meminator.username = 'richo' # USERNAME GOES HERE
+Meminator.password = 'password' # PASSWORD GOES HERE
+
+memer = Meminator::Meminator.new
+
+puts memer.get_url("I_WOLF", "Patient stubbed his toe", "Had to put him down")

data/lib/meminator.rb

@@ -1,13 +1,14 @@
 require 'net/http'
-require 'nokogiri'
 require 'cgi'
+require 'json'
 
 ##
 # Generate memes using http://memegenerator.net
 
 module Meminator
-  VERSION = '0.0.1'
-  GENERATOR_URL = 'http://memegenerator.net/Instance/CreateOrEdit'
+  VERSION = '0.0.2'
+  GENERATOR_URL = 'http://version1.api.memegenerator.net/Instance_Create'
+  DISPLAY_URL = 'http://cdn.memegenerator.net'
   class Error < Exception; end
   class Meminator
 
@@ -20,53 +21,47 @@ module Meminator
 
       url = URI.parse(GENERATOR_URL)
 
-      post_data = { 'templateType'  => template_type,
-                    'templateID'    => template_id,
-                    'generatorName' => generator_name }
+      params = { 'username'      => ::Meminator.username,
+                 'password'      => ::Meminator.password,
+                 'templateType'  => template_type,
+                 'generatorID'   => template_id,
+                 'imageID'       => 20, # TODO infer from generatorID
+                 'generatorName' => generator_name }
 
       [default_line, *text].compact.each_with_index do |item, idx|
-         post_data.merge! "text#{idx}" => item
+         params.merge! "text#{idx}" => item
       end
 
       begin
-        return fetch(url, post_data)
+        return fetch(url, params)
       rescue Error => e
         return e.message
       end
     end
 
-    def fetch(url, post_data)
+    def fetch(url, params)
+      params = params.collect { |k,v| "#{k}=#{CGI::escape(v.to_s)}" }.join('&')
       Net::HTTP.start url.host do |http|
-        post = Net::HTTP::Post.new url.path
-        post['User-Agent'] = ::Meminator.user_agent
-        post.set_form_data post_data
+        get = Net::HTTP::Get.new url.path + "?#{params}"
+        get['User-Agent'] = ::Meminator.user_agent
 
-        res = http.request post
+        res = http.request get
 
         unless  Net::HTTPSuccess === res
           raise Error, "memegenerator.net appears to be down, got #{res.code}"
         end
 
-        location = res['Location']
-        redirect = url + location
-
-        get = Net::HTTP::Get.new redirect.request_uri
-        get['User-Agent'] = ::Meminator.user_agent
-
-        res = http.request get
-      end
+        ret = JSON.load(res.body)
 
-      if Net::HTTPSuccess === res
-        doc = Nokogiri.HTML res.body
-        doc.css("a[href=\"#{location}\"] img").first['src']
-      else
-        raise Error, "memegenerator.net appears to be down, got #{res.code}"
+        if ret["success"]
+          return "#{DISPLAY_URL}#{ret["result"]["instanceImageUrl"]}"
+        end
       end
     end
 
   end
 end
 
-%w[list user_agent].each do |filename|
+%w[list user_agent auth].each do |filename|
   require "meminator/#{filename}"
 end

data/lib/meminator/auth.rb

@@ -0,0 +1,34 @@
+module Meminator
+  extend self
+
+  @@username = nil
+  @@password = nil
+
+  def username
+    if @@username
+      @@username
+    else
+      raise NotAuthorized
+    end
+  end
+
+  def password
+    if @@password
+      @@password
+    else
+      raise NotAuthorized
+    end
+  end
+
+  def username=(uname)
+    @@username = uname
+  end
+
+  def password=(pword)
+    @@password = pword
+  end
+end
+
+module Meminator
+  class NotAuthorized < Exception; end
+end

data/lib/meminator/list.rb

@@ -34,7 +34,7 @@ module Meminator
       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 'I_WOLF',             45,     'Insanity-Wolf'
       advice_dog 'JESUS',              1281,    'jesus-says'
       advice_dog 'J_DUCREUX',          1356,    'Joseph-Ducreux'
       advice_dog 'KANYE',              622033,  'kanyee'

data/meminator.gemspec

@@ -1,17 +1,15 @@
 Gem::Specification.new do |s|
   s.name        = "meminator"
-  s.version     = "0.0.1"
+  s.version     = "0.0.2"
   s.authors     = ["Eric Hodel", "Rich Healey"]
   s.email       = ["richo@psych0tik.net"]
   s.homepage    = "http://github.com/richoH/meminator"
   s.summary     = "API to retrieve urls for memes"
   s.description = s.summary
 
-  s.add_dependency "nokogiri"
   s.add_development_dependency "mocha"
   s.add_development_dependency "rspec"
 
   s.files         = `git ls-files`.split("\n")
-  # s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 end

data/spec/meminator/auth_spec.rb

@@ -0,0 +1,29 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Meminator do
+
+  it "Should raise an exception when no username set" do
+    ::Meminator.username = nil
+    lambda {
+      ::Meminator.username
+    }.should raise_error ::Meminator::NotAuthorized
+  end
+
+  it "Should raise an exception when no password set" do
+    ::Meminator.password = nil
+    lambda {
+      ::Meminator.password
+    }.should raise_error ::Meminator::NotAuthorized
+  end
+
+  it "Should return the set username" do
+    ::Meminator.username = "richo"
+    ::Meminator.username.should == "richo"
+  end
+
+  it "Should return the set password" do
+    ::Meminator.password = "rawk"
+    ::Meminator.password.should == "rawk"
+  end
+
+end

data/spec/meminator_spec.rb

@@ -4,10 +4,11 @@ describe Meminator do
 
   it "Should serialize it's arguments" do
     meminator = Meminator::Meminator.new
-
+    Meminator.username = "richo2"
+    Meminator.password = "richo3"
 
     meminator.expects(:fetch).with(URI.parse(Meminator::GENERATOR_URL),
-      {'templateType' => 'AdviceDogSpinoff', 'templateID' => 926, 'generatorName' => 'Insanity-Wolf', 'text0' => 'First line', 'text1' => 'Second line'}
+      {'username' => 'richo2', 'password' => 'richo3', 'templateType' => 'AdviceDogSpinoff', 'generatorID' => 45, 'imageID' => 20, 'generatorName' => 'Insanity-Wolf', 'text0' => 'First line', 'text1' => 'Second line'}
     )
 
     meminator.get_url("I_WOLF", "First line", "Second line")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meminator
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,24 +10,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-07 00:00:00.000000000 Z
+date: 2012-05-08 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -75,10 +59,13 @@ files:
 - Manifest.txt
 - README.md
 - Rakefile
+- demo.rb
 - lib/meminator.rb
+- lib/meminator/auth.rb
 - lib/meminator/list.rb
 - lib/meminator/user_agent.rb
 - meminator.gemspec
+- spec/meminator/auth_spec.rb
 - spec/meminator/list_spec.rb
 - spec/meminator/user_agent_spec.rb
 - spec/meminator_spec.rb