rfql 0.1.alpha.4 → 0.1.alpha.5

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.1.alpha.5. Updating to Facebook FQL changes
+
 v0.1.alpha.4. RFQL::request -> RFQL.request
 
 v0.1.alpha.3. moved a require to the right place

data/lib/rfql.rb

@@ -1,7 +1,7 @@
 require 'rfql/query'
 require 'rfql/request'
 module RFQL
-  VERSION = '0.1.alpha.4'
+  VERSION = '0.1.alpha.5'
   def self.request(obj = nil)
     RFQL::Request.new(obj)
   end

data/lib/rfql/request.rb

@@ -47,37 +47,42 @@ module RFQL
       end.join('&')
     end
     
-    def fetch(json_format = :parsed, options = {})
+    def response(json_format = :parsed, options = {})
       begin
-        fetch!(json_format, options)
+        response!(json_format, options)
       rescue RFQL::Response::FQLError
         nil
       end
     end
     
-    # Example: RFQL.request.query('SELECT aid, owner, name, object_id FROM album WHERE aid="20531316728_324257"').fetch
-    def fetch!(json_format = :parsed, options = {})
+    # Examples:
+    #   RFQL.request.select('aid, owner, name, object_id').from('album').where(:aid => "20531316728_324257").response
+    #   RFQL.request.query('SELECT aid, owner, name, object_id FROM album WHERE aid="20531316728_324257"').response
+    def response!(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"
       end
       
-      if options.delete(:force_execution).blank? and @response and
-         ( ( json_format == :parsed and ( @response.is_a?(RFQL::Response::JSON::Parsed) or
-                                          @response.is_a?(RFQL::Response::JSON::Parsed::Records) or
-                                          @response.is_a?(RFQL::Response::JSON::Parsed::Error) ) ) or
-           ( json_format == :raw and @response.is_a?(RFQL::Response::JSON::Raw) ) )
-        return @response
+      if not options.delete(:force_execution) and @cached_response
+        case json_format
+        when :raw    then return @cached_response.raw
+        when :parsed then return @cached_response
+        end
       end
       
-      json_parse_opts = options[:json_parse_options] || {}
-      open_uri_read_opts = options[:open_uri_options] || {}
+      json_parse_opts    = options[:json_parse_options] || {}
+      open_uri_read_opts = options[:open_uri_options]   || {}
       
-      @response = RFQL::Response::JSON.new(self, options.merge(:format => json_format))
+      @cached_response = RFQL::Response::JSON.new self, options.merge(:format => :parsed)
       
-      raise RFQL::Response::FQLError.new(@response) if @response.is_a?(RFQL::Response::JSON::Parsed::Error)
+      raise RFQL::Response::FQLError.new(@cached_response) if @cached_response.is_a?(RFQL::Response::JSON::Parsed::Error)
       
-      @response
+      case json_format
+      when :raw    then @cached_response.raw
+      when :parsed then @cached_response
+      end
     end
   end
 end

data/lib/rfql/response.rb

@@ -1,24 +1,30 @@
 require 'open-uri'
-
 require 'rfql/response/json'
 require 'rfql/response/fql_error'
 
 module RFQL
   module Response
-    class << self
-      def new(request, options = {})
-        options[:format] ||= :json_parsed
-        raise ArgumentError, 'illegal format' unless [:json_raw, :json_parsed].include?(options[:format])
-        
-        options[:format] = options[:format].to_s[/^json_(.*)/, 1].to_sym
-        
-        RFQL::Response::JSON.new(request, options)
+    def self.read(request, open_uri_options = {})
+      request_url = request.respond_to?(:to_url) ? request.to_url : request.to_s
+      begin
+        URI.parse(request_url).read(open_uri_options)
+      rescue OpenURI::HTTPError => e
+        raise RFQL::Response::FQLError.new(e.message, e.io, request)
+        #raise RFQL::Response::HTTPError.new(e.message, e.io, request)
       end
+    end
+    def initialize(request, options = {})
+      options[:format] ||= :json_parsed
+
+      raise ArgumentError, 'illegal format' unless [:json_raw, :json_parsed].include?(options[:format])
       
-      def read(request, options = {})
-        request_url = request.respond_to?(:to_url) ? request.to_url : request.to_s
-        URI.parse(request_url).read(options[:open_uri_options] || {})
-      end
+      options[:format] = 
+        case options[:format]
+        when :json_raw    then :raw
+        when :json_parsed then :parsed
+        end
+      
+      RFQL::Response::JSON.new(request, options)
     end
   end
 end

data/lib/rfql/response/fql_error.rb

@@ -1,9 +1,14 @@
 module RFQL
   module Response
     class FQLError < StandardError
-      attr_reader :error
-      def initialize(error)
-        @error = error
+      attr_reader :request, :io, :data
+      def initialize(message, io, request)
+        super(message)
+        @io, @request = io, request
+        begin
+          @data = ::JSON.parse @io.readlines.join("\n")
+        rescue Exception
+        end
       end
     end
   end

data/lib/rfql/response/json.rb

@@ -7,13 +7,17 @@ require 'rfql/response/json/parsed/error'
 module RFQL
   module Response
     class JSON
+      # Overwriting self.new in order to return another object depending to the format option
       def self.new(request, options = {})
-        options[:format] ||= :parsed
-        raise ArgumentError, 'illegal format' unless [:raw, :parsed].include?(options[:format])
+        defaults = { :format => :parsed, :open_uri_options => {}, :json_parse_options => {} }
+        options  = defaults.merge(options)
+
+        format = options.delete(:format)
+        raise ArgumentError, 'illegal format' unless [:raw, :parsed].include? format
         
-        case options[:format]
-          when :raw    then RFQL::Response::JSON::Raw.new(request, options)
-          when :parsed then RFQL::Response::JSON::Parsed.new(request, options)
+        case format
+        when :raw    then RFQL::Response::JSON::Raw.new(request, options[:open_uri_options])
+        when :parsed then RFQL::Response::JSON::Parsed.new(request, options)
         end
       end
     end

data/lib/rfql/response/json/parsed.rb

@@ -3,23 +3,25 @@ module RFQL
   module Response
     class JSON
       class Parsed
-        attr_reader :request, :response
+        attr_reader :request, :raw, :data
+        # Overwriting of self.new in order to return a different type of object
+        # in some cases
         def self.new(request, options = {})
-          json_raw_response = RFQL::Response::JSON::Raw.new(request, options)
+          defaults = { :open_uri_options => {}, :json_parse_options => {} }
+          options  = defaults.merge(options)
+
+          json_raw_data    = RFQL::Response::JSON::Raw.new(request, options[:open_uri_options])
+          json_parsed_data = ::JSON.parse(json_raw_data, options[:json_parse_options])
           
-          json_parsed_response = ::JSON.parse(json_raw_response, options[:json_parse_options] || {})
-          
-          if json_parsed_response.is_a?(Hash) and json_parsed_response.has_key?('error_code')
-            RFQL::Response::JSON::Parsed::Error.new(request, json_parsed_response)
-          elsif json_parsed_response.is_a?(Array)
-            RFQL::Response::JSON::Parsed::Records.new(request, json_parsed_response)
+          if json_parsed_data.is_a?(Hash) and json_parsed_data['data'].is_a?(Array)
+            RFQL::Response::JSON::Parsed::Records.new(request, json_raw_data, json_parsed_data['data'])
           else
-            super(request, json_parsed_response)
+            super(request, json_raw_data, json_parsed_data)
           end
         end
-       private
-        def initialize(request, json_parsed_response)
-          @request, @response = request, json_parsed_response
+        private
+        def initialize(request, json_raw_data, json_parsed_data)
+          @request, @raw, @data = request, json_raw_data, json_parsed_data
         end
       end
     end

data/lib/rfql/response/json/parsed/error.rb

@@ -3,18 +3,18 @@ module RFQL
     class JSON
       class Parsed
         class Error < Hash
-          attr_reader :request
-          def initialize(request, hash)
-            @request = request
+          attr_reader :request, :raw
+          def initialize(request, raw, hash)
+            @request, @raw = request, raw
             merge!(hash)
             # FIXME SyntaxError, dunno why
-    #        hash.keys.each do |key|
-    #          self.class.class_eval<<-"RB"
-    #            def #{key}
-    #              send :fetch, #{key}
-    #            end
-    #          RB
-    #        end
+            # hash.keys.each do |key|
+            #   self.class.class_eval<<-"RB"
+            #     def #{key}
+            #       send :fetch, #{key}
+            #     end
+            #   RB
+            # end
           end
         end
       end

data/lib/rfql/response/json/parsed/records.rb

@@ -3,9 +3,9 @@ module RFQL
     class JSON
       class Parsed
         class Records < Array
-          attr_reader :request
-          def initialize(request, array)
-            @request = request
+          attr_reader :request, :raw
+          def initialize(request, raw, array)
+            @request, @raw = request, raw
             super(array)
           end
         end

data/lib/rfql/response/json/raw.rb

@@ -3,10 +3,9 @@ module RFQL
     class JSON
       class Raw < String
         attr_reader :request
-        def initialize(request, options = {})
+        def initialize(request, open_uri_options = {})
           @request = request
-          options[:format] = :json
-          super RFQL::Response.read(request, options)
+          super RFQL::Response.read(request, open_uri_options)
         end
       end
     end

data/rfql.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = "rfql"
-  s.version = "0.1.alpha.4"
+  s.version = "0.1.alpha.5"
 
   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 = "2012-01-04"
+  s.date = "2012-03-28"
   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.12"
+  s.rubygems_version = "1.8.20"
   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.4
+  version: 0.1.alpha.5
   prerelease: 4
 platform: ruby
 authors:
@@ -50,7 +50,7 @@ cert_chain:
   -----END CERTIFICATE-----
 
 '
-date: 2012-01-04 00:00:00.000000000 Z
+date: 2012-03-28 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.12
+rubygems_version: 1.8.20
 signing_key: 
 specification_version: 3
 summary: It lets you use ORM-style code for fetching data from Facebook through the