fauna 0.1.2 → 0.2.2

data/CHANGELOG

@@ -1,3 +1,5 @@
+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.
 
 v0.1.1 Fix ActionDispatch::Reloader bug.

data/Manifest

@@ -11,9 +11,8 @@ lib/fauna/connection.rb
 lib/fauna/ddl.rb
 lib/fauna/model.rb
 lib/fauna/model/class.rb
-lib/fauna/model/follow.rb
+lib/fauna/model/event_set.rb
 lib/fauna/model/publisher.rb
-lib/fauna/model/timeline.rb
 lib/fauna/model/user.rb
 lib/fauna/rails.rb
 lib/fauna/resource.rb
@@ -22,9 +21,8 @@ test/connection_test.rb
 test/fixtures.rb
 test/model/association_test.rb
 test/model/class_test.rb
-test/model/follow_test.rb
+test/model/event_set_test.rb
 test/model/publisher_test.rb
-test/model/timeline_test.rb
 test/model/user_test.rb
 test/model/validation_test.rb
 test/readme_test.rb

data/README.md

@@ -54,8 +54,9 @@ debugging:
 
 ```ruby
 require "logger"
-$fauna = Fauna::Connection.new(publisher_key: publisher_key, logger:
-Logger.new(STDERR))
+$fauna = Fauna::Connection.new(
+  publisher_key: publisher_key,
+  logger: Logger.new(STDERR))
 ```
 
 ### Client Contexts
@@ -65,7 +66,8 @@ context*, and then manipulate resources within that context:
 
 ```ruby
 Fauna::Client.context($fauna) do
-  user = Fauna::User.create!(name: "Taran", email: "taran@example.com")
+  user = Fauna::User.create!(email: "taran@example.com")
+  user.data["name"] = "Taran"
   user.data["profession"] = "Pigkeeper"
   user.save!
   user.destroy
@@ -89,25 +91,20 @@ fields:
 
 ```ruby
 Fauna::Client.context($fauna) do
-  user = Fauna::User.create(external_id: "taran77", name: "Taran")
+  user = Fauna::User.create(unique_id: "taran77")
 
   # fields
-  user.ref         # => "users/123"
-  user.ts          # => 1359579766996758
-  user.deleted     # => false
-  user.external_id # => "taran77"
+  user.ref       # => "users/123"
+  user.ts        # => 1359579766996758
+  user.deleted   # => false
+  user.unique_id # => "taran77"
 
   # data and references
   user.data       # => {}
   user.references # => {}
 
-  # standard timelines
+  # changes event set
   user.changes
-  user.user_follows
-  user.user_followers
-  user.instance_follows
-  user.instance_followers
-  user.local
 end
 ```
 
@@ -158,15 +155,15 @@ end
 ```
 
 Fields and references can be configured dynamically, but the classes
-and timelines themselves must be configured with an additional
+and event sets themselves must be configured with an additional
 `Fauna.schema` block (normally placed in
 `config/initializers/fauna.rb`):
 
 ```ruby
 Fauna.schema do
   with Pig do
-    # Add a custom timeline
-    timeline :visions
+    # Add a custom event set
+    event_set :visions
   end
 
   with Vision
@@ -196,7 +193,6 @@ end
 # Create a user, fill their pockets, and delete them.
 Fauna::Client.context($fauna) do
   taran = Fauna::User.new(
-    name: "Taran",
     email: "taran@example.com",
     password: "secret")
 
@@ -212,7 +208,7 @@ end
 ```ruby
 # Create, find, update, and destroy Pigs.
 Fauna::Client.context($fauna) do
-  @pig = Pig.create!(name: "Henwen", external_id: "henwen")
+  @pig = Pig.create!(name: "Henwen", unique_id: "henwen")
 
   @pig = Pig.find(@pig.ref)
   @pig.update(title: "Oracular Swine")
@@ -224,15 +220,15 @@ Fauna::Client.context($fauna) do
 end
 ```
 
-### Timelines
+### Event Sets
 
-[Timelines](https://fauna.org/API#timelines) are high-cardinality,
-bidirectional event collections. Timelines must be declared in the
+[Event Sets](https://fauna.org/API#event-sets) are high-cardinality,
+bidirectional event collections. Event sets must be declared in the
 Schema.
 
 ```ruby
 Fauna::Client.context($fauna) do
-  @pig = Pig.create!(name: "Henwen", external_id: "henwen")
+  @pig = Pig.create!(name: "Henwen", unique_id: "henwen")
 
   @vision = Vision.create!(pronouncement: "In an ominous tower...")
   @pig.visions.add @vision
@@ -261,7 +257,7 @@ end
 
 Please see the Fauna [REST Documentation](https://fauna.org/API) for a
 complete API reference, or look in
-[`/tests`](https://github.com/fauna/fauna-ruby/tree/master/test) for
+[`/test`](https://github.com/fauna/fauna-ruby/tree/master/test) for
 more examples.
 
 ## Contributing

data/fauna.gemspec

@@ -2,22 +2,22 @@
 
 Gem::Specification.new do |s|
   s.name = "fauna"
-  s.version = "0.1.2"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Fauna, Inc."]
-  s.date = "2013-02-09"
+  s.date = "2013-03-02"
   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/follow.rb", "lib/fauna/model/publisher.rb", "lib/fauna/model/timeline.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/follow.rb", "lib/fauna/model/publisher.rb", "lib/fauna/model/timeline.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/follow_test.rb", "test/model/publisher_test.rb", "test/model/timeline_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/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.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/follow_test.rb", "test/model/publisher_test.rb", "test/model/timeline_test.rb", "test/model/user_test.rb", "test/model/validation_test.rb", "test/readme_test.rb", "test/test_helper.rb"]
+  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"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/fauna.rb

@@ -23,9 +23,8 @@ require "fauna/client"
 require "fauna/resource"
 require "fauna/model"
 require "fauna/model/class"
-require "fauna/model/follow"
 require "fauna/model/publisher"
-require "fauna/model/timeline"
+require "fauna/model/event_set"
 require "fauna/model/user"
 require "fauna/ddl"
 
@@ -33,30 +32,29 @@ module Fauna
 
   DEFAULT_BLOCK = proc do
     with User, class_name: "users"
-    with User::Settings, class_name: "users/settings"
-    with Follow, class_name: "follows"
-    with TimelinePage, class_name: "timelines"
-    with TimelineSettings, class_name: "timelines/settings"
-    with ClassSettings, class_name: "classes"
+    with User::Config, class_name: "users/config"
+    with EventSetPage, class_name: "sets"
+    with EventSetConfig, class_name: "sets/config"
+    with ClassConfig, class_name: "classes/config"
     with Publisher, class_name: "publisher"
   end
 
   def self.configure_schema!
-    @_classes = {}
+    @classes = {}
     @schema = Fauna::DDL.new
-    @_blocks.each { |blk| @schema.instance_eval(&blk) }
+    @blocks.each { |blk| @schema.instance_eval(&blk) }
     @schema.configure!
     nil
   end
 
   def self.schema(&block)
-    @_blocks << block
+    @blocks << block
     configure_schema!
   end
 
 
   def self.reset_schema!
-    @_blocks = [DEFAULT_BLOCK]
+    @blocks = [DEFAULT_BLOCK]
     configure_schema!
   end
 
@@ -67,25 +65,25 @@ module Fauna
 
   # these should be private to the gem
 
-  def self.exists_class_for_name?(class_name)
-    !!@_classes[class_name]
+  def self.exists_class_for_name?(fauna_class)
+    !!@classes[fauna_class]
   end
 
-  def self.add_class(class_name, klass)
-    klass.fauna_class_name = class_name.to_s
-    @_classes.delete_if { |_, v| v == klass }
-    @_classes[class_name.to_s] = klass
+  def self.add_class(fauna_class, klass)
+    klass.fauna_class = fauna_class.to_s
+    @classes.delete_if { |_, v| v == klass }
+    @classes[fauna_class.to_s] = klass
   end
 
-  def self.class_for_name(class_name)
-    @_classes[class_name] ||=
-    if class_name =~ %r{^classes/[^/]+$}
+  def self.class_for_name(fauna_class)
+    @classes[fauna_class] ||=
+    if fauna_class =~ %r{^classes/[^/]+$}
       klass = begin $1.classify.constantize rescue NameError; nil end
-      if klass.nil? || klass >= Fauna::Class || klass.fauna_class_name
+      if klass.nil? || klass >= Fauna::Class || klass.fauna_class # e.g. already associated with another fauna_class
         klass = ::Class.new(Fauna::Class)
       end
 
-      klass.fauna_class_name = class_name
+      klass.fauna_class = fauna_class
       klass
     else
       ::Class.new(Fauna::Resource)

data/lib/fauna/client.rb

@@ -50,7 +50,7 @@ module Fauna
       def cohere(ref, res)
         @cache[ref] = res['resource'] if ref =~ %r{^users/self}
         @cache[res['resource']['ref']] = res['resource']
-        @cache.merge!(res['references'])
+        @cache.merge!(res['references'] || {})
       end
     end
 

data/lib/fauna/connection.rb

@@ -1,7 +1,5 @@
 module Fauna
   class Connection
-    API_VERSION = 0
-
     class Error < RuntimeError
       attr_reader :param_errors
 
@@ -37,6 +35,7 @@ module Fauna
 
     def initialize(params={})
       @logger = params[:logger] || nil
+      @api_version = params[:version] || "v1/"
 
       if ENV["FAUNA_DEBUG"]
         @logger = Logger.new(STDERR)
@@ -54,24 +53,26 @@ module Fauna
       elsif params[:email] and params[:password]
         "#{CGI.escape(params[:email])}:#{CGI.escape(params[:password])}"
       else
-        raise ArgumentError, "Credentials not defined."
+        raise TypeError
       end
+    rescue TypeError
+      raise ArgumentError, "Credentials must be in the form of a hash containing either :publisher_key, :client_key, or :token, or both :email and :password."
     end
 
     def get(ref, query = nil)
-      JSON.parse(execute(:get, ref, nil, query))
+      parse(execute(:get, ref, nil, query))
     end
 
     def post(ref, data = nil)
-      JSON.parse(execute(:post, ref, data))
+      parse(execute(:post, ref, data))
     end
 
     def put(ref, data = nil)
-      JSON.parse(execute(:put, ref, data))
+      parse(execute(:put, ref, data))
     end
 
     def patch(ref, data = nil)
-      JSON.parse(execute(:patch, ref, data))
+      parse(execute(:patch, ref, data))
     end
 
     def delete(ref, data = nil)
@@ -81,6 +82,16 @@ module Fauna
 
     private
 
+    def parse(response)
+      obj = if response.empty?
+        {}
+      else
+        JSON.parse(response)
+      end
+      obj.merge!("headers" => response.headers.stringify_keys)
+      obj
+    end
+
     def log(indent)
       Array(yield).map do |string|
         string.split("\n")
@@ -123,7 +134,7 @@ module Fauna
     end
 
     def url(ref)
-      "https://#{@credentials}@rest.fauna.org/v#{API_VERSION}/#{ref}"
+      "https://#{@credentials}@rest.fauna.org/#{@api_version}#{ref}"
     end
   end
 end

data/lib/fauna/ddl.rb

@@ -15,41 +15,42 @@ module Fauna
 
     # resources
 
-    def with(__class__, args = {}, &block)
-      res = ResourceDDL.new(__class__, args)
+    def with(klass, args = {}, &block)
+      res = ResourceDDL.new(klass, args)
       res.instance_eval(&block) if block_given?
       @ddls << res
       nil
     end
 
     class ResourceDDL
-      def initialize(__class__, args = {})
-        @timelines = []
-        @class = __class__
-        @class_name = args[:class_name] || fauna_class_name(@class)
-        @class.fauna_class_name = @class_name
-
-        unless @class <= max_super(@class_name)
-          raise ArgmentError "#{@class} must be a subclass of #{max_super(@class_name)}."
+      def initialize(klass, args = {})
+        @event_sets = []
+        @class = klass
+        @fauna_class = args[:class_name] || derived_fauna_class(@class)
+
+        unless @class <= max_super(@fauna_class)
+          raise ArgumentError, "#{@class} must be a subclass of #{max_super(@fauna_class)}."
         end
 
-        @meta = Fauna::ClassSettings.alloc('ref' => @class_name) if @class_name =~ %r{^classes/[^/]+$}
+        if @fauna_class =~ %r{^classes/[^/]+$} && @fauna_class != 'classes/config'
+          @meta = Fauna::ClassConfig.alloc('ref' => "#{@fauna_class}/config")
+        end
       end
 
       def configure!
-        Fauna.add_class(@class_name, @class) if @class
+        Fauna.add_class(@fauna_class, @class) if @class
       end
 
       def load!
         @meta.save! if @meta
-        @timelines.each { |t| t.load! }
+        @event_sets.each { |t| t.load! }
       end
 
-      def timeline(*name)
+      def event_set(*name)
         args = name.last.is_a?(Hash) ? name.pop : {}
-        @class.send :timeline, *name
+        @class.send :event_set, *name
 
-        name.each { |n| @timelines << TimelineDDL.new(@class_name, n, args) }
+        name.each { |n| @event_sets << EventSetDDL.new(@fauna_class, n, args) }
       end
 
       def field(*name)
@@ -66,34 +67,30 @@ module Fauna
         case name
         when "users" then Fauna::User
         when "publisher" then Fauna::Publisher
+        when "classes/config" then Fauna::Resource
         when %r{^classes/[^/]+$} then Fauna::Class
         else Fauna::Resource
         end
       end
 
-      def fauna_class_name(__class__)
-        if __class__ < Fauna::User
+      def derived_fauna_class(klass)
+        if klass < Fauna::User
           "users"
-        elsif __class__ < Fauna::Publisher
+        elsif klass < Fauna::Publisher
           "publisher"
-        elsif  __class__ < Fauna::Class
-          "classes/#{__class__.name.tableize}"
+        elsif  klass < Fauna::Class
+          "classes/#{klass.name.tableize}"
         else
-          raise ArgumentError, "Must specify a :class_name for non-default resource class #{__class__.name}"
+          raise ArgumentError, "Must specify a :class_name for non-default resource class #{klass.name}"
         end
       end
     end
 
-    # timelines
-
-    def timeline(*name)
-      args = name.last.is_a?(Hash) ? name.pop : {}
-      name.each { |n| @ddls << TimelineDDL.new(nil, n, args) }
-    end
+    # event_sets
 
-    class TimelineDDL
+    class EventSetDDL
       def initialize(parent_class, name, args)
-        @meta = TimelineSettings.new(name, args)
+        @meta = EventSetConfig.new(parent_class, name, args)
       end
 
       def configure!

data/lib/fauna/model.rb

@@ -17,17 +17,20 @@ module Fauna
     # TODO: use proper class here
     def self.find_by_id(id)
       ref =
-        if self <= Fauna::User
-          "users/#{id}"
-        elsif self <= Fauna::User::Settings
-          "users/#{id}/settings"
+        if self <= Fauna::User::Config
+          "users/#{id}/config"
         else
-          "instances/#{id}"
+          "#{fauna_class}/#{id}"
         end
 
       Fauna::Resource.find(ref)
     end
 
+
+    def self.find_by_unique_id(unique_id)
+      find("#{fauna_class}/unique_id/#{unique_id}")
+    end
+
     def id
       ref.split("/").last
     end

data/lib/fauna/model/class.rb

@@ -1,5 +1,5 @@
 module Fauna
-  class ClassSettings < Fauna::Resource; end
+  class ClassConfig < Fauna::Resource; end
 
   class Class < Fauna::Model
     class << self
@@ -8,42 +8,31 @@ module Fauna
         Fauna.add_class(fc, base) unless Fauna.exists_class_for_name?(fc)
       end
 
-      def ref
-        fauna_class_name
+      def config_ref
+        "#{fauna_class}/config"
       end
 
       def data
-        Fauna::Resource.find(fauna_class_name).data
+        Fauna::Resource.find(config_ref).data
       end
 
       def update_data!(hash = {})
-        meta = Fauna::Resource.find(fauna_class_name)
+        meta = Fauna::Resource.find(config_ref)
         block_given? ? yield(meta.data) : meta.data = hash
         meta.save!
       end
 
       def update_data(hash = {})
-        meta = Fauna::Resource.find(fauna_class_name)
+        meta = Fauna::Resource.find(config_ref)
         block_given? ? yield(meta.data) : meta.data = hash
         meta.save
       end
-
-      def __class_name__
-        @__class_name__ ||= begin
-          raise MissingMigration, "Class #{name} has not been added to Fauna.schema." if !fauna_class_name
-          fauna_class_name[8..-1]
-        end
-      end
-
-      def find_by_external_id(external_id)
-        find_by("instances", :external_id => external_id, :class => __class_name__).first
-      end
     end
 
     private
 
     def post
-      Fauna::Client.post("instances", struct.merge("class" => self.class.__class_name__))
+      Fauna::Client.post(self.class.fauna_class, struct)
     end
   end
 end

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

@@ -1,30 +1,29 @@
 
 module Fauna
-  class TimelineEvent
+  class Event
 
-    attr_reader :ts, :timeline_ref, :resource_ref, :action
+    attr_reader :ts, :set_ref, :resource_ref, :action
 
     def initialize(attrs)
       # TODO v1
-      # @ts = attrs['ts']
-      # @timeline_ref = attrs['timeline']
-      # @resource_ref = attrs['resource']
-      # @action = attrs['action']
-      @ts, @action, @resource_ref = *attrs
+      @ts = attrs['ts']
+      @set_ref = attrs['set']
+      @resource_ref = attrs['resource']
+      @action = attrs['action']
     end
 
     def resource
       Fauna::Resource.find(resource_ref)
     end
 
-    def timeline
-      Timeline.new(timeline_ref)
+    def set
+      EventSet.new(set_ref)
     end
   end
 
-  class TimelinePage < Fauna::Resource
+  class EventSetPage < Fauna::Resource
     def events
-      @events ||= struct['events'].map { |e| TimelineEvent.new(e) }
+      @events ||= struct['events'].map { |e| Event.new(e) }
     end
 
     def any?
@@ -32,7 +31,7 @@ module Fauna
     end
 
     def resources
-      # TODO duplicates can exist in the local timeline. remove w/ v1
+      # 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])
@@ -45,7 +44,7 @@ module Fauna
     end
   end
 
-  class Timeline
+  class EventSet
     attr_reader :ref
 
     def initialize(ref)
@@ -53,7 +52,7 @@ module Fauna
     end
 
     def page(query = nil)
-      TimelinePage.find(ref, query)
+      EventSetPage.find(ref, query)
     end
 
     def events(query = nil)
@@ -83,10 +82,10 @@ module Fauna
     end
   end
 
-  class TimelineSettings < Fauna::Resource
-    def initialize(name, attrs = {})
+  class EventSetConfig < Fauna::Resource
+    def initialize(parent_class, name, attrs = {})
       super(attrs)
-      struct['ref'] = "timelines/#{name}"
+      struct['ref'] = "#{parent_class}/sets/#{name}/config"
     end
   end
 end

data/lib/fauna/model/user.rb

@@ -2,37 +2,22 @@
 module Fauna
   class User < Fauna::Model
 
-    validates :name, :presence => true
-
-    class Settings < Fauna::Model; end
+    class Config < Fauna::Model; end
 
     def self.self
       find("users/self")
     end
 
     def self.find_by_email(email)
-      find_by("users", :email => email)
-    end
-
-    def self.find_by_external_id(external_id)
-      find_by("users", :external_id => external_id).first
-    end
-
-    def self.find_by_name(name)
-      find_by("users", :name => name)
+      find("users/email/#{email}")
     end
 
     def email; struct['email']; end
 
     def password; struct['password']; end
 
-    # FIXME https://github.com/fauna/issues/issues/16
-    def name
-      struct['name']
-    end
-
-    def settings
-      Fauna::User::Settings.find("#{ref}/settings")
+    def config
+      Fauna::User::Config.find("#{ref}/config")
     end
 
     private

data/lib/fauna/resource.rb

@@ -2,13 +2,17 @@ module Fauna
   class Resource
 
     def self.fields; @fields ||= [] end
-    def self.timelines; @timelines ||= [] end
+    def self.event_sets; @event_sets ||= [] end
     def self.references; @references ||= [] end
 
     # config DSL
 
     class << self
-      attr_accessor :fauna_class_name
+      attr_accessor :fauna_class
+
+      def fauna_class
+        @fauna_class or raise MissingMigration, "Class #{name} has not been added to Fauna.schema."
+      end
 
       private
 
@@ -23,15 +27,15 @@ module Fauna
         end
       end
 
-      def timeline(*names)
+      def event_set(*names)
         args = names.last.is_a?(Hash) ? names.pop : {}
 
         names.each do |name|
-          timeline_name = args[:internal] ? name.to_s : "timelines/#{name}"
-          timelines << timeline_name
-          timelines.uniq!
+          set_name = args[:internal] ? name.to_s : "sets/#{name}"
+          event_sets << set_name
+          event_sets.uniq!
 
-          define_method(name.to_s) { Fauna::Timeline.new("#{ref}/#{timeline_name}") }
+          define_method(name.to_s) { Fauna::EventSet.new("#{ref}/#{set_name}") }
         end
       end
 
@@ -62,7 +66,7 @@ module Fauna
 
     def self.find(ref, query = nil)
       res = Fauna::Client.get(ref, query)
-      Fauna.class_for_name(res.fauna_class_name).alloc(res.to_hash)
+      Fauna.class_for_name(res.fauna_class).alloc(res.to_hash)
     end
 
     def self.create(*args)
@@ -89,17 +93,13 @@ module Fauna
     end
 
     def ref; struct['ref'] end
+    def fauna_class; struct['class'] end
     def ts; struct['ts'] end
     def deleted; struct['deleted'] end
-    def external_id; struct['external_id'] end
+    def unique_id; struct['unique_id'] end
     def data; struct['data'] ||= {} end
     def references; struct['references'] ||= {} end
-    def changes; Timeline.new("#{ref}/changes") end
-    def user_follows; Timeline.new("#{ref}/follows/users") end
-    def user_followers; Timeline.new("#{ref}/followers/users") end
-    def instance_follows; Timeline.new("#{ref}/follows/instances") end
-    def instance_followers; Timeline.new("#{ref}/followers/instances") end
-    def local; Timeline.new("#{ref}/local") end
+    def changes; EventSet.new("#{ref}/changes") end
 
     def eql?(other)
       self.class.equal?(other.class) && self.ref == other.ref && self.ref != nil
@@ -170,42 +170,6 @@ module Fauna
 
     alias :destroy :delete
 
-    # TODO eliminate/simplify once v1 drops
-
-    def fauna_class_name
-      @_fauna_class_name ||=
-      case ref
-      when %r{^users/[^/]+$}
-        "users"
-      when %r{^instances/[^/]+$}
-        "classes/#{struct['class']}"
-      when %r{^[^/]+/[^/]+/follows/[^/]+/[^/]+$}
-        "follows"
-      when %r{^.+/timelines/[^/]+$}
-        "timelines"
-      when %r{^.+/changes$}
-        "timelines"
-      when %r{^.+/local$}
-        "timelines"
-      when %r{^.+/follows/[^/]+$}
-        "timelines"
-      when %r{^.+/followers/[^/]+$}
-        "timelines"
-      when %r{^timelines/[^/]+$}
-        "timelines/settings"
-      when %r{^classes/[^/]+$}
-        "classes"
-      when %r{^users/[^/]+/settings$}
-        "users/settings"
-      when "publisher/settings"
-        "publisher/settings"
-      when "publisher"
-        "publisher"
-      else
-        nil
-      end
-    end
-
     private
 
     # TODO: make this configurable, and possible to invert to a white list

data/test/fixtures.rb

@@ -7,6 +7,7 @@
 # end
 
 class Fauna::User
+  field :name
   field :pockets
 end
 
@@ -43,7 +44,7 @@ end
 
 Fauna.schema do |f|
   with Pig, :class_name => "classes/pigs" do
-    timeline :visions
+    event_set :visions
   end
 
   with Pigkeeper
@@ -51,7 +52,7 @@ Fauna.schema do |f|
   with Vision
 
   with MessageBoard, :class_name => "classes/board" do
-    timeline :posts
+    event_set :posts
   end
 
   with Post

data/test/model/association_test.rb

@@ -10,7 +10,7 @@ class AssociationTest < MiniTest::Unit::TestCase
     @pig.visions.add @vision
   end
 
-  def test_timeline
+  def test_event_set
     assert_equal @pig.visions.page.events.first.resource, @vision
     assert @pig.visions.page.events.first.resource.pronouncement
   end

data/test/model/class_test.rb

@@ -9,7 +9,8 @@ class ClassTest < ActiveModel::TestCase
   end
 
   def test_class_name
-    assert_equal 'classes/pigs', Pig.ref
+    assert_equal 'classes/pigs', Pig.fauna_class
+    assert_equal 'classes/pigs/config', Pig.config_ref
   end
 
   def test_class_save

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

@@ -2,7 +2,7 @@ require File.expand_path('../../test_helper', __FILE__)
 
 # TODO use association_test classes
 
-class TimelineTest < ActiveModel::TestCase
+class EventSetTest < ActiveModel::TestCase
   # include ActiveModel::Lint::Tests
 
   def setup
@@ -12,7 +12,7 @@ class TimelineTest < ActiveModel::TestCase
 
   def test_page
     page = @model.posts.page
-    assert_equal page.ref, "#{@model.ref}/timelines/posts"
+    assert_equal page.ref, "#{@model.ref}/sets/posts"
     assert_equal page.events.size, 0
   end
 
@@ -22,29 +22,17 @@ class TimelineTest < ActiveModel::TestCase
     assert @model.posts.page.events.any?
   end
 
-  def test_timeline_add
+  def test_event_set_add
     @model.posts.add(Post.create(:body => "Goodbye"))
     page = @model.posts.page
     assert_equal page.events.size, 1
     assert_equal page.events[0].resource.body, "Goodbye"
   end
 
-  def test_timeline_remove
+  def test_event_set_remove
     @model.posts.add(Post.create(:body => "Hello"))
     page = @model.posts.page
     assert_equal page.events.size, 1
     @model.posts.remove(page.events[0].resource)
   end
-
-  def test_local
-    user = Fauna::User.create!(:name => "user", :email => email)
-
-    follow = Fauna::Follow.new(:follower => user, :resource => @model)
-    follow.save!
-
-    post = Post.create(:body => "Goodbye")
-    @model.posts.add(post)
-
-    assert(user.local.page.events.find { |e| e.resource_ref == post.ref })
-  end
 end

data/test/model/user_test.rb

@@ -52,21 +52,16 @@ class UserTest < ActiveModel::TestCase
 
   def test_find_by_email
     user = Fauna::User.create(@attributes.merge(:email => "test@example.com"))
-    assert_equal [user], Fauna::User.find_by_email("test@example.com")
+    assert_equal user, Fauna::User.find_by_email("test@example.com")
   end
 
-  def test_find_by_name
-    user = Fauna::User.create(@attributes.merge(:name => "Gwystyl"))
-    assert_equal [user], Fauna::User.find_by_name("Gwystyl")
-  end
-
-  def test_user_settings
+  def test_user_config
     user = Fauna::User.create(@attributes)
-    assert_equal user.settings.ref, "#{user.ref}/settings"
+    assert_equal user.config.ref, "#{user.ref}/config"
   end
 
-  # def test_find_by_external_id
-  #   user = Fauna::User.create(@attributes.merge(:external_id => "henwen"))
-  #   assert_equal [user], Fauna::User.find_by_external_id("henwen")
-  # end
+  def test_find_by_unique_id
+    user = Fauna::User.create(@attributes.merge(:unique_id => "henwen"))
+    assert_equal user, Fauna::User.find_by_unique_id("henwen")
+  end
 end

data/test/model/validation_test.rb

@@ -7,17 +7,7 @@ class ClassValidationTest < MiniTest::Unit::TestCase
     refute h.save
     assert_equal ["can't be blank"], h.errors[:visited],
 
-      h.visited = true
-    assert h.save
-  end
-
-  def test_validates_presence_of
-    h = Fauna::User.new(:email => email, :password => password)
-    refute h.valid?
-    refute h.save
-    assert_equal ["can't be blank"], h.errors[:name]
-
-    h.name = "Llyan"
+    h.visited = true
     assert h.save
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fauna
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-09 00:00:00.000000000 Z
+date: 2013-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -137,9 +137,8 @@ extra_rdoc_files:
 - lib/fauna/ddl.rb
 - lib/fauna/model.rb
 - lib/fauna/model/class.rb
-- lib/fauna/model/follow.rb
+- lib/fauna/model/event_set.rb
 - lib/fauna/model/publisher.rb
-- lib/fauna/model/timeline.rb
 - lib/fauna/model/user.rb
 - lib/fauna/rails.rb
 - lib/fauna/resource.rb
@@ -157,9 +156,8 @@ files:
 - lib/fauna/ddl.rb
 - lib/fauna/model.rb
 - lib/fauna/model/class.rb
-- lib/fauna/model/follow.rb
+- lib/fauna/model/event_set.rb
 - lib/fauna/model/publisher.rb
-- lib/fauna/model/timeline.rb
 - lib/fauna/model/user.rb
 - lib/fauna/rails.rb
 - lib/fauna/resource.rb
@@ -168,9 +166,8 @@ files:
 - test/fixtures.rb
 - test/model/association_test.rb
 - test/model/class_test.rb
-- test/model/follow_test.rb
+- test/model/event_set_test.rb
 - test/model/publisher_test.rb
-- test/model/timeline_test.rb
 - test/model/user_test.rb
 - test/model/validation_test.rb
 - test/readme_test.rb
@@ -210,9 +207,8 @@ test_files:
 - test/connection_test.rb
 - test/model/association_test.rb
 - test/model/class_test.rb
-- test/model/follow_test.rb
+- test/model/event_set_test.rb
 - test/model/publisher_test.rb
-- test/model/timeline_test.rb
 - test/model/user_test.rb
 - test/model/validation_test.rb
 - test/readme_test.rb

data/lib/fauna/model/follow.rb

@@ -1,43 +0,0 @@
-
-module Fauna
-  class Follow < Fauna::Model
-    def self.find_by_follower_and_resource(follower, resource)
-      find(new(:follower => follower, :resource => resource).ref)
-    end
-
-    def initialize(attrs = {})
-      super({})
-      attrs.stringify_keys!
-      follower_ref = attrs['follower_ref']
-      follower_ref = attrs['follower'].ref if attrs['follower']
-      resource_ref = attrs['resource_ref']
-      resource_ref = attrs['resource'].ref if attrs['resource']
-      ref = "#{follower_ref}/follows/#{resource_ref}"
-
-      raise ArgumentError, "Follower ref is nil." if follower_ref.nil?
-      raise ArgumentError, "Resource ref is nil." if resource_ref.nil?
-
-      @struct = { 'ref' => ref, 'follower' => follower_ref, 'resource' => resource_ref }
-    end
-
-    def follower_ref
-      struct['follower']
-    end
-
-    def follower
-      Fauna::Resource.find(follower_ref)
-    end
-
-    def resource_ref
-      struct['resource']
-    end
-
-    def resource
-      Fauna::Resource.find(resource_ref)
-    end
-
-    def update(*args)
-      raise Fauna::Invalid, "Follows have nothing to update."
-    end
-  end
-end

data/test/model/follow_test.rb

@@ -1,47 +0,0 @@
-require File.expand_path('../../test_helper', __FILE__)
-
-class FollowTest < ActiveModel::TestCase
-  #include ActiveModel::Lint::Tests
-
-  def setup
-    super
-    @pig = Pig.create!
-    @pigkeeper = Pigkeeper.create! :visited => true, :pockets => 1
-    @attributes = {:follower => @pig, :resource => @pigkeeper}
-    @model = Fauna::Follow.new(@attributes)
-  end
-
-  def test_create
-    follow = Fauna::Follow.create(@attributes)
-    assert follow.persisted?
-    assert follow.ref
-  end
-
-  def test_save
-    follow = Fauna::Follow.new(@attributes)
-    follow.save
-    assert follow.persisted?
-    assert follow.ref
-  end
-
-  def test_update
-    follow = Fauna::Follow.create(@attributes)
-    assert_raises(Fauna::Invalid) do
-      follow.update(@attributes)
-    end
-  end
-
-  def test_find
-    Fauna::Follow.create(@attributes)
-    follow = Fauna::Follow.find_by_follower_and_resource(@pig, @pigkeeper)
-    assert follow.persisted?
-    assert follow.ref
-  end
-
-  def test_destroy
-    follow = Fauna::Follow.create(@attributes)
-    follow.destroy
-    assert !follow.persisted?
-    assert follow.ref
-  end
-end