urifetch 0.1.1.rc5 → 0.1.1.rc6

data/lib/urifetch.rb

@@ -14,12 +14,12 @@ include ActionView::Helpers::NumberHelper
 
 module Urifetch
   
-  autoload :Response, 'urifetch/response'
-  autoload :Strategy, 'urifetch/strategy'
-  autoload :Router,   'urifetch/router'
-  autoload :Version,  'urifetch/version'
-
-  autoload :OpenGraph, 'urifetch/ext/opengraph'
+  require "#{File.expand_path(File.dirname(__FILE__))}/urifetch/response"
+  require "#{File.expand_path(File.dirname(__FILE__))}/urifetch/strategy"
+  require "#{File.expand_path(File.dirname(__FILE__))}/urifetch/router"
+  require "#{File.expand_path(File.dirname(__FILE__))}/urifetch/version"
+  
+  require "#{File.expand_path(File.dirname(__FILE__))}/urifetch/ext/opengraph"
   
   @@router = Router.new()
   

data/lib/urifetch/strategy.rb

@@ -2,8 +2,8 @@ module Urifetch
   
   module Strategy
     
-    autoload :Base, 'urifetch/strategy/base'
-    autoload :Image, 'urifetch/strategy/image'
+    require "#{File.expand_path(File.dirname(__FILE__))}/strategy/base"
+    require "#{File.expand_path(File.dirname(__FILE__))}/strategy/image"
     
   end
   

data/lib/urifetch/strategy/base.rb

@@ -49,8 +49,8 @@ module Urifetch
         # Start by setting the URI
         set :url, uri.to_s.sub(/\/$/,"")
         
-        doc = Nokogiri::HTML.parse(@request,false)
-        
+        doc = Nokogiri::HTML.parse(@request)
+                
         # Image
         image = doc.css('img').first
         image = image.nil? ? nil : image['src'].try(:strip)
@@ -62,7 +62,7 @@ module Urifetch
         end
                 
         # Open Auth data
-        if og = OpenGraph.parse(doc)
+        if og = OpenGraph.parse(doc,false)
           set :url,         og.url.to_s.sub(/\/$/,""),  override: true
           set :title,       og.title,                   override: true
           set :image,       og.image,                   override: true
@@ -97,7 +97,9 @@ module Urifetch
       end
             
       def set(key,value,args={})
-        response.data[key.to_s] = value if (args[:override] == true) or response.data[key.to_s].nil? unless value.nil?
+        if value.present?
+          response.data[key.to_s] = value if (args[:override] || !response.data[key.to_s].present?)
+        end
       end
       
       def set?(key)

data/lib/urifetch/version.rb

@@ -5,7 +5,7 @@ module Urifetch
     MAJOR = 0
     MINOR = 1
     PATCH = 1
-    BUILD = 'rc5'
+    BUILD = 'rc6'
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
     

data/urifetch.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "urifetch"
-  s.version = "0.1.1.rc5"
+  s.version = "0.1.1.rc6"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Philip Vieira"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: urifetch
 version: !ruby/object:Gem::Version
-  version: 0.1.1.rc5
+  version: 0.1.1.rc6
   prerelease: 6
 platform: ruby
 authors:
@@ -249,7 +249,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1453431270534021920
+      hash: 460218162848213799
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: