atduskgreg-dm-fql-adapter 0.0.1 → 0.0.2

data/README.rdoc

@@ -6,7 +6,7 @@ For usage, see example_app.rb.
 
 As of 7/16/09, this only ran on the DataMapper Next branch (i.e. 0.10). For details on how to upgrade to that branch, see here: http://sick.snusnu.info/2009/06/03/migrating-to-datamapper-0100/
 
-At some point, I will probably factor this into a gem. You know, if people bug me.
+Install as a gem: sudo gem install atduskgreg-dm-fql-adapter
 
 Also, this repo includes Facemask, a more straightforward approach to querying the Facebook API than some of the more complex libs out there.
 

data/lib/dm-fql-adapter.rb

@@ -9,37 +9,50 @@ require 'json'
 
 module DataMapper
   module Adapters
-    
-    class DataObjectsAdapter
-      module SQL
-        def quote_name(name)
-          name
-        end
-      end
-    end
+  
     
     class FqlAdapter < AbstractAdapter
 
       include DataMapper::Adapters::DataObjectsAdapter::SQL
 
+      # override DataObjectsAdapter::SQL#quote_name
+      def quote_name(name)
+        name
+      end
+      
+      def quote_value(value)
+        case value
+        when Array
+          "(#{value.map { |entry| quote_value(entry) }.join(', ')})"
+        else
+          "\"#{value}\""
+        end
+      end
+
       def initialize(name, options={})
         super
         
         self.resource_naming_convention = DataMapper::NamingConventions::Resource::Underscored        
         
-        @facebook = Facemask.new :api_key     => options[:api_key],
-                                 :secret_key  => options[:secret_key],
-                                 :session_key => options[:session_key]
+        @facebook = Facemask.new :api_key => options[:api_key],
+                                 :secret_key => options[:secret_key],
+                                 :session_key => options[:session_key]        
       end
       
       def read(query)        
-        q = select_statement(query).to_s
-      
-        # hack around the mysterious '?'
-        q = q.gsub(/\?(\w*)/){"\"#{$1}\""}
-
-        results = @facebook.find_by_fql(q)
+        statement, bind_values = select_statement(query)
+    
+        statement.gsub!(/\?/) { quote_value(bind_values.shift) }
+    
+        results = @facebook.find_by_fql(statement)
+        
         results = JSON.parse(results)
+        
+        puts
+        puts "DM JSON**********"
+        puts results.inspect
+        puts
+        
         query.filter_records(results)
       end
       

data/spec/dm-fql-adapter_spec.rb

@@ -12,8 +12,16 @@ class User
   property :pic_big, String
 end
 
+class Stream
+  include DataMapper::Resource
+  
+  property :source_id, Integer
+  property :post_id, Integer, :key => true
+  property :message, String
+end
+
 describe DataMapper::Adapters::FqlAdapter do
-  before :all do
+  before do
     Facemask.stub!(:new).and_return(@f = mock('Facemask'))                                      
 
     @adapter = DataMapper.setup(:default, :adapter   => 'fql',
@@ -26,4 +34,16 @@ describe DataMapper::Adapters::FqlAdapter do
     User.get(12345)
   end
 
-end
+  it "should package up the objects correctly even if there are multiple entries returned" do
+   
+    @f.stub!(:find_by_fql).and_return('[{"post_id":"103592400571_124417260882","source_id":103592400571,"message":"This is another post."},{"post_id":"103592400571_126720720199","source_id":103592400571,"message":"Check it out!"}]')
+
+    result = Stream.all( :source_id => 103592400571)
+
+    result.collect{|s| s.message}.should include("This is another post.")
+    result.collect{|s| s.message}.should include("Check it out!")
+  end
+  
+
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: atduskgreg-dm-fql-adapter
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Greg Borenstein