microformats 4.0.7 → 4.0.9

data/lib/microformats/property_parser.rb

@@ -1,7 +1,6 @@
 module Microformats
   class PropertyParser < ParserCore
-
-    def parse(element, base: nil, element_type: , format_class_array: [], backcompat: nil)
+    def parse(element, base: nil, element_type:, format_class_array: [], backcompat: nil)
       @base = base
       @value = nil
       @property_type = element_type
@@ -13,55 +12,53 @@ module Microformats
         parse_value_class_pattern(element)
 
         if @value.nil?
-          if element.name == 'abbr' and not element.attribute('title').nil?
-            @value = element.attribute('title').value.strip
-          elsif (element.name == 'data' or element.name == 'input') and not element.attribute('value').nil?
-            @value = element.attribute('value').value.strip
-          elsif (element.name == 'img' or element.name == 'area') and not element.attribute('alt').nil?
-            @value = element.attribute('alt').value.strip
-          else
-            @value = render_text_and_replace_images(element, base: @base)
-          end
+          @value =
+            if element.name == 'abbr' && !element.attribute('title').nil?
+              element.attribute('title').value.strip
+            elsif element.name == 'link' && !element.attribute('title').nil?
+              element.attribute('title').value.strip
+            elsif (element.name == 'data' || element.name == 'input') && !element.attribute('value').nil?
+              element.attribute('value').value.strip
+            elsif (element.name == 'img' || element.name == 'area') && !element.attribute('alt').nil?
+              element.attribute('alt').value.strip
+            else
+              render_text(element, base: @base)
+            end
         end
-
       elsif element_type == 'e'
         @value = {
-          value: render_text(element, base: @base), #TODO the spec doesn't say to remove script and style tags, assuming this to be in error
-          html: element.inner_html.gsub(/\A +/, '').gsub(/ +\Z/, '')
+          value: render_text(element, base: @base),
+          html: element.inner_html.strip
         }
-
       elsif element_type == 'u'
-        if ['a', 'area'].include? element.name and not element.attribute('href').nil?
+        if %w[a area link].include?(element.name) && !element.attribute('href').nil?
           @value = element.attribute('href').value.strip
-        elsif ['img', 'audio', 'video', 'source'].include? element.name and not element.attribute('src').nil?
+        elsif %w[img audio video source].include?(element.name) && !element.attribute('src').nil?
           @value = element.attribute('src').value.strip
-        elsif element.name == 'video' and not element.attribute('poster').nil?
+        elsif element.name == 'video' && !element.attribute('poster').nil?
           @value = element.attribute('poster').value.strip
-        elsif element.name == 'object' and not element.attribute('data').nil?
+        elsif element.name == 'object' && !element.attribute('data').nil?
           @value = element.attribute('data').value.strip
         end
 
-        if not @value.nil?
+        if !@value.nil?
           @value = Microformats::AbsoluteUri.new(@value, base: @base).absolutize
         else
-
           parse_value_class_pattern(element)
 
           if @value.nil?
-            if element.name == 'abbr' and not element.attribute('title').nil?
-              @value = element.attribute('title').value.strip
-            elsif (element.name == 'data' or element.name == 'input') and not element.attribute('value').nil?
-              @value = element.attribute('value').value.strip
-            else
-              @value = render_text(element, base: @base)
-            end
-
+            @value =
+              if element.name == 'abbr' && !element.attribute('title').nil?
+                element.attribute('title').value.strip
+              elsif (element.name == 'data' || element.name == 'input') && !element.attribute('value').nil?
+                element.attribute('value').value.strip
+              else
+                render_text(element, base: @base)
+              end
           end
         end
-
       elsif element_type == 'dt'
         @value = Microformats::TimePropertyParser.new.parse(element, base: base, element_type: element_type, format_class_array: format_class_array, backcompat: backcompat)
-
       end
 
       @value
@@ -69,54 +66,34 @@ module Microformats
 
     def parse_value_class_pattern(element)
       @value_class_pattern_value = []
+
       parse_node(element.children)
+
       @value = @value_class_pattern_value.join unless @value_class_pattern_value.empty?
     end
 
     def parse_element(element)
       if value_title_classes(element).length >= 1
         @value_class_pattern_value << element.attribute('title').value.strip
-
       elsif value_classes(element).length >= 1
-        if element.name == 'img' or element.name == 'area' and not element.attribute('alt').nil?
-          @value_class_pattern_value << element.attribute('alt').value.strip
-        elsif element.name == 'data' and not element.attribute('value').nil?
-          @value_class_pattern_value << element.attribute('value').value.strip
-        elsif element.name == 'abbr' and not element.attribute('title').nil?
-          @value_class_pattern_value << element.attribute('title').value.strip
-        else
-          @value_class_pattern_value << element.text.strip
-        end
+        @value_class_pattern_value <<
+          if element.name == 'img' || element.name == 'area' && !element.attribute('alt').nil?
+            element.attribute('alt').value.strip
+          elsif element.name == 'data' && !element.attribute('value').nil?
+            element.attribute('value').value.strip
+          elsif element.name == 'abbr' && !element.attribute('title').nil?
+            element.attribute('title').value.strip
+          else
+            render_and_strip(element.text.strip)
+          end
       else
         p_classes = property_classes(element)
         p_classes = backcompat_property_classes(element) if @mode_backcompat
-        if p_classes.length == 0 and format_classes(element).length == 0
-          parse_node(element.children)
-        end
-      end
-    end
 
-    def render_text_and_replace_images(node, base: nil)
-      new_doc = Nokogiri::HTML(node.inner_html)
-      new_doc.xpath('//script').remove
-      new_doc.xpath('//style').remove
-      new_doc.traverse do |node|
-        if node.name == 'img' and not node.attribute('alt').nil?
-          node.replace(' ' + node.attribute('alt').value.to_s + ' ')
-        elsif node.name == 'img' and not node.attribute('src').nil?
-          absolute_url = Microformats::AbsoluteUri.new(node.attribute('src').value.to_s, base: @base).absolutize
-          node.replace(' ' + absolute_url  + ' ')
+        if p_classes.empty? && format_classes(element).empty?
+          parse_node(element.children)
         end
       end
-      new_doc.text.strip
     end
-
-    def render_text(node, base: nil)
-      new_doc = Nokogiri::HTML(node.inner_html)
-      new_doc.xpath('//script').remove
-      new_doc.xpath('//style').remove
-      new_doc.text.strip
-    end
-
   end
 end

data/lib/microformats/results/collection.rb

@@ -1,8 +1,6 @@
 module Microformats
-
-  #stub to get around the tests for now
+  # stub to get around the tests for now
   class Collection
-
     def initialize(hash)
       @hash = hash
     end
@@ -20,21 +18,13 @@ module Microformats
     end
 
     def to_s
-      if @hash['value']
-        return @hash['value']
-      else
-        super
-      end
+      @hash.to_s
     end
 
     def [](key)
       @hash[key]
     end
 
-    def value
-      @hash['value']
-    end
-
     def items
       @hash['items'].map do |item|
         ParserResult.new(item)
@@ -50,19 +40,19 @@ module Microformats
     end
 
     def respond_to?(sym, include_private = false)
-      has_item?(sym) || super(sym, include_private)
+      item?(sym) || super(sym, include_private)
     end
 
     def method_missing(sym, *args, &block)
-
       name = sym.to_s
-      name_dash = name.gsub('_', '-') if name.include? '_'
+      name_dash = name.tr('_', '-') if name.include?('_')
 
-      if not @hash['items'].nil?
+      unless @hash['items'].nil?
         result_hash = @hash['items'].select do |x|
-            x['type'].include?('h-' + name)
+          x['type'].include?('h-' + name)
         end
-        if result_hash.empty? and not name_dash.nil?
+
+        if result_hash.empty? && !name_dash.nil?
           result_hash = @hash['items'].select do |x|
             x['type'].include?('h-' + name_dash)
           end
@@ -71,51 +61,42 @@ module Microformats
 
       super(sym, *args, &block) if result_hash.empty?
 
-      if result_hash.is_a? Array
+      if result_hash.is_a?(Array)
         if args[0].nil?
-          result_hash = result_hash[0] #will return nil for an empty array
-
+          result_hash = result_hash[0] # will return nil for an empty array
         elsif args[0] == :all
           return result_hash.map do |x|
             ParserResult.new(x)
           end
-
         elsif args[0].to_i < result_hash.count
           result_hash = result_hash[args[0].to_i]
-
         else
-          result_hash = result_hash[0] #will return nil for an empty array
+          result_hash = result_hash[0] # will return nil for an empty array
         end
       end
 
-      if result_hash.nil? or result_hash.empty?
-        result_hash
-      elsif result_hash.is_a? Hash
-        ParserResult.new(result_hash)
-      else
-        result_hash
-      end
+      ParserResult.new(result_hash)
     end
 
     private
 
-    def has_item?(name)
+    def item?(name)
       name = name.to_s
-      name_dash = name.gsub('_', '-') if name.include? '_'
-      if not @hash['items'].nil?
+      name_dash = name.tr('_', '-') if name.include?('_')
+
+      unless @hash['items'].nil?
         result_hash = @hash['items'].select do |x|
           x['type'].include?('h-' + name)
         end
-        if result_hash.empty? and not name_dash.nil?
+
+        if result_hash.empty? && !name_dash.nil?
           result_hash = @hash['items'].select do |x|
             x['type'].include?('h-' + name_dash)
           end
         end
       end
 
-      not result_hash.empty?
+      !result_hash.empty?
     end
-
   end
 end
-

data/lib/microformats/results/parser_result.rb

@@ -1,8 +1,6 @@
 module Microformats
-
-  #stub to get around the tests for now
+  # stub to get around the tests for now
   class ParserResult
-
     def initialize(hash)
       @hash = hash
     end
@@ -20,11 +18,9 @@ module Microformats
     end
 
     def to_s
-      if @hash['value']
-        return @hash['value']
-      else
-        super
-      end
+      return @hash['value'] if @hash['value']
+
+      @hash.to_s
     end
 
     def [](key)
@@ -36,54 +32,46 @@ module Microformats
     end
 
     def properties
-      PropertySet.new( @hash['properties'])
+      PropertySet.new(@hash['properties'])
     end
 
     def respond_to?(sym, include_private = false)
-      has_key?(sym) || has_property?(sym) || super(sym, include_private)
+      key?(sym) || property?(sym) || super(sym, include_private)
     end
 
     def method_missing(sym, *args, &block)
-
       name = sym.to_s
-      name_dash = name.gsub('_', '-') if name.include? '_'
+      name_dash = name.tr('_', '-') if name.include?('_')
 
-      if not @hash[name].nil?
+      if !@hash[name].nil?
         result_hash = @hash[name]
-
-      elsif not @hash['properties'].nil? and not @hash['properties'][name].nil?
+      elsif !@hash['properties'].nil? && !@hash['properties'][name].nil?
         result_hash = @hash['properties'][name]
-
-      elsif not name_dash.nil? and not @hash[name_dash].nil?
+      elsif !name_dash.nil? && !@hash[name_dash].nil?
         result_hash = @hash[name_dash]
-
-      elsif not name_dash.nil? and not @hash['properties'].nil? and not @hash['properties'][name_dash].nil?
+      elsif !name_dash.nil? && !@hash['properties'].nil? && !@hash['properties'][name_dash].nil?
         result_hash = @hash['properties'][name_dash]
-
       else
         super(sym, *args, &block)
       end
 
-      if result_hash.is_a? Array
+      if result_hash.is_a?(Array)
         if args[0].nil?
-          result_hash = result_hash[0] #will return nil for an empty array
-
+          result_hash = result_hash[0] # will return nil for an empty array
         elsif args[0] == :all
           return result_hash.map do |x|
             ParserResult.new(x)
           end
-
         elsif args[0].to_i < result_hash.count
           result_hash = result_hash[args[0].to_i]
-
         else
-          result_hash = result_hash[0] #will return nil for an empty array
+          result_hash = result_hash[0] # will return nil for an empty array
         end
       end
 
-      if result_hash.nil? or result_hash.empty?
+      if result_hash.nil? || result_hash.empty?
         result_hash
-      elsif result_hash.is_a? Hash
+      elsif result_hash.is_a?(Hash)
         ParserResult.new(result_hash)
       else
         result_hash
@@ -92,20 +80,20 @@ module Microformats
 
     private
 
-    def has_key?(name)
+    def key?(name)
       name = name.to_s
-      name_dash = name.gsub('_', '-') if name.include? '_'
+      name_dash = name.tr('_', '-') if name.include?('_')
 
-      not @hash[name].nil? or not @hash[name_dash].nil?
+      !@hash[name].nil? || !@hash[name_dash].nil?
     end
-    
-    def has_property?(name)
+
+    def property?(name)
       name = name.to_s
-      name_dash = name.gsub('_', '-') if name.include? '_'
+      name_dash = name.tr('_', '-') if name.include?('_')
+
       return false if @hash['properties'].nil?
-      not @hash['properties'][name].nil? or not @hash['properties'][name_dash].nil?
-    end
 
+      !@hash['properties'][name].nil? || !@hash['properties'][name_dash].nil?
+    end
   end
 end
-

data/lib/microformats/results/property_set.rb

@@ -1,8 +1,6 @@
 module Microformats
-
-  #stub to get around the tests for now
-  class PropertySet 
-
+  # stub to get around the tests for now
+  class PropertySet
     def initialize(hash)
       @hash = hash
     end
@@ -23,65 +21,60 @@ module Microformats
       @hash[key]
     end
 
-    def respond_to?(sym, include_private = false)
-      has_key?(sym) || super(sym, include_private)
+    def to_s
+      @hash.to_s
     end
 
+    def respond_to?(sym, include_private = false)
+      key?(sym) || super(sym, include_private)
+    end
 
     def method_missing(mname, *args, &block)
+      if respond_to?(mname)
+        result_hash = val?(mname)
 
-      if respond_to? mname
-        result_hash = get_val? mname
-        if result_hash.is_a? Array
+        if result_hash.is_a?(Array)
           if args[0].nil?
-            result_hash = result_hash[0] #will return nil for an empty array
-
+            result_hash = result_hash[0] # will return nil for an empty array
           elsif args[0] == :all
             return result_hash.map do |x|
               ParserResult.new(x)
             end
-
           elsif args[0].to_i < result_hash.count
             result_hash = result_hash[args[0].to_i]
-
           else
-            result_hash = result_hash[0] #will return nil for an empty array
+            result_hash = result_hash[0] # will return nil for an empty array
           end
         end
 
-        if result_hash.is_a? Hash
+        if result_hash.is_a?(Hash)
           ParserResult.new(result_hash)
         else
           result_hash
         end
       else
-         super(mname, *args, &block)
+        super(mname, *args, &block)
       end
-
     end
 
     private
 
-    def has_key?(name)
+    def key?(name)
       name = name.to_s
-      name_dash = name.gsub('_', '-') if name.include? '_'
-      not @hash[name].nil? or  not @hash[name_dash].nil? 
+      name_dash = name.tr('_', '-') if name.include?('_')
+
+      !@hash[name].nil? || !@hash[name_dash].nil?
     end
 
-    def get_val?(name)
+    def val?(name)
       name = name.to_s
-      name_dash = name.gsub('_', '-') if name.include? '_'
-
-      if not @hash[name].nil?
-        result_hash = @hash[name]
+      name_dash = name.tr('_', '-') if name.include?('_')
 
-      elsif not @hash[name_dash].nil?
-        result_hash = @hash[name_dash]
-      else
-        nil
+      if !@hash[name].nil?
+        @hash[name]
+      elsif !@hash[name_dash].nil?
+        @hash[name_dash]
       end
     end
-
   end
 end
-