michael-ken 0.0.3 → 0.1.0

data/lib/ken.rb

@@ -8,7 +8,6 @@ require 'addressable/uri'
 
 dir = Pathname(__FILE__).dirname.expand_path + 'ken'
 
-require dir + 'version'
 require dir + 'util'
 require dir + 'resource'
 require dir + 'type'
@@ -26,10 +25,8 @@ Ken::Logger.new(STDOUT, :error)
 Ken::Session.new('http://www.freebase.com', 'ma', 'xxxxx')
 
 module Ken
-  
   extend Extlib::Assertions
   
-  
   # store query as a constant here.
   # if the hash gets updated using
   # #merge! or #update, this will mean
@@ -62,6 +59,7 @@ module Ken
   # Executes an Mql Query against the Freebase API and returns the result as
   # a <tt>Collection</tt> of <tt>Resources</tt>.
   #
+  # performs a cursored query unless there's a limit specified
   # == Examples
   #
   # Ken.all(:name => "Apple", :type => "/music/album")
@@ -76,8 +74,8 @@ module Ken
   # @api public
   def self.all(options = {})
     assert_kind_of 'options', options, Hash
-    query = { :name => nil }.merge!(options).merge!(:id => nil) # collection queries MUST have :id => nil, no?
-    result = Ken.session.mqlread([ query ])    
+    query = { :name => nil }.merge!(options).merge!(:id => nil)
+    result = Ken.session.mqlread([ query ], :cursor => !options[:limit])    
     Ken::Collection.new(result.map { |r| Ken::Resource.new(r) })
   end
   
@@ -91,13 +89,9 @@ module Ken
   # @api public
   def self.get(id)
     assert_kind_of 'id', id, String
-    raise ArgumentError, "id must be in /type/object/id format" unless valid_id_attribute?(id)
     result = Ken.session.mqlread(QUERY.merge!(:id => id))
+    raise ResourceNotFound unless result
     Ken::Resource.new(result)
   end
   
-  def self.valid_id_attribute?(id)
-    id =~ /\/\w+/
-  end
-  
 end # module Ken

data/rails/init.rb

@@ -0,0 +1,2 @@
+# when used as a rails plugin
+require 'ken'

data/tasks/ken.rb

@@ -0,0 +1,4 @@
+# desc "Explaining what the task does"
+# task :ken do
+#   # Task goes here
+# end

data/tasks/spec.rb

@@ -22,4 +22,4 @@ begin
   end
 rescue LoadError
   # rspec not installed
-end
+end

data/{spec → test}/fixtures/music_artist.json

@@ -1,3 +1,4 @@
+
 {
   "id" : "/music/artist",
   "name" : "Musical Artist",