neography 1.1.4 → 1.2.0

data/README.md

@@ -3,7 +3,7 @@ Neography
 
 - [![Gem Version](https://badge.fury.io/rb/neography.png)](https://rubygems.org/gems/neography)
 - [![Build Status](https://secure.travis-ci.org/maxdemarzi/neography.png?branch=master)](http://travis-ci.org/maxdemarzi/neography)
-- [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/maxdemarzi/neography)
+- [![Code Climate](https://codeclimate.com/github/maxdemarzi/neography.png)](https://codeclimate.com/github/maxdemarzi/neography)
 - [![Coverage Status](https://coveralls.io/repos/maxdemarzi/neography/badge.png?branch=master)](https://coveralls.io/r/maxdemarzi/neography)
 
 ## Welcome to Neography 

data/lib/neography.rb

@@ -5,7 +5,7 @@ require 'multi_json'
 require 'logger'
 require 'ostruct'
 require 'os'
-require 'zip/zipfilesystem'
+require 'zip/filesystem'
 
 require 'neography/multi_json_parser'
 

data/lib/neography/connection.rb

@@ -3,7 +3,8 @@ module Neography
   end
   class Connection
     USER_AGENT = "Neography/#{Neography::VERSION}"
-
+    ACTIONS = ["get", "post", "put", "delete"]
+    
     attr_accessor :protocol, :server, :port, :directory,
       :cypher_path, :gremlin_path,
       :log_file, :log_enabled, :logger,
@@ -27,7 +28,7 @@ module Neography
     end
 
     def configuration
-      "#{@protocol}#{@server}:#{@port}#{@directory}/db/data"
+      @configuration ||= "#{@protocol}#{@server}:#{@port}#{@directory}/db/data"
     end
 
     def merge_options(options)
@@ -37,24 +38,11 @@ module Neography
       merged_options
     end
 
-    def get(path, options={})
-      authenticate(configuration + path)
-      evaluate_response(@client.get(configuration + path, merge_options(options)[:body], merge_options(options)[:headers]))
-    end
-
-    def post(path, options={})
-      authenticate(configuration + path)
-      evaluate_response(@client.post(configuration + path, merge_options(options)[:body], merge_options(options)[:headers]))
-    end
-
-    def put(path, options={})
-      authenticate(configuration + path)
-      evaluate_response(@client.put(configuration + path, merge_options(options)[:body], merge_options(options)[:headers]))
-    end
-
-    def delete(path, options={})
-      authenticate(configuration + path)
-      evaluate_response(@client.delete(configuration + path, merge_options(options)[:body], merge_options(options)[:headers]))
+    ACTIONS.each do |action|
+      define_method(action) do |path, options = {}|
+        authenticate(configuration + path)
+        evaluate_response(@client.send(action.to_sym, configuration + path, merge_options(options)[:body], merge_options(options)[:headers]))    
+      end 
     end
 
     def authenticate(path)
@@ -172,29 +160,29 @@ module Neography
     end
     
     def raise_errors(code, exception, message, stacktrace)
+      error = nil
       case code
-      when 400, 404
-        case exception
-        when /SyntaxException/               ; raise SyntaxException.new(message, code, stacktrace)
-        when /this is not a query/           ; raise SyntaxException.new(message, code, stacktrace)
-        when /PropertyValueException/        ; raise PropertyValueException.new(message, code, stacktrace)
-        when /BadInputException/             ; raise BadInputException.new(message, code, stacktrace)
-        when /NodeNotFoundException/         ; raise NodeNotFoundException.new(message, code, stacktrace)
-        when /NoSuchPropertyException/       ; raise NoSuchPropertyException.new(message, code, stacktrace)
-        when /RelationshipNotFoundException/ ; raise RelationshipNotFoundException.new(message, code, stacktrace)
-        when /NotFoundException/             ; raise NotFoundException.new(message, code, stacktrace)
-        when /UniquePathNotUniqueException/  ; raise UniquePathNotUniqueException.new(message, code, stacktrace)
+        when 401
+          error = UnauthorizedError
+        when 409
+          error = OperationFailureException
+      end
+
+      error ||= case exception
+        when /SyntaxException/               ; SyntaxException
+        when /this is not a query/           ; SyntaxException
+        when /PropertyValueException/        ; PropertyValueException
+        when /BadInputException/             ; BadInputException
+        when /NodeNotFoundException/         ; NodeNotFoundException
+        when /NoSuchPropertyException/       ; NoSuchPropertyException
+        when /RelationshipNotFoundException/ ; RelationshipNotFoundException
+        when /NotFoundException/             ; NotFoundException
+        when /UniquePathNotUniqueException/  ; UniquePathNotUniqueException
         else
-          raise NeographyError.new(message, code, stacktrace)
-        end
-      when 401
-        raise UnauthorizedError.new(message, code, stacktrace)
-      when 409
-        raise OperationFailureException.new(message, code, stacktrace)
-      else
-        raise NeographyError.new(message, code, stacktrace)
+          NeographyError
       end
       
+      raise error.new(message, code, stacktrace)      
     end
 
     def parse_string_options(options)

data/lib/neography/tasks.rb

@@ -1,13 +1,13 @@
 # borrowed from architect4r
 require 'os'
 require 'httpclient'
-require 'zip/zip'
+require 'zip'
 require 'net/http'
 
 namespace :neo4j do
   desc "Install Neo4j"
   task :install, :edition, :version do |t, args|
-    args.with_defaults(:edition => "community", :version => "1.9")
+    args.with_defaults(:edition => "community", :version => "1.9.3")
     puts "Installing Neo4j-#{args[:edition]}-#{args[:version]}"
     
     if OS::Underlying.windows?
@@ -29,7 +29,7 @@ namespace :neo4j do
 
       # Extract and move to neo4j directory
       unless File.exist?('neo4j')
-        Zip::ZipFile.open('neo4j.zip') do |zip_file|
+        Zip::File.open('neo4j.zip') do |zip_file|
           zip_file.each do |f|
            f_path=File.join(".", f.name)
            FileUtils.mkdir_p(File.dirname(f_path))

data/lib/neography/version.rb

@@ -1,3 +1,3 @@
 module Neography
-  VERSION = "1.1.4"
+  VERSION = "1.2.0"
 end

data/neography.gemspec

@@ -27,6 +27,6 @@ Gem::Specification.new do |s|
   s.add_dependency "rake", ">= 0.8.7"
   s.add_dependency "json", ">= 1.7.7"
   s.add_dependency "os", ">= 0.9.6"
-  s.add_dependency "rubyzip", "~> 0.9.7"
-  s.add_dependency "multi_json", ">= 1.3.2" 
+  s.add_dependency "rubyzip", "~> 1.0.0"
+  s.add_dependency "multi_json", ">= 1.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neography
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-30 00:00:00.000000000 Z
+date: 2013-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -146,7 +146,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.7
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.7
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement