structure 0.27.5 → 0.27.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bfa61be65533087a6a80a31bfac5e2ad42e4265
-  data.tar.gz: 95de6560a9bfc44d96996316f4882013f81cc063
+  metadata.gz: 7923734fab4cbf99ced503dd98c06fd8c6216c23
+  data.tar.gz: 8d8b1dda5952d0fb8a9ff5ca9ea790c34d489304
 SHA512:
-  metadata.gz: 0620ac53aa5f5fc3b0251c9fe146df6e8c18506e85adc53a0f4c86db4342f533bfbae716c007f541bb12de955e6b7f3bdac4de2bf4ddd17552995defd2b038bc
-  data.tar.gz: e35884dfea3921545a678245fdad78513f0bce1be1727adedbf85da8d5d30b843b4ae12eaa7b8ac3fe653313c68425a3fd012684ac342bffd82a0fecac4c3016
+  metadata.gz: 3fbdcbf61a7d398c76d5296832ae31e9c1e9808c3ce4d2c27b8227faf14092ca35cc1a2fed2ffea092060355107bfee4e91b0087ebddf5449f1aab5fe7b11785
+  data.tar.gz: 446a6f29b1944961e814f2b8fcdf5fe567be66c83f5dc5f604d822686fb667b6f9c6397fbe5550f885854be7d870296ead5da8fa662b76adb9045dde81d5bf0a

data/structure.rb

@@ -1,16 +1,18 @@
 module Structure
   def self.included(base)
-    base
-      .extend(ClassMethods)
-      .instance_variable_set(:@attribute_names, [])
+    base.extend(ClassMethods).instance_variable_set(:@attribute_names, [])
   end
 
   def attributes
-    self.class.attribute_names.reduce({}) { |ret, name|
+    attribute_names.reduce({}) { |ret, name|
       ret.update(name => self.send(name))
     }
   end
 
+  def attribute_names
+    self.class.attribute_names
+  end
+
   def ==(other)
     attributes == other.attributes
   end
@@ -37,13 +39,25 @@ module Structure
     attr_reader :attribute_names
 
     def to_struct
-      return Struct.const_get(name, false) if Struct.const_defined?(name, false)
+      class_name = name || to_s.gsub(/\W/, '')
 
-      Struct.new(name, *attribute_names) do
+      if Struct.const_defined?(class_name, false)
+        return Struct.const_get(class_name, false)
+      end
+
+      klass = Struct.new(class_name, *attribute_names) do
         def initialize(data = {})
           data.each { |key, val| self.send("#{key}=", val) }
         end
       end
+
+      attribute_names.each do |name|
+        if instance_methods(false).include?(:"#{name}?")
+          klass.module_eval "def #{name}?; #{name} end"
+        end
+      end
+
+      klass
     end
 
     def inherited(subclass)
@@ -51,15 +65,12 @@ module Structure
     end
 
     def attribute(name, &blk)
+      name = name.to_s
+      module_eval "def #{name}?; #{name}; end" if name.chomp!('?')
+      module_eval "def #{name}; @#{name} ||= _#{name}; end"
       define_method("_#{name}", blk)
       private "_#{name}"
 
-      module_eval <<-END
-        def #{name}
-          @#{name} ||= _#{name}
-        end
-      END
-
       @attribute_names << name
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: structure
 version: !ruby/object:Gem::Version
-  version: 0.27.5
+  version: 0.27.6
 platform: ruby
 authors:
 - Hakan Ensari