neo4j-core 3.1.1 → 4.0.0

data/lib/neo4j/transaction.rb

@@ -1,6 +1,5 @@
 module Neo4j
   module Transaction
-
     extend self
 
     module Instance
@@ -10,16 +9,26 @@ module Neo4j
         Neo4j::Transaction.register(self)
       end
 
-      # Marks this transaction as failed, which means that it will unconditionally be rolled back when close() is called.
-      def failure
+      # Marks this transaction as failed, which means that it will unconditionally be rolled back when close() is called. Aliased for legacy purposes.
+      def mark_failed
         @failure = true
       end
-      alias_method :fail, :failure
+      alias_method :failure, :mark_failed
 
-      # If it has been marked as failed
-      def failure?
+      # If it has been marked as failed. Aliased for legacy purposes.
+      def failed?
         !!@failure
       end
+      alias_method :failure?, :failed?
+
+      def mark_expired
+        @expired = true
+      end
+      alias_method :expired, :mark_expired
+
+      def expired?
+        !!@expired
+      end
 
       # @private
       def push_nested!
@@ -51,19 +60,12 @@ module Neo4j
       def close
         pop_nested!
         return if @pushed_nested >= 0
-        raise "Can't commit transaction, already committed" if (@pushed_nested < -1)
+        fail "Can't commit transaction, already committed" if @pushed_nested < -1
         Neo4j::Transaction.unregister(self)
-        if failure?
-          _delete_tx
-        else
-          _commit_tx
-        end
+        failed? ? _delete_tx : _commit_tx
       end
-
     end
 
-
-
     # @return [Neo4j::Transaction::Instance]
     def new(current = Session.current!)
       current.begin_tx
@@ -72,20 +74,20 @@ module Neo4j
     # Runs the given block in a new transaction.
     # @param [Boolean] run_in_tx if true a new transaction will not be created, instead if will simply yield to the given block
     # @@yield [Neo4j::Transaction::Instance]
-    def run(run_in_tx=true)
-      raise ArgumentError.new("Expected a block to run in Transaction.run") unless block_given?
+    def run(run_in_tx = true)
+      fail ArgumentError, 'Expected a block to run in Transaction.run' unless block_given?
 
       return yield(nil) unless run_in_tx
 
       begin
         tx = Neo4j::Transaction.new
         ret = yield tx
-      rescue Exception => e
-        if e.respond_to?(:cause) && e.cause
+      rescue Exception => e # rubocop:disable Lint/RescueException
+        if e.respond_to?(:cause) && e.cause.respond_to?(:print_stack_trace)
           puts "Java Exception in a transaction, cause: #{e.cause}"
           e.cause.print_stack_trace
         end
-        tx.failure unless tx.nil?
+        tx.mark_failed unless tx.nil?
         raise
       ensure
         tx.close unless tx.nil?
@@ -106,7 +108,7 @@ module Neo4j
     # @private
     def register(tx)
       # we don't support running more then one transaction per thread
-      raise "Already running a transaction" if current
+      fail 'Already running a transaction' if current
       Thread.current[:neo4j_curr_tx] = tx
     end
 
@@ -114,6 +116,5 @@ module Neo4j
     def unregister_current
       Thread.current[:neo4j_curr_tx] = nil
     end
-
   end
 end

data/neo4j-core.gemspec

@@ -1,17 +1,17 @@
 lib = File.expand_path('../lib/', __FILE__)
-$:.unshift lib unless $:.include?(lib)
+$LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib)
 
 require 'neo4j-core/version'
 
 Gem::Specification.new do |s|
-  s.name     = "neo4j-core"
+  s.name     = 'neo4j-core'
   s.version  = Neo4j::Core::VERSION
-  s.required_ruby_version = ">= 1.9.3"
+  s.required_ruby_version = '>= 1.9.3'
 
-  s.authors  = "Andreas Ronge, Chris Grigg, Brian Underwood"
+  s.authors  = 'Andreas Ronge, Chris Grigg, Brian Underwood'
   s.email    = 'andreas.ronge@gmail.com, chris@subvertallmedia.com, brian@brian-underwood.codes'
-  s.homepage = "https://github.com/neo4jrb/neo4j-core"
-  s.summary = "A basic library to work with the graph database Neo4j."
+  s.homepage = 'https://github.com/neo4jrb/neo4j-core'
+  s.summary = 'A basic library to work with the graph database Neo4j.'
   s.license = 'MIT'
 
   s.description = <<-EOF
@@ -19,24 +19,29 @@ Neo4j-core provides classes and methods to work with the graph database Neo4j.
   EOF
 
   s.require_path = 'lib'
-  s.files = Dir.glob("{bin,lib,config}/**/*") + %w(README.md Gemfile neo4j-core.gemspec)
+  s.files = Dir.glob('{bin,lib,config}/**/*') + %w(README.md Gemfile neo4j-core.gemspec)
   s.has_rdoc = true
   s.extra_rdoc_files = %w( README.md )
-  s.rdoc_options = ["--quiet", "--title", "Neo4j::Core", "--line-numbers", "--main", "README.rdoc", "--inline-source"]
+  s.rdoc_options = ['--quiet', '--title', 'Neo4j::Core', '--line-numbers', '--main', 'README.rdoc', '--inline-source']
 
-  # Not released yet
-  s.add_dependency("httparty")
-  s.add_dependency("faraday", '~> 0.9.0')
+  s.add_dependency('httparty')
+  s.add_dependency('faraday', '~> 0.9.0')
   s.add_dependency('net-http-persistent')
   s.add_dependency('httpclient')
   s.add_dependency('faraday_middleware', '~> 0.9.1')
-  s.add_dependency("json")
-  s.add_dependency("os")  # for Rake task
-  s.add_dependency("zip") # for Rake task
-  s.add_dependency("activesupport") # For ActiveSupport::Notifications
+  s.add_dependency('json')
+  s.add_dependency('os')  # for Rake task
+  s.add_dependency('zip') # for Rake task
+  s.add_dependency('activesupport') # For ActiveSupport::Notifications
+
+  s.add_development_dependency('pry')
+  s.add_development_dependency('yard')
+  s.add_development_dependency('simplecov')
+  s.add_development_dependency('guard')
+  s.add_development_dependency('guard-rubocop')
 
   if RUBY_PLATFORM == 'java'
-    s.add_dependency("neo4j-community", '~> 2.1.1')
+    s.add_dependency('neo4j-community', '~> 2.1.1')
     s.add_development_dependency 'ruby-debug'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-core
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Andreas Ronge, Chris Grigg, Brian Underwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-25 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -136,6 +136,76 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   Neo4j-core provides classes and methods to work with the graph database Neo4j.
 email: andreas.ronge@gmail.com, chris@subvertallmedia.com, brian@brian-underwood.codes