cistern 2.3.0 → 2.4.0

data/lib/cistern/version.rb

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

data/spec/attributes_spec.rb

@@ -75,7 +75,7 @@ describe Cistern::Attributes, 'parsing' do
   it 'should parse string' do
     expect(TypeSpec.new(name: 1).name).to eq('1')
     expect(TypeSpec.new(name: "b").name).to eq('b')
-    expect(TypeSpec.new(name: nil).name).to eq("")
+    expect(TypeSpec.new(name: nil).name).to eq(nil)
   end
 
   it 'should allow nils in string types' do

data/spec/coverage_spec.rb

@@ -30,6 +30,6 @@ describe 'coverage', :coverage do
 
   it "should store how many times an attribute's reader is called" do
     expect(CoverageSpec.attributes[:used][:coverage_hits]).to eq(2)
-    expect(CoverageSpec.attributes[:unused][:coverage_hits]).to eq(0)
+    expect(CoverageSpec.attributes[:unused][:coverage_hits]).to eq(3)
   end
 end

data/spec/hash_spec.rb

@@ -49,3 +49,38 @@ describe 'Cistern::Hash' do
     end
   end
 end
+
+shared_examples_for 'hash_support' do
+  it { should respond_to(:hash_except) }
+  it { should respond_to(:hash_except!) }
+  it { should respond_to(:hash_slice) }
+  it { should respond_to(:hash_stringify_keys) }
+end
+
+describe Cistern::Model do
+  subject { Class.new(Sample::Model).new }
+
+  include_examples 'hash_support'
+end
+
+describe Cistern::Collection do
+  subject { Class.new(Sample::Collection).new }
+
+  include_examples 'hash_support'
+end
+
+describe Cistern::Singular do
+  subject { Class.new(Sample::Singular) do
+    def reload
+      attributes
+    end
+  end.new({}) }
+
+  include_examples 'hash_support'
+end
+
+describe Cistern::Request do
+  subject { Class.new(Sample::Request).new({}) }
+
+  include_examples 'hash_support'
+end

data/spec/model_spec.rb

@@ -1,6 +1,20 @@
 require 'spec_helper'
 
 describe 'Cistern::Model' do
+  describe 'inheritance' do
+    it 'provides the child with the attributes of the parent' do
+      parent = Class.new(Sample::Model) do
+        attribute :parent
+      end
+
+      child = Class.new(parent) do
+        attribute :child
+      end
+
+      expect(parent.attributes.keys).to contain_exactly(:parent)
+      expect(child.attributes.keys).to contain_exactly(:parent, :child)
+    end
+  end
   describe '#update' do
     class UpdateSpec < Sample::Model
       identity :id

data/spec/singular_spec.rb

@@ -1,35 +1,43 @@
 require 'spec_helper'
 
 describe 'Cistern::Singular' do
-  class SampleSingular < Sample::Singular
-    attribute :name
+  class Settings < Sample::Singular
+    attribute :name, type: :string
     attribute :count, type: :number
 
-    def fetch_attributes
-      # test that initialize waits for cistern to be defined
-      fail 'missing cistern' unless cistern
+    def save
+      result = @@settings = attributes.merge(dirty_attributes)
 
-      @counter ||= 0
-      @counter += 1
-      { name: 'amazing', count: @counter }
+      merge_attributes(result)
     end
-  end
 
-  it 'should work' do
-    expect(Sample.new.sample_singular.name).to eq('amazing')
+    def get
+      settings = @@settings ||= {}
+      settings[:count] ||= 0
+      settings[:count] += 1
+
+      merge_attributes(settings)
+    end
   end
 
+  let!(:service) { Sample.new }
+
   describe 'deprecation', :deprecated do
     it 'responds to #service' do
-      sample = Sample.new.sample_singular
+      sample = service.settings.load
+
       expect(sample.service).to eq(sample.cistern)
     end
   end
 
-  it 'should reload' do
-    singular = Sample.new.sample_singular
-    old_count = singular.count
-    expect(singular.count).to eq(old_count)
-    expect(singular.reload.count).to be > old_count
+  it 'reloads' do
+    singular = service.settings(count: 0)
+
+    expect { singular.reload }.to change(singular, :count).by(1)
+  end
+
+  it 'updates' do
+    service.settings.update(name: 6)
+    expect(service.settings.load.name).to eq('6')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cistern
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-17 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies: []
 description: API client framework extracted from Fog
 email:
@@ -20,6 +20,7 @@ files:
 - ".gemrelease"
 - ".gitignore"
 - ".travis.yml"
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -28,6 +29,7 @@ files:
 - Rakefile
 - TODO.md
 - cistern.gemspec
+- gemfiles/ruby_lt_2.0.gemfile
 - lib/cistern.rb
 - lib/cistern/attributes.rb
 - lib/cistern/client.rb
@@ -41,6 +43,7 @@ files:
 - lib/cistern/formatter/default.rb
 - lib/cistern/formatter/formatador.rb
 - lib/cistern/hash.rb
+- lib/cistern/hash_support.rb
 - lib/cistern/mock.rb
 - lib/cistern/model.rb
 - lib/cistern/request.rb
@@ -105,3 +108,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/service.rb
 - spec/wait_for_spec.rb
+has_rdoc: