greedy 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/greedy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{greedy}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Weiland"]
-  s.date = %q{2010-07-24}
+  s.date = %q{2010-07-25}
   s.description = %q{With greedy, you can access and manipulate the reading list for a Google Reader account via the API. Inspired by John Nunemaker's GoogleReader gem.}
   s.email = %q{jeremy6d@gmail.com}
   s.extra_rdoc_files = [

data/lib/greedy/connection.rb

@@ -1,8 +1,3 @@
-require 'gdata'
-require 'nokogiri'
-require 'json'
-require 'cgi'
-
 module Greedy
   class Connection
     BASE_URL = "http://www.google.com/reader/api/0/"

data/lib/greedy/entry.rb

@@ -2,22 +2,18 @@ module Greedy
   class Entry
     attr_reader :title, :author, :href, :google_item_id, :feed,
                 :categories, :body, :truncated_body, :stream
-    
-    # Entry States
-    # read   A read item will have the state read
-    # kept-unread  Once you've clicked on "keep unread", an item will have the state kept-unread
-    # fresh  When a new item of one of your feeds arrive, it's labeled as fresh. When (need to find what remove fresh label), the fresh label disappear.
-    # starred  When your mark an item with a star, you set it's starred state
-    # broadcast  When your mark an item as being public, you set it's broadcast state
-    # reading-list   All you items are flagged with the reading-list state. To see all your items, just ask for items in the state reading-list
-    # tracking-body-link-used  Set if you ever clicked on a link in the description of the item.
-    # tracking-emailed   Set if you ever emailed the item to someone.
-    # tracking-item-link-used  Set if you ever clicked on a link in the description of the item.
-    # tracking-kept-unread   Set if you ever mark your read item as unread.
+
     module States
-      ALL = ["read", "kept-unread", "fresh", "starred", "broadcast", 
-             "reading-list", "tracking-body-link-used", "tracking-emailed",
-             "tracking-item-link-used", "tracking-kept-unread"]
+      ALL = ["read",                    # A read item will have the state read
+             "kept-unread",             # Once you've clicked on "keep unread", an item will have the state kept-unread
+             "fresh",                   # When a new item of one of your feeds arrive, it's labeled as fresh. When (need to find what remove fresh label), the fresh label disappear.
+             "broadcast",               # When your mark an item as being public, you set it's broadcast state
+             "reading-list",            # All you items are flagged with the reading-list state. To see all your items, just ask for items in the state reading-list
+             "tracking-body-link-used", # Set if you ever clicked on a link in the description of the item.
+             "tracking-emailed",        # Set if you ever emailed the item to someone.
+             "tracking-item-link-used", # Set if you ever clicked on a link in the description of the item.
+             "tracking-kept-unread"     # Set if you ever mark your read item as unread.
+            ]
       ALL.each do |name|
         const_set name.upcase.gsub("-", "_"), "user/-/state/com.google/#{name}"
       end
@@ -26,7 +22,7 @@ module Greedy
     DEFAULT_CHAR_COUNT = 2000
   
     # Instantiate and normalize a new Google Reader entry
-    def initialize(item, stream)
+    def initialize(item, stream = nil)
       @stream = stream
       raise "Title is nil" unless item['title']
       @title = normalize item['title']
@@ -35,9 +31,11 @@ module Greedy
       @google_item_id = item['id']
       @published = item['published']
       @updated = item['updated']
-      body = get_body(item)
+      puts "error rendering body for hash\n#{item.inspect}" unless set_body!(item)
       @feed = Greedy::Feed.new(item['origin'])
     end
+    
+    def
   
     # Provide the entry time by which the entry should be sorted amongst other entries
     def sort_by_time
@@ -55,8 +53,16 @@ module Greedy
     end
   
     # Set the body of the entry as normalized text and create a truncated version
-    def body=(text, char_count = DEFAULT_CHAR_COUNT)
-      @body = normalize(text)
+    def set_body!(in_hash)
+      raw_text = begin
+        key = %w(content summary container).detect { |key| in_hash[key] }
+        in_hash[key]['content']
+      rescue
+        return false  
+      end
+      
+      @body = normalize raw_text
+      
       doc = Nokogiri::XML::DocumentFragment.parse(@body)
       count = index = 0
       truncated = false
@@ -64,14 +70,14 @@ module Greedy
       doc.children.each do |child|
         count = count + child.content.length.to_i
         index = index + 1
-        if count > char_count
+        if count > DEFAULT_CHAR_COUNT
           truncated = true
           break
         end
       end
 
       @truncated_body = doc.children.slice(0, index).to_html
-      @body
+      true
     end
     
     def mark_as_read!
@@ -83,13 +89,6 @@ module Greedy
     end
   
   protected
-
-    def get_body(item_hash)
-      container = item_hash['content'] || item_hash['summary'] || item_hash['description']
-      return container['content']
-    rescue
-      nil
-    end
   
     def normalize(text)
       return text if text.nil?

data/lib/greedy/stream.rb

@@ -1,8 +1,3 @@
-require 'gdata'
-require 'nokogiri'
-require 'json'
-require 'cgi'
-
 module Greedy
   class Stream
     BASE_PATH = "stream/contents/"
@@ -39,7 +34,6 @@ module Greedy
     end
     
     def change_state_for(entry, state)
-      debugger
       @connection.post((BASE_PATH + CHANGE_STATE_PATH), { :a => state,
                                                           :i => entry.google_item_id,
                                                           :s => entry.feed.google_feed_id })

data/lib/greedy.rb

@@ -1,11 +1,14 @@
 $:.unshift(File.join(File.dirname(__FILE__), %w[lib]))
 
+puts "\n\nLOCAL VERSION\n\n"
+
 require "rubygems"
 
 require 'gdata'
 require 'nokogiri'
 require 'json'
 require 'cgi'
+require 'ruby-debug'
 
 require 'greedy/connection'
 require 'greedy/stream'

data/test/test_entry.rb

@@ -16,8 +16,14 @@ class TestEntry < Test::Unit::TestCase
       @entry.href.should == "http://feeds.officer.com/~r/officerrss/top_news_stories/~3/UmVWa_XwtRc/article.jsp"
     end
     
+    should "set body correctly" do
+      @entry.body.should == "Jeremy Hernandez, 20, was arrested after he tried to pull over an undercover police officer.<img src=\"http://feeds.feedburner.com/~r/officerrss/top_news_stories/~4/UmVWa_XwtRc\" height=\"1\" width=\"1\">"
+      @entry.truncated_body.should == "Jeremy Hernandez, 20, was arrested after he tried to pull over an undercover police officer.<img src=\"http://feeds.feedburner.com/~r/officerrss/top_news_stories/~4/UmVWa_XwtRc\" height=\"1\" width=\"1\">"
+    end
+    
     should "set truncated_body correctly" do
-      @entry.body                   = File.open("test/fixtures/lorem_ipsum.txt").read
+      @raw_entry['summary']['content'] = File.open("test/fixtures/lorem_ipsum.txt").read
+      @entry = Greedy::Entry.new(@raw_entry, @stream)
       @entry.truncated_body.should == "<p>Lorem ipsum putant alterum in ius. Ex partiendo honestatis ius, ex ignota lucilius eam. Nec modo utroque mentitum id, id erant adipisci democritum qui. Veniam altera vim ex. In nullam constituto mei, singulis electram adipiscing eu nam. Eos debet impedit perpetua ad, movet luptatum sit at.  </p>  <p> Ut sale utinam has, at eam enim fabellas probatus. Id sea autem nostro maiorum, ridens cotidieque an eam. Dolore corpora pro cu, eu quodsi probatus deseruisse sea. Eu ullum oratio voluptatum vim.  </p>  <p> Quo labore iisque erroribus ne, homero doctus ex usu. His dicant aliquam verterem in. Eum id zzril altera. Per ei novum perpetua salutandi, noluisse scaevola sententiae an eam.  </p>  <p> Mea no noluisse persequeris, ea eos mazim possit salutandi, aeque malorum eloquentiam usu te. Et vidit nostrum pertinax sea, eros voluptua officiis in vis. Te dolorum molestie inciderint est. Mea ei populo quaeque euripidis, invenire democritum omittantur et mel. Nullam epicurei ex nam, no mea cetero disputationi. Ne utinam feugait sed. No impedit appareat mei, qui at facete aperiam comprehensam, omnes complectitur mea id.  </p>  <p> Eum nostrud laoreet invidunt ne, puto elitr per ex. Modo accusamus ex eos. Sit cu dicam nominati, animal regione eam at. Prima tation suavitate ea eam. Sea error perpetua consetetur ex, duo inani decore dissentias ne. Quidam inimicus vis ad, modo duis et pro, id porro dicunt maluisset eos.  </p>  <p> In elitr ceteros laboramus vis, cu meliore scribentur eum. Ne graece corpora vim, in zzril tamquam persecuti pro. Mel dicit eripuit ad, fugit rationibus consectetuer cu cum. Qui mandamus adipiscing in. Ei duo meis liber, his admodum tincidunt ad. Mea ut detracto iracundia.  </p>  <p> Vel altera labore ponderum an, ea has sapientem gloriatur, ad vim prompta eleifend. Ut per nostro alterum noluisse, in eruditi nostrum vim. No fugit virtute alterum mei, vis ne autem clita. Duo in sonet epicurei expetenda, ea movet erroribus ius, ne usu nihil nobis. Legere liberavisse his ne, pri cibo invenire cotidieque ut. No elaboraret referrentur sit, sea ne iuvaret oporteat. Eum cu quidam maiorum, est ex indoctum rationibus voluptatibus.  </p>"
     end
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: greedy
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Jeremy Weiland
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-24 00:00:00 -04:00
+date: 2010-07-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency