assert_json 0.2.1 → 0.2.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MzAxM2QzMGNiNzJiNDFhYTdkNWM0ZDZhNWRlYjIwMTMwZTUyN2Y4MQ==
-  data.tar.gz: !binary |-
-    MjhlOGNmZGE0YTlmYzA0YTIyYmM0MTVlMTlkMDZkYmMxMzBiZDVjYg==
+SHA1:
+  metadata.gz: b01b0ad73c49c672ad096d20bc0c01989f47bd2f
+  data.tar.gz: 89aefc5f150b7955103a3099cca8a82ade7fa4a7
 SHA512:
-  metadata.gz: !binary |-
-    NGNjMTA3MDc5N2VlNjJjZjA2ZDEyMjhmOTQ3YjZhOTdkZjVjMWNjMjlkZDYw
-    ZTMzYzkyNzgzNmRkOTU0NWZiMTViNTE0NGQzNzA3NGI5ODFiYWM0Y2VlYTAy
-    ZDUxMThjMjE3YzJhMjU2MGFjZjc1ZTNiMjdkOWIxZjMzMjU0ZDM=
-  data.tar.gz: !binary |-
-    YjlkZTk5NTQzOWU5MGQ3MjY1OGY4ZWNkMjkzMmJmZTg2YjY5Y2M3YjdiMzc2
-    ZTA3NzE3NjgxYjc5ZmEzMTYzZTNhODRjY2ZlODNhMWE1OTJjMmJkYmE2MmEw
-    ODRlYWZjYjU2OGZiMTk5NDk4MGFhNDUyYWRjN2FhYjA3YmI2MDI=
+  metadata.gz: d25fdba2cfa9776c19bb5ddc62cdae83b1fd3d603f8440c331b56c9f7849ae261c833e30bfaaecad0a06d00bc8ee069c58402508978829de381146df84e3a8ba
+  data.tar.gz: 39e7799b0c82bf725a396b187ef4f2596da1888d583dfeeb99e960d4dfb956e2b9c74aec6fc3546f23b4b30186fd881777533c4ec1c64e21b5052262e7ecd916

data/.travis.yml

@@ -0,0 +1,14 @@
+language: ruby
+
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1
+  # - jruby-18mode # JRuby in 1.8 mode
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx-2.2.1
+
+matrix:
+  allow_failures:
+    - rvm: rbx-2.2.1
+    - rvm: jruby-19mode

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 0.3.0 (not yet released)
+
+ * 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))
+
+## 0.2.2
+
+ * 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
 
  * correctly match boolean and null values (thanks to [@pgaertig](https://github.com/pgaertig), see [issue 3](https://github.com/alto/assert_json/issues/3))

data/README.md

@@ -1,5 +1,7 @@
 # AssertJson #
 
+[![Build Status](https://travis-ci.org/alto/assert_json.svg?branch=master)](https://travis-ci.org/alto/assert_json)
+
 Test your JSON strings.
 
 ## Installation ##
@@ -25,14 +27,15 @@ class MyActionTest < ActionController::TestCase
 
   def test_my_action
     get :my_action, :format => 'json'
-    # => @response.body= '{"key":[{"inner_key1":"value1"},{"inner_key2":"value2"}]}'
+    # => @response.body= '{"key":[{"inner_key1":"value1"},{"inner_key2":"value2"}, {'special-key': null}]}'
 
     assert_json(@response.body) do
-      has 'key' do
-        has 'inner_key1', 'value1'
-        has 'inner_key2', /lue2/
+      has :key do
+        has :inner_key1, 'value1'
+        has :inner_key2, /lue2/
       end
-      has_not 'key_not_included'
+      has 'special-key', nil
+      has_not :key_not_included
     end
   end
 
@@ -45,9 +48,9 @@ use `item(i)` to select the item to test, like this
 ```ruby
 assert_json '[{"id":1, "key":"test", "name":"test"}, {"id":2, "key":"test", "name":"test"}, {"id":3, "key":"test", "name":"test"}]' do
   item 0 do
-    has 'id', 1
-    has 'key', 'test'
-    has 'name', 'test'
+    has :id, 1
+    has :key, 'test'
+    has :name, 'test'
   end
   item 2 do
     has 'id', 3

data/Rakefile

@@ -1,12 +1,11 @@
-require 'rubygems'
-require 'rake'
-require 'bundler/gem_tasks'
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
 
 require 'rake/testtask'
 
 desc 'Test the assert_json plugin.'
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
+  t.libs << 'lib' << 'test'
   t.pattern = 'test/**/*_test.rb'
   t.verbose = true
 end

data/assert_json.gemspec

@@ -20,5 +20,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'activesupport'
 
+  s.add_development_dependency 'rake'
   s.add_development_dependency 'minitest'
 end

data/lib/assert_json/assert_json.rb

@@ -44,14 +44,18 @@ module AssertJson
               end
       case token
       when Hash
+        arg = arg.to_s
         raise_error("element #{arg} not found") unless token.keys.include?(arg)
         unless args.empty?
           second_arg = args.shift
+          gen_error = lambda {raise_error("element #{token[arg].inspect} does not match #{second_arg.inspect}")}
           case second_arg
           when Regexp
-            raise_error("element #{token[arg].inspect} does not match #{second_arg.inspect}") if second_arg !~ token[arg]
+            gen_error.call if second_arg !~ token[arg].to_s
+          when Symbol
+            gen_error.call if second_arg.to_s != token[arg]
           else
-            raise_error("element #{token[arg].inspect} does not match #{second_arg.inspect}") if second_arg != token[arg]
+            gen_error.call if second_arg != token[arg]
           end
         end
       when Array
@@ -61,7 +65,7 @@ module AssertJson
         when Regexp
           raise_error("element #{arg.inspect} not found") if token !~ arg
         else
-          raise_error("element #{arg.inspect} not found") if token != arg
+          raise_error("element #{arg.inspect} not found") if token != arg.to_s
         end
       when NilClass
         raise_error("no element left")
@@ -86,9 +90,9 @@ module AssertJson
       token = @decoded_json
       case token
       when Array
-        raise_error("element #{arg} found, but not expected") if token.include?(arg)
+        raise_error("element #{arg} found, but not expected") if token.include?(arg.to_s)
       else
-        raise_error("element #{arg} found, but not expected") if token.keys.include?(arg)
+        raise_error("element #{arg} found, but not expected") if token.keys.include?(arg.to_s)
       end
     end
     alias has_not not_element

data/lib/assert_json/version.rb

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

data/test/assert_json_new_dsl_test.rb

@@ -1,6 +1,6 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+require 'test_helper'
 
-class AssertJsonNewDslTest < Test::Unit::TestCase
+class AssertJsonNewDslTest < Minitest::Test
   include AssertJson
 
   def test_string
@@ -344,4 +344,72 @@ class AssertJsonNewDslTest < Test::Unit::TestCase
     end
   end
 
+  def test_symbol_as_a_value
+    assert_json '{"key": "text"}' do
+      has :key, :text
+    end
+    assert_raises(MiniTest::Assertion) do
+      assert_json '{"key": "badtext"}' do
+        has :key, :text
+      end
+    end
+  end
+
+  def test_symbol_as_a_key
+    assert_json '{"sym": true, "text": "1"}' do
+      has :sym, true
+      has :text, /\d+/
+      has_not :bad_sym
+    end
+    assert_json '{"sym": false, "text": "2", "topkey": {"subkey": "value1"}}' do
+      has :sym, false
+      has :text, /\d+/
+      has_not :bad_sym
+      has :topkey do
+        has :subkey, :value1
+      end
+    end
+  end
+
+  def test_symbol_as_string_value
+    assert_json '{"topkey": {"subkey": "value1"}}' do
+      has :topkey do
+        has :subkey do
+          has :value1
+        end
+      end
+    end
+  end
+
+
+  def test_symbol_as_a_key_crossheck
+    assert_raises(MiniTest::Assertion) do
+      assert_json '{"text": "1"}' do
+        has :sym, true  #this should fail
+        has :text, /\d+/
+        has_not :bad_sym
+      end
+    end
+
+    assert_raises(MiniTest::Assertion) do
+      assert_json '{"sym": false, "text": "abc"}' do
+        has :sym, false
+        has :text, /\d+/   #this should fail
+        has_not :bad_sym
+      end
+    end
+
+    assert_raises(MiniTest::Assertion) do
+      assert_json '{"sym": false}' do
+        has_not :sym
+      end
+    end
+  end
+
+  def test_regex_with_number
+    assert_json '{"number": 1}' do
+      has :number, /^\d+$/
+    end
+  end
+
 end

data/test/assert_json_test.rb

@@ -1,6 +1,6 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+require 'test_helper'
 
-class AssertJsonTest < Test::Unit::TestCase
+class AssertJsonTest < Minitest::Test
   include AssertJson
 
   def test_string

data/test/test_helper.rb

@@ -1,6 +1,4 @@
-require 'rubygems'
-require 'minitest'
-require 'test/unit'
+require 'minitest/autorun'
 require 'active_support'
 
 $:.push File.expand_path("../../lib", __FILE__)

metadata

@@ -1,41 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: assert_json
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Thorsten Böttger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !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'
 - !ruby/object:Gem::Dependency
   name: minitest
   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: A gem to test JSON strings.
@@ -45,6 +59,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
@@ -67,17 +82,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.2
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: A gem to test JSON strings.