cistern 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a2797ca8edb773a77fe40604024aeca97df9880
-  data.tar.gz: 4bfd89a74eef61fdd0cca096a01465235a40009f
+  metadata.gz: 8d74b41f098f699d93b5d42a8cc0915ac2169162
+  data.tar.gz: 1171cb486f3155fb05faf470bad810349d3a7a36
 SHA512:
-  metadata.gz: bab52f2a7c09673e54e943da2ada9cacdf8684ca0b3b419c415a8fbc031f5090a9c378ba366adeee9d662770a744975b6732b6715dbc03baccbc0bde93d3fa23
-  data.tar.gz: 805ab1b15511ada7e048f0ebdea1f7e1ca8ab15bfdd3cf7fca417c8662eeef7e4cfd5851381491cc432fcb21f9ece6bd033bd2ea150634195307578b2ec1ab33
+  metadata.gz: 697575fd1b7a88143f1c6ed754ed38fc1813584e2bf22faa324499f3eb8ae503cb02413c799aa14bafc5f9b97af44c721aaf03cafe9ae9502af78337edffbb60
+  data.tar.gz: 285daf44f8c9048ed45321c9c270c2be04c0a5d181ef867c8aee5a1a421b81e0ce231e3d535c522ba9f9e4f9ae54d93bba15ccda689306a3c9651af1414128c0

data/CHANGELOG.md

@@ -2,7 +2,14 @@
 
 ## [Unreleased](https://github.com/lanej/cistern/tree/HEAD)
 
-[Full Changelog](https://github.com/lanej/cistern/compare/v2.3.0...HEAD)
+[Full Changelog](https://github.com/lanej/cistern/compare/v2.4.0...HEAD)
+
+**Merged pull requests:**
+
+- fix\(attributes\): child classes inherit parent identity [\#64](https://github.com/lanej/cistern/pull/64) ([lanej](https://github.com/lanej))
+
+## [v2.4.0](https://github.com/lanej/cistern/tree/v2.4.0) (2016-07-11)
+[Full Changelog](https://github.com/lanej/cistern/compare/v2.3.0...v2.4.0)
 
 **Implemented enhancements:**
 

data/lib/cistern/attributes.rb

@@ -57,11 +57,12 @@ module Cistern::Attributes
 
       define_attribute_reader(name_sym, options)
       define_attribute_writer(name_sym, options)
+
+      name_sym
     end
 
-    def identity(name, options = {})
-      @identity = name
-      attribute(name, options)
+    def identity(*args)
+      args.any? ? @identity = attribute(*args) : (@identity ||= parent_identity)
     end
 
     def ignore_attributes(*args)
@@ -117,6 +118,10 @@ module Cistern::Attributes
     def parent_attributes
       superclass && superclass.respond_to?(:attributes) && superclass.attributes.dup
     end
+
+    def parent_identity
+      superclass && superclass.respond_to?(:identity) && superclass.identity
+    end
   end
 
   module InstanceMethods
@@ -174,13 +179,13 @@ module Cistern::Attributes
     end
 
     def identity
-      key = self.class.instance_variable_get('@identity')
+      key = self.class.identity
 
       public_send(key) if key
     end
 
     def identity=(new_identity)
-      key = self.class.instance_variable_get('@identity')
+      key = self.class.identity
 
       if key
         public_send("#{key}=", new_identity)

data/lib/cistern/version.rb

@@ -1,3 +1,3 @@
 module Cistern
-  VERSION = '2.4.0'
+  VERSION = '2.4.1'
 end

data/spec/model_spec.rb

@@ -14,7 +14,29 @@ describe 'Cistern::Model' do
       expect(parent.attributes.keys).to contain_exactly(:parent)
       expect(child.attributes.keys).to contain_exactly(:parent, :child)
     end
+
+    it 'provides the child with the identity of the parent' do
+      parent = Class.new(Sample::Model) do
+        identity :name
+        attribute :parent
+      end
+
+      child = Class.new(parent) do
+        attribute :child
+      end
+
+      expect(parent.identity).to eq(:name)
+      expect(child.identity).to eq(:name)
+      expect(child.new).to respond_to(:name)
+
+      girl = child.new
+
+      expect {
+        girl.name = 'lady'
+      }.to change(girl, :identity).to('lady')
+    end
   end
+
   describe '#update' do
     class UpdateSpec < Sample::Model
       identity :id

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cistern
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2016-07-16 00:00:00.000000000 Z
 dependencies: []
 description: API client framework extracted from Fog
 email: