braque 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 117d19be143c1b7314093816acc359f136666c06
-  data.tar.gz: abb1836ab553182c46553ea2578fb530c5b018be
+  metadata.gz: 1301ea8c8cb20ba8d4bf8785c56d43483e39f5c9
+  data.tar.gz: a105f99e589ed6be0ed3a5144b8c0ed3e83d08c2
 SHA512:
-  metadata.gz: 54f0b02909ea21b7345b5718ba90738c24a7a613a6d77b346b606f5eb87e81218972a1e64f869429ae176a906c6c5bf2fe1eaaef7be1087fc030583c11f51534
-  data.tar.gz: b6959ce75f02e30fb785896ebb8fd43c70dac27eb0a8b614f3d8edebe8fa74227d248e23688b14dad4939135dcba5c2d8dc718dfc70a8d06a6f6a94fe347ae76
+  metadata.gz: ede1d3e637ae1b3dd5f2830c4043bfbf1762c624040ab2d047c3ce2b00fb9d09cc38ee3641ca0906457fdb4a4c69d4526038b46960cc007bbe52007f651e7b5e
+  data.tar.gz: 34aa058fdc69bc3668315ad6a2b6d31d10eaf11b8bb93031264731a5275e9f5502f35a78244a3f3f5abb80e92f2cd8d18b681534e1560d8f6d50b00e8be1e6cf

data/lib/braque/collection.rb

@@ -6,21 +6,21 @@ module Braque
       attr_reader :total_count
 
       def initialize(response = [], klass)
-        next_link = response._links.try(:next)
-        previous_link = response._links.try(:prev)
-        total_count = response.try(:total_count)
+        @next_link = response._links.try(:next)
+        @previous_link = response._links.try(:prev)
+        @total_count = response.try(:total_count)
+        super build_retrieved_items(response, klass)
+      end
+
+      def build_retrieved_items(response, klass)
         retrieved_items = []
-        response_items(response, klass).each do |item|
+        response_collection(response, klass).each do |item|
           retrieved_items << klass.new(item)
         end
-        @retrieved_items = retrieved_items
-        @next_link = next_link
-        @previous_link = previous_link
-        @total_count = total_count
-        super retrieved_items
+        retrieved_items
       end
 
-      def response_items(response, klass)
+      def response_collection(response, klass)
         return response unless response.respond_to? :_embedded
         response._embedded.send klass.collection_method_name
       end

data/lib/braque/model.rb

@@ -1,7 +1,7 @@
 module Braque
   module Model
-    extend ::ActiveSupport::Concern
-    include ::ActiveAttr::Model
+    extend ActiveSupport::Concern
+    include ActiveAttr::Model
 
     included do
       class_attribute :config
@@ -15,7 +15,7 @@ module Braque
       # in client apps if some other scheme is more advisable.
       #
       def to_param
-        fail 'Please overide to_param or add id to your model attributes.' unless attributes.include? 'id'
+        fail 'Please overide to_param or add ID to your model attributes.' unless attributes.include? 'id'
         id.to_s
       end
 
@@ -27,7 +27,7 @@ module Braque
       # classes in client apps if some other scheme is more advisable.
       #
       def resource_find_options
-        fail 'Please overide resource_find_options or add id to your model attributes.' unless attributes.include? 'id'
+        fail 'Please overide resource_find_options or add ID to your model attributes.' unless attributes.include? 'id'
         { id: id }
       end
 
@@ -50,8 +50,16 @@ module Braque
 
         def self.inherited(subclass)
           subclass.class_eval do
+            # Allow the config settings for a superclass Braque::Model
+            # to be inherited by its subclassed Braque::Model classes
+            #
             self.config = self.config.dup
 
+            # Allow a superclass's attributes to be inerited
+            # by subclassed Braque::Model classes
+            #
+            self.attributes = self.superclass.attributes.dup
+
             define_singleton_method subclass.instance_method_name do
             end
 

data/lib/braque/version.rb

@@ -1,3 +1,3 @@
 module Braque
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

data/spec/braque/model_attributes_spec.rb

@@ -52,7 +52,7 @@ RSpec.describe 'Braque::Model attribute definitions', type: :model do
     context '.to_param' do
       it 'raises an error unless id is defined or the method overridden' do
         expect { Agate.new.to_param }.to raise_error(
-          RuntimeError, 'Please overide to_param or add id to your model attributes.'
+          RuntimeError, 'Please overide to_param or add ID to your model attributes.'
         )
       end
 
@@ -76,7 +76,7 @@ RSpec.describe 'Braque::Model attribute definitions', type: :model do
     context '.resource_find_options' do
       it 'raises an error unless id is defined or the method is overridden' do
         expect { Agate.new.resource_find_options }.to raise_error(
-          RuntimeError, 'Please overide resource_find_options or add id to your model attributes.'
+          RuntimeError, 'Please overide resource_find_options or add ID to your model attributes.'
         )
       end
 

data/spec/braque/subclassed_model_spec.rb

@@ -2,26 +2,27 @@ require 'spec_helper'
 
 RSpec.describe Braque::Model, type: :model do
   context 'with subclassed Braque::Model classes' do
-    before do
-      class GeologicModel
-        include ::Braque::Model
-        api_root_url 'http://localhost:9292'
-        http_authorization_header 'replace-me'
-      end
+    class GeologicModel
+      include ::Braque::Model
+      api_root_url 'http://localhost:9292'
+      http_authorization_header 'replace-me'
+      attribute :id
+    end
 
-      class ContinentalDrift < GeologicModel
-      end
+    class ContinentalDrift < GeologicModel
+      attribute :name
+    end
 
-      class Convection < GeologicModel
-        api_root_url 'http://localhost:9595'
-        http_authorization_header 'ok-another-one-to-replace'
-      end
+    class Convection < GeologicModel
+      api_root_url 'http://localhost:9595'
+      http_authorization_header 'ok-another-one-to-replace'
+      attribute :first_name
+    end
 
-      class SeafloorSpreading
-        include ::Braque::Model
-        api_root_url 'http://localhost:9393'
-        http_authorization_header 'do-replace-me-as-well'
-      end
+    class SeafloorSpreading
+      include ::Braque::Model
+      api_root_url 'http://localhost:9393'
+      http_authorization_header 'do-replace-me-as-well'
     end
 
     context 'api configuration' do
@@ -43,6 +44,19 @@ RSpec.describe Braque::Model, type: :model do
       end
     end
 
+    context 'attributes' do
+      [GeologicModel, ContinentalDrift, Convection].each do |klass|
+        it 'includes attributes defined by the superclass' do
+          expect(klass.attributes).to include :id
+        end
+      end
+
+      it 'includes attributes defined by the subclass' do
+        expect(ContinentalDrift.attributes).to include :name
+        expect(Convection.attributes).to include :first_name
+      end
+    end
+
     context 'dynamic class methods' do
       it 'sets the correct dynamic class methods for the base class' do
         [:geologic_model, :geologic_models].each do |sym|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: braque
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Dylan Fareed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-05 00:00:00.000000000 Z
+date: 2015-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hyperclient