cistern 2.8.0 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c46e3adcc00de17de88267eb956010d23a800448
-  data.tar.gz: 55b688beea4299e4ff6ce8b2e7a417b57138aeef
+SHA256:
+  metadata.gz: 6949d6bf767316892c02a7ae3ae1f14afc2cff8331b4fc0a72bf93295e126e7a
+  data.tar.gz: d2a27bae1d717ec47ed4f6135cc7fa4e635423a1f81e7facd2b616cf33eed3ef
 SHA512:
-  metadata.gz: cf42fdb4f9909d0e5a388366eec9c12ac3154d8de3d431fd0319e64119d2d437ddf4f72fed4ce0a51c847f598b834ff1a7dbc3e5699018c42e632409e186e424
-  data.tar.gz: '0542951ae0e2926ac3454c5140b7e15bc690fa6593b410277da23554f585da872b83006f7dfa9026569a9aa931100eb09759f0d96b74f29e774449542b5c6074'
+  metadata.gz: '02565729c04cff5108f5b3b7547e635b3c3a56dd239d00bb3108b8106a05ad7a50d79b03992dddea1a136bf66552d97a3c140d282a1218c73c5b0e4df1116b2a'
+  data.tar.gz: aa96a0b7dd8ad8e985e4ee8c9f1d22f8c8ca673b9ef9346d7771a4b853440791a7acef4a9f95fb6cb2c86b69f0d969bc8c8cc8f62f9a92c793798781601631cc

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 rvm:
 - 2.3.0
 - 2.2
+- 2.4.1
 bundler_args: "--without development"
 before_install:
 - gem install bundler -v "~> 1.10"

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Change Log
 
+## [Unreleased](https://github.com/lanej/cistern/tree/HEAD)
+
+[Full Changelog](https://github.com/lanej/cistern/compare/v2.7.2...HEAD)
+
+**Merged pull requests:**
+
+- fix codeclimate reporting [\#80](https://github.com/lanej/cistern/pull/80) ([lanej](https://github.com/lanej))
+- Add support for a Date type. [\#78](https://github.com/lanej/cistern/pull/78) ([leklund](https://github.com/leklund))
+- fix 0.12 branch for ruby 2.4 [\#77](https://github.com/lanej/cistern/pull/77) ([ehowe](https://github.com/ehowe))
+
+## [v2.7.2](https://github.com/lanej/cistern/tree/v2.7.2) (2016-10-21)
+[Full Changelog](https://github.com/lanej/cistern/compare/v2.7.1...v2.7.2)
+
+**Merged pull requests:**
+
+- feature: add \#clone\_attributes [\#75](https://github.com/lanej/cistern/pull/75) ([lanej](https://github.com/lanej))
+- fix: alias attributes= to merge\_attributes [\#74](https://github.com/lanej/cistern/pull/74) ([lanej](https://github.com/lanej))
+
 ## [v2.7.1](https://github.com/lanej/cistern/tree/v2.7.1) (2016-08-26)
 [Full Changelog](https://github.com/lanej/cistern/compare/v2.7.0...v2.7.1)
 

data/lib/cistern/associations.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Cistern::Associations
 
   def self.extended(klass)

data/lib/cistern/attributes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Cistern::Attributes
   PROTECTED_METHODS = [:cistern, :service, :identity, :collection].freeze
   TRUTHY = ['true', '1'].freeze

data/lib/cistern/client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Cistern::Client
   module Collections
     def collections

data/lib/cistern/collection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Cistern::Collection
   include Cistern::HashSupport
 

data/lib/cistern/coverage.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Cistern::Coverage
   unless Kernel.respond_to? :caller_locations
     abort <<-ABORT

data/lib/cistern/data/hash.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Cistern::Data::Hash
   Cistern::Data.backends[:hash] = self
 

data/lib/cistern/data/redis.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Cistern::Data::Redis
   Cistern::Data.backends[:redis] = self
 

data/lib/cistern/data.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Cistern::Data
   def self.extended(klass)
     klass.send(:extend, ClassMethods)

data/lib/cistern/formatter/awesome_print.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'awesome_print'
 
 module Cistern::Formatter::AwesomePrint
@@ -27,14 +29,16 @@ module AwesomePrint::Cistern
   # Format Cistern::Model
   #------------------------------------------------------------------------------
   def awesome_cistern_model(object)
-    data = object.attributes.keys.sort.each_with_object({}) { |e, a| a[e] = object.public_send(e) }
-    "#{object} " << awesome_hash(data)
+    data = object.attributes.keys.sort.each_with_object({}) do |e, a|
+      a[e] = object.read_attribute(e)
+    end
+    "#{object} #{awesome_hash(data)}"
   end
 
   # Format Cistern::Model
   #------------------------------------------------------------------------------
   def awesome_cistern_collection(object)
-    "#{object.class.name} " << awesome_hash(attributes: object.attributes, records: object.to_a)
+    "#{object.class.name} #{awesome_hash(attributes: object.attributes, records: object.to_a)}"
   end
 end
 

data/lib/cistern/formatter/default.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Cistern::Formatter::Default
   class << self
     def call(object)

data/lib/cistern/formatter/formatador.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'formatador'
 
 module Cistern::Formatter::Formatador
@@ -12,24 +14,24 @@ module Cistern::Formatter::Formatador
 
   def self.model_inspect(model)
     Thread.current[:formatador] ||= Formatador.new
-    data = "#{Thread.current[:formatador].indentation}<#{model.class.name}"
+    data = ["#{Thread.current[:formatador].indentation}<#{model.class.name}"]
     Thread.current[:formatador].indent do
       unless model.class.attributes.empty?
         data << "\n#{Thread.current[:formatador].indentation}"
-        data << model.class.attributes.map { |attribute, _| "#{attribute}=#{model.send(attribute).inspect}" }.join(",\n#{Thread.current[:formatador].indentation}")
+        data << model.class.attributes.map { |attribute, _| "#{attribute}=#{model.read_attribute(attribute).inspect}" }.join(",\n#{Thread.current[:formatador].indentation}")
       end
     end
     data << "\n#{Thread.current[:formatador].indentation}>"
-    data
+    data.join
   end
 
   def self.collection_inspect(collection)
     Thread.current[:formatador] ||= Formatador.new
-    data = "#{Thread.current[:formatador].indentation}<#{collection.class.name}\n"
+    data = ["#{Thread.current[:formatador].indentation}<#{collection.class.name}\n"]
     Thread.current[:formatador].indent do
       unless collection.class.attributes.empty?
         data << "#{Thread.current[:formatador].indentation}"
-        data << collection.class.attributes.map { |attribute| "#{attribute}=#{send(attribute).inspect}" }.join(",\n#{Thread.current[:formatador].indentation}")
+        data << collection.class.attributes.map { |attribute, _| "#{attribute}=#{collection.read_attribute(attribute).inspect}" }.join(",\n#{Thread.current[:formatador].indentation}")
         data << "\n"
       end
       data << "#{Thread.current[:formatador].indentation}["
@@ -44,7 +46,7 @@ module Cistern::Formatter::Formatador
       data << "]\n"
     end
     data << "#{Thread.current[:formatador].indentation}>"
-    data
+    data.join
   end
 
   def table(attributes = nil)

data/lib/cistern/formatter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Cistern::Formatter
   autoload :AwesomePrint, 'cistern/formatter/awesome_print'
   autoload :Formatador,   'cistern/formatter/formatador'

data/lib/cistern/hash.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Cistern::Hash
   # @example
   #   Cistern::Hash.slice({ :a => 1, :b => 2 }, :a) #=> { :a => 1 }

data/lib/cistern/hash_support.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Cistern::HashSupport
   def hash_slice(*args); Cistern::Hash.slice(*args); end
   def hash_except(*args); Cistern::Hash.except(*args); end

data/lib/cistern/mock.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Cistern
   class Mock
     def self.not_implemented(method = '')

data/lib/cistern/model.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Cistern::Model
   include Cistern::Attributes::InstanceMethods
   include Cistern::HashSupport

data/lib/cistern/request.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Cistern::Request
   include Cistern::HashSupport
 

data/lib/cistern/service.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Cistern::Service
   def self.inherited(klass)
     Cistern.deprecation(

data/lib/cistern/singular.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Cistern::Singular
   include Cistern::Model
 

data/lib/cistern/string.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Cistern::String
   def self.camelize(string)
     string.gsub(/[A-Z]+/) { |w| "_#{w.downcase}" }.gsub(/^_/, '')

data/lib/cistern/timeout.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Cistern
   module WaitFor
     def self.wait_for(timeout = Cistern.timeout, interval = Cistern.poll_interval, &_block)

data/lib/cistern/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Cistern
-  VERSION = '2.8.0'
+  VERSION = '2.8.1'
 end

data/lib/cistern/wait_for.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'timeout'
 
 module Cistern

data/lib/cistern.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cistern/version'
 
 # stdlib

data/spec/associations_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Cistern::Associations do

data/spec/attributes_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Cistern::Attributes, '#clone_attributes' do

data/spec/client_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe 'client' do

data/spec/collection_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'Cistern::Collection' do

data/spec/coverage_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'coverage', :coverage do

data/spec/dirty_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'Cistern::Model#dirty' do

data/spec/formatter_spec.rb

@@ -1,8 +1,13 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 class Inspector < Sample::Model
   identity :id
   attribute :name
+
+  has_many :employees, -> { Inspectors.new(associate_id: id).all }
+  has_many :managers, -> { Inspectors.new(associate_id: nil).all }
 end
 
 class Anon < Sample::Model
@@ -10,11 +15,13 @@ class Anon < Sample::Model
 end
 
 class Inspectors < Sample::Collection
+  attribute :associate_id
+
   model Inspector
 
   def all(options = {})
     merge_attributes(options)
-    load([{ id: 1, name: '2' }, { id: 3, name: '4' }])
+    load([{ id: 1, name: '2', managers: [{ id: 5, name: '5'}]}, { id: 3, name: '4' }, employees: [{ id: 9, name: '8'}]])
   end
 end
 
@@ -64,20 +71,33 @@ describe Cistern::Formatter::Formatador do
 
     expect(Inspector.new(id: 1, name: 'name').inspect).to eq('  <Inspector
     id=1,
-    name="name"
+    name="name",
+    employees=nil,
+    managers=nil
   >')
   end
 
   it 'formats a collection' do
     expect(Inspectors.new.all.inspect).to eq('  <Inspectors
+    associate_id=nil
     [
       <Inspector
         id=1,
-        name="2"
+        name="2",
+        employees=nil,
+        managers=[{"id"=>5, "name"=>"5"}]
       >,
       <Inspector
         id=3,
-        name="4"
+        name="4",
+        employees=nil,
+        managers=nil
+      >,
+      <Inspector
+        id=nil,
+        name=nil,
+        employees=[{"id"=>9, "name"=>"8"}],
+        managers=nil
       >
     ]
   >')

data/spec/hash_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'Cistern::Hash' do

data/spec/mock_data_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'mock data' do

data/spec/model_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'Cistern::Model' do

data/spec/request_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'Cistern::Request' do

data/spec/singular_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'Cistern::Singular' do

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 if ENV.key?('COVERAGE')
   require 'simplecov'
   SimpleCov.start

data/spec/support/service.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.configure do |config|
   config.before(:each) {
     Object.send(:remove_const, :Sample) if Object.constants.include?(:Sample)

data/spec/wait_for_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'Cistern::WaitFor' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cistern
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.8.1
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-21 00:00:00.000000000 Z
+date: 2018-05-01 00:00:00.000000000 Z
 dependencies: []
 description: API client framework extracted from Fog
 email:
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: API client framework