berg 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1db42bed4f1d7e59d44ca2eb2a154202d1ae1023
-  data.tar.gz: 3b8a595b4e9fda38c3a447aad6bbf09a40fa1a9c
+  metadata.gz: a6c5925f3d437e3acc5c2a94861726b5bc60b28b
+  data.tar.gz: 2e85cf261e78a57b4fa8195780be6829eb75d1b3
 SHA512:
-  metadata.gz: 0d03491c493610fd9093e7e254f5c410005adb1c431302021748aead7df817a00702f6073a886fa5594359d2fc8f8cb789380bf298059c649a835db653bdf094
-  data.tar.gz: b96f97617248045fa7b6d52f9b2884e7f912758d0cbae4c8fc59dbd013e50cd83435da8553cea6b34a7342df1c00fcd0306351dc4b71ceba0cfdcdadd65104cf
+  metadata.gz: fa243d096f19dc7e0c80c03b26cd945917de0184e2b48f3221d91750aac82d4983cdb8bb155f3f49c73c4eb9f2fd700f094125a5fbf18cac808bfa9e6d2a2915
+  data.tar.gz: 6dfc5617d90aab29c2046a45646a557c2e9e261adfb6980cecaab264e49b817162617d1e0834f823f2dc4f74fe5a8ce1a750ca5e8cbdd464390ef5b55af29b31

data/lib/berg.rb

@@ -1,4 +1,5 @@
 require "berg/version"
+require "berg/base"
 require "berg/value"
 require "berg/key"
 require "berg/container"

data/lib/berg/base.rb

@@ -0,0 +1,9 @@
+module Berg
+  module Base
+    ARRAY_ID = /\[(-?\d+)\]/
+
+    def add(trace, key)
+      trace + (key.match(ARRAY_ID) ? key : ".#{key}")
+    end
+  end
+end

data/lib/berg/key.rb

@@ -1,29 +1,31 @@
 module Berg
   class Key
+    include Berg::Base
+
     def initialize(&block)
       @block = block
     end
 
     def self.locate(object, &block)
-      new(&block).locate(object, "")
+      new(&block).locate(object)
     end
 
-    def locate(object, current)
+    def locate(object, trace = "")
       case object
       when Array
         object.each_with_index do |rest, index|
-          if (result = locate(rest, current + "[#{index}]")).found?
+          if (result = locate(rest, add(trace, "[#{index}]"))).found?
             return result
           end
         end
       when Hash
         object.each_pair do |key, value|
-          if (result = locate(value, current + ".#{key}")).found?
+          if (result = locate(value, add(trace, key))).found?
             return result
           end
         end
       when TrueClass, FalseClass, NilClass, Fixnum, String
-        return @block.call(object) ? Found.new(current) : NotFound.new
+        return @block.call(object) ? Found.new(trace) : NotFound.new
       when Found, NotFound
         return object
       else

data/lib/berg/value.rb

@@ -1,6 +1,6 @@
 module Berg
   class Value
-    ARRAY_ID = /\[(\d+)\]/
+    include Berg::Base
 
     def initialize(object, query, debug = false)
       @object = object
@@ -15,7 +15,7 @@ module Berg
     def locate
       result, _ = keys.inject([@object, ""]) do |(latest, trace), key|
         found = case key
-        when ARRAY_ID
+        when Base::ARRAY_ID
           latest[$1.to_i]
         else
           latest[key] || latest[key.to_sym]
@@ -37,11 +37,7 @@ module Berg
     private
 
     def keys
-      @query.split(/\.|(\[\d+\])/).reject(&:empty?)
-    end
-
-    def add(trace, key)
-      trace << (key.match(ARRAY_ID) ? key : ".#{key}")
+      @query.split(/\.|(\[-?\d+\])/).reject(&:empty?)
     end
   end
 end

data/lib/berg/version.rb

@@ -1,3 +1,3 @@
 module Berg
-  VERSION = "0.1.0"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berg
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Linus Oleander
@@ -81,6 +81,7 @@ files:
 - Rakefile
 - berg.gemspec
 - lib/berg.rb
+- lib/berg/base.rb
 - lib/berg/container.rb
 - lib/berg/errors.rb
 - lib/berg/key.rb