cistern 2.2.4 → 2.2.5

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 12f0361fa92430b5aab7d1b3e8934a615670369a
-  data.tar.gz: 0a09ee7dd69399efbeb59a6341cbf6b18d7e55af
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NzE1YjIxZjIyMzY5ZWU4NWJmOGFiYTNiMzgwMTIwOWRmM2Q1MzQwZg==
+  data.tar.gz: !binary |-
+    ODliMWIzYWIxNjlhZjg2NzAzNmE0MTgzY2UwNzNkNzgzMDQ5NzgwYQ==
 SHA512:
-  metadata.gz: 03c0726e4050c3c02fa05397625a43b651516dc1d7eea53166953dad89286212474ec880d74411ca44ff1d511c8cf17809116dc695831c118a02fe01fa3d4f01
-  data.tar.gz: d5149e6a0212522f9dae85f85b73ba1e699da5a06093a48b1ee5c5aa8733c43ee5855409c57c57ea6d24e940435b487c377eb7d0cb6d875d53fb999eea967c7f
+  metadata.gz: !binary |-
+    NGI5NjdkNGI5MTUyMWQyNTIzOWUwM2ExMDE4YzI1MDMzYmQ2ZWNlYmI1Mzk3
+    M2I1NGVkMThhNzY3MDAyMTJhNTczMzNlYWZlOWJhMzE5NDQ4ZDk0NjEzNjM5
+    MzA2ODA4ZDIxNzI4NGY3ZGRmNDY3MDJhMzZkM2FiN2Y1YWQ0ZTQ=
+  data.tar.gz: !binary |-
+    YThiNDM3ZDdmYTA5NDFkODkwNDFmZTA2NWRiMTc4MDhmNzU0ZDg3ZmJhYWJh
+    MzM0MDNiMmU4NWU2ZTRmMjA2NDE3Mzg3YzRiZWUxNWM0OWRmMjQwYjM1YWUz
+    M2NkNzEzMDY5MDk1ODU0MzBjODkzMzkxZDNiMDgxNjVmN2Q5NTA=

data/lib/cistern/attributes.rb

@@ -1,7 +1,7 @@
 module Cistern::Attributes
   def self.parsers
     @parsers ||= {
-      string: ->(v, _) { v.to_s },
+      string: ->(v, opts) { (opts[:allow_nil] && v.nil?) ? v : v.to_s },
       time: ->(v, _) { v.is_a?(Time) ? v : v && Time.parse(v.to_s) },
       integer: ->(v, _) { v && v.to_i },
       float: ->(v, _) { v && v.to_f },

data/lib/cistern/version.rb

@@ -1,3 +1,3 @@
 module Cistern
-  VERSION = '2.2.4'
+  VERSION = '2.2.5'
 end

data/spec/model_spec.rb

@@ -95,6 +95,7 @@ describe 'Cistern::Model' do
       attribute :vegetable, aliases: 'squash'
       attribute :custom, parser: lambda { |v, _| "X!#{v}" }
       attribute :default, default: 'im a squash'
+      attribute :string_allow_nil, type: :string, allow_nil: true
 
       attribute :same_alias_1, aliases: 'nested'
       attribute :same_alias_2, aliases: 'nested'
@@ -111,8 +112,13 @@ describe 'Cistern::Model' 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("")
     end
 
+    it 'should allow nils in string types' do
+      expect(TypeSpec.new(string_allow_nil: nil).string_allow_nil).to eq(nil)
+    end
     it "should handle a 'attributes' aliased attribute" do
       expect(TypeSpec.new(attributes: 'x').adam_attributes).to eq('x')
     end

data/spec/wait_for_spec.rb

@@ -45,7 +45,7 @@ describe 'WaitForModel#timeout' do
 
     elapsed = 0
 
-    timeout(2) do
+    Timeout.timeout(2) do
       expect do
         model.wait_for! { sleep(0.2); elapsed += 0.2; elapsed > 0.2 }
       end.to raise_exception(Sample::Timeout)
@@ -58,7 +58,7 @@ describe 'WaitForModel#timeout' do
 
     elapsed = 0
 
-    timeout(2) do
+    Timeout.timeout(2) do
       expect do
         model.wait_for!(0.1) { sleep(0.2); elapsed += 0.2; elapsed > 0.2 }
       end.to raise_exception(Sample::Timeout)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cistern
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.5
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-27 00:00:00.000000000 Z
+date: 2016-01-14 00:00:00.000000000 Z
 dependencies: []
 description: API client framework extracted from Fog
 email:
@@ -17,9 +17,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gemrelease"
-- ".gitignore"
-- ".travis.yml"
+- .gemrelease
+- .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -73,17 +73,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: API client framework