fauna 1.3.2 → 1.3.3

data/lib/fauna/resource.rb

@@ -1,5 +1,5 @@
 module Fauna
-  class Resource
+  class Resource # rubocop:disable Metrics/ClassLength
     def self.resource_subclass(fauna_class)
       case fauna_class
       when 'databases' then Fauna::NamedResource
@@ -18,7 +18,7 @@ module Fauna
 
     def self.new(fauna_class, attrs = {})
       obj = resource_subclass(fauna_class).allocate
-      obj.instance_variable_set('@struct', { 'ref' => nil, 'ts' => nil, 'deleted' => false, 'class' => fauna_class })
+      obj.instance_variable_set('@struct', 'ref' => nil, 'ts' => nil, 'deleted' => false, 'class' => fauna_class)
       obj.struct = attrs
       obj
     end
@@ -32,7 +32,7 @@ module Fauna
     end
 
     attr_reader :struct
-    alias :to_hash :struct
+    alias_method :to_hash, :struct
 
     def ts
       struct['ts'] ? Fauna.time_from_usecs(struct['ts']) : nil
@@ -42,27 +42,47 @@ module Fauna
       struct['ts'] = Fauna.usecs_from_time(time)
     end
 
-    def ref; struct['ref'] end
-    def fauna_class; struct['class'] end
-    def deleted; struct['deleted'] end
-    def constraints; struct['constraints'] ||= {} end
-    def data; struct['data'] ||= {} end
-    def references; struct['references'] ||= {} end
-    def permissions; struct['permissions'] ||= {} end
+    def ref
+      struct['ref']
+    end
+
+    def fauna_class
+      struct['class']
+    end
+
+    def deleted
+      struct['deleted']
+    end
+
+    def constraints
+      struct['constraints'] ||= {}
+    end
+
+    def data
+      struct['data'] ||= {}
+    end
+
+    def references
+      struct['references'] ||= {}
+    end
+
+    def permissions
+      struct['permissions'] ||= {}
+    end
 
     def events(pagination = {})
       EventsPage.find("#{ref}/events", {}, pagination)
     end
 
     def new_event(action, time)
-      if persisted?
-        Fauna::Event.new(
-          'resource' => ref,
-          'set' => ref,
-          'action' => action,
-          'ts' => Fauna.usecs_from_time(time)
-        )
-      end
+      return unless persisted?
+
+      Fauna::Event.new(
+        'resource' => ref,
+        'set' => ref,
+        'action' => action,
+        'ts' => Fauna.usecs_from_time(time),
+      )
     end
 
     def set(name)
@@ -70,9 +90,9 @@ module Fauna
     end
 
     def eql?(other)
-      self.fauna_class == other.fauna_class && self.ref == other.ref && self.ref != nil
+      fauna_class == other.fauna_class && ref == other.ref && !ref.nil?
     end
-    alias :== :eql?
+    alias_method :==, :eql?
 
     # dynamic field access
 
@@ -81,9 +101,9 @@ module Fauna
     end
 
     def method_missing(method, *args)
-      if field = getter_method(method)
+      if (field = getter_method(method))
         struct[field]
-      elsif field = setter_method(method)
+      elsif (field = setter_method(method))
         struct[field] = args.first
       else
         super
@@ -92,11 +112,17 @@ module Fauna
 
     # object lifecycle
 
-    def new_record?; ref.nil? end
+    def new_record?
+      ref.nil?
+    end
 
-    def deleted?; !!deleted end
+    def deleted?
+      !!deleted
+    end
 
-    def persisted?; !(new_record? || deleted?) end
+    def persisted?
+      !(new_record? || deleted?)
+    end
 
     def save
       new_record? ? post : put
@@ -124,15 +150,17 @@ module Fauna
     # TODO: make this configurable, and possible to invert to a white list
     UNASSIGNABLE_ATTRIBUTES = %w(ts deleted fauna_class).inject({}) { |h, attr| h.update attr => true }
 
-    DEFAULT_ATTRIBUTES = {"data" => {}, "references" => {}, "constraints" => {} }
-
     def struct=(attributes)
-      DEFAULT_ATTRIBUTES.merge(attributes).each do |name, val|
+      default_attributes.merge(attributes).each do |name, val|
         send "#{name}=", val unless UNASSIGNABLE_ATTRIBUTES[name.to_s]
       end
     end
 
-    private
+  private
+
+    def default_attributes
+      { 'data' => {}, 'references' => {}, 'constraints' => {} }
+    end
 
     def getter_method(method)
       field = method.to_s
@@ -140,7 +168,7 @@ module Fauna
     end
 
     def setter_method(method)
-      (/(.*)=$/ =~ method.to_s) ? $1 : nil
+      (/(.*)=$/ =~ method.to_s) ? Regexp.last_match[1] : nil
     end
   end
 end

data/lib/fauna/set.rb

@@ -1,6 +1,5 @@
 module Fauna
   class Set
-
     attr_reader :ref
 
     def initialize(ref)
@@ -62,16 +61,12 @@ module Fauna
     def param_strings
       if @function == 'match'
         # Escape strings for match values
-        @params = @params[0..1] + @params[2..-1].map do |p|
-          if p.is_a?(String)
-            p.inspect
-          else
-            p
-          end
+        @params = @params[0..1] + @params[2..-1].collect do |p|
+          p.is_a?(String) ? p.inspect : p
         end
       end
 
-      @param_strings ||= @params.map do |p|
+      @param_strings ||= @params.collect do |p|
         if p.respond_to? :expr
           p.expr
         elsif p.respond_to? :ref
@@ -156,16 +151,24 @@ module Fauna
       refs.empty?
     end
 
-    def fauna_count; struct['count'] end
-    def length; refs.length end
-    def size; refs.size end
+    def fauna_count
+      struct['count']
+    end
+
+    def length
+      refs.length
+    end
+
+    def size
+      refs.size
+    end
   end
 
   class EventsPage < Fauna::Resource
     include Enumerable
 
     def events
-      @events ||= struct['events'].map { |e| Event.new(e) }
+      @events ||= struct['events'].collect { |e| Event.new(e) }
     end
 
     def each(&block)
@@ -176,9 +179,17 @@ module Fauna
       events.empty?
     end
 
-    def fauna_count; struct['count'] end
-    def length; events.length end
-    def size; events.size end
+    def fauna_count
+      struct['count']
+    end
+
+    def length
+      events.length
+    end
+
+    def size
+      events.size
+    end
   end
 
   class Event
@@ -223,7 +234,7 @@ module Fauna
     end
 
     def editable?
-      ['create', 'delete'].include? action
+      %w(create delete).include? action
     end
   end
 end

data/lib/fauna/util.rb

@@ -1,9 +1,9 @@
 module Fauna
   def self.time_from_usecs(microseconds)
-    Time.at(microseconds/1_000_000, microseconds % 1_000_000)
+    Time.at(microseconds / 1_000_000, microseconds % 1_000_000)
   end
 
   def self.usecs_from_time(time)
-    time.to_i * 1000000 + time.usec
+    time.to_i * 1_000_000 + time.usec
   end
 end

data/lib/tasks/fauna.rake

@@ -2,7 +2,7 @@
 task :environment
 
 namespace :fauna do
-  desc "Migrate your Fauna database to the latest version of your schema"
+  desc 'Migrate your Fauna database to the latest version of your schema'
   task :migrate => :environment do
     puts "Migrating #{Rails.env} Fauna database schema"
     Fauna::Client.context(Fauna.connection) do
@@ -10,14 +10,14 @@ namespace :fauna do
     end
   end
 
-  desc "Completely reset your Fauna database"
+  desc 'Completely reset your Fauna database'
   task :reset => :environment do
     if Rails.env.production?
       puts "Won't reset #{Rails.env} Fauna database"
     else
       Fauna::Client.context(Fauna.root_connection) do
         puts "Resetting #{Rails.env} Fauna database"
-        Fauna::Client.delete("everything")
+        Fauna::Client.delete('everything')
       end
       Fauna.auth!
     end
@@ -29,8 +29,8 @@ namespace :fauna do
     Fauna::Client.context(Fauna.connection) do
       FileUtils.mkdir_p(Fauna::FIXTURES_DIR)
 
-      class_configs = Fauna.connection.get("/classes")["references"] || {}
-      class_configs["users"] = nil
+      class_configs = Fauna.connection.get('/classes')['references'] || {}
+      class_configs['users'] = nil
 
       Dir.chdir(Fauna::FIXTURES_DIR) do
         class_configs.each do |ref, value|
@@ -38,10 +38,10 @@ namespace :fauna do
           FileUtils.mkdir_p(class_name)
 
           Dir.chdir(class_name) do
-            # FIXME shouldn't round trip JSON
-            File.open("config.json", "w") { |f| f.write(value.to_json)} if value
-            (Fauna.connection.get(class_name)["references"] || {}).each do |ref, value|
-              File.open("#{ref.split("/").last}.json", "w") { |f| f.write(value.to_json) }
+            # FIXME: shouldn't round trip JSON
+            File.open('config.json', 'w') { |f| f.write(value.to_json) } if value
+            (Fauna.connection.get(class_name)['references'] || {}).each do |inner_ref, inner_value|
+              File.open("#{inner_ref.split('/').last}.json", 'w') { |f| f.write(inner_value.to_json) }
             end
           end
         end
@@ -49,17 +49,17 @@ namespace :fauna do
     end
   end
 
-  desc "Load the contents of your Fauna database"
+  desc 'Load the contents of your Fauna database'
   task :load => :environment do
     puts "Loading #{Rails.env} Fauna database contents from #{Fauna::FIXTURES_DIR}"
     Fauna::Client.context(Fauna.connection) do
       Dir.chdir(Fauna::FIXTURES_DIR) do
-        Dir["**/*.json"].map do |filename|
+        Dir['**/*.json'].collect do |filename|
           value = JSON.parse(File.open(filename) { |f| f.read })
           begin
-            Fauna.connection.put(value["ref"], value)
+            Fauna.connection.put(value['ref'], value)
           rescue Fauna::Connection::NotFound
-            Fauna.connection.post(value["ref"].split("/")[0..-2].join("/"), value)
+            Fauna.connection.post(value['ref'].split('/')[0..-2].join('/'), value)
           end
         end
       end
@@ -68,4 +68,4 @@ namespace :fauna do
 
 end
 
-task :test => ["fauna:reset", "fauna:migrate", "fauna:load"]
+task :test => ['fauna:reset', 'fauna:migrate', 'fauna:load']

data/test/class_test.rb

@@ -1,12 +1,17 @@
 require File.expand_path('../test_helper', __FILE__)
 
 class ClassTest < MiniTest::Unit::TestCase
-
   def setup
     super
     @model = Fauna::Resource.new('classes/pigs')
   end
 
+  def test_new
+    settings = Fauna::Resource.new('settings', :ref => 'settings/12345678', :email => 'test@test.com')
+    user = Fauna::Resource.new('users', :ref => 'users/87654321')
+    assert user.data.object_id != settings.data.object_id
+  end
+
   def test_create
     pig = Fauna::Resource.create 'classes/pigs', :data => { :visited => true }
     assert_equal true, pig.data['visited']

data/test/client_test.rb

@@ -3,12 +3,12 @@ require File.expand_path('../test_helper', __FILE__)
 class ClientTest < MiniTest::Unit::TestCase
   def setup
     super
-    @attributes = { "name" => "Princess Eilonwy", "email" => email, "password" => password }
+    @attributes = { 'name' => 'Princess Eilonwy', 'email' => email, 'password' => password }
   end
 
   def test_database_context
     Fauna::Client.context(@server_connection) do
-      user = Fauna::Client.post("users", @attributes)
+      user = Fauna::Client.post('users', @attributes)
       user = Fauna::Client.get(user['ref'])
       Fauna::Client.delete(user['ref'])
     end
@@ -16,10 +16,11 @@ class ClientTest < MiniTest::Unit::TestCase
 
   def test_client_context
     Fauna::Client.context(@client_connection) do
-      user = Fauna::Resource.create("users", @attributes)
+      Fauna::Resource.create('users', @attributes)
+
       Fauna::Client.context(@client_connection) do
         assert_raises(Fauna::Connection::PermissionDenied) do
-          instance = Fauna::Resource.create("classes/posts", @attributes)
+          Fauna::Resource.create('classes/posts', @attributes)
         end
       end
     end
@@ -27,11 +28,11 @@ class ClientTest < MiniTest::Unit::TestCase
 
   def test_token_context
     Fauna::Client.context(@server_connection) do
-      Fauna::Client.post("users", @attributes)
+      Fauna::Client.post('users', @attributes)
     end
 
     Fauna::Client.context(@client_connection) do
-      @token = Fauna::Client.post("tokens", @attributes)
+      @token = Fauna::Client.post('tokens', @attributes)
     end
 
     Fauna::Client.context(Fauna::Connection.new(:secret => @token['secret'], :domain => @server_connection.domain, :scheme => @server_connection.scheme, :port => @server_connection.port)) do
@@ -42,7 +43,7 @@ class ClientTest < MiniTest::Unit::TestCase
 
   def test_caching_1
     Fauna::Client.context(@server_connection) do
-      user = Fauna::Client.post("users", @attributes)
+      user = Fauna::Client.post('users', @attributes)
       @server_connection.expects(:get).never
       Fauna::Client.get(user['ref'])
     end
@@ -50,7 +51,7 @@ class ClientTest < MiniTest::Unit::TestCase
 
   def test_caching_2
     Fauna::Client.context(@client_connection) do
-      user = Fauna::Client.post("users", @attributes)
+      user = Fauna::Client.post('users', @attributes)
 
       Fauna::Client.context(@server_connection) do
         Fauna::Client.get(user['ref'])

data/test/connection_test.rb

@@ -3,47 +3,47 @@ require File.expand_path('../test_helper', __FILE__)
 class ConnectionTest < MiniTest::Unit::TestCase
   def setup
     super
-    @attributes = { "name" => "Arawn", "email" => email, "password" => password }
+    @attributes = { 'name' => 'Arawn', 'email' => email, 'password' => password }
   end
 
   def test_get
-    @server_connection.get("users/instances")
+    @server_connection.get('users/instances')
   end
 
   def test_get_with_invalid_key
     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")
+      connection.get('users/instances')
     end
   end
 
   def test_post
-    @client_connection.post("users", @attributes)['resource']
+    @client_connection.post('users', @attributes)['resource']
   end
 
   def test_put
-    user = @server_connection.post("users", @attributes)['resource']
-    user = @server_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']
 
-    user = @server_connection.put(user['ref'], {:data => {:apples => 3}})['resource']
+    user = @server_connection.put(user['ref'], :data => { :apples => 3 })['resource']
 
     assert_nil user['data']['pockets']
     assert_equal 3, user['data']['apples']
   end
 
   def test_patch
-    user = @server_connection.post("users", @attributes)['resource']
-    user = @server_connection.patch(user['ref'], {:data => {:pockets => 2}})['resource']
-    user = @server_connection.patch(user['ref'], {:data => {:apples => 3}})['resource']
+    user = @server_connection.post('users', @attributes)['resource']
+    user = @server_connection.patch(user['ref'], :data => { :pockets => 2 })['resource']
+    user = @server_connection.patch(user['ref'], :data => { :apples => 3 })['resource']
 
     assert_equal 2, user['data']['pockets']
     assert_equal 3, user['data']['apples']
   end
 
   def test_delete
-    user = @server_connection.post("users", @attributes)['resource']
+    user = @server_connection.post('users', @attributes)['resource']
     @server_connection.delete(user['ref'])
     assert_raises(Fauna::Connection::NotFound) do
       @server_connection.get(user['ref'])
@@ -61,6 +61,6 @@ class ConnectionTest < MiniTest::Unit::TestCase
   #       raise RestClient::ServerBrokeConnection
   #     end
   #   end
-  #   @server_connection.get("users/instances")
+  #   @server_connection.get('users/instances')
   # end
 end