fql 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34419040302c147714e99cb7eddbb0308894dd97
-  data.tar.gz: 67ada8a05cbd94a7f1f645e684317b3a4cadd981
+  metadata.gz: 10d04c4ff02dcb5a4b0d2dc6af40ec9d7808a73d
+  data.tar.gz: 47a732ce1c67ed9d03453af916113fffd2bf00db
 SHA512:
-  metadata.gz: ecb627fb33a5655c263dc57f4489f2c11000dc1f0aa11907fdc114c6f9190e8ea6fe2b892e58859f149882b2d347c2cd711895cd88f6a14066d1211bd31c92b9
-  data.tar.gz: 704df50720717395e8017be239e21e204930ec8512515cb45cd41d8a06c2140b168fb9a6c11c3bcca082da506bb91b68ee0e5853fe82898f135e284707f76520
+  metadata.gz: 4883ec0b394db9f0e41bf8f2f1cb768515a9969cb179e347a9dfbbd6ea84e12ad25ed9e1bc2c56ecdeab11be192bd4c6aab27599c8bb080ed4b187b2a981b65b
+  data.tar.gz: e0f8d62f5b00ccf76b94c8e5c180da8181cb71fd7e172623cfdda47879550fe0f97489f063de3310ce1308e1e93ef809c0ff7b0d4e167281e3170a5cebb3b31c

data/Rakefile

@@ -1,38 +1,4 @@
-#!/usr/bin/env rake
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Fql'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-
-
-
-Bundler::GemHelper.install_tasks
-
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-
-
-task :default => :test
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec

data/lib/fql.rb

@@ -1,4 +1,5 @@
 require "net/http"
+require "openssl"
 require "fql/query"
 require "fql/exception"
 require "multi_json"

data/lib/fql/exception.rb

@@ -1,10 +1,11 @@
 class Fql::Exception < Exception
 
-  attr_reader :type
+  attr_reader :type, :decoded_json
 
   def initialize(decoded_json)
     error = decoded_json["error"]
     @type = error["type"]
+    @decoded_json = decoded_json
     super(error["message"])
   end
 

data/lib/fql/query.rb

@@ -23,14 +23,10 @@ module Fql
 
     protected
 
-    def escape_query(query)
-      query.gsub(/(\r\n|\r|\n)/m, '')
-    end
-
     def compose_multi_query
       q = ''
       @queries.each do |key, query|
-        q += "'#{key}':'#{escape_query query}',"
+        q += "\"#{key}\":\"#{escape_query query}\","
       end
       # Remove last ',' and add enclosing braces
       '{' + q[0...-1] + '}'
@@ -40,5 +36,8 @@ module Fql
       escape_query @queries[@queries.keys[0]]
     end
 
+    def escape_query(query)
+      query.gsub(/(\r\n|\r|\n)/m, '')
+    end
   end
 end

data/lib/fql/version.rb

@@ -1,3 +1,3 @@
 module Fql
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

data/spec/fql/query_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe Fql::Query do
+  describe :compose do
+    it "composes single queries" do
+      result = described_class.new("SELECT name FROM user WHERE uid=me()").compose
+      result.should eq "SELECT name FROM user WHERE uid=me()"
+    end
+
+    it "composes single queries with newlines" do
+      result = described_class.new("SELECT name FROM \r\nuser WHERE\r\n uid=me()").compose
+      result.should eq "SELECT name FROM user WHERE uid=me()"
+    end
+
+    it "composes multi queries" do
+      query = { all_friends: "SELECT uid2 FROM friend WHERE uid1=me()",
+                my_name: "SELECT name FROM user WHERE uid=me()" }
+      result = described_class.new(query).compose
+      result.should eq "{\"all_friends\":\"SELECT uid2 FROM friend WHERE uid1=me()\",\"my_name\":\"SELECT name FROM user WHERE uid=me()\"}"
+    end
+
+    it "composes multi queries with newlines" do
+      query = { all_friends: "SELECT\n uid2 FROM friend \rWHERE uid1=me()",
+                my_name: "SELECT\r\n name FROM user WHERE uid=me()" }
+      result = described_class.new(query).compose
+      result.should eq "{\"all_friends\":\"SELECT uid2 FROM friend WHERE uid1=me()\",\"my_name\":\"SELECT name FROM user WHERE uid=me()\"}"
+    end
+  end # :compose
+end

data/spec/fql_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+describe Fql do
+  let(:subject) { described_class }
+  describe :execute do
+    let(:single_query) { "SELECT name FROM user WHERE uid=4" }
+    let(:multi_query) do
+      { query1: "SELECT uid FROM user WHERE uid=4",
+        query2: "SELECT name FROM user WHERE uid IN ( SELECT uid FROM #query1 )" }
+    end
+
+    context 'without access_token' do
+      it "works for single queries" do
+        VCR.use_cassette('single_query') do
+          results = subject.execute single_query
+          results.should be_a Array
+          results.length.should eq 1
+          results.first["name"].should eq "Mark Zuckerberg"
+        end
+      end
+
+      it "works for multi-queries" do
+        VCR.use_cassette('multi_query') do
+          results = subject.execute multi_query
+          results.should be_a Array
+          results.each do |query_result|
+            query_result["name"].should be_a String
+            query_result["fql_result_set"].should be_a Array
+          end
+        end
+      end
+
+      it "works for queries containing single quotes" do
+        query = { "likes1" => "SELECT user_id FROM like WHERE post_id = '204418407569_10151239646912570'",
+                  "likes2" => "SELECT user_id FROM like WHERE post_id = '204418407569_10151239646912570'" }
+        VCR.use_cassette('single_quoted_query') do
+          expect{ subject.execute query }.to_not raise_error(Fql::Exception)
+        end
+      end
+    end
+
+    context 'with invalid access_token' do
+      it "returns an oauth exception" do
+        VCR.use_cassette('invalid_token') do
+          expect {
+            subject.execute(single_query, access_token: 'invalid')
+          }.to raise_error(Fql::Exception)
+        end
+      end
+    end
+  end # :execute
+end

data/spec/spec_helper.rb

@@ -0,0 +1,13 @@
+require 'rubygems'
+require 'bundler/setup'
+require 'fql'
+require 'vcr'
+
+
+# Configure VCR
+# Read more: https://github.com/vcr/vcr
+#
+VCR.configure do |c|
+  c.cassette_library_dir = 'spec/support/vcr_cassettes'
+  c.hook_into :webmock
+end

data/spec/support/vcr_cassettes/invalid_token.yml

@@ -0,0 +1,48 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://graph.facebook.com/fql?access_token=invalid&q=SELECT%20name%20FROM%20user%20WHERE%20uid=4
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 400
+      message: Bad Request
+    headers:
+      Access-Control-Allow-Origin:
+      - '*'
+      Cache-Control:
+      - no-store
+      Content-Type:
+      - application/json; charset=UTF-8
+      Expires:
+      - Sat, 01 Jan 2000 00:00:00 GMT
+      Pragma:
+      - no-cache
+      Www-Authenticate:
+      - OAuth "Facebook Platform" "invalid_token" "Invalid OAuth access token."
+      X-Fb-Rev:
+      - '834072'
+      X-Fb-Debug:
+      - KonGvFQEh4QIx0m4ABMSpm/9EFDQjluJlBu50ofk9VY=
+      Date:
+      - Mon, 03 Jun 2013 20:27:40 GMT
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '86'
+    body:
+      encoding: UTF-8
+      string: '{"error":{"message":"Invalid OAuth access token.","type":"OAuthException","code":190}}'
+    http_version: 
+  recorded_at: Mon, 03 Jun 2013 20:27:40 GMT
+recorded_with: VCR 2.5.0

data/spec/support/vcr_cassettes/multi_query.yml

@@ -0,0 +1,49 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://graph.facebook.com/fql?q=%7B%22query1%22:%22SELECT%20uid%20FROM%20user%20WHERE%20uid=4%22,%22query2%22:%22SELECT%20name%20FROM%20user%20WHERE%20uid%20IN%20(%20SELECT%20uid%20FROM%20%23query1%20)%22%7D
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Access-Control-Allow-Origin:
+      - '*'
+      Cache-Control:
+      - private, no-cache, no-store, must-revalidate
+      Content-Type:
+      - application/json; charset=UTF-8
+      Etag:
+      - '"81f24d646ed8a4f4ffbc4cf0ef67dba4a7ddb2bf"'
+      Expires:
+      - Sat, 01 Jan 2000 00:00:00 GMT
+      Pragma:
+      - no-cache
+      X-Fb-Rev:
+      - '834072'
+      X-Fb-Debug:
+      - gx3H2nm7o4hV6bX09SdnGiIUurZAoZQ2J4x2pjiJDhE=
+      Date:
+      - Mon, 03 Jun 2013 20:27:40 GMT
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '121'
+    body:
+      encoding: UTF-8
+      string: '{"data":[{"name":"query1","fql_result_set":[{"uid":4}]},{"name":"query2","fql_result_set":[{"name":"Mark
+        Zuckerberg"}]}]}'
+    http_version: 
+  recorded_at: Mon, 03 Jun 2013 20:27:40 GMT
+recorded_with: VCR 2.5.0

data/spec/support/vcr_cassettes/single_query.yml

@@ -0,0 +1,48 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://graph.facebook.com/fql?q=SELECT%20name%20FROM%20user%20WHERE%20uid=4
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Access-Control-Allow-Origin:
+      - '*'
+      Cache-Control:
+      - private, no-cache, no-store, must-revalidate
+      Content-Type:
+      - application/json; charset=UTF-8
+      Etag:
+      - '"6fc5f7d94412185c83e8091b2f6c812a80a5d449"'
+      Expires:
+      - Sat, 01 Jan 2000 00:00:00 GMT
+      Pragma:
+      - no-cache
+      X-Fb-Rev:
+      - '834072'
+      X-Fb-Debug:
+      - A7GYQlMbUaK8DP91KYCyPntSZVLEQP2sMs8oAsOR3Xk=
+      Date:
+      - Mon, 03 Jun 2013 20:27:40 GMT
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '37'
+    body:
+      encoding: UTF-8
+      string: '{"data":[{"name":"Mark Zuckerberg"}]}'
+    http_version: 
+  recorded_at: Mon, 03 Jun 2013 20:27:40 GMT
+recorded_with: VCR 2.5.0

data/spec/support/vcr_cassettes/single_quoted_query.yml

@@ -0,0 +1,48 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://graph.facebook.com/fql?q=%7B%22likes1%22:%22SELECT%20user_id%20FROM%20like%20WHERE%20post_id%20=%20'204418407569_10151239646912570'%22,%22likes2%22:%22SELECT%20user_id%20FROM%20like%20WHERE%20post_id%20=%20'204418407569_10151239646912570'%22%7D
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Access-Control-Allow-Origin:
+      - '*'
+      Cache-Control:
+      - private, no-cache, no-store, must-revalidate
+      Content-Type:
+      - application/json; charset=UTF-8
+      Etag:
+      - '"af615beebc3b459f2954da0ad64bcfe62a76e240"'
+      Expires:
+      - Sat, 01 Jan 2000 00:00:00 GMT
+      Pragma:
+      - no-cache
+      X-Fb-Rev:
+      - '834072'
+      X-Fb-Debug:
+      - 2AoZqxyMBO6GwsKAyPVaWg52lwRrxAN3Io9/Hy/Z9Uw=
+      Date:
+      - Mon, 03 Jun 2013 20:27:40 GMT
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '140'
+    body:
+      encoding: UTF-8
+      string: '{"data":[{"name":"likes1","fql_result_set":[{"user_id":100001275762888}]},{"name":"likes2","fql_result_set":[{"user_id":100001275762888}]}]}'
+    http_version: 
+  recorded_at: Mon, 03 Jun 2013 20:27:40 GMT
+recorded_with: VCR 2.5.0

metadata

@@ -1,73 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: fql
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Maarten Claes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-02 00:00:00.000000000 Z
+date: 2013-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.6
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: fakeweb
+  name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rb-fsevent
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -81,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-test
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -108,42 +94,16 @@ files:
 - lib/fql/query.rb
 - lib/fql/version.rb
 - lib/fql.rb
-- lib/tasks/fql_tasks.rake
 - MIT-LICENSE
 - Rakefile
 - README.markdown
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/secret_token.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/config.ru
-- test/dummy/log/test.log
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/Rakefile
-- test/dummy/README.rdoc
-- test/dummy/script/rails
-- test/fql/query_test.rb
-- test/fql_test.rb
-- test/test_helper.rb
+- spec/fql/query_spec.rb
+- spec/fql_spec.rb
+- spec/spec_helper.rb
+- spec/support/vcr_cassettes/invalid_token.yml
+- spec/support/vcr_cassettes/multi_query.yml
+- spec/support/vcr_cassettes/single_query.yml
+- spec/support/vcr_cassettes/single_quoted_query.yml
 homepage: https://github.com/mcls/fql
 licenses: []
 metadata: {}
@@ -163,40 +123,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Facebook Query Language library
 test_files:
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/secret_token.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/config.ru
-- test/dummy/log/test.log
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/Rakefile
-- test/dummy/README.rdoc
-- test/dummy/script/rails
-- test/fql/query_test.rb
-- test/fql_test.rb
-- test/test_helper.rb
+- spec/fql/query_spec.rb
+- spec/fql_spec.rb
+- spec/spec_helper.rb
+- spec/support/vcr_cassettes/invalid_token.yml
+- spec/support/vcr_cassettes/multi_query.yml
+- spec/support/vcr_cassettes/single_query.yml
+- spec/support/vcr_cassettes/single_quoted_query.yml