fauna 0.2.2 → 0.2.3

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.2.3 Event set API enhancements
+
 v0.2.2 Support for Fauna API version 1
 
 v0.1.2 Fauna::User.find_by_external_id returns a User or nil, not an Array.

data/Manifest

@@ -1,7 +1,6 @@
 CHANGELOG
 Gemfile
 LICENSE
-Manifest
 README.md
 Rakefile
 fauna.gemspec
@@ -27,3 +26,4 @@ test/model/user_test.rb
 test/model/validation_test.rb
 test/readme_test.rb
 test/test_helper.rb
+Manifest

data/fauna.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fauna"
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Fauna, Inc."]
-  s.date = "2013-03-02"
+  s.date = "2013-03-03"
   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"]

data/lib/fauna.rb

@@ -33,7 +33,7 @@ module Fauna
   DEFAULT_BLOCK = proc do
     with User, class_name: "users"
     with User::Config, class_name: "users/config"
-    with EventSetPage, class_name: "sets"
+    with EventsPage, class_name: "sets"
     with EventSetConfig, class_name: "sets/config"
     with ClassConfig, class_name: "classes/config"
     with Publisher, class_name: "publisher"

data/lib/fauna/model.rb

@@ -14,18 +14,13 @@ module Fauna
       base.send :include, ActiveModel::Serialization
     end
 
-    # TODO: use proper class here
-    def self.find_by_id(id)
-      ref =
-        if self <= Fauna::User::Config
-          "users/#{id}/config"
-        else
-          "#{fauna_class}/#{id}"
-        end
-
-      Fauna::Resource.find(ref)
+    def self.all
+      Fauna::EventSet.new(fauna_class)
     end
 
+    def self.find_by_id(id)
+      Fauna::Resource.find("#{fauna_class}/#{id}")
+    end
 
     def self.find_by_unique_id(unique_id)
       find("#{fauna_class}/unique_id/#{unique_id}")
@@ -60,5 +55,11 @@ module Fauna
     def to_model
       self
     end
+
+    private
+
+    def post
+      Fauna::Client.post(self.class.fauna_class, struct)
+    end
   end
 end

data/lib/fauna/model/class.rb

@@ -28,11 +28,5 @@ module Fauna
         meta.save
       end
     end
-
-    private
-
-    def post
-      Fauna::Client.post(self.class.fauna_class, struct)
-    end
   end
 end

data/lib/fauna/model/event_set.rb

@@ -1,46 +1,69 @@
 
 module Fauna
-  class Event
-
-    attr_reader :ts, :set_ref, :resource_ref, :action
+  class SetRef
+    attr_reader :ts, :resource_ref
 
     def initialize(attrs)
-      # TODO v1
       @ts = attrs['ts']
-      @set_ref = attrs['set']
       @resource_ref = attrs['resource']
-      @action = attrs['action']
     end
 
     def resource
       Fauna::Resource.find(resource_ref)
     end
+  end
+
+  class Event < SetRef
+    attr_reader :set_ref, :action
+
+    def initialize(attrs)
+      super(attrs)
+      @set_ref = attrs['set']
+      @action = attrs['action']
+    end
 
     def set
       EventSet.new(set_ref)
     end
   end
 
-  class EventSetPage < Fauna::Resource
+  class EventsPage < Fauna::Resource
+    include Enumerable
+
+    def self.find(ref, query = nil)
+      alloc(Fauna::Client.get(ref, query).to_hash)
+    end
+
     def events
       @events ||= struct['events'].map { |e| Event.new(e) }
     end
 
-    def any?
-      struct['events'].any?
+    def each(&block)
+      events.each(&block)
+    end
+
+    def empty?
+      events.empty?
+    end
+  end
+
+  class RefsPage < Fauna::Resource
+    include Enumerable
+
+    def self.find(ref, query = nil)
+      alloc(Fauna::Client.get(ref, query).to_hash)
+    end
+
+    def refs
+      @refs ||= struct['events'].map { |e| SetRef.new(e) }
     end
 
     def resources
-      # TODO duplicates can exist in the local event_set. remove w/ v1
-      seen = {}
-      events.inject([]) do |a, ev|
-        if (ev.action == 'create' && !seen[ev.resource_ref])
-          seen[ev.resource_ref] = true
-          a << ev.resource
-        end
+      refs.map(&:resource)
+    end
 
-        a
-      end
+    def empty?
+      events.empty?
     end
   end
 
@@ -52,7 +75,15 @@ module Fauna
     end
 
     def page(query = nil)
-      EventSetPage.find(ref, query)
+      EventsPage.find(ref, query)
+    end
+
+    def creates(query = nil)
+      RefsPage.find("#{ref}/creates", query)
+    end
+
+    def updates(query = nil)
+      RefsPage.find("#{ref}/updates", query)
     end
 
     def events(query = nil)
@@ -60,7 +91,7 @@ module Fauna
     end
 
     def resources(query = nil)
-      page(query).resources
+      creates(query).resources
     end
 
     def add(resource)

data/lib/fauna/model/publisher.rb

@@ -1,6 +1,6 @@
 
 module Fauna
-  class Publisher < Fauna::Model
+  class Publisher < Fauna::Resource
     def self.find
       super("publisher")
     end

data/lib/fauna/model/user.rb

@@ -2,7 +2,7 @@
 module Fauna
   class User < Fauna::Model
 
-    class Config < Fauna::Model; end
+    class Config < Fauna::Resource; end
 
     def self.self
       find("users/self")
@@ -12,18 +12,12 @@ module Fauna
       find("users/email/#{email}")
     end
 
-    def email; struct['email']; end
-
-    def password; struct['password']; end
-
     def config
       Fauna::User::Config.find("#{ref}/config")
     end
 
-    private
-
-    def post
-      Fauna::Client.post("users", struct)
-    end
+    # set on user create
+    def email; struct['email']; end
+    def password; struct['password']; end
   end
 end

data/test/model/class_test.rb

@@ -27,6 +27,11 @@ class ClassTest < ActiveModel::TestCase
     assert pig.ref
   end
 
+  def test_all
+    pig = Pig.create(:visited => false)
+    assert Pig.all.resources.include?(pig)
+  end
+
   def test_save
     pig = Pig.new(:visited => false)
     pig.save

data/test/model/event_set_test.rb

@@ -35,4 +35,12 @@ class EventSetTest < ActiveModel::TestCase
     assert_equal page.events.size, 1
     @model.posts.remove(page.events[0].resource)
   end
+
+  def test_event_set_resources
+    post = Post.create(:body => "Hello")
+    @model.posts.add(post)
+    assert_equal [post], @model.posts.resources
+    assert_equal [post], @model.posts.creates.resources
+    assert_equal [post], @model.posts.updates.resources
+  end
 end

data/test/model/user_test.rb

@@ -16,6 +16,11 @@ class UserTest < ActiveModel::TestCase
     assert user.ref
   end
 
+  def test_all
+    user = Fauna::User.create(@attributes)
+    assert Fauna::User.all.resources.include?(user)
+  end
+
   def test_save
     user = Fauna::User.new(@attributes)
     user.save

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fauna
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-02 00:00:00.000000000 Z
+date: 2013-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel