racket-registry 0.1.3 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ba4ef30e904cd783dc5d576af5df26022a35f56
-  data.tar.gz: 7149681f3c7c3f7daea25a681bb5e50d5d3c6224
+  metadata.gz: d0ba35e3b8ae749a231ddfb8ebc8c1be932123fc
+  data.tar.gz: dd77a4e59f964f4f23cddad580d3942ec5fc8096
 SHA512:
-  metadata.gz: a4528d1b71a40ab40fd499adbd05e024a76634d0385654ccd2c209d88cfcf1aec1aecbf946b15d3b6aa24bf311b4f2267c5b16891c2a1b5044a54984a92b5547
-  data.tar.gz: 8347c39bf045dfc68967740014a716089e9373baf80480f4f7866a4aaba54b335244db0fd2ba68bdd67e6da65c67201ec8262e82cd6994721cd033164ea530d3
+  metadata.gz: 61e50e05a2981477850b0f431d8dcfd6c50440829f6b2dd89e78bfe2e3367b38930a0ca7d1404b8fb29d9062aa6bd45da1d728bd4b1b685961843707b4da7413
+  data.tar.gz: 585da05068ae97d15b38247fdfe8c1625f97b18eddb8a4cdec8f3fd97cd310f4eccc06683a3dca703882189c0fb3d5449e597870213eee4a3649b4b18f69594f

data/README.md

@@ -26,8 +26,8 @@ obj2 = registry.foo
 registry.singleton(:bar, lambda { Object.new })
 
 # obj1 and obj2 will be the same object
-obj1 = registry.foo
-obj2 = registry.foo
+obj1 = registry.bar
+obj2 = registry.bar
 ```
 
 ## Handling dependendencies within the registry
@@ -41,7 +41,7 @@ end
 
 class NotSoSimple
   def initialize(text, simple_first, simple_second)
-    @text = test
+    @text = text
     @simple_first = simple_first
     @simple_second = simple_second
   end

data/lib/racket/registry.rb

@@ -34,7 +34,8 @@ module Racket
     # @param [Proc|nil] proc
     # @return [nil]
     def register(key, proc = nil, &block)
-      key, proc, proc_args, = usable?(key, proc, block)
+      key, proc, proc_args, =
+        ClassMethods.validate_usable([key, self, proc, block, @resolved])
       singleton_class.instance_eval do
         define_method(key) { proc.call(*proc_args) }
       end && nil
@@ -50,7 +51,8 @@ module Racket
     # @param [Proc|nil] proc
     # @return [nil]
     def register_singleton(key, proc = nil, &block)
-      key, proc, proc_args, resolved = usable?(key, proc, block)
+      key, proc, proc_args, resolved =
+        ClassMethods.validate_usable([key, self, proc, block, @resolved])
       singleton_class.instance_eval do
         define_method(key) do
           return resolved[key] if resolved.key?(key)
@@ -61,31 +63,36 @@ module Racket
 
     alias singleton register_singleton
 
-    private
+    # Racket Registry class methods
+    module ClassMethods
+      # Validates that the parameters sent to the registry is usable.
+      #
+      # @param [Array] args
+      # @return [Array]
+      def self.validate_usable(args)
+        key, obj, proc, block, resolved = args
+        key = validate_key(key, obj)
+        proc = validate_proc(proc, block)
+        [key, proc, proc.arity.zero? ? [] : [obj], resolved]
+      end
 
-    INVALID_KEYS =
-      Object.public_methods.concat([:register, :register_singleton, :singleton])
-    VALID_KEYS = /[\d\w\-\_]+/
+      def self.validate_key(key, obj)
+        sym = key.to_sym
+        insp = key.inspect
+        raise "Invalid key #{insp}" if
+          Racket::Registry.public_methods.include?(sym) ||
+          /^[a-z\_]{1}[\d\w\_]*$/ !~ sym
+        raise "Key #{insp} already registered" if obj.respond_to?(key)
+        sym
+      end
 
-    def key?(key)
-      key = key.to_sym
-      klass = self.class
-      raise 'Invalid key' if klass::INVALID_KEYS.include?(key) ||
-                             !klass::VALID_KEYS =~ key.to_s
-      raise 'Key already registered' if respond_to?(key)
-      key
-    end
-
-    def proc?(proc, block)
-      return proc if proc.respond_to?(:call)
-      return block if block.respond_to?(:call)
-      raise 'No block given'
-    end
+      def self.validate_proc(proc, block)
+        return proc if proc.respond_to?(:call)
+        return block if block.respond_to?(:call)
+        raise 'No proc/block given'
+      end
 
-    def usable?(key, proc, block)
-      key = key?(key)
-      proc = proc?(proc, block)
-      [key, proc, proc.arity.zero? ? [] : [self], @resolved]
+      private_class_method :validate_key, :validate_proc
     end
   end
 end

data/spec/racket_registry.rb

@@ -30,7 +30,7 @@ end
 
 require_relative '../lib/racket/registry.rb'
 
-describe 'Racket::Registry' do
+describe 'Racket::Registry registration' do
   registry = Racket::Registry.new
 
   it 'should be able to register non-singleton entries using a proc' do
@@ -65,7 +65,61 @@ describe 'Racket::Registry' do
     obj1.object_id.should.equal(obj2.object_id)
   end
 
-  it 'should block invalid entries' do
-    -> { registry.register('invalid') }.should.raise(RuntimeError)
+  it 'should block invalid keys' do
+    -> { registry.register('inspect') }
+      .should.raise(RuntimeError)
+      .message.should.equal('Invalid key "inspect"')
+  end
+
+  it 'should block already registered keys' do
+    -> { registry.register('one', -> { Object.new }) }
+      .should.raise(RuntimeError)
+      .message.should.equal('Key "one" already registered')
+  end
+
+  it 'should block invalid block/procs' do
+    -> { registry.register('invalid') }
+      .should.raise(RuntimeError)
+      .message.should.equal('No proc/block given')
+  end
+end
+
+describe 'Racket::Registry dependency handling' do
+  class Simple
+    attr_reader :text
+
+    def initialize(text)
+      @text = text
+    end
+  end
+
+  class NotSoSimple
+    attr_reader :text, :simple_first, :simple_second
+
+    def initialize(text, simple_first, simple_second)
+      @text = text
+      @simple_first = simple_first
+      @simple_second = simple_second
+    end
+  end
+
+  it 'should be able to resolve dependencies regardless of registration order' do
+    registry = Racket::Registry.new
+
+    foo = Simple.new('foo')
+    bar = Simple.new('bar')
+
+    registry.singleton(
+      :baz,
+      lambda { |r| NotSoSimple.new('baz', r.foo, r.bar) }
+    )
+    registry.singleton(:bar, lambda { |r| bar })
+    registry.singleton(:foo, lambda { |r| foo })
+
+    baz = registry.baz
+    baz.simple_first.object_id.should.equal(foo.object_id)
+    baz.simple_second.object_id.should.equal(bar.object_id)
+    registry.foo.object_id.should.equal(foo.object_id)
+    registry.bar.object_id.should.equal(bar.object_id)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: racket-registry
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.1
 platform: ruby
 authors:
 - Lars Olsson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-19 00:00:00.000000000 Z
+date: 2016-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon