attributable 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 167cb3bfb8d4237095209222dd5e925e909b3e6c
-  data.tar.gz: 99d532b61ef03948d2e43a3c00412f54323a7978
+  metadata.gz: c22dc4806f8e50155cb39df375de2e883edfb086
+  data.tar.gz: 5edda9c0de87966920404d14b07a8ca78e395657
 SHA512:
-  metadata.gz: 3b6b9812417f37be3717ce38c74dd04c4e13ba0ddda2278aa7684aeca11f3a0fb234a1bcb3b3359c52c98ad8cdbf1e432473b3f2bdb71a0edff1b0cdbcb33400
-  data.tar.gz: dd81b2cc7552dfe36f6d2f9ca1b69b8197055439f6e728615695493741481816674038169dd33d22053a6773424becb84ebe6cfa36a63a3cd2a8c722a031597c
+  metadata.gz: b50d6942f2276f8571991bb33470191cceb7a215bc78d0e5318466249bba357c443a3e244db843b09ae8a582fdade35e03492666f29eecd1eccc43ebb4f02e77
+  data.tar.gz: ee3fad3f3cffafc5fe94d0ef27c56c590e06cbbcc8708f73aa51fe1e0a429b2179b471a3cea5259df251428d45003265476c2e13abc800f5019f477e6be724c0

data/lib/attributable.rb

@@ -16,7 +16,6 @@ module Attributable
     @predefined_attributes ||= {}
     @predefined_attributes = super_attributes.merge(@predefined_attributes)
     add_instance_methods(@predefined_attributes)
-    @predefined_attributes
   end
 
   private
@@ -44,7 +43,8 @@ module Attributable
 
     define_method "initialize_attributes" do |attributes = {}|
       if self.class.superclass.kind_of? Attributable
-        predefined_attributes = self.class.specialises(self.class.superclass)
+        super_attributes = self.class.superclass.new.instance_variable_get(:@attributes)
+        predefined_attributes = super_attributes.merge(predefined_attributes)
       end
       @attributes = predefined_attributes.merge(attributes)
     end

data/lib/attributable/version.rb

@@ -1,3 +1,3 @@
 module Attributable
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/attributable/specialisation_spec.rb

@@ -95,17 +95,30 @@ describe Attributable do
       expect(s.active).to be_false
     end
 
+    it "should not override any custom methods" do
+      class SuperUser7 < User
+        def inspect
+          "SUPERUSER"
+        end
+      end
+
+      s = SuperUser7.new(id: 1)
+
+      expect(s.id).to eq(1)
+      expect(s.inspect).to eq("SUPERUSER")
+    end
+
     it "shouldn't automatically specialise unless superclass is an instance of Attributable" do
       class PORO
         attr_accessor :name
       end
 
-      class SuperUser7 < PORO
+      class SuperUser8 < PORO
         extend Attributable
         attributes :forename, :surname
       end
 
-      expect { SuperUser7.new }.to_not raise_error
+      expect { SuperUser8.new }.to_not raise_error
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attributable
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Louis Rose