data_container 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03c86dfbb52a0999baa5294ecc389e03093c9b29
-  data.tar.gz: 65bce46c1b4a9d3fc0726dc36c7bcf4900fea413
+  metadata.gz: b88ea5add05a1fb7df10622d57484fdc7c8a814f
+  data.tar.gz: c6295f6b401ad8483402bd5ac08c657bd283d4db
 SHA512:
-  metadata.gz: f5c14ecb983b260d46c959d33735c8ade3ff2beb5e2a4b2bff98ee9433387a5d8692175febfc98cb519c5182045d655ebb5af2f5edfc33f521b9ff47d369241c
-  data.tar.gz: dfc41ed0bca4730cff932ad27ec8fe0889a15a15a5a2ff0bbfecb8d66776b18f3f702af1084d06bb2ba115f8706d6cd05da7568af69b34f4ad3737b1f7389a81
+  metadata.gz: 5b6ca4132e75294b3fae13ce4ec6882211de1eddcc70e080f00e5d9edbee44bc56121d8d191fc9eb7a03ec99de6bfc8738216f02d86a0318793706bd502c6768
+  data.tar.gz: f2a74f902c0a9ea69c2b810375426bc1fc656c99e0f868dea5c1916716630b9a3fc0ebc3aa7162a2aaf443438a88a396acceed29b6f7b67828e90fbebcc9b649

data/lib/data_container.rb

@@ -1,28 +1,39 @@
 class DataContainer < Struct
+  class AttributeError < StandardError; end
+
   def self.new(*args)
-    super.new    # send back an INSTANCE, not a class
+    if args.size == 1 && args.first.is_a?(Hash)    # actually given a hash, not an array of values
+      new_class = super(*args.first.keys)
+      new_class.new(*args.first.values)
+    else
+      new_class = super(*args)   # Struct constructor
+      new_class.new              # send back an INSTANCE, not a class
+    end
+  end
+
+  def initialize(*args)
+    super    # Instance of Struct/new class constructor
   end
 
   def get(ivar)
-    send(ivar) if include?(ivar)
+    do_if_included(ivar) { send(ivar) }
   end
 
   def set(ivar, value)
-    send("#{ivar}=", value) if include?(ivar)
+    if include?(ivar)
+      send("#{ivar}=", value)
+    else
+      raise AttributeError, attribute_error_message(ivar)
+    end
   end
 
   def to_s
-    '@' + variable_value_pairs_string.join(', @')
-  end
-
-  def inspect
-    '#<DataContainer: ' + variable_value_pairs_string.join(' ') + '>'
+    "#<#{name} " + variable_value_pairs_string.join(', ') + '>'
   end
+  alias_method :inspect, :to_s
 
-  def merge!(other_data_container)
-    other_data_container.each_pair do |var, val|
-      set(var, val) unless val.nil?
-    end
+  def name
+    'DataContainer'
   end
 
   def include?(var)
@@ -40,4 +51,12 @@ class DataContainer < Struct
   def variable_value_pairs_string
     each_pair.map { |ivar, value| "#{ivar}=#{value.inspect}" }
   end
+
+  def attribute_error_message(attr)
+    "undefined attribute '#{attr}' for #{inspect} with backtrace:"
+  end
+
+  def do_if_included(ivar)
+    include?(ivar) ? yield(ivar) : raise(AttributeError, attribute_error_message(ivar))
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_container
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Kelli Searfos
@@ -38,7 +38,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: DataContainer class