hentry_consumer 0.3.1 → 0.3.2

data/README.md

@@ -22,7 +22,7 @@ serialized h-entry objects. The returned Object structure looks something like t
 
 ## Current Version
 
-0.3.0
+0.3.2
 
 
 ## Requirements

data/lib/hentry_consumer/h_card.rb

@@ -15,7 +15,7 @@ module HentryConsumer
             :url   => self.url
           }
         }]
-      }
+      }.to_json(a)
     end
     
   end

data/lib/hentry_consumer/h_entry.rb

@@ -21,14 +21,14 @@ module HentryConsumer
           :properties => {
             :name       => self.name,
             :categories => self.categories,
-            :author => self.author.map(&:to_json),
+            :author => self.author,
             :content    => self.content,
             :bookmark   => self.bookmark,
             :published_at  => self.published_at,
             :summary    => self.summary
           }
         }]
-      }
+      }.to_json(a)
     end
 
     private

data/lib/hentry_consumer/h_feed.rb

@@ -5,7 +5,7 @@ module HentryConsumer
       @entries = []
       parse_html(html)
     end
-    
+
     def parse_html(html)
       doc = Nokogiri::HTML(open(html).read)
       doc.css(".h-entry").each do |mf_entry|
@@ -13,19 +13,19 @@ module HentryConsumer
         self.entries << entry
       end
     end
-    
+
     def to_html
       self.entries.collect(&:to_html).join
     end
-    
+
     def to_json(*a)
-      json = {:items => 
+      json = {:items =>
         [{
           :type => ["h-feed"],
-          :properties => {:entries => self.entries.map(&:to_json)}
+          :properties => {:entries => self.entries}
         }]
-      }
+      }.to_json(a)
     end
-    
+
   end
 end

data/lib/hentry_consumer/version.rb

@@ -1,3 +1,3 @@
 module HentryConsumer
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/lib/hentry_consumer/format_rules_spec.rb

@@ -17,11 +17,11 @@ 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

data/spec/lib/hentry_consumer/h_entry_spec.rb

@@ -59,17 +59,17 @@ describe HentryConsumer::HEntry do
   end
   
   describe "json" do
-    let(:json) { entry.to_json }
+    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].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][:summary].should be_an_instance_of Array }
+    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"].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"]["summary"].should be_an_instance_of Array }
   end
 
 end

data/spec/lib/hentry_consumer/h_feed_spec.rb

@@ -2,15 +2,15 @@ require 'hentry_consumer'
 
 describe HentryConsumer::HFeed do
   let(:feed) { HentryConsumer.parse(File.open("spec/support/example.html")) }
-  
+
   describe "to json" do
-    let(:json) { feed.to_json }
-    
-    it { json[:items].first[:type].should include 'h-feed'}
-    it { json[:items].first[:properties][:entries].should be_an_instance_of Array }
-    it { json[:items].first[:properties][:entries].first[:items].should be_an_instance_of Array }
-    it { json[:items].first[:properties][:entries].first[:items].first[:type].should include "h-entry" }
-    
+    let(:json) { JSON.parse(feed.to_json) }
+
+    it { json["items"].first["type"].should include 'h-feed'}
+    it { json["items"].first["properties"]["entries"].should be_an_instance_of Array }
+    it { json["items"].first["properties"]["entries"].first["items"].should be_an_instance_of Array }
+    it { json["items"].first["properties"]["entries"].first["items"].first["type"].should include "h-entry" }
+
   end
   # <article class=\"h-entry\"><h1 class=\"p-name\">Senior Cat Living</h1>
   # <article class=\"h-entry\">\n    <h1 class=\"p-name\">Senior Cat Living</h1>\n
@@ -23,5 +23,5 @@ describe HentryConsumer::HFeed do
       end
     end
   end
-  
+
 end

data/spec/lib/hentry_consumer_spec.rb

@@ -1,19 +1,19 @@
 require 'hentry_consumer'
 
 describe HentryConsumer do
-  
+
   it { should respond_to :parse }
-  
+
   describe "parsing a file" do
     let(:result) { HentryConsumer.parse(File.open("spec/support/example.html")) }
-    
+
     it "should be a HentryConsumer object" do
       result.should be_an_instance_of HentryConsumer::HFeed
     end
-    
+
     it "should have 2 enties" do
       result.entries.size.should eq 2
     end
-    
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hentry_consumer
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-18 00:00:00.000000000 Z
+date: 2012-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri