url2png-dc 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/url2png/cache.rb

@@ -2,8 +2,8 @@ module Url2PngDc
   # TODO Rename this, "Cache" sounds a bit misleading in this context
   #
   class Cache
-    def initialize(json_payload)
-      @payload = json_payload
+    def initialize(url_2json_url)
+      @url_2json_url = url_2json_url
     end
 
     def url
@@ -14,9 +14,18 @@ module Url2PngDc
   private
 
     def parse_out_cache_url_from_payload
-      _json = JSON.parse(@payload)
+      return nil if (payload = request_to_url2png).nil?
+
+      _json = JSON.parse(payload)
       _png = _json['png']
       _png if _png && !_png.empty?
     end
+
+    def request_to_url2png
+      response = ::HTTParty.get(@url_2json_url)
+      response.body
+    rescue
+      nil
+    end
   end
 end

data/lib/url2png/url_helper.rb

@@ -16,8 +16,7 @@ module Url2PngDc
       end
 
       def url_2cache(url, options = {})
-        response = ::HTTParty.get(url_2json(url, options))
-        _cache = Cache.new response.body
+        _cache = Cache.new url_2json(url, options)
         _cache.url || url_2png(url, options)
       end
 

data/test/cache_test.rb

@@ -2,27 +2,44 @@ require 'test_helper'
 
 module Url2PngDc
   class TestCache < MiniTest::Unit::TestCase
+    def url_2json_url
+      Sandbox.new.url_2json "http://google.com"
+    end
+
+
     # This provides a solution to insert images properly for display on
     # Microsoft Outlook email clients
     #
     def test_url_to_return_cached_url
-      cache = Cache.new json_payload
+      mock_my_httparty!
+
+      cache = Cache.new url_2json_url
       assert_match(/cache(-[\d]+)\.url2png\.com/, cache.url)
     end
 
     def test_url_returns_nil_if_png_key_is_empty_or_missing
-      json = JSON.parse(json_payload)
+      cache = Cache.new url_2json_url
+      json  = JSON.parse(json_payload)
+
       json['png'] = ''
-      cache = Cache.new json.to_json
+      mock_my_httparty! json.to_json
       assert_nil cache.url
 
       json.delete('png')
-      cache = Cache.new json.to_json
+      mock_my_httparty! json.to_json
       assert_nil cache.url
     end
 
-    def test_test_url_returns_nil_if_request_to_url2png_is_not_successful
-      flunk "We need to test this"
+    def test_test_url_returns_nil_if_request_to_url2png_raises_anything
+      # mocky
+      HTTParty.instance_eval do
+        def get(url)
+          raise StandardError
+        end
+      end
+
+      cache = Cache.new url_2json_url
+      assert_nil cache.url
     end
   end
 end

data/test/test_helper.rb

@@ -15,8 +15,19 @@ def json_payload
   json
 end
 
+def mock_my_httparty!(and_return_payload = json_payload)
+  # mocky
+  HTTParty.instance_eval do
+    (class << self; self; end).__send__ :define_method, :get do |url|
+      obj = Object.new
+      (class << obj; self; end).__send__ :define_method, :body do
+        and_return_payload
+      end
+      obj
+    end
+  end
+end
 
 class Sandbox
   include Url2PngDc::UrlHelpers
 end
-

data/test/url_helper_test.rb

@@ -18,19 +18,6 @@ module Url2PngDc
       Digest::MD5.hexdigest(query_string+Url2PngDc.configuration.url2png_secret)
     end
 
-    def mock_my_httparty!
-      # mocky
-      HTTParty.instance_eval do
-        def get(url)
-          obj = Object.new
-          def obj.body
-              json_payload
-          end
-          obj
-        end
-      end
-    end
-
 
     def test_url_2png_generates_valid_url2png_url_for_png
       token = token(query_string_with_defaults)

data/url2png-dc.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "url2png-dc"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yung Hwa Kwon"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: url2png-dc
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -112,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2435669331839851502
+      hash: -611436617416580097
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: