structure_digest 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8184011e1799c2b33e1341e3dad068f0aabd094c
-  data.tar.gz: ba65e85584a22cbc2efac85705e0de0b6eb1b262
+  metadata.gz: 1979b197924b8145bd076f3c63d3b82c9c3d8ef5
+  data.tar.gz: 540556788eac03fc0fe2e1deed1b148af770d9de
 SHA512:
-  metadata.gz: 0360f22b4bf9d8febe85219c0a0650c61538a20c8785e3746b63f2136a9cc278589c7729c65c291305f9b4330eea62058dda7d5e2e6f6fafe9384161e51d0852
-  data.tar.gz: b4ad1f41ef59909ece4e1de10af1e951f16337270d5be9818509fcf0e12e2051a449b90cd115266c46d45127e79beeffed115270d02fbe5ba2b21f6188334629
+  metadata.gz: cc2c74da006206bcadab880e06711d015ae43f87a2347ae28d52bfdd8d2934082ace24762ba29973239fe6fc4eaf5090ea7f8ec6a30e2b5801db48d3eed71c1e
+  data.tar.gz: 0860b75d8c9583909ab14b7e60b7f30bf80f8d1e6e1297345d194d568d9bc3e7cfc56c2e46d703aee0edb8ec86d3d40835fe2b819ff68397ef8e90f9db547f12

data/.ruby-version

@@ -1 +1 @@
-2.0.0
+2.2.2

data/lib/structure_digest/array_dereference.rb

@@ -10,6 +10,10 @@ module StructureDigest
         self.class == other.class && @index == other.index
       end
 
+      def serialize
+        "[#{@index}]"
+      end
+
       alias :eql? :==
       def hash; [@index].hash; end
       def abstract

data/lib/structure_digest/digest.rb

@@ -6,10 +6,29 @@ module StructureDigest
       @tree = opts[:tree] || false
     end
 
+    def self.diff(h1,h2)
+      paths1 = []
+      paths2 = []
+      gather_paths(h1, paths1)
+      paths1 = paths1.map(&:serialize)
+      gather_paths(h2, paths2)
+      paths2 = paths2.map(&:serialize)
+
+      added = (paths2 - paths1)
+      removed = (paths1 - paths2)
+      (added + removed).sort.map do |p|
+        if removed.include?(p)
+          "- #{p}"
+        elsif added.include?(p)
+          "+ #{p}"
+        end
+      end
+    end
+
     def injest_yml_files(file_paths)
       file_paths.each do |p|
         y = YAML.load_file(p)
-        gather_paths(y, paths)
+        Digest.gather_paths(y, paths)
       end
       @abstract_paths = paths.map(&:abstract).uniq
       self
@@ -23,7 +42,7 @@ module StructureDigest
 
     def validate(hash)
       paths = []
-      gather_paths(hash, paths)
+      Digest.gather_paths(hash, paths)
       paths.all? do |p|
         print '.'
         @abstract_paths.any?{|my_p| my_p.accepts(p) } && validators_for(p).all?{|v| v.call(p.last[:value]) }
@@ -82,19 +101,27 @@ module StructureDigest
       @validators
     end
 
-    def gather_paths(node, solutions=[], partial_solution=SchemaParts::Path.new)
+    def self.gather_paths(node, solutions=[], partial_solution=SchemaParts::Path.new)
       if Array === node
-        node.each.with_index do |e, i|
-          gather_paths(e, solutions, partial_solution.add_part(SchemaParts::ArrayDereference.new(i)))
+        if node.empty?
+          solutions << (partial_solution.add_part(SchemaParts::Value.new(node)))
+        else
+          node.each.with_index do |e, i|
+            self.gather_paths(e, solutions, partial_solution.add_part(SchemaParts::ArrayDereference.new(i)))
+          end
         end
       elsif Hash === node
-        node.each do |k,v|
-          gather_paths(v, solutions, partial_solution.add_part(SchemaParts::HashDereference.new(k)))
+        if node.empty?
+          solutions << (partial_solution.add_part(SchemaParts::Value.new(node)))
+        else
+          node.each do |k,v|
+            self.gather_paths(v, solutions, partial_solution.add_part(SchemaParts::HashDereference.new(k)))
+          end
         end
       else
         solutions << (partial_solution.add_part(SchemaParts::Value.new(node)))
       end
-      self
+      nil
     end
 
     def deserialize(orig_shorthand)

data/lib/structure_digest/path.rb

@@ -9,6 +9,10 @@ module StructureDigest
         AbstractPath.new(@parts.map(&:abstract).compact)
       end
 
+      def serialize
+        @parts.map(&:serialize).join
+      end
+
       def add_part(part)
         Path.new(@parts + [part])
       end

data/lib/structure_digest/value.rb

@@ -5,6 +5,10 @@ module StructureDigest
         @value = val
       end
 
+      def serialize
+        "=#{@value}"
+      end
+
       def abstract
         nil
       end

data/lib/structure_digest/version.rb

@@ -1,3 +1,3 @@
 module StructureDigest
-  VERSION = "0.2.0"
+  VERSION = "1.0.0"
 end

data/spec/fixtures/sample.json

@@ -2,11 +2,13 @@
   "firstName": "John",
   "lastName": "Smith",
   "age": 25,
+  "stuff": [],
   "address": {
     "streetAddress": "21 2nd Street",
     "city": "New York",
     "state": "NY",
-    "postalCode": 10021
+    "postalCode": 10021,
+    "box": {}
   },
   "phoneNumbers": [
     {

data/spec/integration_spec.rb

@@ -38,6 +38,7 @@ HEREDOC
 
   it "works with JSON" do
     digest_fixture("sample.json").should == <<HEREDOC.chomp
+.address.box
 .address.city
 .address.postalCode
 .address.state
@@ -47,12 +48,14 @@ HEREDOC
 .lastName
 .phoneNumbers[].number
 .phoneNumbers[].type
+.stuff
 HEREDOC
   end
 
   it "works with JSON in tree format" do
     digest_fixture("sample.json", tree: true).should == <<HEREDOC.chomp
 .address
+  .box
   .city
   .postalCode
   .state
@@ -63,6 +66,41 @@ HEREDOC
 .phoneNumbers[]
   .number
   .type
+.stuff
 HEREDOC
   end
+
+  it "works as a diff library" do
+    h1 = {
+      a: 1,
+      b: [{
+        c: 4,
+        d: 5
+      },
+      {
+        e: 6,
+        f: []
+      },
+      3
+      ]
+    }
+    h2 = {
+      b: [{
+        c: 4,
+        d: 8,
+        f: 6
+      },
+      {
+        e: 9
+      },
+      3,
+      {}
+      ]
+    }
+
+    diff = StructureDigest::Digest.diff(h1, h2)
+    expect(diff).to eq([
+      "- .a=1", "- .b[0].d=5", "+ .b[0].d=8", "+ .b[0].f=6", "- .b[1].e=6", "+ .b[1].e=9", "- .b[1].f=[]", "+ .b[3]={}"
+    ])
+  end
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: structure_digest
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Serguei Filimonov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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: Digests and lists all the paths through a nested dictionary
@@ -46,9 +46,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-gemset
-- .ruby-version
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -78,17 +78,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: run the binary on YAML files to check it out