upholsterer 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 101c0c9e901285c9521bc7b2a073d1c74dbb16f0
-  data.tar.gz: 50346783ee4f0b56113d6b78bda0047f44f18433
+  metadata.gz: 82a5b679c3a25d0c7e689e13c81cd3694610d4d8
+  data.tar.gz: 5ede3e5c7b04cd34376d21becbe2de1326c57295
 SHA512:
-  metadata.gz: ea9046f5a9977cccda59b29de1af0523a5e25823951dd9666e4bee990abb9cb61c4247af8746bedb7298e3672b5d62077e9172559ad86c8d440eac82a2aad0a0
-  data.tar.gz: 7149150db503374b4a2a10def99d98a5d893b3eb1bf15d7ba2653d1849aaa7593eb44c80864b1d8a337c4bd42e2d541753b0d9809183e38ec62387d10c4e6e05
+  metadata.gz: 1c84077f3ad3c5c0694c485755b88007d8820d9ce35a34540c29f2d2499715c031ce6f605f2cce25d6642a54b995c77c030a6c4f07a264c2253dd088cc314aee
+  data.tar.gz: 3194d7453a8173575df38ff6e90c4f19e2f7b289d0d9d564f99dc8c1c861b290de394b6b392216f0a83e206a0410f971a1cdce40f2f148e52151c2bf0365b3c6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    upholsterer (0.4.4)
+    upholsterer (0.4.5)
       activesupport
 
 GEM

data/README.rdoc

@@ -2,6 +2,10 @@
 
 Based on SimplePresenter (https://github.com/fnando/simple_presenter)
 
+{<img src="https://codeclimate.com/github/Archistart/upholsterer/badges/gpa.svg" />}[https://codeclimate.com/github/Archistart/upholsterer]
+{<img src="https://hakiri.io/github/Archistart/upholsterer/master.svg" alt="security" />}[https://hakiri.io/github/Archistart/upholsterer/master]
+{<img src="https://travis-ci.org/Archistart/upholsterer.svg" />}[https://travis-ci.org/Archistart/upholsterer]
+
 == Installation
 
   gem install upholsterer

data/lib/upholsterer/json_presenter.rb

@@ -1,17 +1,16 @@
+require 'active_support/core_ext/module/delegation'
+
 module Upholsterer
   class Base
+    delegate :to_json, :as_json, to: :to_hash, prefix: false
+
     def to_hash
       Hash[json_fields.collect do |field|
         [field, public_send(field)]
       end]
     end
 
-    def to_json(*args)
-      to_hash
-    end
-
     alias :to_h :to_hash
-    alias :as_json :to_json
 
   private
 

data/lib/upholsterer/version.rb

@@ -2,7 +2,7 @@ module Upholsterer
   module Version
     MAJOR = 0
     MINOR = 4
-    PATCH = 4
+    PATCH = 5
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/spec/base_spec.rb

@@ -183,7 +183,7 @@ describe Upholsterer::Base do
     let(:comment) { double body: 'Some comment', user: 'user' }
     subject { ExposeAllPresenter.new(comment).to_json }
 
-    it { should eq '' }
+    it { should eq '{}' }
   end
 
   describe 'expose with block' do
@@ -198,7 +198,7 @@ describe Upholsterer::Base do
       its(:email) { should eq 'foo@bar.com' }
       its(:type) { should eq 'test_type' }
       its(:description) { should eq 'test_description' }
-      its(:to_json) { should eq(name: 'Test', email: 'foo@bar.com', id: 1, description: 'test_description', type: 'test_type') }
+      its(:to_json) { should be_json_with(name: 'Test', email: 'foo@bar.com', id: 1, description: 'test_description', type: 'test_type') }
     end
 
     context 'Real presenter' do
@@ -208,7 +208,7 @@ describe Upholsterer::Base do
       its(:email) { should eq 'foo@bar.com' }
       its(:type) { should eq 'real_type' }
       its(:description) { should eq 'real_description' }
-      its(:to_json) { should eq(name: 'Real', email: 'foo@bar.com', id: 1, description: 'real_description', type: 'real_type') }
+      its(:to_json) { should be_json_with(name: 'Real', email: 'foo@bar.com', id: 1, description: 'real_description', type: 'real_type') }
     end
   end
 end

data/spec/support/matchers/json_matcher.rb

@@ -0,0 +1,18 @@
+RSpec::Matchers.define :be_json_with do |expected|
+  match do |json_string|
+    json_string == expected.to_json
+  end
+end
+
+RSpec::Matchers.define :contain_keys do |*expected|
+  match do |json_string|
+    begin
+      @actual = JSON.parse(json_string).keys
+      @expected = expected.first
+      @actual.sort == @expected.sort
+    rescue
+      @actual = []
+      false
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: upholsterer
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Nando Vieira
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -98,6 +98,7 @@ files:
 - spec/support/comment_presenter.rb
 - spec/support/expose_all_presenter.rb
 - spec/support/iterator_presenter.rb
+- spec/support/matchers/json_matcher.rb
 - spec/support/user.rb
 - spec/support/user_presenter.rb
 - spec/upholsterer_spec.rb