mumukit-core 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 467ae6e58f5ea9c2b81abc793f26c9a0f19ac743
-  data.tar.gz: ebaa76f63eb42f336b8384531aee4e34cc9c9ac7
+  metadata.gz: 7d29995e68bef879dab6d23d988cf2d71fb2f6f9
+  data.tar.gz: cc2f8ff45f2380a9b8414b5e955b386e3fa9c8fd
 SHA512:
-  metadata.gz: 23915e5e3e682e7a83d28bda8aac0439caf38fdf23963530c50817565ad55abb235476482b7b17f64c6b27b200dc1413baffd48838ee34df3f46d772d434130e
-  data.tar.gz: 8e32e29269281978a51685acb6537ebf293dfc0207ad1bdcf7f587a09392ffad1af1972b3a9430b11927c164b270af6675220afbe9f1deb42bbf4d0c97253289
+  metadata.gz: 352a3b7d13c68912d9a84973594cda7dad82a7508857bd8f7eff139fdb41866eee3ba6632a859c2f920ec2a10b24afcc3e1b4bf075faad53c2e0a57cab3cbb2d
+  data.tar.gz: 703f21b0ed2c80d57ca4ea29cb2d70a1596511b844e841051ec6a1ff194dda1f7e777e27de1f0e2f1217ef7169d06d793b53838b34f429ad4eefc237f725d4be

data/lib/mumukit/core/rspec.rb

@@ -1,2 +1,34 @@
-require_relative './rspec/json_like'
-require_relative './rspec/json_eq'
+[:json_eq, :json_like].each do |it|
+
+  def as_matcher_json(obj, options = {})
+    new_options = options.with_indifferent_access
+    new_options['only'] = [*new_options['only']].map &:to_s if new_options['only']
+    new_options['except'] = [*new_options['except']].map &:to_s if new_options['except']
+    if obj.instance_of? String
+      JSON.parse(obj).as_json new_options
+    else
+      JSON.parse(JSON.unparse obj).as_json new_options
+    end
+  end
+
+  RSpec::Matchers.define it do |expected, options={}|
+    match do |actual|
+      as_matcher_json(actual, options) == as_matcher_json(expected, options)
+    end
+
+    failure_message_for_should do |actual|
+      <<-EOS
+      expected: #{as_matcher_json(expected, options)} (#{expected.class})
+           got: #{as_matcher_json(actual, options)} (#{actual.class})
+      EOS
+    end
+
+    failure_message_for_should_not do |actual|
+      <<-EOS
+      expected: value != #{as_matcher_json(expected, options)} (#{expected.class})
+           got:          #{as_matcher_json(actual, options)} (#{actual.class})
+      EOS
+    end
+  end
+
+end

data/lib/mumukit/core/version.rb

@@ -1,5 +1,5 @@
 module Mumukit
   module Core
-    VERSION = '1.0.1'
+    VERSION = '1.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit-core
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-09 00:00:00.000000000 Z
+date: 2017-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -143,8 +143,6 @@ files:
 - lib/mumukit/core/regexp.rb
 - lib/mumukit/core/request.rb
 - lib/mumukit/core/rspec.rb
-- lib/mumukit/core/rspec/json_eq.rb
-- lib/mumukit/core/rspec/json_like.rb
 - lib/mumukit/core/string.rb
 - lib/mumukit/core/version.rb
 - lib/mumukit/core/yaml.rb
@@ -169,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Ruby core extensions for mumuki on top of active support

data/lib/mumukit/core/rspec/json_eq.rb

@@ -1,5 +0,0 @@
-RSpec::Matchers.define :json_eq do |expected_json_hash|
-  match do |actual_json|
-    expected_json_hash.with_indifferent_access == ActiveSupport::JSON.decode(actual_json)
-  end
-end

data/lib/mumukit/core/rspec/json_like.rb

@@ -1,20 +0,0 @@
-RSpec::Matchers.define :json_like do |expected, options={}|
-  except = options[:except] || []
-  match do |actual|
-    actual.as_json.with_indifferent_access.except(except) == expected.as_json.with_indifferent_access
-  end
-
-  failure_message_for_should do |actual|
-    <<-EOS
-    expected: #{expected.as_json} (#{expected.class})
-         got: #{actual.as_json} (#{actual.class})
-    EOS
-  end
-
-  failure_message_for_should_not do |actual|
-    <<-EOS
-    expected: value != #{expected.as_json} (#{expected.class})
-         got:          #{actual.as_json} (#{actual.class})
-    EOS
-  end
-end