hentry_consumer 0.1.3 → 0.2.0

data/README.md

@@ -5,13 +5,14 @@ serialized h-entry objects. The returned Object structure looks something like t
 
 - HFeed
   - HEntry
-    - name
-    - summary
-    - email
-    - content
-    - author
+    - [name]
+    - [summary]
+    - [email]
+    - [content]
+    - [author]
+    - bookmark
       - HCard
-    - categories
+    - [categories]
       - {}
   - HEntry
     - ...
@@ -21,7 +22,7 @@ serialized h-entry objects. The returned Object structure looks something like t
 
 ## Current Version
 
-0.1.3
+0.2.0
 
 
 ## Requirements

data/lib/hentry_consumer/format_rules.rb

@@ -1,13 +1,17 @@
 module HentryConsumer
   class FormatRules
     REQUIRED      = []
-    CAN_HAVE_MANY = [:url, :email, :author, :summary, :hcard]
+    UNIQUE = [:uid, :bookmark]
     class << self
       def required?(format)
         REQUIRED.include? format
       end
       def can_have_many?(format)
-        CAN_HAVE_MANY.include? format
+        !unique?(format)
+      end
+      
+      def unique?(format)
+        UNIQUE.include? format
       end
     end
   end

data/lib/hentry_consumer/h_entry.rb

@@ -3,7 +3,7 @@ module HentryConsumer
 
     attr_accessor :name, :categories, :author, :content, :bookmark, :published_at, :summary
     alias_method :authors, :author
-    
+
     def parse_elements(microformat)
       FormatClass.each do |letter|
         microformat.css(">*[class*=#{letter}-]").each do |attrs|
@@ -13,17 +13,17 @@ module HentryConsumer
         end
       end
     end
-    
+
     def to_json(*a)
-      {:items => 
+      {:items =>
         [{
           :type => ["h-entry"],
           :properties => {
             :name       => self.name,
             :categories => self.categories,
             :author => self.author,
-            :content    => self.content, 
-            :bookmark   => self.bookmark, 
+            :content    => self.content,
+            :bookmark   => self.bookmark,
             :published_at  => self.published_at,
             :summary    => self.summary
           }
@@ -34,21 +34,22 @@ module HentryConsumer
     private
 
     def parse_element(microformat, klass)
-      case klass
+      key, value = case klass
       when 'p-author'
-        self.assign_value(symbolize_class(klass), HCard.new(microformat))
+        [symbolize_class(klass), HCard.new(microformat)]
       when 'p-category'
         self.categories ||= {}
         self.categories[microformat.text.gsub('\n', " ").strip] = microformat["href"]
       when 'e-content'
-        self.content = parse_content(microformat)
+        [:content, parse_content(microformat)]
       when'dt-published'
-        self.published_at = microformat["datetime"]
+        [:published_at, microformat["datetime"]]
       when "u-uid"
-        self.bookmark = microformat["href"]
+        [:bookmark, microformat['href']]
       else
-        self.assign_value(symbolize_class(klass), microformat.text.gsub('\n', " ").strip)
+        [symbolize_class(klass), microformat.text.gsub('\n', " ").strip]
       end
+      assign_value(key, value)
     end
 
     def parse_content(microformat)

data/lib/hentry_consumer/version.rb

@@ -1,3 +1,3 @@
 module HentryConsumer
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/spec/lib/hentry_consumer/format_rules_spec.rb

@@ -3,7 +3,7 @@ require 'hentry_consumer'
 describe HentryConsumer::FormatRules do
   before do
     stub_const("HentryConsumer::FormatRules::REQUIRED", [:url])
-    stub_const("HentryConsumer::FormatRules::CAN_HAVE_MANY", [:url])
+    stub_const("HentryConsumer::FormatRules::UNIQUE", [:uid])
   end
 
   it "stubs correctly" do
@@ -17,5 +17,13 @@ describe HentryConsumer::FormatRules do
   it "can have many" do
     HentryConsumer::FormatRules.can_have_many?(:url).should be_true
   end
+  
+  it "can't have many" do
+    HentryConsumer::FormatRules.can_have_many?(:uid).should be_false
+  end
+  
+  it "is unique" do
+    HentryConsumer::FormatRules.unique?(:uid).should be_true
+  end
 
 end

data/spec/lib/hentry_consumer/h_card_spec.rb

@@ -3,14 +3,14 @@ require 'hentry_consumer'
 describe HentryConsumer::HEntry do
   before do
     stub_const("HentryConsumer::FormatRules::REQUIRED", [:url, :email])
-    stub_const("HentryConsumer::FormatRules::CAN_HAVE_MANY", [:url, :email, :author])
+    stub_const("HentryConsumer::FormatRules::UNIQUE", [:uid, :bookmark])
   end
 
   let(:result) { HentryConsumer.parse(File.open("spec/support/example.html")) }
   let(:entry) { result.entries.first }
   subject { entry.authors.first }
 
-  its(:name)  { should eq "Jessica Suttles"}
+  its(:name)  { should eq ["Jessica Suttles"]}
 
   its(:emails) { should have(1).things }
   its(:urls) { should have(2).things }

data/spec/lib/hentry_consumer/h_entry_spec.rb

@@ -9,15 +9,15 @@ describe HentryConsumer::HEntry do
   end
 
   it "has a name" do
-    entry.name.should eq "Senior Cat Living"
+    entry.name.should eq ["Senior Cat Living"]
   end
 
   it "has a summary" do
-    entry.summary.first.should eq "Signed up with 3 locations"
+    entry.summary.should eq ["Signed up with 3 locations"]
   end
 
   it "has a time" do
-    entry.published_at.should eq "2012-08-26 20:09-0700"
+    entry.published_at.should eq ["2012-08-26 20:09-0700"]
   end
 
   it "has a bookmark" do
@@ -45,30 +45,30 @@ describe HentryConsumer::HEntry do
     let(:content) { entry.content }
 
     it "should be a blob of html" do
-      content.should match /Locations/
+      content.first.should match /Locations/
     end
 
     it "should be a blob of html" do
-      content.should match /\<dt\>/
+      content.first.should match /\<dt\>/
     end
 
     it "should be a blob of html" do
-      content.should_not match /time/
+      content.first.should_not match /time/
     end
 
   end
-  
+
   describe "json" do
     let(:json) { JSON.parse(entry.to_json) }
-    
+
     it { json["items"].should be_an_instance_of Array }
     it { json["items"].first["type"].should include 'h-entry'}
-    it { json["items"].first["properties"]["name"].should eq 'Senior Cat Living'}
-    it { json["items"].first["properties"]["content"].should match /Locations/ }
+    it { json["items"].first["properties"]["name"].should eq ['Senior Cat Living']}
+    it { json["items"].first["properties"]["content"].first.should match /Locations/ }
     it { json["items"].first["properties"]["author"].should be_an_instance_of Array }
     it { json["items"].first["properties"]["author"].first["items"].first["type"].should include "h-card" }
     it { json["items"].first["properties"]["bookmark"].should eq "http://g5.com/feed/entries/2012-08-26-20-09-0700" }
-    it { json["items"].first["properties"]["published_at"].should eq "2012-08-26 20:09-0700" }
+    it { json["items"].first["properties"]["published_at"].should eq ["2012-08-26 20:09-0700"] }
     it { json["items"].first["properties"]["summary"].should be_an_instance_of Array }
   end
 

metadata

@@ -1,60 +1,55 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: hentry_consumer
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
 platform: ruby
-authors: 
+authors:
 - Bookis Smuin
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-10-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A hATOM feed parser
-email: 
+email:
 - vegan.bookis@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Guardfile
@@ -78,38 +73,30 @@ files:
 - spec/support/example.html
 homepage: https://github.com/G5/hentry_consumer
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Takes in HTML containing an h-feed classed element and returns serialized data based on the Microformat 2 hEntry specs
-test_files: 
+summary: Takes in HTML containing an h-feed classed element and returns serialized
+  data based on the Microformat 2 hEntry specs
+test_files:
 - spec/lib/hentry_consumer/format_rules_spec.rb
 - spec/lib/hentry_consumer/h_card_spec.rb
 - spec/lib/hentry_consumer/h_entry_spec.rb