diff --git a/lib/meta_inspector/document.rb b/lib/meta_inspector/document.rb index fca059c8..4a76dfee 100644 --- a/lib/meta_inspector/document.rb +++ b/lib/meta_inspector/document.rb @@ -37,10 +37,13 @@ def initialize(initial_url, options = {}) end extend Forwardable - def_delegators :@url, :url, :scheme, :host, :root_url - def_delegators :@request, :content_type, :response - def_delegators :@parser, :parsed, :respond_to?, :title, :description, :links, - :images, :image, :feed, :charset, :meta_tags, :meta_tag, :meta, :favicon + delegate [:url, :scheme, :host, :root_url] => :@url + + delegate [:content_type, :response] => :@request + + delegate [:parsed, :title, :description, :links, + :images, :feed, :charset, :meta_tags, + :meta_tag, :meta, :favicon] => :@parser # Returns all document data as a nested Hash def to_hash diff --git a/lib/meta_inspector/exceptionable.rb b/lib/meta_inspector/exceptionable.rb index b38d8028..e259baf8 100644 --- a/lib/meta_inspector/exceptionable.rb +++ b/lib/meta_inspector/exceptionable.rb @@ -4,6 +4,6 @@ module MetaInspector # module Exceptionable extend Forwardable - def_delegators :@exception_log, :exceptions, :ok? + delegate [:exceptions, :ok?] => :@exception_log end end diff --git a/lib/meta_inspector/parser.rb b/lib/meta_inspector/parser.rb index db3ed775..54aad94a 100644 --- a/lib/meta_inspector/parser.rb +++ b/lib/meta_inspector/parser.rb @@ -20,11 +20,11 @@ def initialize(document, options = {}) end extend Forwardable - def_delegators :@document, :url, :scheme, :host - def_delegators :@meta_tag_parser, :meta_tags, :meta_tag, :meta, :charset - def_delegators :@links_parser, :links, :feed, :base_url - def_delegators :@images_parser, :images - def_delegators :@texts_parser, :title, :description + delegate [:url, :scheme, :host] => :@document + delegate [:meta_tags, :meta_tag, :meta, :charset] => :@meta_tag_parser + delegate [:links, :feed, :base_url] => :@links_parser + delegate :images => :@images_parser + delegate [:title, :description] => :@texts_parser # Returns the whole parsed document def parsed diff --git a/lib/meta_inspector/parsers/images.rb b/lib/meta_inspector/parsers/images.rb index ba2a7744..698d00c7 100644 --- a/lib/meta_inspector/parsers/images.rb +++ b/lib/meta_inspector/parsers/images.rb @@ -1,8 +1,8 @@ module MetaInspector module Parsers class ImagesParser < Base - def_delegators :@main_parser, :parsed, :meta, :base_url - def_delegators :images_collection, :each, :length, :size, :last, :[] + delegate [:parsed, :meta, :base_url] => :@main_parser + delegate [:each, :length, :size, :[], :last] => :images_collection include Enumerable diff --git a/lib/meta_inspector/parsers/links.rb b/lib/meta_inspector/parsers/links.rb index 72cb6ac1..26d4658d 100644 --- a/lib/meta_inspector/parsers/links.rb +++ b/lib/meta_inspector/parsers/links.rb @@ -1,7 +1,7 @@ module MetaInspector module Parsers class LinksParser < Base - def_delegators :@main_parser, :parsed, :url, :scheme, :host + delegate [:parsed, :url, :scheme, :host] => :@main_parser def links self diff --git a/lib/meta_inspector/parsers/meta_tags.rb b/lib/meta_inspector/parsers/meta_tags.rb index d62394fc..7b958c29 100644 --- a/lib/meta_inspector/parsers/meta_tags.rb +++ b/lib/meta_inspector/parsers/meta_tags.rb @@ -1,7 +1,7 @@ module MetaInspector module Parsers class MetaTagsParser < Base - def_delegators :@main_parser, :parsed + delegate :parsed => :@main_parser def meta_tags { diff --git a/lib/meta_inspector/parsers/texts.rb b/lib/meta_inspector/parsers/texts.rb index fa0de1e1..a7a38d38 100644 --- a/lib/meta_inspector/parsers/texts.rb +++ b/lib/meta_inspector/parsers/texts.rb @@ -1,7 +1,7 @@ module MetaInspector module Parsers class TextsParser < Base - def_delegators :@main_parser, :parsed, :meta + delegate [:parsed, :meta] => :@main_parser # Returns the parsed document title, from the content of the tag # within the <head> section. diff --git a/lib/meta_inspector/request.rb b/lib/meta_inspector/request.rb index 25edd1b1..47925459 100644 --- a/lib/meta_inspector/request.rb +++ b/lib/meta_inspector/request.rb @@ -22,7 +22,7 @@ def initialize(initial_url, options = {}) end extend Forwardable - def_delegators :@url, :url + delegate :url => :@url def read response.body if response