ken 0.2.0 → 0.2.1

data/Gemfile

@@ -0,0 +1,12 @@
+source 'http://rubygems.org'
+
+gem 'extlib'
+gem 'json'
+gem 'addressable'
+
+group :development do
+  gem 'rake'
+  gem 'jeweler'
+  gem 'shoulda'
+  gem 'jnunemaker-matchy', '0.4.0'
+end

data/Rakefile

@@ -9,11 +9,6 @@ begin
     gem.email = "ma[at]zive[dot]at"
     gem.homepage = "http://github.com/michael/ken"
     gem.authors = ["michael"]
-    gem.add_dependency('extlib')
-    gem.add_dependency('json')
-    gem.add_dependency('addressable')
-    # gem.files = FileList["[A-Z]*.*"]
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 
 rescue LoadError
@@ -57,4 +52,4 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-Jeweler::GemcutterTasks.new
+Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/ken.gemspec

@@ -1,96 +1,92 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{ken}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["michael"]
-  s.date = %q{2009-11-02}
+  s.authors = [%q{michael}]
+  s.date = %q{2011-07-08}
   s.email = %q{ma[at]zive[dot]at}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.textile",
-     "README.txt"
+    "README.textile",
+    "TODO"
   ]
   s.files = [
-    ".gitignore",
-     "History.txt",
-     "LICENSE",
-     "README.textile",
-     "README.txt",
-     "Rakefile",
-     "TODO",
-     "VERSION",
-     "examples/artist.rb",
-     "examples/artist_links.rb",
-     "ken.gemspec",
-     "lib/ken.rb",
-     "lib/ken/attribute.rb",
-     "lib/ken/collection.rb",
-     "lib/ken/logger.rb",
-     "lib/ken/property.rb",
-     "lib/ken/resource.rb",
-     "lib/ken/session.rb",
-     "lib/ken/topic.rb",
-     "lib/ken/type.rb",
-     "lib/ken/util.rb",
-     "lib/ken/view.rb",
-     "rails/init.rb",
-     "tasks/ken.rb",
-     "tasks/spec.rb",
-     "test/fixtures/music_artist.json",
-     "test/fixtures/the_police.json",
-     "test/fixtures/the_police_topic.json",
-     "test/integration/ken_test.rb",
-     "test/test_helper.rb",
-     "test/unit/attribute_test.rb",
-     "test/unit/property_test.rb",
-     "test/unit/resource_test.rb",
-     "test/unit/session_test.rb",
-     "test/unit/topic_test.rb",
-     "test/unit/type_test.rb",
-     "test/unit/view_test.rb"
+    "Gemfile",
+    "History.txt",
+    "LICENSE",
+    "README.textile",
+    "Rakefile",
+    "TODO",
+    "VERSION",
+    "examples/artist.rb",
+    "examples/artist_links.rb",
+    "ken.gemspec",
+    "lib/ken.rb",
+    "lib/ken/attribute.rb",
+    "lib/ken/collection.rb",
+    "lib/ken/logger.rb",
+    "lib/ken/property.rb",
+    "lib/ken/resource.rb",
+    "lib/ken/session.rb",
+    "lib/ken/topic.rb",
+    "lib/ken/type.rb",
+    "lib/ken/util.rb",
+    "lib/ken/view.rb",
+    "rails/init.rb",
+    "tasks/ken.rb",
+    "tasks/spec.rb",
+    "test/fixtures/music_artist.json",
+    "test/fixtures/the_police.json",
+    "test/fixtures/the_police_topic.json",
+    "test/integration/ken_test.rb",
+    "test/test_helper.rb",
+    "test/unit/attribute_test.rb",
+    "test/unit/property_test.rb",
+    "test/unit/resource_test.rb",
+    "test/unit/session_test.rb",
+    "test/unit/topic_test.rb",
+    "test/unit/type_test.rb",
+    "test/unit/view_test.rb"
   ]
   s.homepage = %q{http://github.com/michael/ken}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.5}
   s.summary = %q{Ruby API for Accessing the Freebase}
-  s.test_files = [
-    "test/integration/ken_test.rb",
-     "test/test_helper.rb",
-     "test/unit/attribute_test.rb",
-     "test/unit/property_test.rb",
-     "test/unit/resource_test.rb",
-     "test/unit/session_test.rb",
-     "test/unit/topic_test.rb",
-     "test/unit/type_test.rb",
-     "test/unit/view_test.rb",
-     "examples/artist.rb",
-     "examples/artist_links.rb"
-  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<extlib>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<addressable>, [">= 0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
     else
       s.add_dependency(%q<extlib>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<addressable>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
     end
   else
     s.add_dependency(%q<extlib>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<addressable>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
   end
 end
 

data/lib/ken/session.rb

@@ -51,6 +51,7 @@ module Ken
       :login => '/api/account/login',
       :upload => '/api/service/upload',
       :topic => '/experimental/topic',
+      :search => '/api/service/search'
     }
 
     # get the service url for the specified service.
@@ -117,6 +118,19 @@ module Ken
       Ken.logger.info "<<< Received Topic Response: #{inner['result'].inspect}"
       inner['result']
     end
+    
+    def search(query, options = {})
+      Ken.logger.info ">>> Sending Search Query: #{query}"
+      options.merge!({:query => query})
+      
+      response = http_request search_service_url, options
+      result = JSON.parse response
+      
+      handle_read_error(result)
+      
+      Ken.logger.info "<<< Received Topic Response: #{result['result'].inspect}"
+      result['result']
+    end
 
     protected
     # returns parsed json response from freebase mqlread service
@@ -141,6 +155,7 @@ module Ken
     def http_request(url, parameters = {})
       params = params_to_string(parameters)
       url << '?'+params unless params !~ /\S/
+      Ken.logger.info "<<< URL queried: #{url}"
             
       return Net::HTTP.get_response(::URI.parse(url)).body
       

data/test/test_helper.rb

@@ -3,8 +3,6 @@ require 'test/unit'
 require 'shoulda'
 require 'pathname'
 require 'json'
-
-gem 'jnunemaker-matchy', '0.4.0'
 require 'matchy'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -29,20 +27,20 @@ class Test::Unit::TestCase
     matcher.negative_failure_message = "Expected #{receiver} not to be nil but it was"
     receiver.nil?
   end
-  
+
   custom_matcher :have do |receiver, matcher, args|
     count = args[0]
     something = matcher.chained_messages[0].name
     actual = receiver.send(something).size
     actual == count
   end
-  
+
   custom_matcher :be_true do |receiver, matcher, args|
     matcher.positive_failure_message = "Expected #{receiver} to be true but it wasn't"
     matcher.negative_failure_message = "Expected #{receiver} not to be true but it was"
     receiver.eql?(true)
   end
-  
+
   custom_matcher :be_false do |receiver, matcher, args|
     matcher.positive_failure_message = "Expected #{receiver} to be false but it wasn't"
     matcher.negative_failure_message = "Expected #{receiver} not to be false but it was"
@@ -54,8 +52,8 @@ class Object
   # nice for debugging
   # usage: print_call_stack(:method_name, 2, 10)
   def print_call_stack(from = 2, to = nil, html = false)
-    (from..(to ? to : caller.length)).each do |idx| 
+    (from..(to ? to : caller.length)).each do |idx|
       p "[#{idx}]: #{caller[idx]}#{html ? '<br />' : ''}"
     end
   end
-end
+end

data/test/unit/session_test.rb

@@ -35,5 +35,10 @@ class SessionTest < Test::Unit::TestCase
     should 'do topic requests' do
       Ken.session.topic("/en/the_police")
     end
+    
+    should 'do search requests' do
+      Ken.session.search("the police").length.should >= 1
+    end
+    
   end # context
 end # SessionTest

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ken
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  hash: 21
+  prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - michael
@@ -9,39 +15,108 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-02 00:00:00 +01:00
-default_executable: 
+date: 2011-07-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: extlib
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: addressable
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: jnunemaker-matchy
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 4
+        - 0
+        version: 0.4.0
+  type: :development
+  version_requirements: *id007
 description: 
 email: ma[at]zive[dot]at
 executables: []
@@ -51,13 +126,12 @@ extensions: []
 extra_rdoc_files: 
 - LICENSE
 - README.textile
-- README.txt
+- TODO
 files: 
-- .gitignore
+- Gemfile
 - History.txt
 - LICENSE
 - README.textile
-- README.txt
 - Rakefile
 - TODO
 - VERSION
@@ -90,43 +164,38 @@ files:
 - test/unit/topic_test.rb
 - test/unit/type_test.rb
 - test/unit/view_test.rb
-has_rdoc: true
 homepage: http://github.com/michael/ken
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Ruby API for Accessing the Freebase
-test_files: 
-- test/integration/ken_test.rb
-- test/test_helper.rb
-- test/unit/attribute_test.rb
-- test/unit/property_test.rb
-- test/unit/resource_test.rb
-- test/unit/session_test.rb
-- test/unit/topic_test.rb
-- test/unit/type_test.rb
-- test/unit/view_test.rb
-- examples/artist.rb
-- examples/artist_links.rb
+test_files: []
+

data/.gitignore

@@ -1,23 +0,0 @@
-test_log
-pkg
-pkg/*
-*/pkg/*
-bundle
-bundle/*
-doc
-*.log
-log
-!log*.rb
-*/log
-log/*
-*/log/*
-coverage
-*/coverage
-lib/dm-more.rb
-*.db
-nbproject
-.DS_Store
-rspec_report.html
-*.swp
-_Yardoc
-*/ri

data/README.txt

@@ -1,76 +0,0 @@
-= Ken
-
-* http://www.github.com/michael/ken
-
-== DESCRIPTION:
-
-Ken is a Data Layer for Knowledge Representation.
-
-It's being built to access the Metaweb Services supplied by Freebase.com.
-Just born, the project’s goals are the provision of a concise API for querying and writing.
-Therefore it wraps the Metaweb Architecture to smart Ruby Objects (that represent the Metaweb Architecture).
-
-You can navigate the Freebase Graph using a rubyish syntax.
-
-You should be able to use this Library as a Data Layer (instead of or in addition to 
-ActiveRecord/DataMapper) for your Web Framework of choice (Merb, Rails).
-
-
-== FEATURES/PROBLEMS:
-
-Features
-
-* Fetching of single Resources
-* Type inspection
-* Attributes inspection
-* Views on Resources to group Attributes based on the Resource's types
-* Some specs
-
-Roadmap
-
-1. Much more specs
-2. Support for querying of multiple Resources
-3. Better Type Support
-4. API for Set Based Browsing (see http://mqlx.com/~david/parallax/)
-5. Accessing Properties/Attributes directly (e.g. resource.genres )
-6. Write-Support
-
-== SYNOPSIS:
-
-resource = Ken.get('/en/new_order') # => <Resource id="/en/new_order" name="New Order">
-
-== REQUIREMENTS:
-
-- Ruby >=1.8.x
-- RubyGems >=1.2.x
-- Extlib >=0.9.x
-
-== INSTALL:
-
-$ gem sources -a http://gems.github.com (you only have to do this once)
-$ sudo gem install michael-ken
-
-== LICENSE:
-
-(The MIT License)
-
-Copyright (c) 2009 Michael Aufreiter
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.