class_kit 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6175988d95d1b402e572de4e37188609b472faf
-  data.tar.gz: cb3d17f32c2d552fd0a75f82d6aa07c6767a4b03
+  metadata.gz: dc76efa8bece6ce97ebdd183cf8dfbb714eab01e
+  data.tar.gz: ecd76a46a52174f00a5063efe331270a3351a799
 SHA512:
-  metadata.gz: 63fba237db2c0dfdd7ee309696beb40d4715ce14b79ec3cac04eb8452ca779f759edbc689f3f297a2a13c874270218652b13a96b6d6aa798aab8f49c576ecb8b
-  data.tar.gz: e187ffdfdf9acc30fd4eec3ce2a983899c8ddc495e3eed2ec797e8fd0a040de4c53c3750acb9ded8906782fd655569b11adf5439c7c33c45a569fd435363fcde
+  metadata.gz: a64b6be2224ce8daa5ffafd09b3a896ce19186d05045c43874ea1d4fa4f3530953b180750c7bf52d795b32ce81e87cfb1182ad01520d3884f0d97cbffe235549
+  data.tar.gz: b9f06655edf946da687ebac8febd2f10f693e30e80134d01b1f141e2d04db67feaf300febca1958acd3bb39c3a115211e1f5564e8fb89abeed0ff26540d7f405

data/lib/class_kit/attribute_helper.rb

@@ -6,7 +6,16 @@ module ClassKit
     #
     # @return [Hash]
     def get_attributes(klass)
-      klass.class_variable_get(:@@class_kit_attributes).values.freeze
+      attributes = []
+      klass.ancestors.map do |k|
+        hash = k.instance_variable_get(:@class_kit_attributes)
+        if hash != nil
+          hash.values.each do |a|
+            attributes.push(a)
+          end
+        end
+      end
+      attributes.compact
     end
 
     # Get attribute for a given class and name
@@ -18,7 +27,7 @@ module ClassKit
     #
     # @return [Hash] that describes the attribute
     def get_attribute(klass:, name:)
-      klass.class_variable_get(:@@class_kit_attributes)[name] ||
+      get_attributes(klass).detect { |a| a[:name] == name } ||
         raise(ClassKit::Exceptions::AttributeNotFoundError, "Attribute: #{name}, could not be found.")
     end
 

data/lib/class_kit/class_methods.rb

@@ -2,18 +2,20 @@ module ClassKit
   def attr_accessor_type(name, type: nil, collection_type: nil, allow_nil: true, default: nil, auto_init: false,
                          meta: {})
 
-    unless class_variable_defined?(:@@class_kit_attributes)
-      class_variable_set(:@@class_kit_attributes, {})
+    unless instance_variable_defined?(:@class_kit_attributes)
+      instance_variable_set(:@class_kit_attributes, {})
     end
 
-    attributes = class_variable_get(:@@class_kit_attributes)
+    attributes = instance_variable_get(:@class_kit_attributes)
 
     attributes[name] = { name: name, type: type, collection_type: collection_type, allow_nil: allow_nil,
                                   default: default, auto_init: auto_init, meta: meta }
+    puts self
+    puts self.ancestors
 
     class_eval do
       define_method name do
-        cka = self.class.class_variable_get(:@@class_kit_attributes)[name]
+        cka = self.class.instance_variable_get(:@class_kit_attributes)[name]
 
         current_value = instance_variable_get(:"@#{name}")
 
@@ -32,7 +34,7 @@ module ClassKit
     class_eval do
       define_method "#{name}=" do |value|
         #get the attribute meta data
-        cka = self.class.class_variable_get(:@@class_kit_attributes)[name]
+        cka = self.class.instance_variable_get(:@class_kit_attributes)[name]
 
         #verify if the attribute is allowed to be set to nil
         if value.nil? && cka[:allow_nil] == false

data/lib/class_kit/version.rb

@@ -1,3 +1,3 @@
 module ClassKit
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: class_kit
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - vaughanbrittonsage
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-27 00:00:00.000000000 Z
+date: 2016-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler