assert_json 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b01b0ad73c49c672ad096d20bc0c01989f47bd2f
-  data.tar.gz: 89aefc5f150b7955103a3099cca8a82ade7fa4a7
+  metadata.gz: 84984fa4a3256eeeb0fd478682aaac73edf8ce6e
+  data.tar.gz: 735eb857f7c81ee55bfe0d24bc7283713768396c
 SHA512:
-  metadata.gz: d25fdba2cfa9776c19bb5ddc62cdae83b1fd3d603f8440c331b56c9f7849ae261c833e30bfaaecad0a06d00bc8ee069c58402508978829de381146df84e3a8ba
-  data.tar.gz: 39e7799b0c82bf725a396b187ef4f2596da1888d583dfeeb99e960d4dfb956e2b9c74aec6fc3546f23b4b30186fd881777533c4ec1c64e21b5052262e7ecd916
+  metadata.gz: 065d1b029be8512f5f6676e91b4596aa2e41f1ff220d8d35c9b2e45e11ed0ddfe3b61988c7afeebf8484ff3f12eabb9b579d895fdd75cda8063762810f178597
+  data.tar.gz: ee97759d3a65474fce2ce15f43cd3bf2b10025437136167c07d638a0a18b319e47095559825561089dc42a8e09a02f1ec0b1ff606d569593786414963d8bbf54

data/CHANGELOG.md

@@ -1,11 +1,12 @@
 # CHANGELOG
 
-## 0.3.0 (not yet released)
+## 0.2.3
 
- * allow Ruby symbols as keys and values (thanks to [@pgaertig](https://github.com/pgaertig), see [issue 4](https://github.com/alto/assert_json/issues/4))
+ * bugfix for itemised nested arrays (see [issue 7](https://github.com/alto/assert_json/issues/7))
 
 ## 0.2.2
 
+ * allow Ruby symbols as keys and values (thanks to [@pgaertig](https://github.com/pgaertig), see [issue 4](https://github.com/alto/assert_json/issues/4))
  * allowing to validate real numbers (thanks to [@plu](https://github.com/plu), see [issue 6](https://github.com/alto/assert_json/pull/6))
 
 ## 0.2.1

data/lib/assert_json/assert_json.rb

@@ -27,21 +27,25 @@ module AssertJson
     end
 
     def item(index, &block)
-      @index = index
-      yield if block_given?
+      decoded_json_in_scope = @decoded_json
+      @decoded_json = @decoded_json[index]
+      begin
+        yield if block_given?
+      ensure
+        @decoded_json = decoded_json_in_scope
+      end
     end
 
     def element(*args, &block)
       arg = args.shift
-      token = if @decoded_json.is_a?(Array)
-                if @index
-                  @decoded_json[@index]
-                else
-                  @decoded_json.shift
-                end
+
+      token = case @decoded_json
+              when Array
+                @decoded_json.shift
               else
                 @decoded_json
               end
+
       case token
       when Hash
         arg = arg.to_s
@@ -59,7 +63,9 @@ module AssertJson
           end
         end
       when Array
-        raise_error("element #{arg} not found") if token != arg
+        if !block_given? && token != arg
+          raise_error("element #{arg} not found")
+        end
       when String
         case arg
         when Regexp
@@ -75,10 +81,16 @@ module AssertJson
 
       if block_given?
         begin
-          in_scope, @decoded_json = @decoded_json, token.is_a?(Hash) ? token[arg] : token
+          decoded_json_in_scope = @decoded_json
+          @decoded_json = case token
+                          when Hash
+                            token[arg]
+                          else
+                            token
+                          end
           yield
         ensure
-          @decoded_json = in_scope
+          @decoded_json = decoded_json_in_scope
         end
       end
 

data/lib/assert_json/version.rb

@@ -1,3 +1,3 @@
 module AssertJson
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/test/assert_json_new_dsl_test.rb

@@ -121,6 +121,43 @@ class AssertJsonNewDslTest < Minitest::Test
     end
   end
 
+  def test_itemised_nested_array
+    json = '[["deep","another_depp"],["second_deep"]]'
+    assert_json json do
+      item 0 do
+        item 0 do
+          has 'deep'
+        end
+        item 1 do
+          has 'another_depp'
+        end
+      end
+      item 1 do
+        has 'second_deep'
+      end
+    end
+  end
+  def test_itemised_nested_array_crosscheck
+    json = '[["deep","another_depp"],["second_deep"]]'
+    assert_json json do
+      item 0 do
+        item 0 do
+          has 'deep'
+        end
+        item 1 do
+          assert_raises(MiniTest::Assertion) do
+            has 'wrong_item_value'
+          end
+        end
+      end
+      item 1 do
+        assert_raises(MiniTest::Assertion) do
+          has 'unknown_item_value'
+        end
+      end
+    end
+  end
+
   def test_hash_with_value_array
     assert_json '{"key":["value1","value2"]}' do
       has 'key', ['value1', 'value2']
@@ -412,4 +449,29 @@ class AssertJsonNewDslTest < Minitest::Test
     end
   end
 
+  # for issue #/
+  def test_complex_example
+    json = '{"count":2,"total_count":3,"results":[{"id":14,"tags":["tag1","tag2"],"created_at":"2014-10-14T00:50:39Z","updated_at":"2014-10-14T00:51:39Z"},{"id":15,"tags":["tag3","tag4"],"created_at":"2014-10-15T00:50:39Z","updated_at":"2014-10-15T00:51:39Z"}]}'
+
+    assert_json json do
+      has 'count', 2
+      has 'total_count', 3
+      has 'results' do
+        item 0 do
+          has 'id', 14
+          has 'tags' do
+            item 0 do
+              has 'tag1'
+            end
+            item 1 do
+              has 'tag2'
+            end
+          end
+          has 'created_at', '2014-10-14T00:50:39Z'
+          has 'updated_at', '2014-10-14T00:51:39Z'
+        end
+      end
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: assert_json
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Thorsten Böttger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-17 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport