RubyGems - evri - Versions diffs - 0.06 → 0.07 - Mend

evri 0.06 → 0.07

Files changed (9) hide show

data/Manifest.txt CHANGED Viewed

@@ -4,12 +4,18 @@ README.txt
 Rakefile
 TODO
 evri-api.gemspec
+index.html
 lib/evri.rb
 lib/evri/entity.rb
 lib/evri/media.rb
 lib/evri/relation.rb
+lib/evri/urls.rb
 lib/evri/zeitgeist.rb
+lib/traverse.rb
+t.rb
+test/barack.txt
 test/test_entity.rb
 test/test_evri.rb
 test/test_media.rb
+test/test_traverse.rb
 test/test_zeitgeist.rb

data/evri-api.gemspec CHANGED Viewed

@@ -1,22 +1,22 @@
 Gem::Specification.new do |s|
   s.name = %q{evri}
-  s.version = "0.03"
+  s.version = "0.07"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joe Van Dyk"]
-  s.date = %q{2008-10-27}
+  s.date = %q{2008-11-06}
   s.description = %q{A beautiful API that wraps the RESTful services provided by evri.com.}
   s.email = ["joe@@fixieconsulting.com"]
-  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt"]
-  s.files = ["History.txt", "Manifest.txt", "README.txt", "Rakefile", "TODO", "evri-api.gemspec", "lib/evri.rb", "lib/evri/entity.rb", "lib/evri/media.rb", "lib/evri/relation.rb", "lib/evri/zeitgeist.rb", "test/test_entity.rb", "test/test_evri.rb", "test/test_media.rb", "test/test_zeitgeist.rb"]
+  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt", "test/barack.txt"]
+  s.files = ["History.txt", "Manifest.txt", "README.txt", "Rakefile", "TODO", "evri-api.gemspec", "index.html", "lib/evri.rb", "lib/evri/entity.rb", "lib/evri/media.rb", "lib/evri/relation.rb", "lib/evri/urls.rb", "lib/evri/zeitgeist.rb", "lib/traverse.rb", "t.rb", "test/barack.txt", "test/test_entity.rb", "test/test_evri.rb", "test/test_media.rb", "test/test_traverse.rb", "test/test_zeitgeist.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/joevandyk/evri-api}
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{evri}
+  s.rubyforge_project = %q{evri-api}
   s.rubygems_version = %q{1.2.0}
   s.summary = %q{A beautiful API that wraps the RESTful services provided by evri.com.}
-  s.test_files = ["test/test_media.rb", "test/test_zeitgeist.rb", "test/test_entity.rb", "test/test_evri.rb"]
+  s.test_files = ["test/test_entity.rb", "test/test_evri.rb", "test/test_zeitgeist.rb", "test/test_media.rb", "test/test_traverse.rb"]
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
@@ -25,15 +25,15 @@ Gem::Specification.new do |s|
     if current_version >= 3 then
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
-      s.add_development_dependency(%q<hoe>, [">= 1.7.0"])
+      s.add_development_dependency(%q<hoe>, [">= 1.8.2"])
     else
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
-      s.add_dependency(%q<hoe>, [">= 1.7.0"])
+      s.add_dependency(%q<hoe>, [">= 1.8.2"])
     end
   else
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
-    s.add_dependency(%q<hoe>, [">= 1.7.0"])
+    s.add_dependency(%q<hoe>, [">= 1.8.2"])
   end
 end

data/index.html ADDED Viewed

@@ -0,0 +1,6 @@
+<html>
+  <body>
+    <h1> Evri Page </h1>
+    <p> Welcome, Dude.  <a href="/evri">Here is the API</a>.</p>
+  </body>
+</html>

data/lib/evri.rb CHANGED Viewed

@@ -25,7 +25,7 @@ module Evri
   # Raised whenever the entity you are searching for cannot be found.
   class EntityNotFound < Error; end
-  VERSION     = "0.06"
+  VERSION     = "0.07"
   @@api_host    = "api.evri.com"
   @@source_host  = @@api_host
   @@source_url   = nil

data/lib/evri/urls.rb ADDED Viewed

@@ -0,0 +1,67 @@
+module Evri
+  module URLs
+    # FIXME This is ugly and should be changed.
+    # Given a set of options, builds a path and query string that we will be requesting.
+    # :type is the name of the type of query you are done.
+    # :query (should be renamed) is the thing you are looking for
+    # :entity is an entity that  ..
+    def self.generate options = {} #:nodoc:
+      query = ""
+      case options[:type]
+      when :uri
+        path = options[:query]
+      when :relations
+        path = options[:query] + "/relations"
+        if options[:from_domains]
+          query = "includeDomain=#{options[:from_domains]}"
+        end
+      when :related_by
+        if options[:uri]
+          path = options[:query] + "/related/entities"
+          query = "uri=#{escape(options[:uri])}"
+        else
+          path = options[:query] + "/relations"
+          if options[:verb]
+            path += "/#{options[:verb]}/#{escape(options[:value])}"
+            if options[:entity]
+              path += options[:entity].href
+            end
+          end
+          if options[:media]
+            query += "media=#{options[:media]}"
+          end
+        end
+      when :zeitgeist
+        path = "/zeitgeist/entities/" + options[:query]
+      when :related_medias
+        path = options[:query] + "/media/related"
+        if options[:entities]
+          query = options[:entities].map do |e|
+          "entityURI=#{e}&"
+          end
+          query = query.join
+        end
+        query += "type=#{options[:media]}" if options[:media]
+      when :from_media
+        path = "/media/entities"
+        query = "uri=#{escape(options[:uri])}&text=#{escape(options[:text])}"
+      when :search
+        path  = "/entities/find"
+        query = "name=#{escape(options[:query])}"
+      when :prefix
+        path  = "/entities/find"
+        query = "prefix=#{escape(options[:query])}"
+      else
+        raise ArgumentError, "unexpected type #{ options[:type] }"
+      end
+      query = nil if query.empty?
+      return [path, query]
+    end
+    def self.escape text
+      text ? CGI.escape(text.to_s) : ''
+    end
+  end
+end

data/lib/traverse.rb ADDED Viewed

@@ -0,0 +1,65 @@
+class Traverse
+  include Enumerable
+  attr_reader :json
+  def each
+    @json.each { |j| yield Traverse.new(j) }
+  end
+  def multiple?
+    @json.class == Array
+  end
+  def initialize json
+    @json = json
+  end
+  def size
+    @json.size
+  end
+  def blank?
+    size == 0
+  end
+  alias empty? blank?
+  # TODO clean this crap up
+  def [] value
+    value = value.to_s
+    if values = value.split("/") and values.size > 1
+      str = values.map { |v| "['#{v}']" }.join
+      code = "self#{str}"
+      return eval(code)
+    end
+    result =
+      if @json.class == Array
+        @json.find do |key|
+          if key.class == Array
+            if key.first.class == Array
+              if key.first.first == "$"
+                key.first.last == value
+              end
+            elsif key.first.class == String
+              key.first == value
+            end
+          end
+        end
+      else
+        @json[value] || @json["@#{value}"]
+      end
+    if result
+      if result.class == Hash
+        result = result["$"] || result
+      end
+    end
+    if result.class == Hash || result.class == Array
+      result = Traverse.new(result)
+    else
+      result
+    end
+    return result if result
+    return Traverse.new([])
+  end
+end

data/t.rb ADDED Viewed

@@ -0,0 +1,8 @@
+require 'lib/evri'
+require 'pp'
+text = %(He starred in "Forgetting Sarah Marshall" and was picked as one of Variety's 10 comics to watch, but Russell Brand's latest performance is no laughing matter for the BBC.)
+uri = "http://www.variety.com/article/VR1117994787.html?categoryid=14&cs=1&nid=2565"
+pp Evri::Entity.from_media(:text => text, :uri => uri).first

data/test/barack.txt ADDED Viewed

@@ -0,0 +1,307 @@
+{
+  "entity": {
+    "name": {
+      "$": "Barack Obama"
+    },
+    "@href": "\/person\/barack-obama-0x16f69",
+    "@inOntology": "true",
+    "@id": "94057",
+    "type": {
+      "$": "PERSON"
+    },
+    "links": {
+    },
+    "@score": "0.0",
+    "properties": {
+      "property": [
+        {
+          "name": {
+            "$": "birthplace"
+          },
+          "@provenance": "8",
+          "value": {
+            "$": "Honolulu, Hawaii"
+          }
+        },
+        {
+          "name": {
+            "$": "occupation"
+          },
+          "@provenance": "8",
+          "value": {
+            "$": "Attorney"
+          }
+        },
+        {
+          "name": {
+            "$": "source_url"
+          },
+          "@provenance": "8",
+          "value": {
+            "$": "http:\/\/en.wikipedia.org\/wiki\/Barack_Obama"
+          }
+        },
+        {
+          "name": {
+            "$": "residence"
+          },
+          "@provenance": "8",
+          "value": {
+            "$": "Kenwood, Chicago, Illinois"
+          }
+        },
+        {
+          "name": {
+            "$": "full_title"
+          },
+          "@provenance": "8",
+          "value": {
+            "$": "President-elect of the United States"
+          }
+        },
+        {
+          "name": {
+            "$": "name"
+          },
+          "@provenance": "8",
+          "value": {
+            "$": "Obama, Barack Hussein"
+          }
+        },
+        {
+          "name": {
+            "$": "birth_name"
+          },
+          "@provenance": "8",
+          "value": {
+            "$": "Barack Hussein Obama II"
+          }
+        },
+        {
+          "name": {
+            "$": "birth_date"
+          },
+          "@provenance": "8",
+          "value": {
+            "$": "1961-08-04 00:00:00.0"
+          }
+        },
+        {
+          "name": {
+            "$": "birthplace"
+          },
+          "@provenance": "8",
+          "value": {
+            "$": "Honolulu, Hawaii, U.S.A."
+          }
+        },
+        {
+          "name": {
+            "$": "name"
+          },
+          "@provenance": "8",
+          "value": {
+            "$": "Obama, Barack, Jr."
+          }
+        },
+        {
+          "name": {
+            "$": "university_attended"
+          },
+          "@provenance": "8",
+          "value": {
+            "$": "Columbia University"
+          }
+        },
+        {
+          "name": {
+            "$": "vice_president"
+          },
+          "@provenance": "8",
+          "@linkObjectName": "Joe Biden",
+          "value": {
+            "$": "Joe Biden (elect)"
+          },
+          "@linkHref": "\/person\/joe-biden-0x2d99a",
+          "@linkInOntology": "true"
+        },
+        {
+          "name": {
+            "$": "name"
+          },
+          "@provenance": "8",
+          "value": {
+            "$": "Barack Obama"
+          }
+        },
+        {
+          "name": {
+            "$": "wikipedia_paragraph"
+          },
+          "@provenance": "8",
+          "value": {
+            "$": "Barack Hussein Obama II (pronounced: \/b\u0259\u02c8r\u0251\u02d0k h\u028a\u02c8se\u026an o\u028a\u02c8b\u0251\u02d0m\u0259\/; born August 4, 1961) is the President-elect of the United States of America and the junior United States Senator from Illinois. His inauguration into office as the forty-fourth President of the United States is scheduled for January 20, 2009. Obama is the first African American to be elected President of the United States, and was the first to be nominated for President by a major political party. Obama is also the first candidate born in Hawaii to have been nominated and subsequently elected president.\n\nA graduate of Columbia University and Harvard Law School, he became the first African American to serve as president of the Harvard Law Review. Obama worked as a community organizer and practiced as a civil rights attorney before serving three terms in the Illinois Senate from 1997 to 2004. He taught constitutional law at the University of Chicago Law School from 1992 to 2004. Following an unsuccessful bid for a seat in the U.S. House of Representatives in 2000, he announced his campaign for the U.S. Senate in January 2003. After a primary victory in March 2004, Obama delivered the keynote address at the Democratic National Convention in July 2004. He was elected to the Senate in November 2004 with 70 percent of the vote."
+          }
+        },
+        {
+          "name": {
+            "$": "children"
+          },
+          "@provenance": "8",
+          "value": {
+            "$": "Malia Ann, Sasha"
+          }
+        },
+        {
+          "name": {
+            "$": "university_attended"
+          },
+          "@provenance": "8",
+          "@linkObjectName": "Occidental College",
+          "value": {
+            "$": "Occidental College"
+          },
+          "@linkHref": "\/organization\/occidental-college-0xbd22f",
+          "@linkInOntology": "true"
+        },
+        {
+          "name": {
+            "$": "university_attended"
+          },
+          "@provenance": "8",
+          "@linkObjectName": "Harvard Law School",
+          "value": {
+            "$": "Harvard Law School"
+          },
+          "@linkHref": "\/organization\/harvard-law-school-0xd826a",
+          "@linkInOntology": "true"
+        },
+        {
+          "name": {
+            "$": "religion"
+          },
+          "@provenance": "8",
+          "@linkObjectName": "United Church of Christ",
+          "value": {
+            "$": "United Church of Christ"
+          },
+          "@linkHref": "\/organization\/united-church-of-christ-0x12af2d",
+          "@linkInOntology": "true"
+        },
+        {
+          "name": {
+            "$": "political_party"
+          },
+          "@provenance": "8",
+          "@linkObjectName": "Democratic Party",
+          "value": {
+            "$": "Democratic Party"
+          },
+          "@linkHref": "\/organization\/democratic-party-0x3e58b",
+          "@linkInOntology": "true"
+        },
+        {
+          "name": {
+            "$": "occupation"
+          },
+          "@provenance": "8",
+          "value": {
+            "$": "Politician"
+          }
+        },
+        {
+          "name": {
+            "$": "spouse"
+          },
+          "@provenance": "8",
+          "@linkObjectName": "Michelle Obama",
+          "value": {
+            "$": "Michelle Obama"
+          },
+          "@linkHref": "\/person\/michelle-obama-0x4c6e8",
+          "@linkInOntology": "true"
+        },
+        {
+          "name": {
+            "$": "represent_political"
+          },
+          "@groupNum": "2",
+          "@provenance": "8",
+          "@linkObjectName": "Illinois",
+          "value": {
+            "$": "Illinois"
+          },
+          "@linkHref": "\/location\/illinois-0x319c2",
+          "@linkInOntology": "true"
+        },
+        {
+          "name": {
+            "$": "official_website"
+          },
+          "@provenance": "8",
+          "value": {
+            "$": "Office of the President-Elect"
+          }
+        },
+        {
+          "name": {
+            "$": "birth_date"
+          },
+          "@provenance": "8",
+          "value": {
+            "$": "1961-08-04 00:00:00.0"
+          }
+        }
+      ]
+    },
+    "facets": {
+      "facet": [
+        {
+          "name": {
+            "$": "Author"
+          },
+          "relations": {
+          },
+          "properties": {
+          }
+        },
+        {
+          "name": {
+            "$": "Lawyer"
+          },
+          "relations": {
+          },
+          "properties": {
+          }
+        },
+        {
+          "name": {
+            "$": "U.S. Politician"
+          },
+          "relations": {
+          },
+          "properties": {
+          }
+        },
+        {
+          "name": {
+            "$": "Academic"
+          },
+          "relations": {
+          },
+          "properties": {
+          }
+        }
+      ]
+    }
+  }
+}

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evri
 version: !ruby/object:Gem::Version
-  version: "0.06"
+  version: "0.07"
 platform: ruby
 authors:
 - Joe Van Dyk
@@ -53,6 +53,7 @@ extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - README.txt
+- test/barack.txt
 files:
 - History.txt
 - Manifest.txt
@@ -60,14 +61,20 @@ files:
 - Rakefile
 - TODO
 - evri-api.gemspec
+- index.html
 - lib/evri.rb
 - lib/evri/entity.rb
 - lib/evri/media.rb
 - lib/evri/relation.rb
+- lib/evri/urls.rb
 - lib/evri/zeitgeist.rb
+- lib/traverse.rb
+- t.rb
+- test/barack.txt
 - test/test_entity.rb
 - test/test_evri.rb
 - test/test_media.rb
+- test/test_traverse.rb
 - test/test_zeitgeist.rb
 has_rdoc: true
 homepage: http://github.com/joevandyk/evri-api