fauna 1.1.0 → 1.1.1

data/CHANGELOG

@@ -1,4 +1,6 @@
-v1.1.0. Updates for Fauna 1.1. Remove schema configuration.
+v1.1.1 Remove last bit of ORM-ness.
+
+v1.1.0 Updates for Fauna 1.1. Remove schema configuration.
 
 v0.2.6 Implement set paging.
 

data/Manifest

@@ -0,0 +1,24 @@
+CHANGELOG
+Gemfile
+LICENSE
+Manifest
+README.md
+Rakefile
+fauna.gemspec
+lib/fauna.rb
+lib/fauna/cache.rb
+lib/fauna/client.rb
+lib/fauna/connection.rb
+lib/fauna/named_resource.rb
+lib/fauna/rails.rb
+lib/fauna/resource.rb
+lib/fauna/set.rb
+lib/fauna/util.rb
+lib/tasks/fauna.rake
+test/class_test.rb
+test/client_test.rb
+test/connection_test.rb
+test/database_test.rb
+test/readme_test.rb
+test/set_test.rb
+test/test_helper.rb

data/fauna.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = "fauna"
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Fauna, Inc."]
-  s.date = "2013-07-31"
+  s.date = "2013-08-08"
   s.description = "Official Ruby client for the Fauna API."
   s.email = ""
-  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.md", "lib/fauna.rb", "lib/fauna/cache.rb", "lib/fauna/client.rb", "lib/fauna/connection.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"]
-  s.files = ["CHANGELOG", "Gemfile", "LICENSE", "Manifest", "README.md", "Rakefile", "examples/welcome.rb", "fauna.gemspec", "lib/fauna.rb", "lib/fauna/cache.rb", "lib/fauna/client.rb", "lib/fauna/connection.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/class_test.rb", "test/client_test.rb", "test/connection_test.rb", "test/database_test.rb", "test/readme_test.rb", "test/set_test.rb", "test/test_helper.rb"]
+  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.md", "lib/fauna.rb", "lib/fauna/cache.rb", "lib/fauna/client.rb", "lib/fauna/connection.rb", "lib/fauna/named_resource.rb", "lib/fauna/rails.rb", "lib/fauna/resource.rb", "lib/fauna/set.rb", "lib/fauna/util.rb", "lib/tasks/fauna.rake"]
+  s.files = ["CHANGELOG", "Gemfile", "LICENSE", "Manifest", "README.md", "Rakefile", "fauna.gemspec", "lib/fauna.rb", "lib/fauna/cache.rb", "lib/fauna/client.rb", "lib/fauna/connection.rb", "lib/fauna/named_resource.rb", "lib/fauna/rails.rb", "lib/fauna/resource.rb", "lib/fauna/set.rb", "lib/fauna/util.rb", "lib/tasks/fauna.rake", "test/class_test.rb", "test/client_test.rb", "test/connection_test.rb", "test/database_test.rb", "test/readme_test.rb", "test/set_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"]

data/lib/fauna.rb

@@ -20,5 +20,5 @@ require 'fauna/connection'
 require 'fauna/cache'
 require 'fauna/client'
 require 'fauna/resource'
+require 'fauna/named_resource'
 require 'fauna/set'
-require 'fauna/provided_classes'

data/lib/fauna/connection.rb

@@ -33,12 +33,13 @@ module Fauna
       end
     end
 
-    attr_reader :domain, :scheme
+    attr_reader :domain, :scheme, :port, :credentials
 
     def initialize(params={})
       @logger = params[:logger] || nil
       @domain = params[:domain] || "rest1.fauna.org"
       @scheme = params[:scheme] || "https"
+      @port = params[:port] || 80
 
       if ENV["FAUNA_DEBUG"]
         @logger = Logger.new(STDERR)
@@ -135,7 +136,7 @@ module Fauna
     end
 
     def url(ref)
-      "#{@scheme}://#{@credentials}@#{@domain}/#{ref}"
+      "#{@scheme}://#{@credentials}@#{@domain}:#{@port}/#{ref}"
     end
   end
 end

data/lib/fauna/named_resource.rb

@@ -0,0 +1,17 @@
+module Fauna
+  class NamedResource < Fauna::Resource
+    def name
+      struct['name']
+    end
+
+    def ref
+      super || "#{fauna_class}/#{name}"
+    end
+
+    private
+
+    def post
+      raise Invalid, "Cannot POST to named resource."
+    end
+  end
+end

data/lib/fauna/resource.rb

@@ -2,9 +2,8 @@ module Fauna
   class Resource
     def self.resource_subclass(fauna_class)
       case fauna_class
-      when 'databases' then Fauna::Database
-      when 'classes' then Fauna::Class
-      when 'keys' then Fauna::Key
+      when 'databases' then Fauna::NamedResource
+      when 'classes' then Fauna::NamedResource
       when 'resources' then Fauna::SetPage
       when 'events' then Fauna::EventsPage
       else Fauna::Resource

data/test/client_test.rb

@@ -19,7 +19,7 @@ class ClientTest < MiniTest::Unit::TestCase
       user = Fauna::Resource.create("users", @attributes)
       Fauna::Client.context(@client_connection) do
         assert_raises(Fauna::Connection::Unauthorized) do
-          Fauna::Client.get(user.ref)
+          instance = Fauna::Resource.create("classes/posts", @attributes)
         end
       end
     end
@@ -34,7 +34,7 @@ class ClientTest < MiniTest::Unit::TestCase
       @token = Fauna::Client.post("tokens", @attributes)
     end
 
-    Fauna::Client.context(Fauna::Connection.new(:secret => @token['secret'], :domain => @server_connection.domain, :scheme => @server_connection.scheme)) do
+    Fauna::Client.context(Fauna::Connection.new(:secret => @token['secret'], :domain => @server_connection.domain, :scheme => @server_connection.scheme, :port => @server_connection.port)) do
       user = Fauna::Client.get(@token['user'])
       Fauna::Client.delete(user['ref'])
     end

data/test/connection_test.rb

@@ -11,7 +11,7 @@ class ConnectionTest < MiniTest::Unit::TestCase
   end
 
   def test_get_with_invalid_key
-    connection = Fauna::Connection.new(:secret => 'bad_key', :domain => @server_connection.domain, :scheme => @server_connection.scheme)
+    connection = Fauna::Connection.new(:secret => 'bad_key', :domain => @server_connection.domain, :scheme => @server_connection.scheme, :port => @server_connection.port)
     assert_raises(Fauna::Connection::Unauthorized) do
       connection.get("users/instances")
     end

data/test/database_test.rb

@@ -4,7 +4,7 @@ class DatabaseTest < MiniTest::Unit::TestCase
 
   def setup
     super
-    @model = Fauna::Database.new("ref" => "databases/fauna-ruby-test2")
+    @model = Fauna::Resource.new 'databases', :name => 'fauna-ruby-test2'
     Fauna::Client.context(@root_connection) do
       @model.save
     end
@@ -16,15 +16,6 @@ class DatabaseTest < MiniTest::Unit::TestCase
     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

data/test/set_test.rb

@@ -34,7 +34,7 @@ class SetTest < MiniTest::Unit::TestCase
     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)
+    page6 = @posts.page(:size => 2, :after => page5.after)
     assert_equal 1, page6.refs.size
   end
 

data/test/test_helper.rb

@@ -7,36 +7,37 @@ require "fauna"
 require "securerandom"
 require "mocha/setup"
 
-FAUNA_TEST_ROOTKEY = ENV["FAUNA_TEST_ROOTKEY"]
-FAUNA_TEST_DOMAIN = ENV["FAUNA_TEST_DOMAIN"]
-FAUNA_TEST_SCHEME = ENV["FAUNA_TEST_SCHEME"]
+FAUNA_ROOTKEY = ENV["FAUNA_ROOTKEY"]
+FAUNA_DOMAIN = ENV["FAUNA_DOMAIN"]
+FAUNA_SCHEME = ENV["FAUNA_SCHEME"]
+FAUNA_PORT = ENV["FAUNA_PORT"]
 
-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."
+if !(FAUNA_ROOTKEY && FAUNA_DOMAIN && FAUNA_SCHEME && FAUNA_PORT)
+  raise "FAUNA_ROOTKEY, FAUNA_DOMAIN, FAUNA_SCHEME and FAUNA_PORT must be defined in your environment to run tests."
 end
 
-ROOT_CONNECTION = Fauna::Connection.new(:secret => FAUNA_TEST_ROOTKEY, :domain => FAUNA_TEST_DOMAIN, :scheme => FAUNA_TEST_SCHEME)
+ROOT_CONNECTION = Fauna::Connection.new(:secret => FAUNA_ROOTKEY, :domain => FAUNA_DOMAIN, :scheme => FAUNA_SCHEME, :port => FAUNA_PORT)
 
 Fauna::Client.context(ROOT_CONNECTION) do
-  Fauna::Database.new(:name => "fauna-ruby-test").delete rescue nil
-  Fauna::Database.create(:name => "fauna-ruby-test")
+  Fauna::Resource.new('databases', :name => "fauna-ruby-test").delete rescue nil
+  Fauna::Resource.create 'databases', :name => "fauna-ruby-test"
 
-  server_key = Fauna::Key.create :database => "databases/fauna-ruby-test", :role => "server"
-  client_key = Fauna::Key.create :database => "databases/fauna-ruby-test", :role => "client"
+  server_key = Fauna::Resource.create 'keys', :database => "databases/fauna-ruby-test", :role => "server"
+  client_key = Fauna::Resource.create 'keys', :database => "databases/fauna-ruby-test", :role => "client"
 
-  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)
+  SERVER_CONNECTION = Fauna::Connection.new(:secret => server_key.secret, :domain => FAUNA_DOMAIN, :scheme => FAUNA_SCHEME, :port => FAUNA_PORT)
+  CLIENT_CONNECTION = Fauna::Connection.new(:secret => client_key.secret, :domain => FAUNA_DOMAIN, :scheme => FAUNA_SCHEME, :port => FAUNA_PORT)
 end
 
 # fixtures
 
 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'
+  Fauna::Resource.create 'classes', :name => 'pigs'
+  Fauna::Resource.create 'classes', :name => 'pigkeepers'
+  Fauna::Resource.create 'classes', :name => 'visions'
+  Fauna::Resource.create 'classes', :name => 'message_boards'
+  Fauna::Resource.create 'classes', :name => 'posts'
+  Fauna::Resource.create 'classes', :name => 'comments'
 end
 
 # test harness

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fauna
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2013-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -103,7 +103,7 @@ extra_rdoc_files:
 - lib/fauna/cache.rb
 - lib/fauna/client.rb
 - lib/fauna/connection.rb
-- lib/fauna/provided_classes.rb
+- lib/fauna/named_resource.rb
 - lib/fauna/rails.rb
 - lib/fauna/resource.rb
 - lib/fauna/set.rb
@@ -116,13 +116,12 @@ files:
 - Manifest
 - README.md
 - Rakefile
-- examples/welcome.rb
 - fauna.gemspec
 - lib/fauna.rb
 - lib/fauna/cache.rb
 - lib/fauna/client.rb
 - lib/fauna/connection.rb
-- lib/fauna/provided_classes.rb
+- lib/fauna/named_resource.rb
 - lib/fauna/rails.rb
 - lib/fauna/resource.rb
 - lib/fauna/set.rb

data/examples/welcome.rb

@@ -1,73 +0,0 @@
-#!/usr/bin/env ruby
-# Ruby 1.9 required
-
-require "rubygems"
-require "pp"
-begin
-  require "fauna"
-rescue LoadError
-  puts "Please run: sudo gem install fauna"
-  exit!
-end
-
-print "Email: "
-email = gets.chomp
-
-print "Password: "
-pass = gets.chomp
-
-puts "\nConnected to Fauna Cloud Platform."
-
-puts "\nCreating a server key:"
-root = Fauna::Connection.new(email: email, password: pass)
-key = root.post("keys", "role" => "server")['resource']['key']
-$fauna = Fauna::Connection.new(server_key: key)
-pp key
-
-puts "\nCreating classes:"
-class User < Fauna::User
-  pp self
-end
-
-class Spell < Fauna::Class
-  pp self
-end
-
-puts "\nCreating an event set."
-Fauna.schema do
-  with User do
-    event_set :spellbook
-  end
-
-  with Spell
-end
-
-Fauna::Client.context($fauna) do
-  puts "\nMigrating."
-  Fauna.migrate_schema!
-
-  puts "\nCreating a user:"
-  user = User.create!(
-    email: "#{object_id}@example.com",
-    password: "1234",
-    data: {
-      name: "Taran",
-      profession: "Pigkeeper",
-      location: "Caer Dallben"
-  })
-  pp user.struct
-
-  puts "\nCreating an instance:"
-  spell = Spell.create!(
-    data: {
-      pronouncement: "Draw Dyrnwyn only thou of royal blood.",
-      title: "Protector of Dyrnwyn"
-  })
-  pp spell.struct
-
-  puts "\nAdding the instance to the user's event set."
-  user.spellbook.add(spell)
-
-  puts "\nFetching the event set:"
-  pp user.spellbook.page.struct
-end

data/lib/fauna/provided_classes.rb

@@ -1,39 +0,0 @@
-module Fauna
-  class NamedResource < Fauna::Resource
-    def name; struct['name'] end
-
-    def ref; super || "#{fauna_class}/#{name}" end
-
-    private
-
-    def post
-      raise Invalid, "Cannot POST to named resource."
-    end
-  end
-
-  class Database < Fauna::NamedResource
-    def self.new(*args); super('databases', *args) end
-  end
-
-  class Class < Fauna::NamedResource
-    def self.new(*args); super('classes', *args) end
-  end
-
-  class Key < Fauna::Resource
-    def self.new(*args); super('keys', *args) end
-
-    def database
-      struct['database'] || ref.split('/keys').first
-    end
-
-    private
-
-    def post
-      Fauna::Client.post("#{database}/keys", struct)
-    end
-  end
-
-  class Token < Fauna::Resource
-    def self.new(*args); super('tokens', *args) end
-  end
-end