monkeyhelper-muddyit_fu 0.2.2 → 0.2.3

data/README.rdoc

@@ -32,20 +32,26 @@ can be stored in a yml file, an example of which is provided below.
   access_token: "YOUR_ACCESS_TOKEN"
   access_token_secret: "YOUR_ACCESS_TOKEN_SECRET"
 
-== Retrieving a site
+== Retrieving all sites
 
   require 'muddyit_fu'
   muddyit = Muddyit.new('muddyit.yml')
-  muddyit.sites.each do |site|
+  muddyit.sites.find(:all).each do |site|
     puts "#{site.label} : #{site.token}"
   end
 
+== Retrieving a single site
+
+  require 'muddyit_fu'
+  muddyit = Muddyit.new('muddyit.yml')
+  puts muddyit.sites.find('a0ret4').label
+
 == Categorisation request
 
   require 'muddyit_fu'
   muddyit = Muddyit.new('muddyit.yml')
   site = muddyit.sites.first
-  site.pages.categorise({:identifier => 'http://news.bbc.co.uk/1/hi/uk_politics/8011321.stm'}, {:minium_confidence => 0.2})
+  site.pages.create({:identifier => 'http://news.bbc.co.uk/1/hi/uk_politics/8011321.stm'}, {:minium_confidence => 0.2})
 
 == View categorised pages
 
@@ -55,10 +61,10 @@ can be stored in a yml file, an example of which is provided below.
                          :access_token => 'ccc',
                          :access_token_secret => 'ddd')
   site = muddyit.sites.first
-  site.pages.index do |page|
+  site.pages.find(:all) do |page|
     puts page.title
-    page.results.each do |result|
-      puts result.uri
+    page.entities.each do |entity|
+      puts entity.uri
     end
   end
 
@@ -66,7 +72,7 @@ can be stored in a yml file, an example of which is provided below.
 
   require 'muddyit_fu'
   muddyit = Muddyit.new('muddyit.yml')
-  site = muddyit.sites.first
+  site = muddyit.sites.find(:all).first
   site.pages.find_by_entity('http://dbpedia.org/resource/Gordon_Brown') do |page|
     puts page.identifier
   end
@@ -75,8 +81,8 @@ can be stored in a yml file, an example of which is provided below.
 
   require 'muddyit_fu'
   muddyit = Muddyit.new('muddyit.yml')
-  site = muddyit.sites.first
-  site.entities.related('http://dbpedia.org/resource/Gordon_Brown').each do |entity|
+  site = muddyit.sites.find(:all).first
+  site.entities.find_related('http://dbpedia.org/resource/Gordon_Brown').each do |entity|
     puts "#{entity.uri} : #{entity.confidence}"
   end
 
@@ -84,20 +90,19 @@ can be stored in a yml file, an example of which is provided below.
 
   require 'muddyit_fu'
   muddyit = Muddyit.new('muddyit.yml')
-  site = muddyit.sites.first
-  page = site.pages.find('http://news.bbc.co.uk/1/hi/uk_politics/7878418.stm')
+  site = muddyit.sites.find(:all).first
+  page = site.pages.find(:all, :uri => 'http://news.bbc.co.uk/1/hi/uk_politics/7878418.stm').first
   puts "Our page : #{page.title}\n\n"
   page.related_content.each do |results|
     puts "#{results[:page].title} #{results[:count]}"
   end
 
-== Authorising clients using irb
+== Obtaining oauth access credentials
 
-See http://gist.github.com/178993 for details on how to obtain access credentials.
+See http://gist.github.com/178993
 
 == Contact
 
   Author: Rob Lee
   Email: robl [at] monkeyhelper.com
   Main Repository: http://github.com/monkeyhelper/muddyit_fu/tree/master
-

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/muddyit/sites/entities/entity.rb

@@ -14,7 +14,7 @@ class Muddyit::Sites::Site::Entities::Entity < Muddyit::Generic
   # * options (Optional)
   #
   def related(options = {})
-    api_url = "/sites/#{self.site.attributes[:token]}/entities/#{Digest::MD5.hexdigest(URI.encode(@attributes[:uri]))}/related"
+    api_url = "/sites/#{self.site.attributes[:token]}/entities/#{Digest::MD5.hexdigest(@attributes[:uri])}/related"
     response = @muddyit.send_request(api_url, :get, options)
 
     results = []
@@ -27,7 +27,7 @@ class Muddyit::Sites::Site::Entities::Entity < Muddyit::Generic
 
   protected
   def fetch
-    api_url = "/sites/#{@attributes[:site][:token]}/entities/#{Digest::MD5.hexdigest(URI.encode(@attributes[:uri]))}"
+    api_url = "/sites/#{@attributes[:site][:token]}/entities/#{Digest::MD5.hexdigest(@attributes[:uri])}"
     response = @muddyit.send_request(api_url, :get)
     response.nested_symbolize_keys!
   end

data/lib/muddyit/sites/entities.rb

@@ -1,4 +1,4 @@
-class Muddyit::Sites::Site::Entities
+class Muddyit::Sites::Site::Entities < Muddyit::Generic
   # Placeholder
 
   # retrieve entities related to the specified entity within the site entities collection
@@ -6,9 +6,10 @@ class Muddyit::Sites::Site::Entities
   # Params
   # * options (Optional)
   #
-  def related(uri, options = {})
+  def find_related(uri, options = {})
+
     raise if uri.nil?
-    api_url = "/sites/#{self.site.attributes[:token]}/entities/#{Digest::MD5.hexdigest(URI.encode(uri))}/related"
+    api_url = "/sites/#{self.site.attributes[:token]}/entities/#{Digest::MD5.hexdigest(uri)}/related"
     response = @muddyit.send_request(api_url, :get, options)
 
     results = []

data/lib/muddyit/sites/pages.rb

@@ -125,7 +125,7 @@ class Muddyit::Sites::Site::Pages < Muddyit::Generic
   #     must contain uri parameter which corresponds to dbpedia uri
   #
   def queryAllWithURI(uri, options, &block)
-    api_url = "/sites/#{self.site.attributes[:token]}/entities/#{Digest::MD5.hexdigest(URI.encode(uri))}"
+    api_url = "/sites/#{self.site.attributes[:token]}/entities/#{Digest::MD5.hexdigest(uri)}"
     query_page(api_url, options, &block)
   end
 
@@ -138,7 +138,7 @@ class Muddyit::Sites::Site::Pages < Muddyit::Generic
   #
   #
   def queryAllWithTerm(term, options, &block)
-    api_url = "/sites/#{self.site.attributes[:token]}/terms/#{URI.escape(CGI.escape(term),'.')}"
+    api_url = "/sites/#{self.site.attributes[:token]}/terms/#{term}"
     query_page(api_url, options, &block)
   end
 

data/lib/muddyit/sites/site.rb

@@ -3,6 +3,7 @@ class Muddyit::Sites::Site < Muddyit::Generic
   # get pages object for site
   #
   def pages() @pages ||= Muddyit::Sites::Site::Pages.new(@muddyit, :site => self) end
+  def entities() @entities ||= Muddyit::Sites::Site::Entities.new(@muddyit, :site => self) end
   
   protected
   def fetch

data/muddyit_fu.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muddyit_fu}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["robl"]
-  s.date = %q{2009-09-10}
+  s.date = %q{2009-09-23}
   s.email = %q{robl[at]monkeyhelper.com}
   s.extra_rdoc_files = [
     "LICENSE",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: monkeyhelper-muddyit_fu
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - robl
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-10 00:00:00 -07:00
+date: 2009-09-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency