flareshow 0.3.4 → 0.3.6

data/Flareshow.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{flareshow}
-  s.version = "0.3.4"
+  s.version = "0.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Will Bailey"]
@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
      "test/flareshow_test.rb",
      "test/test_helper.rb"
   ]
-  s.homepage = %q{http://github.com/willbailey/flareshow}
+  s.homepage = %q{http://github.com/zenbe/flareshow}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{flareshow}
@@ -65,12 +65,14 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<curb>, ["> 0"])
       s.add_runtime_dependency(%q<facets>, ["> 0"])
       s.add_runtime_dependency(%q<uuid>, ["> 0"])
+      s.add_runtime_dependency(%q<nokogiri>, ["> 0"])
     else
       s.add_dependency(%q<thoughtbot-shoulda>, ["> 0"])
       s.add_dependency(%q<json>, ["> 0"])
       s.add_dependency(%q<curb>, ["> 0"])
       s.add_dependency(%q<facets>, ["> 0"])
       s.add_dependency(%q<uuid>, ["> 0"])
+      s.add_dependency(%q<nokogiri>, ["> 0"])
     end
   else
     s.add_dependency(%q<thoughtbot-shoulda>, ["> 0"])
@@ -78,5 +80,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<curb>, ["> 0"])
     s.add_dependency(%q<facets>, ["> 0"])
     s.add_dependency(%q<uuid>, ["> 0"])
+    s.add_dependency(%q<nokogiri>, ["> 0"])
   end
 end

data/Rakefile

@@ -8,13 +8,14 @@ begin
     gem.summary = %Q{a ruby gem for interacting with the shareflow collaboration service}
     gem.description = %Q{a ruby gem for interacting with the shareflow collaboration service by Zenbe}
     gem.email = "will.bailey@gmail.com"
-    gem.homepage = "http://github.com/willbailey/flareshow"
+    gem.homepage = "http://github.com/zenbe/flareshow"
     gem.authors = ["Will Bailey"]
     gem.add_development_dependency "thoughtbot-shoulda", "> 0"
     gem.add_dependency "json", "> 0"
     gem.add_dependency "curb", "> 0"
     gem.add_dependency "facets", "> 0"
     gem.add_dependency "uuid", "> 0"
+    gem.add_dependency "nokogiri", "> 0"
     gem.rubyforge_project = "flareshow"
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.6

data/lib/comment.rb

@@ -16,13 +16,25 @@ class Comment < Flareshow::Resource
   
   # get the post for this comment
   def post
-    Post.first(:id => post_id)
+    post = Post.get_from_cache(reply_to)
+    post || Post.first(:id => reply_to)
   end
   
   # user for this post
   def user
     return User.current unless user_id
-    User.first({:id => user_id})
+    user = User.get_from_cache(user_id)
+    user || User.first({:id => user_id})
+  end
+  
+  # persisted files for this post
+  def files
+    cached = FileAttachment.list_cache
+    files = cached.select{|f|f.post_id == id}
+  end
+  
+  def content
+    Nokogiri::HTML::Document.new.fragment(get("content")).to_s
   end
   
 end

data/lib/file_attachment.rb

@@ -28,13 +28,17 @@ class FileAttachment < Flareshow::Resource
   # post for this file
   def post
     return false unless post_id
-    Post.find({:id => post_id})
+    post = Post.get_from_cache(post_id)
+    post ||= Comment.get_from_cache(post_id)
+    post ||= Post.find({:id => post_id})
+    post ||= Comment.find({:id => post_id})
   end
   
-  # get the user for this file
+  # user for this post
   def user
-    p = post && post.first
-    p.user && p.user.first
+    return User.current unless user_id
+    user = User.get_from_cache(user_id)
+    user || User.first({:id => user_id})
   end
   
 end

data/lib/flareshow.rb

@@ -8,6 +8,7 @@ require 'facets/dictionary'
 require 'uuid'
 require 'mime/types'
 require 'cgi'
+require 'nokogiri'
 
 # std lib
 require 'net/http'

data/lib/post.rb

@@ -40,14 +40,21 @@ class Post < Flareshow::Resource
     self.files = []
   end
   
+  def content
+    Nokogiri::HTML::Document.new.fragment(get("content")).to_s
+  end
+  
   # persisted files for this post
   def files
-    FileAttachment.find({:post_id => id}) || []
+    cached = FileAttachment.list_cache
+    files = cached.select{|f|f.post_id == id}
   end
   
   # comments for this post
   def comments
-    Comment.find({:post_id => id})
+    cached = Comment.list_cache
+    comments = cached.select{|c|c.reply_to == id}
+    comments
   end
   
   # user for this post

data/lib/resource.rb

@@ -21,7 +21,7 @@ class Flareshow::Resource
     
     # list out the instances in memory
     def list_cache
-      store.list_resource(resource_key)
+      store.list_resource(resource_key).map{|k,v|v}
     end
     
     # store the response resources in the cache

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: flareshow
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
+  version: 0.3.6
 platform: ruby
 authors: 
 - Will Bailey
@@ -62,6 +62,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: a ruby gem for interacting with the shareflow collaboration service by Zenbe
 email: will.bailey@gmail.com
 executables: []
@@ -99,7 +109,7 @@ files:
 - test/flareshow_test.rb
 - test/test_helper.rb
 has_rdoc: true
-homepage: http://github.com/willbailey/flareshow
+homepage: http://github.com/zenbe/flareshow
 licenses: []
 
 post_install_message: