jeena/microformats2
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Merge pull request #12 from tommorris/rels-alternates

Browse source 
Added support for rel and alternates
This commit is contained in:
Jessica Lynn Suttles 2013-10-03 20:38:57 -07:00
commit 71ec812511
8 changed files with 97 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -19,12 +19,12 @@ Implemented:
* nested properties * nested properties
* nested microformat with associated property * nested microformat with associated property
* dynamic creation of properties * dynamic creation of properties
* [rel](http://microformats.org/wiki/rel)
Not Implemented: Not Implemented:
* [normalize u-* property values](http://microformats.org/wiki/microformats2-parsing-faq#normalizing_u-.2A_property_values) * [normalize u-* property values](http://microformats.org/wiki/microformats2-parsing-faq#normalizing_u-.2A_property_values)
* nested microformat without associated property * nested microformat without associated property
* [rel](http://microformats.org/wiki/rel)
* [value-class-pattern](http://microformats.org/wiki/value-class-pattern) * [value-class-pattern](http://microformats.org/wiki/value-class-pattern)
* [include-pattern](http://microformats.org/wiki/include-pattern) * [include-pattern](http://microformats.org/wiki/include-pattern)
* recognition of [vendor extensions](http://microformats.org/wiki/microformats2#VENDOR_EXTENSIONS) * recognition of [vendor extensions](http://microformats.org/wiki/microformats2#VENDOR_EXTENSIONS)

53
lib/microformats2/collection.rb
View file

@ -2,13 +2,25 @@ module Microformats2
class Collection class Collection
attr_reader :all attr_reader :all
def initialize(element) def initialize(element, url = nil)
@element = element @element = element
@base = nil
if url != nil
@base = url
end
if @element.search("base").size > 0
@base = @element.search("base")[0].attribute("href")
end
@format_names = [] @format_names = []
@rels = {}
@alternates = []
end end
def parse def parse
all all
parse_rels
self self
end end
@ -29,10 +41,12 @@ module Microformats2
end end
def to_hash def to_hash
hash = { items: [] } hash = { items: [], rels: @rels }
all.each do |format| all.each do |format|
hash[:items] << format.to_hash hash[:items] << format.to_hash
end end
hash[:alternates] = @alternates unless @alternates.nil? || @alternates.empty?
hash hash
end end
@ -67,5 +81,40 @@ module Microformats2
send("#{mn.pluralize}=", [value]) send("#{mn.pluralize}=", [value])
end end
end end
def parse_rels
@element.search("*[@rel]").each do |rel|
rel_values = rel.attribute("rel").text.split(" ")
if rel_values.member?("alternate")
alternate_inst = {}
alternate_inst["url"] = absolutize(rel.attribute("href").text)
alternate_inst["rel"] = (rel_values - ["alternate"]).join(" ")
unless rel.attribute("media").nil?
alternate_inst["media"] = rel.attribute("media").text
end
unless rel.attribute("hreflang").nil?
alternate_inst["hreflang"] = rel.attribute("hreflang").text
end
unless rel.attribute("type").nil?
alternate_inst["type"] = rel.attribute("type").text
end
@alternates << alternate_inst
else
rel_values.each do |rel_value|
@rels[rel_value] = [] unless @rels.has_key?(rel_value)
@rels[rel_value] << absolutize(rel.attribute("href").text)
end
end
end
end
def absolutize(href)
if URI.parse(href).absolute?
href
else
URI.join(@base, href).to_s
end
end
end end
end end

14
spec/lib/microformats2/collection_spec.rb
View file

@ -176,6 +176,20 @@ describe Microformats2::Collection do
end end
end end
end end
describe "rels.html" do
before do
html = "spec/support/lib/microformats2/rels.html"
@collection = Microformats2.parse(html)
end
describe "#to_json" do
it "should match rels.js" do
json = "spec/support/lib/microformats2/rels.js"
json = open(json).read
JSON.parse(@collection.to_json).should == JSON.parse(json)
end
end
end
end end

3
spec/support/lib/microformats2/nested-format-with-property.js
View file

@ -11,5 +11,6 @@
}], }],
"name": ["Jessica Lynn Suttles"] "name": ["Jessica Lynn Suttles"]
} }
}] }],
"rels": {}
} }

3
spec/support/lib/microformats2/nested-property.js
View file

@ -4,6 +4,7 @@
"name": ["jlsuttles"], "name": ["jlsuttles"],
"nickname": ["jlsuttles"] "nickname": ["jlsuttles"]
} }
}] }],
"rels": {}
} }

12
spec/support/lib/microformats2/rels.html Normal file
View file

@ -0,0 +1,12 @@
<!DOCTYPE html>
<html>
<head>
<title>Rels Test</title>
<base href="http://example.org/">
<link rel="updates alternate" href="http://tantek.com/updates.atom" type="application/atom+xml" />
</head>
<body>
<li><a rel="met friend" href="http://adactio.com/">Jeremy Keith</a></li>
<li><a rel="met friend" href="http://tantek.com/">Tantek Çelik</a></li>
</body>
</html>

13
spec/support/lib/microformats2/rels.js Normal file
View file

@ -0,0 +1,13 @@
{
"items": [],
"rels": {
"friend": ["http://adactio.com/", "http://tantek.com/"],
"met": ["http://adactio.com/", "http://tantek.com/"]
},
"alternates": [
{"url": "http://tantek.com/updates.atom",
"type": "application/atom+xml",
"rel": "updates"
}
]
}

3
spec/support/lib/microformats2/simple.js
View file

@ -6,5 +6,6 @@
"bday": ["1990-10-15"], "bday": ["1990-10-15"],
"content": ["<p>Vegan. Cat lover. Coder.</p>"] "content": ["<p>Vegan. Cat lover. Coder.</p>"]
} }
}] }],
"rels": {}
} }