mimi-struct 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8064ab3ebc35af445e5be33a322db6d14a31693e
-  data.tar.gz: f8d1a850531925e12fe0c473647dc519538072f0
+  metadata.gz: a37be40de19ddfe65927cd3bef957db71979360d
+  data.tar.gz: 1e724f9d02e10c4fc59353af4f5e6e9121d79e7f
 SHA512:
-  metadata.gz: 3d62b706cf2bffafb74bd09ead748382b95e1a4d297c6976832968065f5ecc7c9a6ca65b9daa7baed14f741c46719891ceaa23fcd7fdc921b8a73b0344e90fea
-  data.tar.gz: ad312292e8c75438467baa6754658f26e101040dd9ee1121dc6a4ddf349975c09d72f5ebe72e91566ddc384a33a8e3bd6fe835d982373de8dce817ddc9a8c506
+  metadata.gz: 0302621a9b95b236a61c578533de6db60386a3d4e96445b1a6af8291fe0aa2658cf37895acf9429f2b50221922c5c4e32ed3f8c2f3bf95a9872aa13235d65f0b
+  data.tar.gz: 8bf489c4861b644fb9b00f0a64ecb797b86967a32a8a6f2121f26bed3a5b39ad588583af41e6ef1faafbfb30c18893caa3ac445ff1e58bd449842d0e3d21868b

data/examples/customer.rb

@@ -19,4 +19,4 @@ end
 
 customer = Customer << { id: "person1", type: :person, firstName: "John", lastName: "Smith" }
 
-puts customer.to_h
+puts customer.to_h

data/lib/mimi/struct/version.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
 module Mimi
-  class Struct
-    VERSION = "1.0.0"
-  end
+  Struct_VERSION = "1.1.0"
 end

data/lib/mimi/struct.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "mimi/core"
+require "mimi/struct/version"
 
 module Mimi
   #
@@ -10,6 +11,8 @@ module Mimi
   # are mapped from input data.
   #
   class Struct < Mimi::Core::Struct
+    VERSION = Mimi::Struct_VERSION
+
     #
     # Default attribute mapper
     #
@@ -17,10 +20,16 @@ module Mimi
     # Calculates a default value if the source attribute is not set.
     #
     DEFAULT_ATTRIBUTE_MAPPER = -> (o, params) do
-      if params.key?(:default)
-        o.respond_to?(params[:from]) || call_as_proc(params[:default], o, params)
-      else
+      source_attr_set = o.respond_to?(params[:from]) && !o.send(params[:from]).nil?
+      if source_attr_set || !params.key?(:default)
         o.send(params[:from])
+      else
+        # source attr is not set AND there is :default
+        if params[:default].is_a?(Proc)
+          call_as_proc(params[:default], o, params) # default as proc
+        else
+          params[:default] # default as literal value
+        end
       end
     end
 
@@ -32,11 +41,15 @@ module Mimi
       o.respond_to?(params[:from])
     end
 
+    # General Mimi::Struct error
+    #
+    class Error < StandardError; end
+
     # Creates a mapped Struct object from another object
     #
     # @param source [Hash,Object]
     #
-    def initialize(source)
+    def initialize(source = {})
       source = Mimi::Core::Struct.new(source) if source.is_a?(Hash)
       attributes = self.class.transform_attributes(source)
       super(attributes)
@@ -44,14 +57,6 @@ module Mimi
       raise e.class, "Failed to construct #{self.class}: #{e}", e.backtrace
     end
 
-    # Fetches an attribute with given name
-    #
-    # @param name [Symbol]
-    #
-    def [](name)
-      @attributes[name.to_sym]
-    end
-
     # Presents this Struct as a Hash, deeply converting nested Structs
     #
     # @return [Hash]
@@ -84,7 +89,7 @@ module Mimi
     #
     def self.attribute(name, params = {})
       name = name.to_sym
-      raise "Attribute '#{name}' is already declared" if attribute_definitions.key?(name)
+      raise ArgumentError, "Attribute '#{name}' is already declared" if attribute_definitions.key?(name)
       defaults = group_params.reduce(:merge).merge(
         from: name,
         using: DEFAULT_ATTRIBUTE_MAPPER
@@ -192,7 +197,7 @@ module Mimi
       end
       raise "unexpected :using type: #{params[:using].class}"
     rescue StandardError => e
-      raise "Failed to transform attribute :#{key} : #{e}"
+      raise Error, "Failed to transform attribute :#{key} : #{e}"
     end
 
     # Calls a lambda as a proc, not caring about the number of arguments
@@ -225,5 +230,3 @@ module Mimi
     end
   end # class Struct
 end # module Mimi
-
-require "mimi/struct/version"

data/mimi-struct.gemspec

@@ -1,10 +1,11 @@
 lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "mimi/struct"
+
+require "mimi/struct/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "mimi-struct"
-  spec.version       = Mimi::Struct::VERSION
+  spec.version       = Mimi::Struct_VERSION
   spec.authors       = ["Alex Kukushkin"]
   spec.email         = ["alex@kukushk.in"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mimi-struct
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Alex Kukushkin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-28 00:00:00.000000000 Z
+date: 2019-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mimi-core