fauna 0.2.3 → 0.2.4

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.2.4 Event set query API
+
 v0.2.3 Event set API enhancements
 
 v0.2.2 Support for Fauna API version 1

data/Manifest

@@ -1,6 +1,7 @@
 CHANGELOG
 Gemfile
 LICENSE
+Manifest
 README.md
 Rakefile
 fauna.gemspec
@@ -8,22 +9,21 @@ lib/fauna.rb
 lib/fauna/client.rb
 lib/fauna/connection.rb
 lib/fauna/ddl.rb
+lib/fauna/event_set.rb
 lib/fauna/model.rb
 lib/fauna/model/class.rb
-lib/fauna/model/event_set.rb
-lib/fauna/model/publisher.rb
 lib/fauna/model/user.rb
+lib/fauna/publisher.rb
 lib/fauna/rails.rb
 lib/fauna/resource.rb
+test/association_test.rb
+test/class_test.rb
 test/client_test.rb
 test/connection_test.rb
+test/event_set_test.rb
 test/fixtures.rb
-test/model/association_test.rb
-test/model/class_test.rb
-test/model/event_set_test.rb
-test/model/publisher_test.rb
-test/model/user_test.rb
-test/model/validation_test.rb
+test/publisher_test.rb
 test/readme_test.rb
 test/test_helper.rb
-Manifest
+test/user_test.rb
+test/validation_test.rb

data/fauna.gemspec

@@ -2,22 +2,22 @@
 
 Gem::Specification.new do |s|
   s.name = "fauna"
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Fauna, Inc."]
-  s.date = "2013-03-03"
+  s.date = "2013-03-05"
   s.description = "Official Ruby client for the Fauna API."
   s.email = ""
-  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.md", "lib/fauna.rb", "lib/fauna/client.rb", "lib/fauna/connection.rb", "lib/fauna/ddl.rb", "lib/fauna/model.rb", "lib/fauna/model/class.rb", "lib/fauna/model/event_set.rb", "lib/fauna/model/publisher.rb", "lib/fauna/model/user.rb", "lib/fauna/rails.rb", "lib/fauna/resource.rb"]
-  s.files = ["CHANGELOG", "Gemfile", "LICENSE", "Manifest", "README.md", "Rakefile", "fauna.gemspec", "lib/fauna.rb", "lib/fauna/client.rb", "lib/fauna/connection.rb", "lib/fauna/ddl.rb", "lib/fauna/model.rb", "lib/fauna/model/class.rb", "lib/fauna/model/event_set.rb", "lib/fauna/model/publisher.rb", "lib/fauna/model/user.rb", "lib/fauna/rails.rb", "lib/fauna/resource.rb", "test/client_test.rb", "test/connection_test.rb", "test/fixtures.rb", "test/model/association_test.rb", "test/model/class_test.rb", "test/model/event_set_test.rb", "test/model/publisher_test.rb", "test/model/user_test.rb", "test/model/validation_test.rb", "test/readme_test.rb", "test/test_helper.rb"]
+  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.md", "lib/fauna.rb", "lib/fauna/client.rb", "lib/fauna/connection.rb", "lib/fauna/ddl.rb", "lib/fauna/event_set.rb", "lib/fauna/model.rb", "lib/fauna/model/class.rb", "lib/fauna/model/user.rb", "lib/fauna/publisher.rb", "lib/fauna/rails.rb", "lib/fauna/resource.rb"]
+  s.files = ["CHANGELOG", "Gemfile", "LICENSE", "Manifest", "README.md", "Rakefile", "fauna.gemspec", "lib/fauna.rb", "lib/fauna/client.rb", "lib/fauna/connection.rb", "lib/fauna/ddl.rb", "lib/fauna/event_set.rb", "lib/fauna/model.rb", "lib/fauna/model/class.rb", "lib/fauna/model/user.rb", "lib/fauna/publisher.rb", "lib/fauna/rails.rb", "lib/fauna/resource.rb", "test/association_test.rb", "test/class_test.rb", "test/client_test.rb", "test/connection_test.rb", "test/event_set_test.rb", "test/fixtures.rb", "test/publisher_test.rb", "test/readme_test.rb", "test/test_helper.rb", "test/user_test.rb", "test/validation_test.rb"]
   s.homepage = "http://fauna.github.com/fauna/"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Fauna", "--main", "README.md"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "fauna"
   s.rubygems_version = "1.8.23"
   s.summary = "Official Ruby client for the Fauna API."
-  s.test_files = ["test/client_test.rb", "test/connection_test.rb", "test/model/association_test.rb", "test/model/class_test.rb", "test/model/event_set_test.rb", "test/model/publisher_test.rb", "test/model/user_test.rb", "test/model/validation_test.rb", "test/readme_test.rb", "test/test_helper.rb"]
+  s.test_files = ["test/association_test.rb", "test/class_test.rb", "test/client_test.rb", "test/connection_test.rb", "test/event_set_test.rb", "test/publisher_test.rb", "test/readme_test.rb", "test/test_helper.rb", "test/user_test.rb", "test/validation_test.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/fauna.rb

@@ -21,10 +21,10 @@ end
 require "fauna/connection"
 require "fauna/client"
 require "fauna/resource"
+require "fauna/publisher"
+require "fauna/event_set"
 require "fauna/model"
 require "fauna/model/class"
-require "fauna/model/publisher"
-require "fauna/model/event_set"
 require "fauna/model/user"
 require "fauna/ddl"
 

data/lib/fauna/{model/event_set.rb → event_set.rb}

@@ -94,6 +94,28 @@ module Fauna
       creates(query).resources
     end
 
+    def self.join(*args)
+      EventSetQuery.new('join', *args)
+    end
+
+    def self.union(*args)
+      EventSetQuery.new('union', *args)
+    end
+
+    def self.intersection(*args)
+      EventSetQuery.new('intersection', *args)
+    end
+
+    def self.difference(*args)
+      EventSetQuery.new('difference', *args)
+    end
+
+    def self.query(&block)
+      module_eval(&block)
+    end
+  end
+
+  class CustomEventSet < EventSet
     def add(resource)
       self.class.add(ref, resource)
     end
@@ -113,6 +135,41 @@ module Fauna
     end
   end
 
+  class EventSetQuery < EventSet
+    def initialize(function, *params)
+      @function = function
+      @params = params
+    end
+
+    def query
+      @query ||=
+      begin
+        pstrs = @params.map do |p|
+          p.respond_to?(:query) ? p.query : "'#{p.respond_to?(:ref) ? p.ref : p}'"
+        end
+
+        "#{@function}(#{pstrs.join(',')})"
+      end
+    end
+
+    def ref
+      "query?query=#{query}"
+    end
+
+    def page(query = nil)
+      EventsPage.find("query", (query || {}).merge(:query => self.query))
+    end
+
+    def creates(query = nil)
+      RefsPage.find("query/creates", (query || {}).merge(:query => self.query))
+    end
+
+    def updates(query = nil)
+      RefsPage.find("query/updates", (query || {}).merge(:query => self.query))
+    end
+
+  end
+
   class EventSetConfig < Fauna::Resource
     def initialize(parent_class, name, attrs = {})
       super(attrs)

data/lib/fauna/resource.rb

@@ -35,7 +35,7 @@ module Fauna
           event_sets << set_name
           event_sets.uniq!
 
-          define_method(name.to_s) { Fauna::EventSet.new("#{ref}/#{set_name}") }
+          define_method(name.to_s) { Fauna::CustomEventSet.new("#{ref}/#{set_name}") }
         end
       end
 

data/test/{model/association_test.rb → association_test.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', __FILE__)
+require File.expand_path('../test_helper', __FILE__)
 
 class AssociationTest < MiniTest::Unit::TestCase
 

data/test/{model/class_test.rb → class_test.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', __FILE__)
+require File.expand_path('../test_helper', __FILE__)
 
 class ClassTest < ActiveModel::TestCase
   include ActiveModel::Lint::Tests

data/test/{model/event_set_test.rb → event_set_test.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', __FILE__)
+require File.expand_path('../test_helper', __FILE__)
 
 # TODO use association_test classes
 
@@ -43,4 +43,28 @@ class EventSetTest < ActiveModel::TestCase
     assert_equal [post], @model.posts.creates.resources
     assert_equal [post], @model.posts.updates.resources
   end
+
+  def test_event_set_query
+    posts = (1..3).map do |i|
+      Post.create(:body => "p#{i}").tap do |p|
+        @model.posts.add(p)
+      end
+    end
+
+    comments = posts.map do |p|
+      (1..3).map do |i|
+        Comment.create(:body => "#{p.body}_c#{i}").tap do |c|
+          p.comments.add(c)
+        end
+      end
+    end
+
+    q = Fauna::EventSet.join(@model.posts, 'sets/comments')
+
+    assert_equal 9, q.resources.size
+
+    comments.flatten.each do |c|
+      assert q.resources.include?(c)
+    end
+  end
 end

data/test/fixtures.rb

@@ -42,6 +42,10 @@ class Post < Fauna::Class
   field :body
 end
 
+class Comment < Fauna::Class
+  field :body
+end
+
 Fauna.schema do |f|
   with Pig, :class_name => "classes/pigs" do
     event_set :visions
@@ -55,5 +59,9 @@ Fauna.schema do |f|
     event_set :posts
   end
 
-  with Post
+  with Post do
+    event_set :comments
+  end
+
+  with Comment
 end

data/test/{model/publisher_test.rb → publisher_test.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', __FILE__)
+require File.expand_path('../test_helper', __FILE__)
 
 class PublisherTest < ActiveModel::TestCase
   # include ActiveModel::Lint::Tests

data/test/{model/user_test.rb → user_test.rb}

@@ -1,4 +1,4 @@
-require File.expand_path("../../test_helper", __FILE__)
+require File.expand_path("../test_helper", __FILE__)
 
 class UserTest < ActiveModel::TestCase
   # include ActiveModel::Lint::Tests

data/test/{model/validation_test.rb → validation_test.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', __FILE__)
+require File.expand_path('../test_helper', __FILE__)
 
 class ClassValidationTest < MiniTest::Unit::TestCase
   def test_validates_presence_of_field

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fauna
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-03 00:00:00.000000000 Z
+date: 2013-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -135,11 +135,11 @@ extra_rdoc_files:
 - lib/fauna/client.rb
 - lib/fauna/connection.rb
 - lib/fauna/ddl.rb
+- lib/fauna/event_set.rb
 - lib/fauna/model.rb
 - lib/fauna/model/class.rb
-- lib/fauna/model/event_set.rb
-- lib/fauna/model/publisher.rb
 - lib/fauna/model/user.rb
+- lib/fauna/publisher.rb
 - lib/fauna/rails.rb
 - lib/fauna/resource.rb
 files:
@@ -154,24 +154,24 @@ files:
 - lib/fauna/client.rb
 - lib/fauna/connection.rb
 - lib/fauna/ddl.rb
+- lib/fauna/event_set.rb
 - lib/fauna/model.rb
 - lib/fauna/model/class.rb
-- lib/fauna/model/event_set.rb
-- lib/fauna/model/publisher.rb
 - lib/fauna/model/user.rb
+- lib/fauna/publisher.rb
 - lib/fauna/rails.rb
 - lib/fauna/resource.rb
+- test/association_test.rb
+- test/class_test.rb
 - test/client_test.rb
 - test/connection_test.rb
+- test/event_set_test.rb
 - test/fixtures.rb
-- test/model/association_test.rb
-- test/model/class_test.rb
-- test/model/event_set_test.rb
-- test/model/publisher_test.rb
-- test/model/user_test.rb
-- test/model/validation_test.rb
+- test/publisher_test.rb
 - test/readme_test.rb
 - test/test_helper.rb
+- test/user_test.rb
+- test/validation_test.rb
 homepage: http://fauna.github.com/fauna/
 licenses: []
 post_install_message: 
@@ -203,13 +203,13 @@ signing_key:
 specification_version: 3
 summary: Official Ruby client for the Fauna API.
 test_files:
+- test/association_test.rb
+- test/class_test.rb
 - test/client_test.rb
 - test/connection_test.rb
-- test/model/association_test.rb
-- test/model/class_test.rb
-- test/model/event_set_test.rb
-- test/model/publisher_test.rb
-- test/model/user_test.rb
-- test/model/validation_test.rb
+- test/event_set_test.rb
+- test/publisher_test.rb
 - test/readme_test.rb
 - test/test_helper.rb
+- test/user_test.rb
+- test/validation_test.rb