Fix issues connecting to Cortex, serving up Webpage result contents, and Snippet view helper output

Author: toastercup

lib/cortex/snippets/client.rb

@@ -7,16 +7,16 @@ module Client
       class << self
         def cortex_client
           if ENV['CORTEX_SNIPPET_ACCESS_TOKEN'].nil? || ENV['CORTEX_SNIPPET_ACCESS_TOKEN'].empty?
-            @cortex_client ||= ConnectionPool::Wrapper.new(size: 5, timeout: 3) { Cortex::Client.new(access_token: ENV['CORTEX_SNIPPET_ACCESS_TOKEN']) }
-          else
             @cortex_client ||= ConnectionPool::Wrapper.new(size: 5, timeout: 3) { Cortex::Client.new(key: ENV['CORTEX_SNIPPET_KEY'], secret: ENV['CORTEX_SNIPPET_SECRET'], base_url: ENV['CORTEX_SNIPPET_BASE_URL']) }
+          else
+            @cortex_client ||= ConnectionPool::Wrapper.new(size: 5, timeout: 3) { Cortex::Client.new(access_token: ENV['CORTEX_SNIPPET_ACCESS_TOKEN']) }
           end
         end
 
         def current_webpage(request)
           if defined?(Rails)
             Rails.cache.fetch("webpages/#{request_url(request)}", expires_in: 30.minutes) do
-              cortex_client.webpages.get_feed(request_url(request))
+              cortex_client.webpages.get_feed(request_url(request)).contents
             end
           else
             raise 'Your Web framework is not supported. Supported frameworks: Rails'

lib/cortex/snippets/version.rb

@@ -1,5 +1,5 @@
 module Cortex
   module Snippets
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

lib/cortex/snippets/view_helpers.rb

@@ -4,7 +4,7 @@ module ViewHelpers
       def snippet(options = {}, &block)
         snippet = webpage[:snippets].find { |snippet| snippet.name == options[:id] }
 
-        if snippet.empty?
+        if snippet.nil? || snippet.empty?
           content_tag(:snippet, capture(&block), id: options[:id])
         else
           content_tag(:snippet, snippet, id: options[:id])