handle-system 0.0.7 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 76c65ae14325b6d728f70dcebf771e1fb751cf79
+  data.tar.gz: 21672e3d8709029e49c46f5e45b8d384acd08ca5
+SHA512:
+  metadata.gz: b70973c2a12ce56edb3ccc497c6a96d3ea8636f7b6fc10e44c0a08a2b57a46c4830526b50f735faba62ae64273e99211fd1432ad1aa58182764e78b5d9a61a5f
+  data.tar.gz: cf546a453841f775eaae19b5ee5b8cac2cf3dc39fe139b344526f4a55a3750da4d82270c32e6a65a9987f270f6ad38dfdbe6082b88b0d1646ae445d3d3b69f41

data/README.md

@@ -55,3 +55,7 @@ record = conn.resolve_handle('handle.prefix/new.handle')
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## History
+
+- v0.1.0 - First stable release

data/lib/handle/command/connection.rb

@@ -4,7 +4,7 @@ module Handle
   module Command
     class Batch
       def initialize(handle, index, auth)
-        @batch_file = Tempfile.new('hdl') 
+        @batch_file = Tempfile.new('hdl')
         auth_type = auth.length == 2 ? "PUBKEY" : "SECKEY"
         @batch_file.puts "AUTHENTICATE #{auth_type}:#{index}:#{handle}"
         @batch_file.puts auth.select { |p| not (p.nil? or p.empty?) }.join('|')
@@ -15,18 +15,17 @@ module Handle
         @batch_file.unlink
       end
 
+      # Raises an error if any part of the output is a "FAILURE" message
       def execute!
         @batch_file.close
         cmd = File.join(Handle::HOME, 'bin', 'hdl-genericbatch')
         output = `#{cmd} #{@batch_file.path} 2>/dev/null`
         results = output.lines.select { |line| line =~ /^=+>/ }
         results.each do |rs|
-          (status, message) = rs.scan(/^=+>(.+)\[[0-9]+\]: (.+)/).flatten
-          (action, handle, code, message) = message.split(/:\s*/,4)
-          if status == 'FAILURE'
-            exception = Handle::HandleError.new message
-            exception.set_backtrace(caller[3..-1])
-            raise exception
+          if message = ErrorParser.failure_message(rs)
+            raise Handle::HandleError.new(message).tap { |exception|
+              exception.set_backtrace(caller[3..-1])
+            }
           end
         end
         return true

data/lib/handle/command.rb

@@ -1,2 +1,3 @@
+require 'handle/error_parser'
 require 'handle/command/connection'
 require 'handle/command/persistence'

data/lib/handle/error_parser.rb

@@ -0,0 +1,13 @@
+module Handle
+  # Parses raw messages from hdl-genericbatch and returns a useful message if
+  # the line is an error message.
+  module ErrorParser
+
+    def self.failure_message(line)
+      (status, raw_message) = line.scan(/^=+>(.+)\[[0-9]+\]: (.+)/).flatten
+      return unless status == 'FAILURE'
+      raw_message.split(/:\s*/).last
+    end
+
+  end
+end

data/lib/handle/permissions.rb

@@ -58,4 +58,4 @@ module Handle
       "[#{str}]"
     end
   end
-end
+end

data/lib/handle/record.rb

@@ -68,6 +68,7 @@ module Handle
     end
 
     def ==(other)
+      self.class == other.class &&
       self.to_a == other.to_a
     end
 

data/lib/handle/version.rb

@@ -1,3 +1,3 @@
 module Handle
-  VERSION = "0.0.7"
+  VERSION = "0.1.0"
 end

data/spec/command/connection_spec.rb

@@ -1,9 +1,9 @@
-require File.expand_path('../../spec_helper',__FILE__)
+require 'spec_helper'
 
 on_cruby do
   def parse_batch(command)
     (cmd, fname, redirect) = command.split(/\s+/,3)
-    File.read(fname).split(/\n\n/).collect { |batch| 
+    File.read(fname).split(/\n\n/).collect { |batch|
       (op, data) = batch.split(/\n/,2)
       { :op => op.strip, :data => data.strip }
     }
@@ -12,21 +12,21 @@ on_cruby do
   describe Handle::Command::Connection do
     describe "#initialize" do
       it "file-based private key" do
-        Handle::Command::Connection.new('0.NA/FAKE.ADMIN', 300, 'privkey', 'keypass').batch { |b|
-          b.should_receive(:`) do |command|
+        expect(Handle::Command::Connection.new('0.NA/FAKE.ADMIN', 300, 'privkey', 'keypass') { |b|
+          expect(b).to receive(:`) do |command|
             expect(parse_batch(command)[0]).to eq({ op: "AUTHENTICATE PUBKEY:300:0.NA/FAKE.ADMIN", data: "privkey|keypass" })
             ""
           end
-        }.should be_true
+        }).to be_kind_of Handle::Command::Connection
       end
 
       it "shared secret" do
-        Handle::Command::Connection.new('0.NA/FAKE.ADMIN', 301, 'seckey') { |b|
-          b.should_receive(:`) do |command|
+        expect(Handle::Command::Connection.new('0.NA/FAKE.ADMIN', 301, 'seckey') { |b|
+          expect(b).to receive(:`) do |command|
             expect(parse_batch(command)[0]).to eq({ op: "AUTHENTICATE SECKEY:301:0.NA/FAKE.ADMIN", data: "seckey" })
             ""
           end
-        }.should be_true
+        }).to be_kind_of Handle::Command::Connection
       end
     end
 
@@ -46,7 +46,7 @@ on_cruby do
       subject { Handle::Command::Connection.new('0.NA/FAKE.ADMIN', 300, 'privkey', 'keypass') }
 
       it "#resolve_handle" do
-        subject.should_receive(:`) { |command|
+        expect(subject).to receive(:`) { |command|
           expect(command).to match(/hdl-qresolver #{fake_handle}/)
           "Got Response:\n#{record.to_s}"
         }
@@ -54,7 +54,7 @@ on_cruby do
       end
 
       it "#resolve_handle (not found)" do
-        subject.should_receive(:`) { |command|
+        expect(subject).to receive(:`) { |command|
           expect(command).to match(/hdl-qresolver #{bad_handle}/)
           "Got Error:\nError(100): HANDLE NOT FOUND"
         }
@@ -62,7 +62,7 @@ on_cruby do
       end
 
       it "#resolve_handle (other error)" do
-        subject.should_receive(:`) { |command|
+        expect(subject).to receive(:`) { |command|
           expect(command).to match(/hdl-qresolver #{bad_handle}/)
           "Got Error:\nError(3): SERVER TOO BUSY"
         }
@@ -76,18 +76,18 @@ on_cruby do
       end
 
       it "#create_handle" do
-        Handle::Command::Batch.any_instance.should_receive(:`) do |command|
+        expect_any_instance_of(Handle::Command::Batch).to receive(:`) do |_, command|
           ops = parse_batch(command)
           expect(ops.length).to eq(2)
           expect(ops[1][:op]).to eq("CREATE #{new_handle}")
           expect(ops[1][:data]).to eq("2 URL 86400 1110 UTF8 http://www.example.edu/fake-handle\n6 EMAIL 86400 1110 UTF8 handle@example.edu\n100 HS_ADMIN 86400 1110 ADMIN 300:111111111111:0.NA/FAKE.ADMIN")
           "==>SUCCESS[7]: create:#{new_handle}"
         end
-        expect(subject.create_handle(new_handle, record)).to be_true
+        expect(subject.create_handle(new_handle, record)).to be true
       end
 
       it "#create_handle (handle already exists)" do
-        Handle::Command::Batch.any_instance.should_receive(:`) do |command|
+        expect_any_instance_of(Handle::Command::Batch).to receive(:`) do |_, command|
           ops = parse_batch(command)
           expect(ops.length).to eq(2)
           expect(ops[1][:op]).to eq("CREATE #{new_handle}")
@@ -98,48 +98,48 @@ on_cruby do
       end
 
       it "#add_handle_values" do
-        Handle::Command::Batch.any_instance.should_receive(:`) do |command|
+        expect_any_instance_of(Handle::Command::Batch).to receive(:`) do |_, command|
           ops = parse_batch(command)
           expect(ops.length).to eq(2)
           expect(ops[1][:op]).to eq("ADD #{new_handle}")
           expect(ops[1][:data]).to eq("2 URL 86400 1110 UTF8 http://www.example.edu/fake-handle\n6 EMAIL 86400 1110 UTF8 handle@example.edu\n100 HS_ADMIN 86400 1110 ADMIN 300:111111111111:0.NA/FAKE.ADMIN")
           "==>SUCCESS[7]: add values:#{new_handle}"
         end
-        expect(subject.add_handle_values(new_handle, record)).to be_true
+        expect(subject.add_handle_values(new_handle, record)).to be true
       end
 
       it "#update_handle_values" do
-        Handle::Command::Batch.any_instance.should_receive(:`) do |command|
+        expect_any_instance_of(Handle::Command::Batch).to receive(:`) do |_, command|
           ops = parse_batch(command)
           expect(ops.length).to eq(2)
           expect(ops[1][:op]).to eq("MODIFY #{new_handle}")
           expect(ops[1][:data]).to eq("2 URL 86400 1110 UTF8 http://www.example.edu/fake-handle\n6 EMAIL 86400 1110 UTF8 handle@example.edu\n100 HS_ADMIN 86400 1110 ADMIN 300:111111111111:0.NA/FAKE.ADMIN")
           "==>SUCCESS[7]: modify values:#{new_handle}"
         end
-        expect(subject.update_handle_values(new_handle, record)).to be_true
+        expect(subject.update_handle_values(new_handle, record)).to be true
       end
 
       it "#delete_handle_values" do
-        Handle::Command::Batch.any_instance.should_receive(:`) do |command|
+        expect_any_instance_of(Handle::Command::Batch).to receive(:`) do |_, command|
           ops = parse_batch(command)
           expect(ops.length).to eq(2)
           expect(ops[1][:op]).to eq("REMOVE 2,6,100:#{new_handle}")
           expect(ops[1][:data]).to be_empty
           "==>SUCCESS[4]: delete values:#{new_handle}"
         end
-        expect(subject.delete_handle_values(new_handle, record)).to be_true
+        expect(subject.delete_handle_values(new_handle, record)).to be true
       end
 
       it "#delete_handle" do
-        Handle::Command::Batch.any_instance.should_receive(:`) do |command|
+        expect_any_instance_of(Handle::Command::Batch).to receive(:`) do |_, command|
           ops = parse_batch(command)
           expect(ops.length).to eq(2)
           expect(ops[1][:op]).to eq("DELETE #{new_handle}")
           expect(ops[1][:data]).to be_empty
           "==>SUCCESS[7]: delete:#{new_handle}"
         end
-        expect(subject.delete_handle(new_handle)).to be_true
+        expect(subject.delete_handle(new_handle)).to be true
       end
     end
   end
-end
+end

data/spec/command/persistence_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../spec_helper',__FILE__)
+require 'spec_helper'
 
 on_cruby do
   describe Handle::Command::Persistence do
@@ -17,14 +17,14 @@ on_cruby do
     it "#reload" do
       current = subject.to_s
       subject.handle = fake_handle
-      connection.should_receive(:resolve_handle).with(fake_handle) { Handle::Record.from_data(subject.to_s) }
+      expect(connection).to receive(:resolve_handle).with(fake_handle) { Handle::Record.from_data(subject.to_s) }
       subject.reload
       expect(subject.to_s).to eq(current)
     end
 
     it "#destroy" do
       subject.handle = fake_handle
-      connection.should_receive(:delete_handle).with(fake_handle)
+      expect(connection).to receive(:delete_handle).with(fake_handle)
       subject.destroy
     end
 
@@ -34,27 +34,27 @@ on_cruby do
       end
 
       it "nil handle, param" do
-        connection.should_receive(:create_handle).with(fake_handle, subject) { true }
-        expect(subject.save(fake_handle)).to be_true
+        expect(connection).to receive(:create_handle).with(fake_handle, subject) { true }
+        expect(subject.save(fake_handle)).to be_kind_of Handle::Record
       end
 
       it "existing handle, no existing record" do
         subject.handle = fake_handle
         current = subject.to_s
-        connection.should_receive(:resolve_handle).with(fake_handle) { raise Handle::NotFound.new('Handle not found') }
-        connection.should_receive(:create_handle) { |handle, record| expect(record).to eq(subject) }
+        expect(connection).to receive(:resolve_handle).with(fake_handle) { raise Handle::NotFound.new('Handle not found') }
+        expect(connection).to receive(:create_handle) { |handle, record| expect(record).to eq(subject) }
         subject.save
       end
 
       it "change existing record" do
         subject.handle = fake_handle
         current = subject.to_s
-        connection.should_receive(:resolve_handle).with(fake_handle) { Handle::Record.from_data(current) }
+        expect(connection).to receive(:resolve_handle).with(fake_handle) { Handle::Record.from_data(current) }
         subject.delete(subject.find_by_index(6))
         subject.add(:URN, 'info:example:fake-handle')
-        connection.should_receive(:delete_handle_values) { |handle, record| expect(record.length).to eq(1) }
-        connection.should_receive(:add_handle_values)    { |handle, record| expect(record.length).to eq(1) }
-        connection.should_receive(:update_handle_values) { |handle, record| expect(record.length).to eq(2) }
+        expect(connection).to receive(:delete_handle_values) { |handle, record| expect(record.length).to eq(1) }
+        expect(connection).to receive(:add_handle_values)    { |handle, record| expect(record.length).to eq(1) }
+        expect(connection).to receive(:update_handle_values) { |handle, record| expect(record.length).to eq(2) }
         subject.save
       end
     end

data/spec/error_parser_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe 'Handle::ErrorParser', unless: jruby? do
+  subject { Handle::ErrorParser.failure_message(raw_line) }
+
+  context "A failure with 3 parts" do
+    let(:raw_line) { '==>FAILURE[7]: create:10427.TEST/000001: No authentication info provided' }
+
+    it { is_expected.to eq 'No authentication info provided' }
+  end
+
+  context "A failure with 4 parts" do
+    let(:raw_line) { "==>FAILURE[7]: create:10427.TEST/000001: Error(101): HANDLE ALREADY EXISTS" }
+
+    it { is_expected.to eq 'HANDLE ALREADY EXISTS' }
+  end
+end

data/spec/java/connection_spec.rb

@@ -91,28 +91,28 @@ on_jruby do
 
       it "#create_handle" do
         server.should_receive(:createHandle).with(new_handle, anything()) { true }
-        expect(subject.create_handle(new_handle, record)).to be_true
+        expect(subject.create_handle(new_handle, record)).to be true
       end
 
       it "#add_handle_values" do
         server.should_receive(:addHandleValues).with(new_handle, anything()) { true }
-        expect(subject.add_handle_values(new_handle, record)).to be_true
+        expect(subject.add_handle_values(new_handle, record)).to be true
       end
 
       it "#update_handle_values" do
         server.should_receive(:updateHandleValues).with(new_handle, anything()) { true }
-        expect(subject.update_handle_values(new_handle, record)).to be_true
+        expect(subject.update_handle_values(new_handle, record)).to be true
       end
 
       it "#delete_handle_values" do
         server.should_receive(:deleteHandleValues).with(new_handle, anything()) { true }
-        expect(subject.delete_handle_values(new_handle, record)).to be_true
+        expect(subject.delete_handle_values(new_handle, record)).to be true
       end
 
       it "#delete_handle" do
         server.should_receive(:deleteHandle).with(new_handle) { true }
-        expect(subject.delete_handle(new_handle)).to be_true
+        expect(subject.delete_handle(new_handle)).to be true
       end
     end
   end
-end
+end

data/spec/java/persistence_spec.rb

@@ -39,7 +39,7 @@ on_jruby do
 
       it "nil handle, param" do
         connection.should_receive(:create_handle).with(fake_handle, subject) { true }
-        expect(subject.save(fake_handle)).to be_true
+        expect(subject.save(fake_handle)).to be_truthy
       end
 
       it "existing handle, no existing record" do

data/spec/permissions_spec.rb

@@ -5,19 +5,25 @@ describe Handle::Permissions do
 
   it "initialize" do
     expect(subject.bitmask).to eq(0b110)
-    expect(subject).not_to be_foo
-    expect(subject).to be_bar
-    expect(subject).to be_baz
-    expect(subject).not_to be_quux
+    expect(subject.read(:foo)).to be false
+    expect(subject.read(:bar)).to be true
+    expect(subject.read(:baz)).to be true
+    expect(subject.read(:quux)).to be false
   end
 
   it "modify" do
     subject.foo = true
     subject.bar = false
-    expect(subject).to be_foo
-    expect(subject).not_to be_bar
-    expect(subject).to be_baz
-    expect(subject).not_to be_quux
+    expect(subject.read(:foo)).to be true
+    expect(subject.read(:bar)).to be false
+    expect(subject.read(:baz)).to be true
+    expect(subject.read(:quux)).to be false
+  end
+
+  describe "#method_missing" do
+    it "handles accessors" do
+      expect(subject.foo?).to be false
+    end
   end
 
   it "#to_bool" do

data/spec/spec_helper.rb

@@ -17,4 +17,4 @@ end
 
 def on_cruby &block
   yield unless jruby?
-end
+end

metadata

@@ -1,64 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: handle-system
 version: !ruby/object:Gem::Version
-  version: 0.0.7
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Michael Klein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-03 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 description: Ruby classes for interfacing with Handle System servers
 email:
 - mbklein@gmail.com
@@ -68,18 +61,34 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
+- Gemfile
+- LICENSE.txt
+- README.md
+- Rakefile
+- lib/handle.rb
+- lib/handle/command.rb
 - lib/handle/command/connection.rb
 - lib/handle/command/persistence.rb
-- lib/handle/command.rb
-- lib/handle/field/admin.rb
+- lib/handle/error_parser.rb
 - lib/handle/field.rb
+- lib/handle/field/admin.rb
+- lib/handle/field/vlist.rb
+- lib/handle/java.rb
 - lib/handle/java/connection.rb
 - lib/handle/java/persistence.rb
-- lib/handle/java.rb
 - lib/handle/permissions.rb
 - lib/handle/record.rb
 - lib/handle/version.rb
-- lib/handle.rb
+- spec/admin_spec.rb
+- spec/command/connection_spec.rb
+- spec/command/persistence_spec.rb
+- spec/error_parser_spec.rb
+- spec/field_spec.rb
+- spec/java/connection_spec.rb
+- spec/java/persistence_spec.rb
+- spec/permissions_spec.rb
+- spec/record_spec.rb
+- spec/spec_helper.rb
 - vendor/handle/bin/hdl-genericbatch
 - vendor/handle/bin/hdl-qresolver
 - vendor/handle/lib/admintool.jar
@@ -94,54 +103,35 @@ files:
 - vendor/handle/lib/je-3.3.98.jar
 - vendor/handle/lib/jython-2.2.1.jar
 - vendor/handle/lib/oldadmintool.jar
-- Gemfile
-- Rakefile
-- LICENSE.txt
-- README.md
-- spec/admin_spec.rb
-- spec/command/connection_spec.rb
-- spec/command/persistence_spec.rb
-- spec/field_spec.rb
-- spec/java/connection_spec.rb
-- spec/java/persistence_spec.rb
-- spec/permissions_spec.rb
-- spec/record_spec.rb
-- spec/spec_helper.rb
 homepage: http://github.com/mbklein/handle
 licenses:
 - Apache 2
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2540496964754808645
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2540496964754808645
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby classes for interfacing with Handle System servers
 test_files:
 - spec/admin_spec.rb
 - spec/command/connection_spec.rb
 - spec/command/persistence_spec.rb
+- spec/error_parser_spec.rb
 - spec/field_spec.rb
 - spec/java/connection_spec.rb
 - spec/java/persistence_spec.rb