fauna 1.3.2 → 1.3.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGY2NjU0NzY0YjAxMGViODQ0YTRlYzBkOGFjM2JlNGJiZTJkYzY1Ng==
+    YzZmYmZjOTlmOWM0ZjEwYWY4ZjcwOWE3NzVjYjdlYTEwZTQ4Y2Q1OQ==
   data.tar.gz: !binary |-
-    OGJjZmVhODYzNGNiM2RjMTRiMmEwYWQ3NDMyZmU5OWRkNjU5ZDhhYw==
+    Y2ExYTdiMzU3YjQ5OGQ1Zjg2OWYzMjI5OWE4Mzg5MWQwYzgzOTBlNA==
 SHA512:
   metadata.gz: !binary |-
-    MTliY2Q1ZTRlNDIzMWNmNTAyOGQ4OWJmZDQwNmExZTViYjM3NzJjZGRiMWNk
-    OTk3NjA0M2MwODNkZTVlNzU5ZDhiNDZmMDg0ZTg1MzE2NWE0MDdmYjFkZjg2
-    ZGU3ZWRiZmUxYzE0MmJmNTc5M2IzYWFhOWFiYTE2NzdmNDY1YTM=
+    NDI4MmY3ZTI2YzEyOGQ5MTM5ZDNmZmFiNTJlN2MxYmRjZDM5ZTllMzc1YTYz
+    M2ZkNDJlNjIyMjIxODBjMTgyYjEzYjg1NGFhMzBjN2U1ODNiMjhmZmRjOGQz
+    NWY5OGE0YjVhYTVkZGUzZDIxMGMxNDk3YzdlMzZiYjgwOTliMTY=
   data.tar.gz: !binary |-
-    YzVjZTA3ZTE2ZTMyOTczMDZhOGZhYjBiZWRhMmMxMjgwNWY2NTE4OGQ0Mjhi
-    MmQ3YTJjNWQ1M2ZjZjg0OTA5NmVkOTZlN2NlY2QzZjFiODQ3NWQzYTQ3ZWMx
-    Y2U5NTJhOTgxNjUzODNhYjI4M2ZjMTM3MTE2ZGJhYTA1NjIzMjA=
+    ZjE2NGM0Y2ExZjA3MjcxMDRlNDRlN2Y0OWU1OWM2YzE1MjAxYzZjOGJiYTky
+    ZjIwMWJkYzc4ZWJlZTcxMTk3MDk1Nzc1ZjEwNjU0MzBjMGJhNzFjM2EzOTgw
+    Yzk1Y2NmZTMzMmIwMjBkY2Y1YjhhNzUzYTc3NDk1ODVlNjQxZjA=

data/CHANGELOG

@@ -1,3 +1,5 @@
+v1.3.3 Fix #61.
+
 v1.3.2 Fix patch.
 
 v1.3.1 Switch to Faraday http client.

data/Manifest

@@ -4,7 +4,6 @@ LICENSE
 Manifest
 README.md
 Rakefile
-fauna-ruby.pem
 fauna.gemspec
 lib/fauna.rb
 lib/fauna/cache.rb

data/README.md

@@ -36,8 +36,6 @@ All API requests start with an instance of `Fauna::Connection`.
 Creating a connection requires either a token, a server key, or a
 client key.
 
-Let's use a server key we got from our [Fauna Cloud console](https://fauna.org/account/databases):
-
 ```ruby
 server_key = 'ls8AkXLdakAAAALPAJFy3LvQAAGwDRAS_Prjy6O8VQBfQAlZzwAA'
 ```

data/Rakefile

@@ -1,23 +1,30 @@
 require 'echoe'
 
-Echoe.new("fauna") do |p|
-  p.author = "Fauna, Inc."
-  p.project = "fauna"
-  p.summary = "Ruby client for the Fauna distributed database."
+Echoe.new('fauna') do |p|
+  p.author = 'Fauna, Inc.'
+  p.project = 'fauna'
+  p.summary = 'Ruby client for the Fauna distributed database.'
   p.retain_gemspec = true
-  p.require_signed
-  p.certificate_chain = ["fauna-ruby.pem"]
-  p.licenses = ["Mozilla Public License, Version 2.0 (MPL2)"]
-  p.dependencies = ["faraday ~>0.9.0", "json ~>1.8.0"]
-  p.development_dependencies = ["mocha", "echoe", "minitest ~>4.0"]
+  p.licenses = ['Mozilla Public License, Version 2.0 (MPL2)']
+  p.dependencies = ['faraday ~>0.9.0', 'json ~>1.8.0']
+  p.development_dependencies = ['mocha', 'echoe', 'minitest ~>4.0', 'rubocop']
 end
 
 task :beautify do
-  require "ruby-beautify"
-  Dir["**/*rb"].each do |filename|
+  require 'ruby-beautify'
+  Dir['**/*rb'].each do |filename|
     s = RBeautify.beautify_string(:ruby, File.read(filename))
     File.write(filename, s) unless s.empty?
-   end
+  end
+end
+
+begin
+  require 'rubocop/rake_task'
+  RuboCop::RakeTask.new
+rescue LoadError
+  task :rubocop do
+    $stderr.puts 'Rubocop is disabled'
+  end
 end
 
 task :prerelease => [:manifest, :test, :install]

data/fauna.gemspec

@@ -1,25 +1,23 @@
 # -*- encoding: utf-8 -*-
-# stub: fauna 1.3.2 ruby lib
+# stub: fauna 1.3.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "fauna"
-  s.version = "1.3.2"
+  s.version = "1.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Fauna, Inc."]
-  s.cert_chain = ["/Users/eweaver/fauna/fauna-ruby/fauna-ruby.pem"]
-  s.date = "2014-05-15"
+  s.date = "2014-11-18"
   s.description = "Ruby client for the Fauna distributed database."
   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/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-ruby.pem", "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/query_test.rb", "test/readme_test.rb", "test/set_test.rb", "test/test_helper.rb"]
+  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/query_test.rb", "test/readme_test.rb", "test/set_test.rb", "test/test_helper.rb"]
   s.homepage = "http://fauna.github.com/fauna/"
   s.licenses = ["Mozilla Public License, Version 2.0 (MPL2)"]
   s.rdoc_options = ["--line-numbers", "--title", "Fauna", "--main", "README.md"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "fauna"
   s.rubygems_version = "2.1.10"
-  s.signing_key = "/Users/eweaver/cloudburst/configuration/gem_certificates/gem-private_key.pem"
   s.summary = "Ruby client for the Fauna distributed database."
   s.test_files = ["test/class_test.rb", "test/client_test.rb", "test/connection_test.rb", "test/database_test.rb", "test/query_test.rb", "test/readme_test.rb", "test/set_test.rb", "test/test_helper.rb"]
 
@@ -32,12 +30,14 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<mocha>, [">= 0"])
       s.add_development_dependency(%q<echoe>, [">= 0"])
       s.add_development_dependency(%q<minitest>, ["~> 4.0"])
+      s.add_development_dependency(%q<rubocop>, [">= 0"])
     else
       s.add_dependency(%q<faraday>, ["~> 0.9.0"])
       s.add_dependency(%q<json>, ["~> 1.8.0"])
       s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<echoe>, [">= 0"])
       s.add_dependency(%q<minitest>, ["~> 4.0"])
+      s.add_dependency(%q<rubocop>, [">= 0"])
     end
   else
     s.add_dependency(%q<faraday>, ["~> 0.9.0"])
@@ -45,5 +45,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<echoe>, [">= 0"])
     s.add_dependency(%q<minitest>, ["~> 4.0"])
+    s.add_dependency(%q<rubocop>, [">= 0"])
   end
 end

data/lib/fauna.rb

@@ -5,9 +5,7 @@ require 'faraday'
 require 'cgi'
 require 'zlib'
 
-if defined?(Rake)
-  load "#{File.dirname(__FILE__)}/tasks/fauna.rake"
-end
+load "#{File.dirname(__FILE__)}/tasks/fauna.rake" if defined?(Rake)
 
 module Fauna
   class Invalid < RuntimeError

data/lib/fauna/cache.rb

@@ -6,7 +6,7 @@ module Fauna
     attr_reader :connection
 
     def initialize(connection)
-      raise ArgumentError, "Connection cannot be nil" unless connection
+      fail ArgumentError, 'Connection cannot be nil' unless connection
       @cache = {}
       @connection = connection
     end
@@ -32,18 +32,16 @@ module Fauna
 
     def put(ref, data)
       res = @connection.put(ref, data)
-      if res['resource']
-        update_cache(ref, res)
-        res['resource']
-      end
+      return unless res['resource']
+      update_cache(ref, res)
+      res['resource']
     end
 
     def patch(ref, data)
       res = @connection.patch(ref, data)
-      if res['resource']
-        update_cache(ref, res)
-        res['resource']
-      end
+      return unless res['resource']
+      update_cache(ref, res)
+      res['resource']
     end
 
     def delete(ref, data)
@@ -52,11 +50,11 @@ module Fauna
       nil
     end
 
-    private
+  private
 
     def update_cache(ref, res)
-      # FIXME Implement set range caching
-      if (res['resource']['class'] != "resources" && res['resource']['class'] != "events")
+      # FIXME: Implement set range caching
+      if res['resource']['class'] != 'resources' && res['resource']['class'] != 'events'
         @cache[ref] = res['resource']['ref'] # store the non-canonical ref as a pointer to the real one.
         @cache[res['resource']['ref']] = res['resource']
       end

data/lib/fauna/client.rb

@@ -16,7 +16,7 @@ module Fauna
     end
 
     def self.reset_context
-      stack = []
+      stack = [] # rubocop:disable Lint/UselessAssignment
     end
 
     def self.get(ref, query = {}, pagination = {})
@@ -40,11 +40,11 @@ module Fauna
     end
 
     def self.connection
-      stack.last or raise NoContextError, "You must be within a Fauna::Client.context block to perform operations."
+      stack.last || fail(NoContextError, 'You must be within a Fauna::Client.context block to perform operations.')
     end
 
     class << self
-      private
+    private
 
       def stack
         Thread.current[:fauna_context_stack] ||= []

data/lib/fauna/connection.rb

@@ -1,5 +1,5 @@
 module Fauna
-  class Connection
+  class Connection # rubocop:disable Metrics/ClassLength
     class Error < RuntimeError
       attr_reader :error, :reason, :parameters
 
@@ -28,25 +28,25 @@ module Fauna
 
     attr_reader :domain, :scheme, :port, :credentials, :timeout, :connection_timeout, :adapter, :logger
 
-    def initialize(params={})
+    def initialize(params = {}) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength
       @logger = params[:logger] || nil
-      @domain = params[:domain] || "rest1.fauna.org"
-      @scheme = params[:scheme] || "https"
-      @port = params[:port] || (@scheme == "https" ? 443 : 80)
+      @domain = params[:domain] || 'rest1.fauna.org'
+      @scheme = params[:scheme] || 'https'
+      @port = params[:port] || (@scheme == 'https' ? 443 : 80)
       @timeout = params[:timeout] || 60
       @connection_timeout = params[:connection_timeout] || 60
       @adapter = params[:adapter] || Faraday.default_adapter
-      @credentials = params[:secret].to_s.split(":")
+      @credentials = params[:secret].to_s.split(':')
 
-      if ENV["FAUNA_DEBUG"]
+      if ENV['FAUNA_DEBUG']
         @logger = Logger.new(STDERR)
         @logger.formatter = proc { |_, _, _, msg| "#{msg}\n" }
       end
 
       @conn = Faraday.new(
         :url => "#{@scheme}://#{@domain}:#{@port}/",
-        :headers => { "Accept-Encoding" => "gzip", "Content-Type" => "application/json;charset=utf-8" },
-        :request => { :timeout => @timeout, :open_timeout => @connection_timeout }
+        :headers => { 'Accept-Encoding' => 'gzip', 'Content-Type' => 'application/json;charset=utf-8' },
+        :request => { :timeout => @timeout, :open_timeout => @connection_timeout },
       ) do |conn|
         conn.adapter(@adapter)
         conn.basic_auth(@credentials[0].to_s, @credentials[1].to_s)
@@ -74,39 +74,36 @@ module Fauna
       nil
     end
 
-    private
+  private
 
     def parse(headers, body)
       obj = body.empty? ? {} : JSON.parse(body)
-      obj.merge!("headers" => headers)
+      obj.merge!('headers' => headers)
       obj
     end
 
     def log(indent)
-      Array(yield).map do |string|
-        string.split("\n")
-      end.flatten.each do |line|
-        @logger.debug(" " * indent + line)
-      end
+      lines = Array(yield).collect { |string| string.split("\n") }
+      lines.flatten.each { |line| @logger.debug(' ' * indent + line) }
     end
 
     def query_string_for_logging(query)
-      if query && !query.empty?
-        "?" + query.map do |k,v|
-          "#{k}=#{v}"
-        end.join("&")
-      end
+      return unless query && !query.empty?
+
+      '?' + query.collect do |k, v|
+        "#{k}=#{v}"
+      end.join('&')
     end
 
     def inflate(response)
-      if ["gzip", "deflate"].include?(response.headers["Content-Encoding"])
+      if %w(gzip deflate).include?(response.headers['Content-Encoding'])
         Zlib::GzipReader.new(StringIO.new(response.body.to_s), :external_encoding => Encoding::UTF_8).read
       else
         response.body.to_s
       end
     end
 
-    def execute(action, ref, data = nil, query = nil)
+    def execute(action, ref, data = nil, query = nil) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength
       if @logger
         log(0) { "Fauna #{action.to_s.upcase} /#{ref}#{query_string_for_logging(query)}" }
         log(2) { "Credentials: #{@credentials}" }
@@ -120,7 +117,7 @@ module Fauna
         real = r1.to_f - r0.to_f
         cpu = (t1.utime - t0.utime) + (t1.stime - t0.stime) + (t1.cutime - t0.cutime) + (t1.cstime - t0.cstime)
         log(2) { ["Response headers: #{JSON.pretty_generate(response.headers)}", "Response JSON: #{body}"] }
-        log(2) { "Response (#{response.status}): API processing #{response.headers["X-HTTP-Request-Processing-Time"]}ms, network latency #{((real - cpu)*1000).to_i}ms, local processing #{(cpu*1000).to_i}ms" }
+        log(2) { "Response (#{response.status}): API processing #{response.headers['X-HTTP-Request-Processing-Time']}ms, network latency #{((real - cpu) * 1000).to_i}ms, local processing #{(cpu * 1000).to_i}ms" }
       else
         response = execute_without_logging(action, ref, data, query)
         body = inflate(response)
@@ -130,17 +127,17 @@ module Fauna
       when 200..299
         [response.headers, body]
       when 400
-        raise BadRequest.new(JSON.parse(body))
+        fail BadRequest.new(JSON.parse(body))
       when 401
-        raise Unauthorized.new(JSON.parse(body))
+        fail Unauthorized.new(JSON.parse(body))
       when 403
-        raise PermissionDenied.new(JSON.parse(body))
+        fail PermissionDenied.new(JSON.parse(body))
       when 404
-        raise NotFound.new(JSON.parse(body))
+        fail NotFound.new(JSON.parse(body))
       when 405
-        raise MethodNotAllowed.new(JSON.parse(body))
+        fail MethodNotAllowed.new(JSON.parse(body))
       else
-        raise NetworkError, body
+        fail NetworkError, body
       end
     end
 
@@ -148,7 +145,7 @@ module Fauna
       @conn.send(action) do |req|
         req.params = query if query.is_a?(Hash)
         req.body = data.to_json if data.is_a?(Hash)
-        req.url(ref)
+        req.url(ref || '')
       end
     end
   end

data/lib/fauna/named_resource.rb

@@ -8,10 +8,10 @@ module Fauna
       super || "#{fauna_class}/#{name}"
     end
 
-    private
+  private
 
     def post
-      raise Invalid, "Cannot POST to named resource."
+      fail Invalid, 'Cannot POST to named resource.'
     end
   end
 end

data/lib/fauna/rails.rb

@@ -10,11 +10,12 @@ if defined?(Rails)
     @silent = false
 
     CONFIG_FILE = "#{Rails.root}/config/fauna.yml"
-    LOCAL_CONFIG_FILE = "#{ENV["HOME"]}/.fauna.yml"
-    APP_NAME = Rails.application.class.name.split("::").first.underscore
+    LOCAL_CONFIG_FILE = "#{ENV['HOME']}/.fauna.yml"
+    APP_NAME = Rails.application.class.name.split('::').first.underscore
     FIXTURES_DIR = "#{Rails.root}/test/fixtures/fauna"
 
-    def self.auth!
+    # rubocop:disable Metrics/BlockNesting
+    def self.auth! # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength
       if File.exist? CONFIG_FILE
         credentials = YAML.load_file(CONFIG_FILE)[Rails.env] || {}
 
@@ -22,37 +23,38 @@ if defined?(Rails)
           credentials.merge!((YAML.load_file(LOCAL_CONFIG_FILE)[APP_NAME] || {})[Rails.env] || {})
         end
 
-        if !@silent
-          if credentials["secret"]
-            STDERR.puts ">> Using Fauna server key #{credentials["secret"].inspect} for #{APP_NAME.inspect}."
+        unless @silent
+          if credentials['secret']
+            STDERR.puts ">> Using Fauna server key #{credentials['secret'].inspect} for #{APP_NAME.inspect}."
           else
-            STDERR.puts ">> Using Fauna account #{credentials["email"].inspect} for #{APP_NAME.inspect}."
+            STDERR.puts ">> Using Fauna account #{credentials['email'].inspect} for #{APP_NAME.inspect}."
           end
 
-          STDERR.puts ">> You can change this in config/fauna.yml or ~/.fauna.yml."
+          STDERR.puts '>> You can change this in config/fauna.yml or ~/.fauna.yml.'
         end
 
-        if credentials["secret"]
-          secret = credentials["secret"]
+        if credentials['secret']
+          secret = credentials['secret']
         else
           self.root_connection = Connection.new(
-            :email => credentials["email"],
-            :password => credentials["password"],
-          :logger => Rails.logger)
+            :email => credentials['email'],
+            :password => credentials['password'],
+            :logger => Rails.logger)
 
-          secret = root_connection.post("keys", "role" => "server")["resource"]["key"]
+          secret = root_connection.post('keys', 'role' => 'server')['resource']['key']
         end
 
-        self.connection = Connection.new(secret: secret, logger: Rails.logger)
+        self.connection = Connection.new(:secret => secret, :logger => Rails.logger)
       else
-        if !@silent
-          STDERR.puts ">> Fauna account not configured. You can add one in config/fauna.yml."
+        unless @silent
+          STDERR.puts '>> Fauna account not configured. You can add one in config/fauna.yml.'
         end
       end
 
       @silent = true
       nil
     end
+    # rubocop:enable Metrics/BlockNesting
 
     # Around filter to set up a default context
 
@@ -85,7 +87,7 @@ if defined?(Rails)
       # suffix for association fields, but not _ref.
       if defined? ActiveSupport::Inflector
         ActiveSupport::Inflector.inflections do |inflect|
-          inflect.human /_ref$/i, ''
+          inflect.human(/_ref$/i, '')
         end
       end
     end