rfql 0.1.alpha.3 → 0.1.alpha.4

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.1.alpha.4. RFQL::request -> RFQL.request
+
 v0.1.alpha.3. moved a require to the right place
 
 v0.1.alpha.2. changed homepage project

data/README.rdoc

@@ -1,6 +1,6 @@
 = RFQL - Ruby API for the {Facebook Query Language}[https://developers.facebook.com/docs/reference/fql/]
 
-<b>Work In Progress - things can change (and probably they will do)</b>
+<b>Work In Progress - things can change (and probably they will)</b>
 
 == Features
 
@@ -12,13 +12,21 @@
 
 == Usage / Examples
 
+    require 'rfql'
+
+    # The query object
+    request = RFQL.request.select('aid, owner, name, object_id').from('album').where(aid: "20531316728_324257")
+    
+    # Retrieving the JSON data response
+    request.fetch.response #=> {"data"=>[{"aid"=>"20531316728_324257", "owner"=>20531316728, "name"=>"Happy Lunar New Year 2011", "object_id"=>"10150146071791729"}]}
+
 == TODO
 
-* Implement XML fetching
-* Did I already implement errors managing??? Who knows!
-* A bit of refactoring
+* Add more examples
+* Have I already implemented errors managing? Who knows!
+* Refactoring
 * Documentation
-* ADD TESTS!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+* ADD TESTS!!!
 
 == License
 

data/lib/rfql/request.rb

@@ -7,11 +7,12 @@ module RFQL
   class Request
     include RFQL::Request::QueryMethodsDelegations
     
+    FQLURL = "https://graph.facebook.com/fql"
+    
     attr_reader :response
     
     def initialize(str = nil)
       @query = RFQL::Query.new(str)
-      @format_param = :json
     end
     
     def query(query = nil)
@@ -30,42 +31,32 @@ module RFQL
       self
     end
     
-    def format_param(format_param = nil)
-      return @format_param if format_param.nil?
-      raise ArgumentError, "illegal format" unless [:json, :xml].include?(format_param)
-      @format_param = format_param
-      self
-    end
-    
-    def params(with_format_param = false)
-      params = {:query => to_sql, :access_token => access_token}
-      return params unless with_format_param
-      params.merge(:format => @format_param)
+    def params
+      {:q => to_sql, :access_token => access_token}
     end
     
-    def to_url(with_format_param = false)
-      RFQL::FQLURL + '?' + hash_to_params_string(params(with_format_param))
+    def to_url
+      FQLURL + '?' + hash_to_params_string(params)
     end
     
     def hash_to_params_string(params)
       params.to_a.select do |param|
         param[0].present? and param[1].present?
       end.map do |param|
-        k, v = URI.escape(param[0].to_s), URI.escape(param[1].to_s)
-        k.gsub!('&', '%26'); k.gsub!('=', '%3D'); v.gsub!('&', '%26'); v.gsub!('=', '%3D')
-        "#{k}=#{v}"
+        "%s=%s" % [CGI.escape(param[0].to_s), CGI.escape(param[1].to_s)]
       end.join('&')
     end
     
-    def to_json(json_format = :parsed, options = {})
+    def fetch(json_format = :parsed, options = {})
       begin
-        to_json!(json_format, options)
+        fetch!(json_format, options)
       rescue RFQL::Response::FQLError
         nil
       end
     end
     
-    def to_json!(json_format = :parsed, options = {})
+    # Example: RFQL.request.query('SELECT aid, owner, name, object_id FROM album WHERE aid="20531316728_324257"').fetch
+    def fetch!(json_format = :parsed, options = {})
       raise ArgumentError, "illegal format" unless [:raw, :parsed].include?(json_format)
       unless options.is_a?(Hash) and (options.keys - [:open_uri_options, :json_parse_options, :force_execution]).blank?
         raise ArgumentError, "illegal options"

data/lib/rfql/response.rb

@@ -8,20 +8,15 @@ module RFQL
     class << self
       def new(request, options = {})
         options[:format] ||= :json_parsed
-        raise ArgumentError, 'illegal format' unless [:xml, :json_raw, :json_parsed].include?(options[:format])
+        raise ArgumentError, 'illegal format' unless [:json_raw, :json_parsed].include?(options[:format])
         
-        case options[:format]
-          when :json_raw, :json_parsed
-            options[:format] = options[:format] == :json_raw ? :raw : :parsed
-            RFQL::Response::JSON.new(request, options)
-          when :xml
-            raise NotImplementedError, 'xml fetching is still a WIP :-P'
-        end
+        options[:format] = options[:format].to_s[/^json_(.*)/, 1].to_sym
+        
+        RFQL::Response::JSON.new(request, options)
       end
+      
       def read(request, options = {})
         request_url = request.respond_to?(:to_url) ? request.to_url : request.to_s
-        raise ArgumentError, 'illegal format' unless [:xml, :json].include?(options[:format])
-        request_url << "&format=#{options[:format]}"
         URI.parse(request_url).read(options[:open_uri_options] || {})
       end
     end

data/lib/rfql.rb

@@ -1,8 +1,7 @@
 require 'rfql/query'
 require 'rfql/request'
 module RFQL
-  VERSION = '0.1.alpha.2'
-  FQLURL = "https://api.facebook.com/method/fql.query"
+  VERSION = '0.1.alpha.4'
   def self.request(obj = nil)
     RFQL::Request.new(obj)
   end

data/rfql.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = "rfql"
-  s.version = "0.1.alpha.3"
+  s.version = "0.1.alpha.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["De Santis Maurizio"]
   s.cert_chain = ["/home/mau/.gem_keys/gem-public_cert.pem"]
-  s.date = "2011-11-11"
+  s.date = "2012-01-04"
   s.description = "RFQL - Ruby interface for Facebook Query Language"
   s.email = "desantis.maurizio@gmail.com"
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.rdoc", "lib/rfql.rb", "lib/rfql/core_ext/object/blank.rb", "lib/rfql/query.rb", "lib/rfql/query/methods.rb", "lib/rfql/query/quoting.rb", "lib/rfql/request.rb", "lib/rfql/request/delegations.rb", "lib/rfql/response.rb", "lib/rfql/response/fql_error.rb", "lib/rfql/response/json.rb", "lib/rfql/response/json/parsed.rb", "lib/rfql/response/json/parsed/error.rb", "lib/rfql/response/json/parsed/null.rb", "lib/rfql/response/json/parsed/records.rb", "lib/rfql/response/json/raw.rb"]
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Rfql", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "rfql"
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.12"
   s.signing_key = "/home/mau/.gem_keys/gem-private_key.pem"
   s.summary = "It lets you use ORM-style code for fetching data from Facebook through the Facebook Query Language"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rfql
 version: !ruby/object:Gem::Version
-  version: 0.1.alpha.3
+  version: 0.1.alpha.4
   prerelease: 4
 platform: ruby
 authors:
@@ -50,7 +50,7 @@ cert_chain:
   -----END CERTIFICATE-----
 
 '
-date: 2011-11-11 00:00:00.000000000 Z
+date: 2012-01-04 00:00:00.000000000 Z
 dependencies: []
 description: RFQL - Ruby interface for Facebook Query Language
 email: desantis.maurizio@gmail.com
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '1.2'
 requirements: []
 rubyforge_project: rfql
-rubygems_version: 1.8.11
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: It lets you use ORM-style code for fetching data from Facebook through the

metadata.gz.sig

@@ -1 +1,2 @@
-�͆Asa��F��UІpE��`u�Cp�G��50$��Lr�Y(���N�}���8J�\驪N>�|K�uD�~K'@v�na�4�N��h_�ӹGy��p�C�=r�]�i�L~��\|���q��!��t܂`XL�%6"8�s$�����S5���
��|ӝ9��/ne��n!="3P�F�@�S��.�%���L����({��\J�V�3�Yj�z��?�:��`,,�b���"�s��q	`�O
+3��Ju��9�#����X9u���1l�64%ɈϏK�)�
+GR�H�3��pק�?uv+�\��Y��a7����1�{�@�[-Ѷv)x��y9�4tV���!N�B��ٹ_�#w�
�Zf�]��є�F5G��^t�ͬ�-]�1����}U�{tT%�oLO0w��	�1o_&�j3�fv�3���=��gs���I���ј���D��3�b��¼!��I�l���T�)`5O�TiO�:=��T���_�