lazy_mapper 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5603d5daa9ab0151fb92ff724606a6e3eb33af849136db570b2857d4977a40a0
-  data.tar.gz: 756b53c74259b65c399a52d48776e989c7c68050a9c8b53b1a69e959b00f192f
+  metadata.gz: 702528c73dfd2a707526f0e792472df55077dd97bf4cf034f6187b97f885ff41
+  data.tar.gz: c2b4708374ca625b5e81a6645cf279854241721705bfafdfee3f258f27f2ab8a
 SHA512:
-  metadata.gz: 69e77cb56f70ac125b01800c0c6f78fb909b58a62539032cb301daaad4959778684687c1400f1f2339694351f6888df0e6abc7d4ba49874722e687af65f3fc8c
-  data.tar.gz: ea5f9c3e44cc05d9652882717cdba1d189f30b5556bd05e44e8c51b1b41aaf6c70321295184a0560598467d14918c32e9b643ae428deef4c6ca468f82e0ed1f6
+  metadata.gz: 0540ab08d1cdcaac33e99876987df7d64ed6f4a31c4bac7f03581cf2d7ec64ee45ac35c9692614c6b78b8ca85952803fc5eab7f61818f790f784490b7c804271
+  data.tar.gz: e22803584b494a25427b059fa32ae059091ab614b72ef2293581dd81486a05b6193372f32b4b576262f7b8f876c74d9b41e1660cce43355472fcf5f1fbcbce31

data/.ruby-version

@@ -0,0 +1 @@
+2.6.1

data/lazy_mapper.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'lazy_mapper'
-  spec.version       = '0.3.1'
+  spec.version       = '0.3.2'
   spec.summary       = 'A lazy object mapper'
   spec.description   = 'Wraps primitive data in a semantically rich model'
   spec.authors       = ['Adam Lett']

data/lib/lazy_mapper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bigdecimal'
 require 'bigdecimal/util'
 require 'time'
@@ -53,7 +55,7 @@ class LazyMapper
     Integer    => 0,
     Numeric    => 0,
     Float      => 0.0,
-    BigDecimal => BigDecimal.new('0'),
+    BigDecimal => BigDecimal(0),
     Array      => []
   }.freeze
 
@@ -154,6 +156,7 @@ class LazyMapper
   def self.from unmapped_data, mappers: {}
     return nil if unmapped_data.nil?
     fail TypeError, "#{ unmapped_data.inspect } is not a Hash" unless unmapped_data.respond_to? :to_h
+
     instance = new
     instance.send :unmapped_data=, unmapped_data.to_h
     instance.send :mappers=, mappers
@@ -162,7 +165,7 @@ class LazyMapper
 
   def self.from_json *args, &block # :nodoc:
     warn "#{ self }.from_json is deprecated. Use #{ self }.from instead."
-    from *args, &block
+    from(*args, &block)
   end
 
   #
@@ -304,27 +307,28 @@ class LazyMapper
   end
 
   def to_h
-    attributes.each_with_object({}) {|(key, _value), h|
+    attributes.each_with_object({}) { |(key, _value), h|
       h[key] = self.send key
     }
   end
 
   def inspect
     @__under_inspection__ ||= 0
-    return "<#{ self.class.name } ... >" if @__under_inspection__ > 0
+    return "<#{ self.class.name } ... >" if @__under_inspection__.positive?
+
     @__under_inspection__ += 1
     present_attributes = attributes.keys.each_with_object({}) { |name, memo|
-      value = self.send name
-      memo[name] = value unless value.nil?
+      ivar = IVAR[name]
+      next unless self.instance_variable_defined? ivar
+
+      memo[name] = self.instance_variable_get ivar
     }
-    "<#{ self.class.name } #{ present_attributes.map { |k, v| k.to_s + ': ' + v.inspect }.join(', ') } >"
+
     res = "<#{ self.class.name } #{ present_attributes.map { |k, v| k.to_s + ': ' + v.inspect }.join(', ') } >"
     @__under_inspection__ -= 1
     res
   end
 
-  protected
-
   #
   # Defines how to map an attribute name
   # to the corresponding name in the unmapped
@@ -358,19 +362,25 @@ class LazyMapper
   end
 
   def mapped_value(name, unmapped_value, type, map: mapping_for(name, type), default: default_value(type))
-    if unmapped_value.nil?
-      # Duplicate to prevent accidental sharing between instances
-      default.dup
-    else
-      fail ArgumentError, "missing mapper for #{ name } (#{ type }). Unmapped value: #{ unmapped_value.inspect }" if map.nil?
-      result = map.arity > 1 ? map.call(unmapped_value, self) : map.call(unmapped_value)
-      result
+    return default.dup if unmapped_value.nil? # Duplicate to prevent accidental sharing between instances
+
+    if map.nil?
+      fail ArgumentError, "missing mapper for #{ name } (#{ type }). "\
+        "Unmapped value: #{ unmapped_value.inspect }"
     end
+
+    return map.call(unmapped_value, self) if map.arity > 1
+
+    map.call(unmapped_value)
   end
 
   def check_type! value, type, allow_nil:
     permitted_types = allow_nil ? Array(type) + [ NilClass ] : Array(type)
-    fail TypeError.new "#{ self.class.name }: #{ value.inspect } is a #{ value.class } but was supposed to be a #{ humanize_list permitted_types, conjunction: ' or ' }" unless permitted_types.any? value.method(:is_a?)
+    return if permitted_types.any? value.method(:is_a?)
+
+    fail TypeError.new "#{ self.class.name }: "\
+      "#{ value.inspect } is a #{ value.class } "\
+      "but was supposed to be a #{ humanize_list permitted_types, conjunction: ' or ' }"
   end
 
   # [1,2,3] -> "1, 2 and 3"
@@ -379,6 +389,7 @@ class LazyMapper
   def humanize_list list, separator: ', ', conjunction: ' and '
     *all_but_last, last = list
     return last if all_but_last.empty?
+
     [ all_but_last.join(separator), last ].join conjunction
   end
 

data/spec/lazy_mapper_spec.rb

@@ -64,6 +64,12 @@ describe LazyMapper do
         expect(mapper).to have_received(:map).exactly(1).times.with('42')
       end
 
+      it 'only shows already mapped values, when inspected' do
+        stub_const 'MyModel', klass
+        instance.created_at
+        expect(instance.inspect).to eq '<MyModel created_at: #<Date: 2015-07-27 ((2457231j,0s,0n),+0s,2299161j)> >'
+      end
+
       context 'if the mapped value is nil' do
         let(:map) { -> x { mapper.map(x); nil } }
 
@@ -101,6 +107,7 @@ describe LazyMapper do
         it 'avoids infinit recursion, when inspected' do
           stub_const('Bar', klass_bar)
           stub_const('Foo', klass_foo)
+          foo.bar.foo
           expect(foo.inspect).to eq('<Foo bar: <Bar foo: <Foo ... > > >')
         end
       end
@@ -163,10 +170,10 @@ describe LazyMapper do
       end
 
       instance = klass.from({ 'foo' => '123 456', 'bar' => 'abc def' },
-                                 mappers: {
-                                   foo: ->(f) { type.new(*f.split(' ').reverse) },
-                                   type => ->(t) { type.new(*t.split(' ')) }
-                                 })
+                            mappers: {
+                              foo: ->(f) { type.new(*f.split(' ').reverse) },
+                              type => ->(t) { type.new(*t.split(' ')) }
+                            })
 
       expect(instance.foo).to eq type.new('456', '123')
       expect(instance.bar).to eq type.new('abc', 'def')
@@ -290,15 +297,15 @@ describe LazyMapper do
 
       it 'still includes every attribute when converted to Hash' do
         expect(instance.to_h).to eq(
-          title: '',
-          count: 0,
-          rate: 0.0,
-          tags: [],
-          widget: nil,
-          things: ['something'],
-          green?: false,
+          title:    '',
+          count:    0,
+          rate:     0.0,
+          tags:     [],
+          widget:   nil,
+          things:   ['something'],
+          green?:   false,
           flowers?: false,
-          cars: []
+          cars:     []
         )
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lazy_mapper
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Adam Lett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-24 00:00:00.000000000 Z
+date: 2019-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -46,6 +46,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- ".ruby-version"
 - Gemfile
 - LICENCE
 - README.md
@@ -72,8 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: A lazy object mapper