upholsterer 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88f0915e56e87ac3f84674452a38276d04fb7afe
-  data.tar.gz: 7f6250fc690066c2bfcfa4824f3ccff02b21cbe3
+  metadata.gz: f86ecfdcf45ec231c8fbc8891e6434e365278a95
+  data.tar.gz: a9d6c734325567bf1a4fb1040782147bcd95688d
 SHA512:
-  metadata.gz: fd5aa4746a69768107a55f6503245cc897172583b67f7e3893f213188809f3e61901e1c2a69873c716efbbb3b08d1225d97f4512f544b44cdeae8074eb09ca0e
-  data.tar.gz: 116a4360f2d79882f65eca474ff38adcf19e864f73b787d63914b6dfc7ce30440af0208d751dbb1ab97f892d6cb1f120c0511457ec0f8d57ad6a35331feb40b4
+  metadata.gz: 245da627ee9baab2a4f2422bb0a7103b1d1372f62a6e88e2c72c00704b430ab2c86796bee24f6908f3c4461171e0d1464c0b4a12d4ab0f1ea37f0f0f0f20064e
+  data.tar.gz: dc459f25c07027059bfb1897c0888b9c1919f2a95a7b2017fbe99578d1fc56e4eccfd12f0fc54507a5ff1ab75703e4a667ffd407d5cf206782ab8d65c05c76d8

data/.gitignore

@@ -3,3 +3,5 @@ pkg
 tmp
 .tags
 .idea
+.ruby-version
+.ruby-gemset

data/.travis.yml

@@ -5,5 +5,5 @@ cache: bundler
 rvm:
   - 2.0.0
   - 2.1
-  - 2.2
   - 2.2.3
+  - 2.3.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    upholsterer (1.4.0)
+    upholsterer (1.4.1)
       activesupport
 
 GEM
@@ -17,7 +17,7 @@ GEM
     coderay (1.0.9)
     diff-lcs (1.2.4)
     i18n (0.6.11)
-    json (1.8.1)
+    json (1.8.3)
     method_source (0.8.2)
     minitest (5.4.2)
     pry (0.9.12.2)
@@ -59,4 +59,4 @@ DEPENDENCIES
   upholsterer!
 
 BUNDLED WITH
-   1.11.2
+   1.12.5

data/lib/upholsterer/json_presenter.rb

@@ -10,25 +10,27 @@ module Upholsterer
       end
     end
 
-    def to_hash
-      Hash[json_fields.collect do |field|
-        [field, public_send(field)]
-      end]
-    end
-
-    alias :to_h :to_hash
-
-  private
-
-    def json_fields
-      @json_fields ||= begin
-        methods = public_methods(false).tap do |fields|
+    def self.serialize_attributes
+      @_json_fields ||= begin
+        methods = instance_methods(false).tap do |fields|
           fields.delete(:subject)
           fields.delete(:respond_to?)
           fields.delete(:method_missing)
         end
-        (methods + self.class.attributes.keys).uniq
+        (methods + attributes.keys).uniq
+      end
+    end
+
+    def to_hash
+      json = {}
+
+      self.class.serialize_attributes.each do |field|
+        json[field] = public_send(field)
       end
+
+      json
     end
+
+    alias :to_h :to_hash
   end
-end
+end

data/lib/upholsterer/rails.rb

@@ -23,7 +23,7 @@ module Upholsterer
     alias_method :r, :routes
 
     def helpers
-      ApplicationController.helpers
+      @_helpers ||= ApplicationController.helpers
     end
     alias_method :h, :helpers
   end

data/lib/upholsterer/version.rb

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

data/spec/support/matchers/json_matcher.rb

@@ -1,6 +1,27 @@
 RSpec::Matchers.define :be_json_with do |expected|
   match do |json_string|
-    json_string == expected.to_json
+    current_hash = JSON.parse(json_string)
+
+    compare_hashes(current_hash, expected)
+  end
+
+  def compare_hashes(actual, expected)
+    if actual.keys.count == expected.keys.count
+      actual.all? do |key, value|
+        key = key.to_sym
+        if expected.has_key?(key)
+          expected_value = expected[key]
+
+          if value.is_a? Hash
+            if expected_value.is_a? Hash
+              compare_hashes(value, expected_value)
+            end
+          else
+            expected_value == value
+          end
+        end
+      end
+    end
   end
 end
 
@@ -15,4 +36,4 @@ RSpec::Matchers.define :contain_keys do |*expected|
       false
     end
   end
-end
+end

data/upholsterer.gemspec

@@ -6,10 +6,10 @@ Gem::Specification.new do |s|
   s.name        = 'upholsterer'
   s.version     = Upholsterer::Version::STRING
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ['Nando Vieira', 'Aleksandr Fomin', 'Gleb Sinyavsky']
-  s.email       = ['fnando.vieira@gmail.com', 'll.wg.bin@gmail.com']
+  s.authors     = ['Aleksandr Fomin']
+  s.email       = ['ll.wg.bin@gmail.com']
   s.homepage    = 'https://github.com/llxff/upholsterer'
-  s.summary     = 'A simple presenter/facade/decorator/whatever implementation.'
+  s.summary     = 'A simple serializer implementation.'
   s.description = s.summary
 
   s.files         = `git ls-files`.split("\n")

metadata

@@ -1,16 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upholsterer
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
-- Nando Vieira
 - Aleksandr Fomin
-- Gleb Sinyavsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2016-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -68,9 +66,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A simple presenter/facade/decorator/whatever implementation.
+description: A simple serializer implementation.
 email:
-- fnando.vieira@gmail.com
 - ll.wg.bin@gmail.com
 executables: []
 extensions: []
@@ -124,8 +121,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: A simple presenter/facade/decorator/whatever implementation.
+summary: A simple serializer implementation.
 test_files: []