fql 0.2.2 → 0.2.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 34419040302c147714e99cb7eddbb0308894dd97
+  data.tar.gz: 67ada8a05cbd94a7f1f645e684317b3a4cadd981
+SHA512:
+  metadata.gz: ecb627fb33a5655c263dc57f4489f2c11000dc1f0aa11907fdc114c6f9190e8ea6fe2b892e58859f149882b2d347c2cd711895cd88f6a14066d1211bd31c92b9
+  data.tar.gz: 704df50720717395e8017be239e21e204930ec8512515cb45cd41d8a06c2140b168fb9a6c11c3bcca082da506bb91b68ee0e5853fe82898f135e284707f76520

data/README.markdown

@@ -1,5 +1,7 @@
 # Fql
 
+[![Code Climate](https://codeclimate.com/github/mcls/fql.png)](https://codeclimate.com/github/mcls/fql)
+
 Easily execute FQL queries with this gem.
 
 ## Download and installation

data/lib/fql/query.rb

@@ -23,17 +23,21 @@ 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}':'#{query}',"
+        q += "'#{key}':'#{escape_query query}',"
       end
       # Remove last ',' and add enclosing braces
       '{' + q[0...-1] + '}'
     end
 
     def compose_single_query
-      @queries[@queries.keys[0]]
+      escape_query @queries[@queries.keys[0]]
     end
 
   end

data/lib/fql/version.rb

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

data/lib/fql.rb

@@ -30,12 +30,12 @@ module Fql
     end
 
     # Constructs the Facebook url which will return the results from the FQL
-    # query. The FQL query and access_token are passed as GET parameters.
+    # query. The FQL query and optional access_token are passed as GET
+    # parameters.
+    #
     def make_url(fql_query, options = {})
       url = self::BASE_URL + URI.encode(fql_query.compose)
-      if options.has_key?(:access_token)
-        url += "&access_token=#{options[:access_token]}"
-      end
+      url += URI.encode("&access_token=#{options[:access_token]}") if options && options[:access_token]
       URI.parse url
     end
 

data/test/fql/query_test.rb

@@ -27,10 +27,36 @@ class FqlQueryTest < ActiveSupport::TestCase
     assert_equal expected, actual
   end
 
+  test 'multiquery gets composed properly even if query is multiline' do
+    multi_query = {
+      all_friends:  "SELECT uid2 FROM friend 
+WHERE uid1=me()",
+      my_name:      "SELECT name FROM user\r\n WHERE uid=me()"
+    }
+    query = Fql::Query.new multi_query
+
+    actual = query.compose
+    expected =  "{" +
+      "'all_friends':'SELECT uid2 FROM friend WHERE uid1=me()'," +
+      "'my_name':'SELECT name FROM user WHERE uid=me()'" +
+    "}"
+
+    assert_equal expected, actual
+  end
+
+
   test 'single query gets composed properly' do
     query = Fql::Query.new "SELECT name FROM user WHERE uid=me()"
     actual   = query.compose
     expected = "SELECT name FROM user WHERE uid=me()"
     assert_equal expected, actual
   end
+
+  test 'single query gets composed properly even if it is multiline' do
+    query = Fql::Query.new "SELECT name FROM \r\nuser WHERE\r\n uid=me()"
+    actual   = query.compose
+    expected = "SELECT name FROM user WHERE uid=me()"
+    assert_equal expected, actual
+  end
+
 end

data/test/fql_test.rb

@@ -57,6 +57,16 @@ class FqlTest < ActiveSupport::TestCase
     end
   end
 
+  test "should add access_token as GET param to url if provided" do
+    query = Fql::Query.new('')
+
+    uri = Fql.make_url(query, access_token: 'token')
+    assert(uri.request_uri.include?("&access_token=token"))
+
+    uri = Fql.make_url(query)
+    assert(!uri.request_uri.include?("access_token"))
+  end
+
   def assert_executes_query_correctly(query, mocked_json_response)
     facebook_should_respond_with mocked_json_response
     actual    = Fql.execute(query)

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: fql
 version: !ruby/object:Gem::Version
-  version: 0.2.2
-  prerelease: 
+  version: 0.2.3
 platform: ruby
 authors:
 - Maarten Claes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-28 00:00:00.000000000 Z
+date: 2013-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,23 +41,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,38 +69,35 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! "    A simple gem to easily use the Facebook Query Language. Just specify
-  single\n    queries as strings or use hashes to compose multiqueries and send them
-  to\n    Facebook using `Fql.execute(query)`.\n"
+description: |2
+      A simple gem to easily use the Facebook Query Language. Just specify single
+      queries as strings or use hashes to compose multiqueries and send them to
+      Facebook using `Fql.execute(query)`.
 email:
 - maartencls@gmail.com
 executables: []
@@ -158,27 +146,26 @@ files:
 - test/test_helper.rb
 homepage: https://github.com/mcls/fql
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Facebook Query Language library
 test_files:
 - test/dummy/app/assets/javascripts/application.js