fauna 0.2.6 → 1.1.0

data/test/connection_test.rb

@@ -7,13 +7,13 @@ class ConnectionTest < MiniTest::Unit::TestCase
   end
 
   def test_get
-    @publisher_connection.get("users")
+    @server_connection.get("users/instances")
   end
 
   def test_get_with_invalid_key
-    connection = Fauna::Connection.new(:publisher_key => 'bad_key')
+    connection = Fauna::Connection.new(:secret => 'bad_key', :domain => @server_connection.domain, :scheme => @server_connection.scheme)
     assert_raises(Fauna::Connection::Unauthorized) do
-      connection.get("users")
+      connection.get("users/instances")
     end
   end
 
@@ -22,16 +22,16 @@ class ConnectionTest < MiniTest::Unit::TestCase
   end
 
   def test_put
-    user = @publisher_connection.post("users", @attributes)['resource']
-    user = @publisher_connection.put(user['ref'], {:data => {:pockets => 2}})['resource']
+    user = @server_connection.post("users", @attributes)['resource']
+    user = @server_connection.put(user['ref'], {:data => {:pockets => 2}})['resource']
     assert_equal 2, user['data']['pockets']
   end
 
   def test_delete
-    user = @publisher_connection.post("users", @attributes)['resource']
-    @publisher_connection.delete(user['ref'])
+    user = @server_connection.post("users", @attributes)['resource']
+    @server_connection.delete(user['ref'])
     assert_raises(Fauna::Connection::NotFound) do
-      @publisher_connection.get(user['ref'])
+      @server_connection.get(user['ref'])
     end
   end
 end

data/test/database_test.rb

@@ -0,0 +1,47 @@
+require File.expand_path('../test_helper', __FILE__)
+
+class DatabaseTest < MiniTest::Unit::TestCase
+
+  def setup
+    super
+    @model = Fauna::Database.new("ref" => "databases/fauna-ruby-test2")
+    Fauna::Client.context(@root_connection) do
+      @model.save
+    end
+  end
+
+  def test_create
+    assert_raises(Fauna::Connection::Unauthorized) do
+      @model.save
+    end
+  end
+
+  def test_find
+    assert_raises(Fauna::Connection::Unauthorized) do
+      Fauna::Database.find(@model.ref)
+    end
+    Fauna::Client.context(@root_connection) do
+      assert_equal @model, Fauna::Database.find(@model.ref)
+    end
+  end
+
+  def test_self
+    database = Fauna::Resource.find('databases/self')
+    assert_equal "databases/fauna-ruby-test", database.ref
+
+    assert_raises(Fauna::Connection::BadRequest) do
+      Fauna::Client.context(@root_connection) do
+        Fauna::Resource.find('databases/self')
+      end
+    end
+  end
+
+  def test_destroy
+    assert_raises(Fauna::Connection::Unauthorized) do
+      Fauna::Resource.find('databases/self').delete
+    end
+    Fauna::Client.context(@root_connection) do
+      @model.delete
+    end
+  end
+end

data/test/readme_test.rb

@@ -8,9 +8,7 @@ class ReadmeTest < MiniTest::Unit::TestCase
     sections.select do |text|
       if text =~ /^ruby/
         next if text =~ /ActionController|logger/
-        text.gsub!("publisher@example.com", FAUNA_TEST_EMAIL)
-        text.gsub!("secret", FAUNA_TEST_PASSWORD)
-        text.gsub!("Fauna.connection", "$fauna")
+        text.gsub!('$fauna = Fauna::Connection.new(secret: server_key)', '$fauna = SERVER_CONNECTION')
         code << text[4..-1]
       end
     end
@@ -26,6 +24,7 @@ class ReadmeTest < MiniTest::Unit::TestCase
       puts e.backtrace
       raise
     end
+
     File.delete(tmp.path)
   end
 end

data/test/set_test.rb

@@ -0,0 +1,94 @@
+require File.expand_path('../test_helper', __FILE__)
+
+# TODO use association_test classes
+
+class SetTest < MiniTest::Unit::TestCase
+
+  def setup
+    super
+    @model = Fauna::Resource.create 'classes/message_boards'
+    @posts = @model.set 'posts'
+  end
+
+  def test_page
+    page = @posts.page
+    assert_equal "#{@model.ref}/sets/posts", page.ref
+    assert_equal 0, page.refs.size
+  end
+
+  def test_pagination
+    @posts.add(Fauna::Resource.create 'classes/posts')
+    @posts.add(Fauna::Resource.create 'classes/posts')
+    @posts.add(Fauna::Resource.create 'classes/posts')
+    @posts.add(Fauna::Resource.create 'classes/posts')
+    @posts.add(Fauna::Resource.create 'classes/posts')
+
+    page1 = @posts.page(:size => 2)
+    assert_equal 2, page1.refs.size
+    page2 = @posts.page(:size => 2, :before => page1.before)
+    assert_equal 2, page2.refs.size
+    page3 = @posts.page(:size => 2, :before => page2.before)
+    assert_equal 1, page3.refs.size
+
+    page4 = @posts.page(:size => 2, :after => page3.refs.last)
+    assert_equal 2, page4.refs.size
+    page5 = @posts.page(:size => 2, :after => page4.after)
+    assert_equal 2, page5.refs.size
+    page6 = @posts.page(:size => 2, :after => page5.refs.first)
+    assert_equal 1, page6.refs.size
+  end
+
+  def test_any
+    @posts.add(Fauna::Resource.create 'classes/posts')
+    assert @posts.page.any?
+    assert @posts.page.refs.any?
+    assert @posts.events.any?
+    assert @posts.events.events.any?
+  end
+
+  def test_event_set_add
+    post = Fauna::Resource.create 'classes/posts'
+    @posts.add(post)
+    page = @posts.page
+    assert_equal 1, page.refs.size
+    assert_equal post.ref, page.refs[0]
+  end
+
+  def test_event_set_remove
+    @posts.add(Fauna::Resource.create 'classes/posts')
+    page = @posts.page
+    assert_equal 1, page.refs.size
+    @posts.remove(page.refs[0])
+  end
+
+  def test_event_set_refs
+    post = Fauna::Resource.create 'classes/posts'
+    @posts.add(post)
+    assert_equal [post.ref], @posts.page.refs
+  end
+
+  def test_event_set_query
+    posts = (1..3).map do |i|
+      Fauna::Resource.create('classes/posts').tap do |p|
+        @posts.add(p)
+      end
+    end
+
+    comments = posts.map do |p|
+      (1..3).map do |i|
+        Fauna::Resource.create('classes/comments').tap do |c|
+          comments = Fauna::CustomSet.new("#{p.ref}/sets/comments")
+          comments.add(c)
+        end
+      end
+    end
+
+    q = Fauna::Set.join(@posts, 'sets/comments')
+
+    assert_equal 9, q.page.size
+
+    comments.flatten.each do |c|
+      assert q.page.include?(c.ref)
+    end
+  end
+end

data/test/test_helper.rb

@@ -7,34 +7,46 @@ require "fauna"
 require "securerandom"
 require "mocha/setup"
 
-FAUNA_TEST_EMAIL = ENV["FAUNA_TEST_EMAIL"]
-FAUNA_TEST_PASSWORD = ENV["FAUNA_TEST_PASSWORD"]
+FAUNA_TEST_ROOTKEY = ENV["FAUNA_TEST_ROOTKEY"]
+FAUNA_TEST_DOMAIN = ENV["FAUNA_TEST_DOMAIN"]
+FAUNA_TEST_SCHEME = ENV["FAUNA_TEST_SCHEME"]
 
-if !(FAUNA_TEST_PASSWORD && FAUNA_TEST_PASSWORD)
-  raise "FAUNA_TEST_EMAIL and FAUNA_TEST_PASSWORD must be defined in your environment to run tests."
+if !(FAUNA_TEST_ROOTKEY && FAUNA_TEST_DOMAIN && FAUNA_TEST_SCHEME)
+  raise "FAUNA_TEST_ROOTKEY, FAUNA_TEST_DOMAIN and FAUNA_TEST_SCHEME must be defined in your environment to run tests."
 end
 
-ROOT_CONNECTION = Fauna::Connection.new(:email => FAUNA_TEST_EMAIL, :password => FAUNA_TEST_PASSWORD)
-ROOT_CONNECTION.delete("everything")
+ROOT_CONNECTION = Fauna::Connection.new(:secret => FAUNA_TEST_ROOTKEY, :domain => FAUNA_TEST_DOMAIN, :scheme => FAUNA_TEST_SCHEME)
 
-key = ROOT_CONNECTION.post("keys/publisher")['resource']['key']
-PUBLISHER_CONNECTION = Fauna::Connection.new(:publisher_key => key)
+Fauna::Client.context(ROOT_CONNECTION) do
+  Fauna::Database.new(:name => "fauna-ruby-test").delete rescue nil
+  Fauna::Database.create(:name => "fauna-ruby-test")
 
-key = ROOT_CONNECTION.post("keys/client")['resource']['key']
-CLIENT_CONNECTION = Fauna::Connection.new(:client_key => key)
+  server_key = Fauna::Key.create :database => "databases/fauna-ruby-test", :role => "server"
+  client_key = Fauna::Key.create :database => "databases/fauna-ruby-test", :role => "client"
 
-load "#{File.dirname(__FILE__)}/fixtures.rb"
+  SERVER_CONNECTION = Fauna::Connection.new(:secret => server_key.secret, :domain => FAUNA_TEST_DOMAIN, :scheme => FAUNA_TEST_SCHEME)
+  CLIENT_CONNECTION = Fauna::Connection.new(:secret => client_key.secret, :domain => FAUNA_TEST_DOMAIN, :scheme => FAUNA_TEST_SCHEME)
+end
+
+# fixtures
 
-Fauna::Client.context(PUBLISHER_CONNECTION) do
-  Fauna.migrate_schema!
+Fauna::Client.context(SERVER_CONNECTION) do
+  Fauna::Class.create :name => 'pigs'
+  Fauna::Class.create :name => 'pigkeepers'
+  Fauna::Class.create :name => 'visions'
+  Fauna::Class.create :name => 'message_boards'
+  Fauna::Class.create :name => 'posts'
+  Fauna::Class.create :name => 'comments'
 end
 
+# test harness
+
 class MiniTest::Unit::TestCase
   def setup
     @root_connection = ROOT_CONNECTION
-    @publisher_connection = PUBLISHER_CONNECTION
+    @server_connection = SERVER_CONNECTION
     @client_connection = CLIENT_CONNECTION
-    Fauna::Client.push_context(@publisher_connection)
+    Fauna::Client.push_context(@server_connection)
   end
 
   def teardown

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fauna
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,40 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-03 00:00:00.000000000 Z
+date: 2013-07-31 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -132,16 +100,14 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 - lib/fauna.rb
+- lib/fauna/cache.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/provided_classes.rb
 - lib/fauna/rails.rb
 - lib/fauna/resource.rb
+- lib/fauna/set.rb
+- lib/fauna/util.rb
 - lib/tasks/fauna.rake
 files:
 - CHANGELOG
@@ -153,28 +119,22 @@ files:
 - examples/welcome.rb
 - fauna.gemspec
 - lib/fauna.rb
+- lib/fauna/cache.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/provided_classes.rb
 - lib/fauna/rails.rb
 - lib/fauna/resource.rb
+- lib/fauna/set.rb
+- lib/fauna/util.rb
 - lib/tasks/fauna.rake
-- 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/database_test.rb
 - test/readme_test.rb
+- test/set_test.rb
 - test/test_helper.rb
-- test/user_test.rb
-- test/validation_test.rb
 homepage: http://fauna.github.com/fauna/
 licenses: []
 post_install_message: 
@@ -206,13 +166,10 @@ 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/event_set_test.rb
-- test/publisher_test.rb
+- test/database_test.rb
 - test/readme_test.rb
+- test/set_test.rb
 - test/test_helper.rb
-- test/user_test.rb
-- test/validation_test.rb

data/lib/fauna/ddl.rb

@@ -1,157 +0,0 @@
-module Fauna
-  class DDL
-
-    def initialize
-      @ddls = []
-    end
-
-    def configure!
-      @ddls.each { |ddl| ddl.configure! }
-    end
-
-    def load!
-      @ddls.each { |ddl| ddl.load! }
-    end
-
-    # resources
-
-    def with(*args, &block)
-      options = args.last.is_a?(Hash) ? args.pop : {}
-      klass = args.first
-      res = ResourceDDL.new(klass, options)
-      res.instance_eval(&block) if block_given?
-      @ddls << res
-      nil
-    end
-
-    class ResourceDDL
-      def initialize(klass, args = {})
-        unless klass || args[:class_name]
-          raise ArgumentError, "Must either provide a class or specify :class_name."
-        end
-
-        @event_sets = []
-        @class = klass || derived_class(args[:class_name])
-        @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
-
-        if @fauna_class =~ %r{^classes/[^/]+$} && @fauna_class != 'classes/config'
-          @meta = Fauna::ClassConfig.alloc('ref' => "#{@fauna_class}/config")
-        end
-      end
-
-      def configure!
-        Fauna.add_class(@fauna_class, @class) if @class
-      end
-
-      def load!
-        @meta.save! if @meta
-        @event_sets.each { |t| t.load! }
-      end
-
-      def event_set(*name)
-        args = name.last.is_a?(Hash) ? name.pop : {}
-        @class.send :event_set, *name
-
-        name.each { |n| @event_sets << EventSetDDL.new(@fauna_class, n, args) }
-      end
-
-      def field(*name)
-        @class.send :field, *name
-      end
-
-      def reference(*name)
-        @class.send :reference, *name
-      end
-
-      private
-
-      def max_super(name)
-        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 derived_class(name)
-        s = max_super(name)
-        case s
-        when Fauna::Class then Class.new(Fauna::Class)
-        when Fauna::Resource then Class.new(Fauna::Resource)
-        else s
-        end
-      end
-
-      def derived_fauna_class(klass)
-        if klass < Fauna::User
-          "users"
-        elsif klass < Fauna::Publisher
-          "publisher"
-        elsif  klass < Fauna::Class
-          "classes/#{klass.name.tableize}"
-        else
-          raise ArgumentError, "Must specify a :class_name for non-default resource class #{klass.name}"
-        end
-      end
-    end
-
-    # event_sets
-
-    class EventSetDDL
-      def initialize(parent_class, name, args)
-        @meta = EventSetConfig.new(parent_class, name, args)
-      end
-
-      def configure!
-      end
-
-      def load!
-        @meta.save!
-      end
-    end
-
-    # commands
-
-    # def command(name)
-    #   cmd = CommandDDL.new(name)
-
-    #   yield cmd
-    #   @ddls << cmd
-
-    #   nil
-    # end
-
-    # class CommandDDL
-    #   attr_accessor :comment
-
-    #   def initialize(name)
-    #     @actions = []
-    #   end
-
-    #   def configure!
-    #   end
-
-    #   def load!
-    #   end
-
-    #   def get(path, args = {})
-    #     args.update method: 'GET', path: path
-    #     args.stringify_keys!
-
-    #     @actions << args
-    #   end
-    # end
-  end
-
-  # c.command "name" do |cmd|
-  #   cmd.comment = "foo bar"
-
-  #   cmd.get "users/self", :actor => "blah", :body => {}
-  # end
-end