basuco 0.0.5 → 0.0.6

data/lib/basuco.rb

@@ -5,69 +5,6 @@ Dir[File.dirname(__FILE__) + '/basuco/*.rb'].each {|file| require file }
 
 module Basuco
 
-    SERVICES = {
-      :mqlread => '/api/service/mqlread',
-      :mqlwrite => '/api/service/mqlwrite',
-      :blurb => '/api/trans/blurb/guid/',
-      :raw => '/api/trans/raw/guid/',
-      :login => '/api/account/login', #not done
-      :logout => '/api/account/logout', #not done
-      :upload => '/api/service/upload',
-      :topic => '/experimental/topic',
-      :search => '/api/service/search',
-      :status => '/api/status', #not done
-      :thumb => 'api/trans/image_thumb'
-
-    }
-
-    def service_url(svc)
-      "#{@host}#{SERVICES[svc]}"
-    end
-
-    SERVICES.each_key do |k|
-      define_method("#{k}_service_url") do
-        service_url(k)
-      end
-    end
-
-    # raise an error if the inner response envelope is encoded as an error
-    def handle_read_error(inner)
-      unless inner['code'][0, '/api/status/ok'.length] == '/api/status/ok'
-        error = inner['messages'][0]
-        raise ReadError.new(error['code'], error['message'])
-      end
-    end # handle_read_error
-
-    # returns parsed json response from freebase mqlread service
-    def get_query_response(query, cursor=nil)
-      envelope = { :qname => {:query => query, :escape => false }}
-      envelope[:qname][:cursor] = cursor if cursor
-      
-      response = http_request mqlread_service_url, :queries => envelope.to_json
-      result = JSON.parse response
-      inner = result['qname']
-      handle_read_error(inner)
-      inner
-    end
-    
-    # encode parameters
-    def params_to_string(parameters)
-      parameters.keys.map {|k| "#{URI.encode(k.to_s)}=#{URI.encode(parameters[k].to_s)}" }.join('&')
-    end
-    
-    # does the dirty work
-    def http_request(url, parameters = {})
-      params = params_to_string(parameters)
-      url << '?'+params unless params !~ /\S/
-            
-      return Net::HTTP.get_response(::URI.parse(url)).body
-      
-      fname = "#{MD5.md5(params)}.mql"
-      open(fname,"w") do |f|
-        f << response
-      end
-    end
-
     #hash of all statuses
     def self.check_statuses
       response = http_request status_service_url
@@ -75,25 +12,6 @@ module Basuco
       result
     end
   
-  # A class for returing errors from the freebase api.
-  # For more infomation see the freebase documentation:
-  class ReadError < ArgumentError
-    attr_accessor :code, :msg
-    def initialize(code,msg)
-      self.code = code
-      self.msg = msg
-    end
-    def message
-      "#{code}: #{msg}"
-    end
-  end
-  
-  class AttributeNotFound < StandardError ; end
-  class PropertyNotFound < StandardError ; end
-  class ResourceNotFound < StandardError ; end
-  class TopicNotFound < StandardError ; end
-  class ViewNotFound < StandardError ; end
-
 end # module Basuco
 
 

data/lib/basuco/api.rb

@@ -4,6 +4,7 @@ module Basuco
   end
 
   class Api
+    include Request
     def initialize(options = {:host => 'http://www.freebase.com', :username => 'un', :password => 'pw'})
       @host = options[:host]
       @username = options[:username]

data/lib/basuco/request.rb

@@ -1,4 +1,85 @@
 module Request
 
+    SERVICES = {
+      :mqlread => '/api/service/mqlread',
+      :mqlwrite => '/api/service/mqlwrite',
+      :blurb => '/api/trans/blurb/guid/',
+      :raw => '/api/trans/raw/guid/',
+      :login => '/api/account/login', #not done
+      :logout => '/api/account/logout', #not done
+      :upload => '/api/service/upload',
+      :topic => '/experimental/topic',
+      :search => '/api/service/search',
+      :status => '/api/status', #not done
+      :thumb => 'api/trans/image_thumb'
 
+    }
+
+    def service_url(svc)
+      "#{@host}#{SERVICES[svc]}"
+    end
+
+    SERVICES.each_key do |k|
+      define_method("#{k}_service_url") do
+        service_url(k)
+      end
+    end
+
+
+  # A class for returing errors from the freebase api.
+  # For more infomation see the freebase documentation:
+  class ReadError < ArgumentError
+    attr_accessor :code, :msg
+    def initialize(code,msg)
+      self.code = code
+      self.msg = msg
+    end
+    def message
+      "#{code}: #{msg}"
+    end
+  end
+  
+  class AttributeNotFound < StandardError ; end
+  class PropertyNotFound < StandardError ; end
+  class ResourceNotFound < StandardError ; end
+  class TopicNotFound < StandardError ; end
+  class ViewNotFound < StandardError ; end
+
+    # raise an error if the inner response envelope is encoded as an error
+    def handle_read_error(inner)
+      unless inner['code'][0, '/api/status/ok'.length] == '/api/status/ok'
+        error = inner['messages'][0]
+        raise ReadError.new(error['code'], error['message'])
+      end
+    end # handle_read_error
+
+    # returns parsed json response from freebase mqlread service
+    def get_query_response(query, cursor=nil)
+      envelope = { :qname => {:query => query, :escape => false }}
+      envelope[:qname][:cursor] = cursor if cursor
+      
+      response = http_request mqlread_service_url, :queries => envelope.to_json
+      result = JSON.parse response
+      inner = result['qname']
+      handle_read_error(inner)
+      inner
+    end
+    
+    # encode parameters
+    def params_to_string(parameters)
+      parameters.keys.map {|k| "#{URI.encode(k.to_s)}=#{URI.encode(parameters[k].to_s)}" }.join('&')
+    end
+    
+    # does the dirty work
+    def http_request(url, parameters = {})
+      params = params_to_string(parameters)
+      url << '?'+params unless params !~ /\S/
+            
+      return Net::HTTP.get_response(::URI.parse(url)).body
+      
+      fname = "#{MD5.md5(params)}.mql"
+      open(fname,"w") do |f|
+        f << response
+      end
+    end
   end #Request

data/lib/basuco/search.rb

@@ -6,7 +6,8 @@ module Basuco
   # partially taken from chris eppstein's freebase api
   # http://github.com/chriseppstein/freebase/tree
   class Search
-
+    include Request
+    
     def initialize(options = {:host => 'http://www.freebase.com', :username => 'un', :password => 'pw'})
       @host = options[:host]
       @username = options[:username]

data/lib/basuco/trans.rb

@@ -6,6 +6,7 @@ module Basuco
   # partially taken from chris eppstein's freebase api
   # http://github.com/chriseppstein/freebase/tree
   class Trans
+    include Request
 
     def initialize(options = {:host => 'http://www.freebase.com', :username => 'un', :password => 'pw'})
       @host = options[:host]

data/lib/basuco/version.rb

@@ -1,3 +1,3 @@
 module Basuco
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: basuco
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &76282620 !ruby/object:Gem::Requirement
+  requirement: &73363010 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76282620
+  version_requirements: *73363010
 description: Transfer information from freebase.com through ruby.
 email:
 - ''