fql 0.2.0 → 0.2.1

data/README.markdown

@@ -2,10 +2,27 @@
 
 Easily execute FQL queries with this gem.
 
+## Download and installation
+
+The latest version of fql can be installed with RubyGems:
+
+```bash
+$ gem install fql
+```
+
+If you're using Bundler, you can add it to your `Gemfile`:
+
+```ruby
+gem 'fql'
+```
+
+## Examples
+
 *Exampe: a single query without access_token*
 
 ```ruby
   Fql.execute('SELECT first_name, last_name FROM user WHERE uid = 4')
+  # => [{"first_name"=>"Mark", "last_name"=>"Zuckerberg"}]
 ```
 
 *Exampe: a multi query with an access_token*
@@ -13,9 +30,10 @@ Easily execute FQL queries with this gem.
 ```ruby
   options = { :access_token => "fb_access_token" }
   Fql.execute({
-    "query1" => "SELECT uid, rsvp_status FROM event_member WHERE eid = 12345678",
-    "query2" => "SELECT name FROM profile WHERE id IN (SELECT uid FROM #query1)"
+    "query1" => "SELECT uid, rsvp_status FROM event_member WHERE eid = 209798352393506 LIMIT 3",
+    "query2" => "SELECT name FROM user WHERE uid IN (SELECT uid FROM #query1)"
   }, options)
+  # => [{"name"=>"query1", "fql_result_set"=>[{"uid"=>712638919, "rsvp_status"=>"attending"}, {"uid"=>711903876, "rsvp_status"=>"attending"}, {"uid"=>711447283, "rsvp_status"=>"attending"}]}, {"name"=>"query2", "fql_result_set"=>[{"name"=>"Srikanth Nagandla"}, {"name"=>"Hinling Yeung"}, {"name"=>"G\u00F6khan Olgun"}]}]
 ```
 
 ---

data/lib/fql/query.rb

@@ -14,11 +14,26 @@ module Fql
     # Returns the query as a String which has been properly formatted and can be
     # sent to Facebook.
     def compose
-      final_query = '{'
+      if @queries.length > 1
+        compose_multi_query
+      else
+        compose_single_query
+      end
+    end
+
+    protected
+
+    def compose_multi_query
+      q = ''
       @queries.each do |key, query|
-        final_query += "'" + key.to_s + "':'" + query + "',"
+        q += "'#{key}':'#{query}',"
       end
-      final_query[0...-1] + '}' # Remove last ',' and add closing '}'
+      # Remove last ',' and add enclosing braces
+      '{' + q[0...-1] + '}'
+    end
+
+    def compose_single_query
+      @queries[:q]
     end
 
   end

data/lib/fql/version.rb

@@ -1,3 +1,3 @@
 module Fql
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fql
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-15 00:00:00.000000000 Z
+date: 2012-09-16 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
-        version: '0'
+        version: 1.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,23 +58,23 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
@@ -107,7 +107,9 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Allows you to easily use FQL in Ruby.
+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"
 email:
 - maartencls@gmail.com
 executables: []
@@ -143,6 +145,7 @@ files:
 - 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
@@ -164,7 +167,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -199,6 +202,7 @@ test_files:
 - 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