cistern 2.7.0 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be9990e15cdccbe77ea1c27b5a6961fecd445129
-  data.tar.gz: d466f0e83e49c33fc9dce01eb713b9f1062e8f7e
+  metadata.gz: fd667c59a902c0cfb27b3d8f9f07a9fdc79f42cf
+  data.tar.gz: f37b9ac705677e8a16e8ca777f5032871ca73d72
 SHA512:
-  metadata.gz: dd4a3d7c95873a7fb999854846db84790273ad3366a018dc0e519d7708a13ec325a3a0d1b0bb4968f28cd6260dc4d72659c513513f56dfc2ec0b52ece8a9fb9d
-  data.tar.gz: 68ca70761102c30cca381a029184250a1750dc01d3c63626afe8b7ecd1929839497a8c6b55f995cef40ad8d5554b534987e1447f44eae567ae6c805cce82c2b5
+  metadata.gz: 4e7b9828dac0f8071418073aa20f868f410a493020b816fae0e6e87e1561ad7f899021620a40ff2a12ca362ab1de71231e3db7216571cd52dd142bb993539030
+  data.tar.gz: e2452a1049e8b66573ed783db09445a47f0eb6b5cebe4e45651f7cefa0577ae133064b83805d66507c11d8af130c7e6983ee07bf1fc88f4f546134684139d579

data/CHANGELOG.md

@@ -1,5 +1,31 @@
 # Change Log
 
+## [Unreleased](https://github.com/lanej/cistern/tree/HEAD)
+
+[Full Changelog](https://github.com/lanej/cistern/compare/v2.7.0...HEAD)
+
+**Implemented enhancements:**
+
+- custom wait for lambdas [\#21](https://github.com/lanej/cistern/issues/21)
+- accept alias as a attribute parameter [\#20](https://github.com/lanej/cistern/issues/20)
+- Offer mock data adapters [\#19](https://github.com/lanej/cistern/issues/19)
+- request method model [\#4](https://github.com/lanej/cistern/issues/4)
+- Service\#requires\_one [\#3](https://github.com/lanej/cistern/issues/3)
+
+**Merged pull requests:**
+
+- feature: allow using `super` to override association methods [\#73](https://github.com/lanej/cistern/pull/73) ([lanej](https://github.com/lanej))
+- fix\(associations\): enable attribute options and method scope blocks [\#72](https://github.com/lanej/cistern/pull/72) ([lanej](https://github.com/lanej))
+
+## [v2.7.0](https://github.com/lanej/cistern/tree/v2.7.0) (2016-08-10)
+[Full Changelog](https://github.com/lanej/cistern/compare/v2.6.0...v2.7.0)
+
+**Merged pull requests:**
+
+- fix\(singular\): add associations support [\#70](https://github.com/lanej/cistern/pull/70) ([lanej](https://github.com/lanej))
+- refactor\(request\): cleanup and document interface [\#69](https://github.com/lanej/cistern/pull/69) ([lanej](https://github.com/lanej))
+- Add a Gitter chat badge to README.md [\#68](https://github.com/lanej/cistern/pull/68) ([gitter-badger](https://github.com/gitter-badger))
+
 ## [v2.6.0](https://github.com/lanej/cistern/tree/v2.6.0) (2016-07-26)
 [Full Changelog](https://github.com/lanej/cistern/compare/v2.5.0...v2.6.0)
 

data/README.md

@@ -405,14 +405,12 @@ tag.creator = blogs.author.get(name: 'phil')
 tag.attributes[:creator] #=> { 'id' => 2, 'name' => 'phil' }
 ```
 
-Foreign keys can be updated with with the association writer by aliasing the original writer and accessing the
-underlying attributes.
+Foreign keys can be updated by overriding the association writer.
 
 ```ruby
 Blog::Tag.class_eval do
-  alias cistern_creator= creator=
   def creator=(creator)
-    self.cistern_creator = creator
+    super
     self.author_id = attributes[:creator][:id]
   end
 end

data/lib/cistern/associations.rb

@@ -1,6 +1,16 @@
 # frozen_string_literal: true
 module Cistern::Associations
 
+  def self.extended(klass)
+    def klass.association_overlay
+      @association_overlay ||= const_set(:Associations, Module.new)
+    end
+
+    klass.send(:include, klass.association_overlay)
+
+    super
+  end
+
   # Lists the associations defined on the resource
   # @return [Hash{Symbol=>Array}] mapping of association type to name
   def associations
@@ -17,25 +27,32 @@ module Cistern::Associations
   #     identity :registration_id
   #     has_many :lawyers, -> { cistern.associates(firm_id: identity) }
   #    end
-  def has_many(name, scope)
+  def has_many(name, *args, &block)
     name_sym = name.to_sym
 
     reader_method = name
     writer_method = "#{name}="
 
-    attribute name, type: :array
+    options = args.last.is_a?(::Hash) ? args.pop : {}
+    scope = args.first || block
 
-    define_method reader_method do
-      collection = instance_exec(&scope)
-      records = attributes[name_sym] || []
+    attribute name_sym, options.merge(writer: false, reader: false, type: :array)
 
-      collection.load(records) if records.any?
-      collection
+    association_overlay.module_eval do
+      define_method reader_method do
+        collection = instance_exec(&scope)
+        records = attributes[name_sym] || []
+
+        collection.load(records) if records.any?
+        collection
+      end
     end
 
-    define_method writer_method do |models|
-      attributes[name] = Array(models).map do |model|
-        model.respond_to?(:attributes) ? model.attributes : model
+    association_overlay.module_eval do
+      define_method writer_method do |models|
+        attributes[name] = Array(models).map do |model|
+          model.respond_to?(:attributes) ? model.attributes : model
+        end
       end
     end
 
@@ -51,24 +68,31 @@ module Cistern::Associations
   #     identity :registration_id
   #     belongs_to :leader, -> { cistern.employees.get(:ceo) }
   #    end
-  def belongs_to(name, block)
+  def belongs_to(name, *args, &block)
     name_sym = name.to_sym
 
     reader_method = name
     writer_method = "#{name}="
 
-    attribute name_sym
+    options = args.last.is_a?(::Hash) ? args.pop : {}
+    scope = args.first || block
+
+    attribute name_sym, options.merge(writer: false, reader: false)
 
-    define_method reader_method do
-      model = instance_exec(&block)
-      attributes[name_sym] = model.attributes
-      model
+    association_overlay.module_eval do
+      define_method reader_method do
+        model = instance_exec(&scope)
+        attributes[name_sym] = model.attributes
+        model
+      end
     end
 
-    define_method writer_method do |model|
-      data = model.respond_to?(:attributes) ? model.attributes : model
-      attributes[name_sym] = data
-      model
+    association_overlay.module_eval do
+      define_method writer_method do |model|
+        data = model.respond_to?(:attributes) ? model.attributes : model
+        attributes[name_sym] = data
+        model
+      end
     end
 
     associations[:belongs_to] << name_sym

data/lib/cistern/attributes.rb

@@ -55,8 +55,8 @@ module Cistern::Attributes
 
       attributes[name_sym] = options
 
-      define_attribute_reader(name_sym, options)
-      define_attribute_writer(name_sym, options)
+      define_attribute_reader(name_sym, options) unless options[:reader] == false
+      define_attribute_writer(name_sym, options) unless options[:writer] == false
 
       name_sym
     end

data/lib/cistern/version.rb

@@ -1,3 +1,3 @@
 module Cistern
-  VERSION = '2.7.0'
+  VERSION = '2.7.1'
 end

data/spec/associations_spec.rb

@@ -45,6 +45,24 @@ describe Cistern::Associations do
       expect(sample.associate).to eq(belongs_to)
     end
 
+    it 'accepts attribute options' do
+      subject.class_eval do
+        belongs_to :other_associates, -> { Sample::Associate.new(id: 3) }, alias: 'others'
+      end
+
+      expect(subject.attributes[:other_associates][:aliases]).to contain_exactly(:others)
+    end
+
+    it 'accepts a scope in block form' do
+      subject.class_eval do
+        belongs_to :other_associates, alias: 'others' do
+          Sample::Associate.new(id: 3)
+        end
+      end
+
+      expect(subject.new.other_associates).to eq(Sample::Associate.new(id: 3))
+    end
+
     describe '{belongs_to}=' do
       it 'accepts a model' do
         sample = subject.new(id: 1, associate_id: 2)
@@ -62,7 +80,7 @@ describe Cistern::Associations do
         expect(sample.attributes[:associate]).to eq(id: 2)
       end
 
-      it 'allows for overrides' do
+      it 'allows for aliased overrides' do
         subject.class_eval do
           alias cistern_associate= associate=
           def associate=(associate)
@@ -79,6 +97,23 @@ describe Cistern::Associations do
           sample.associate = belongs_to
         }.to change(sample, :associate_id).to(2)
       end
+
+      it 'allows for overrides using super' do
+        subject.class_eval do
+          def associate=(associate)
+            super
+            self.associate_id = attributes[:associate][:id]
+          end
+        end
+
+        sample = subject.new(id: 1, associate_id: 3)
+
+        belongs_to = Sample::Associate.new(id: 2)
+
+        expect {
+          sample.associate = belongs_to
+        }.to change(sample, :associate_id).to(2)
+      end
     end
   end
 
@@ -128,6 +163,24 @@ describe Cistern::Associations do
       expect(model.associates.records).to contain_exactly(Sample::Associate.new(id: 3))
     end
 
+    it 'accepts attribute options' do
+      subject.class_eval do
+        has_many :other_associates, -> { Sample::Associates.new }, alias: 'others'
+      end
+
+      expect(subject.attributes[:other_associates][:aliases]).to contain_exactly(:others)
+    end
+
+    it 'accepts a scope in block form' do
+      subject.class_eval do
+        has_many :other_associates, alias: 'others' do
+          Sample::Associates.new(associate_id: 1)
+        end
+      end
+
+      expect(subject.new.other_associates).to eq(Sample::Associates.new(associate_id: 1))
+    end
+
     describe '{has_many}=' do
       it 'accepts models' do
         model = subject.new(associate_id: 2)

data/spec/attributes_spec.rb

@@ -226,6 +226,24 @@ describe Cistern::Attributes, 'parsing' do
     expect(subject.new(default: 'now im a different squash').default).to eq('now im a different squash')
   end
 
+  it 'can skip reader generation' do
+    subject.class_eval do
+      attribute :default, reader: false
+    end
+
+    expect(subject.new).not_to respond_to(:default)
+    expect(subject.new).to respond_to(:default=)
+  end
+
+  it 'can skip writer generation' do
+    subject.class_eval do
+      attribute :default, writer: false
+    end
+
+    expect(subject.new).to respond_to(:default)
+    expect(subject.new).not_to respond_to(:default=)
+  end
+
   context 'allowing the same alias for multiple attributes' do
     before {
       subject.class_eval do

metadata

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