acfs 0.47.0 → 0.48.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: decb9d3e9d395a8be85fbe1121af69d5d14760dc
-  data.tar.gz: a9a4ec3bfd5181238ff1075c1f2c201193e4c6c7
+  metadata.gz: 0a815614c14477b727317758c4deb950750c1609
+  data.tar.gz: d1413e76db34215713693cf20b88e6d2e751efe3
 SHA512:
-  metadata.gz: 9e32e66070e87b77c91d6046b378896aaaf76a45bdaae3a08b9fd00264b5e5bef80003b04de602abffba08fcf3e8892673025659636ff753679c9ee3104e5ded
-  data.tar.gz: a2c3cf04e5f8edc101c9af0d5c8afc6c24d5990ccbc8c36025c99fea69a13e6bc426269c8b2de7b95f57644563ded48b1446d18e721afbd36da786515b7b1fda
+  metadata.gz: 775cf10dd61a350c67faab9704685f251f0e7416cc2c9055b6373be1f6a7419c130e914ad2897b2f79aa5781eec02e8bc7054cbe91078ff8773a57965297604e
+  data.tar.gz: 3d6f4f31d2573375cad139c75a7f24131037b0211cc28bb6143709a391f4ab542357bb7c51fa4984788e739797fdf9c68e22fc58b1d61669173c0d85b0402ce8

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.48.0
+
+* Remove #attribute_types broke since f7e4109 (Sep 2013, v0.23)
+* Fix attribute inheritance on subclassing broken since commit 7cf1d11 (Apr 2014, v0.43)
+
 ## 0.47.0
 
 * Change blank value handling of dict and list type (0a12ef1)

data/lib/acfs/resource/attributes.rb

@@ -222,56 +222,30 @@ class Acfs::Resource
       #   Attributes with default values.
       #
       def attributes
-        {}.tap do |attrs|
-          defined_attributes.each do |key, attr|
-            attrs[key] = attr.default_value
-          end
+        defined_attributes.each_with_object({}) do |(key, attr), hash|
+          hash[key] = attr.default_value
         end
       end
 
       def defined_attributes
-        @attributes ||= begin
-          attributes = {}
-          if superclass.respond_to?(:defined_attributes)
-            attributes.merge superclass.defined_attributes
-          end
-
-          attributes
+        if superclass.respond_to?(:defined_attributes)
+          superclass.defined_attributes.merge(local_attributes)
+        else
+          local_attributes
         end
       end
 
-      # @api public
-      #
-      # Return hash of attributes and there types.
-      #
-      # @example
-      #   class User < Acfs::Resource
-      #     attribute :name, :string
-      #     attribute :age, :integer, default: 25
-      #   end
-      #   User.attributes # => {"name": Acfs::Model::Attributes::String,
-      #                   #     "age":  Acfs::Model::Attributes::Integer}
-      #
-      # @return [Hash{Symbol => Class}] Attributes and their types.
-      #
-      def attribute_types
-        @attribute_types ||= begin
-          attribute_types = {}
-          if superclass.respond_to?(:attribute_types)
-            attribute_types.merge superclass.attribute_types
-          end
+      private
 
-          attribute_types
-        end
+      def local_attributes
+        @local_attributes ||= {}
       end
 
-      private
-
       def define_attribute(name, type, opts = {})
         name      = name.to_s
         attribute = type.new opts
 
-        defined_attributes[name] = attribute
+        local_attributes[name] = attribute
         define_attribute_method name
 
         send :define_method, name do

data/lib/acfs/version.rb

@@ -1,7 +1,7 @@
 module Acfs
   module VERSION
     MAJOR = 0
-    MINOR = 47
+    MINOR = 48
     PATCH = 0
     STAGE = nil
 

data/spec/acfs/resource/attributes_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe Acfs::Resource::Attributes do
   let(:model) { Class.new Acfs::Resource }
+  let(:submodel) { Class.new model }
 
   describe '#initialize' do
     before { model.attribute :name, :string, default: 'John' }
@@ -137,7 +138,7 @@ describe Acfs::Resource::Attributes do
   end
 
   describe 'class' do
-    describe '#attribute' do
+    describe '#attributes' do
       it 'should add an attribute to model attribute list' do
         model.send :attribute, :name, :string
 
@@ -150,18 +151,29 @@ describe Acfs::Resource::Attributes do
         expect(model.attributes.symbolize_keys).to eq name: 'John'
       end
 
-      it 'should accept an symbolic type' do
+      it 'should accept a symbolic type' do
         model.send :attribute, :age, :integer, default: '12'
 
         expect(model.attributes.symbolize_keys).to eq age: 12
       end
 
-      it 'should accept an class type' do
+      it 'should accept a class type' do
         model.send :attribute, :age, Acfs::Resource::Attributes::Integer,
           default: '12'
 
         expect(model.attributes.symbolize_keys).to eq age: 12
       end
+
+      context 'on inherited resources' do
+        before do
+          model.attribute :age, :integer, default: 5
+          submodel.attribute :born_at, :date_time
+        end
+
+        it 'includes superclass attributes' do
+          expect(submodel.attributes.keys).to match_array %w(age born_at)
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acfs
 version: !ruby/object:Gem::Version
-  version: 0.47.0
+  version: 0.48.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-31 00:00:00.000000000 Z
+date: 2016-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport