cistern 2.2.3 → 2.2.4

data/lib/cistern/timeout.rb

@@ -1,6 +1,6 @@
 module Cistern
   module WaitFor
-    def self.wait_for(timeout = Cistern.timeout, interval = Cistern.poll_interval, &block)
+    def self.wait_for(timeout = Cistern.timeout, interval = Cistern.poll_interval, &_block)
       duration = 0
       start    = Time.now
 
@@ -12,11 +12,11 @@ module Cistern
       if duration > timeout
         false
       else
-        { :duration => duration }
+        { duration: duration }
       end
     end
 
-    def self.wait_for!(*arg)
+    def self.wait_for!(*_arg)
       wait_for
     end
   end

data/lib/cistern/version.rb

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

data/lib/cistern/wait_for.rb

@@ -23,10 +23,10 @@ module Cistern
     end
 
     def timeout_error
-      @timeout_error || self.const_defined?(:Timeout) && self.const_get(:Timeout) || ::Timeout::Error
+      @timeout_error || self.const_defined?(:Timeout) && const_get(:Timeout) || ::Timeout::Error
     end
 
-    def wait_for(timeout = self.timeout, interval = self.poll_interval, &block)
+    def wait_for(timeout = self.timeout, interval = poll_interval, &_block)
       duration = 0
       start    = Time.now
 
@@ -38,8 +38,8 @@ module Cistern
       duration > timeout ? false : duration
     end
 
-    def wait_for!(timeout = self.timeout, interval = self.poll_interval, &block)
-      wait_for(timeout, interval, &block) || raise(timeout_error, "wait_for(#{timeout}) exceeded")
+    def wait_for!(timeout = self.timeout, interval = poll_interval, &block)
+      wait_for(timeout, interval, &block) || fail(timeout_error, "wait_for(#{timeout}) exceeded")
     end
   end
 end

data/lib/cistern.rb

@@ -4,7 +4,6 @@ require 'cistern/version'
 require 'time'
 
 module Cistern
-
   Error   = Class.new(StandardError)
   Timeout = Class.new(Error)
 
@@ -27,7 +26,9 @@ module Cistern
 
   require 'cistern/formatter'
 
-  def self.formatter=(formatter); @formatter = formatter; end
+  def self.formatter=(formatter)
+    @formatter = formatter
+  end
 
   def self.formatter
     @formatter ||= Cistern::Formatter.default
@@ -41,10 +42,8 @@ module Cistern
     @deprecation_warnings = status
   end
 
-  def self.deprecation(message, source=caller[1])
-    if deprecation_warnings?
-      STDERR.puts("#{message}. (#{source})")
-    end
+  def self.deprecation(message, source = caller[1])
+    STDERR.puts("#{message}. (#{source})") if deprecation_warnings?
   end
 end
 

data/spec/client_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-RSpec.describe "client" do
-  context "with specific architecture" do
-    it "allows module-based interfaces" do
+RSpec.describe 'client' do
+  context 'with specific architecture' do
+    it 'allows module-based interfaces' do
       class ModuleClient
         include Cistern::Client.with(interface: :module)
       end
@@ -21,7 +21,7 @@ RSpec.describe "client" do
         identity :on
 
         def save
-          self.identity % 3
+          identity % 3
         end
       end
 
@@ -29,7 +29,6 @@ RSpec.describe "client" do
         include ModuleClient::Collection
 
         model ModuleClient::Moon
-
       end
 
       expect(
@@ -37,17 +36,17 @@ RSpec.describe "client" do
       ).to eq(3)
 
       expect(ModuleClient.collections).to contain_exactly(ModuleClient::Moons)
-      expect(ModuleClient.models).to      contain_exactly(ModuleClient::Moon)
-      expect(ModuleClient.requests).to    contain_exactly(ModuleClient::Shoot)
+      expect(ModuleClient.models).to contain_exactly(ModuleClient::Moon)
+      expect(ModuleClient.requests).to contain_exactly(ModuleClient::Shoot)
 
       expect(
         ModuleClient.new.moons.new(on: 5).save
       ).to eq(2)
     end
 
-    it "allows custom model interface" do
+    it 'allows custom model interface' do
       class AskClient
-        include Cistern::Client.with(model: "Ask", interface: :module)
+        include Cistern::Client.with(model: 'Ask', interface: :module)
       end
 
       class AskClient::Model

data/spec/collection_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Cistern::Collection" do
+describe 'Cistern::Collection' do
   class SampleService < Cistern::Service
   end
 
@@ -13,7 +13,7 @@ describe "Cistern::Collection" do
     model Drug
 
     def all
-      self.load([{id: 1}, {id: 3, name: "tom"}, {id: 2}])
+      load([{ id: 1 }, { id: 3, name: 'tom' }, { id: 2 }])
     end
   end
 
@@ -21,47 +21,47 @@ describe "Cistern::Collection" do
     service_method :toes
   end
 
-  it "should generate a default collection method" do
+  it 'should generate a default collection method' do
     expect(SampleService.new.drugs).not_to be_empty
   end
 
-  it "should allow for a specific collection name" do
-    expect(SampleService.new).to     respond_to(:toes)
+  it 'should allow for a specific collection name' do
+    expect(SampleService.new).to respond_to(:toes)
     expect(SampleService.new).not_to respond_to(:tacs)
   end
 
-  it "should give to_s" do
+  it 'should give to_s' do
     collection = Drugs.new
-    expect(collection.to_s).not_to eq "[]"
-    expect(collection.to_s.gsub(/:[^>]*/,'')).to eq(collection.all.to_s.gsub(/:[^>]*/,''))
+    expect(collection.to_s).not_to eq '[]'
+    expect(collection.to_s.gsub(/:[^>]*/, '')).to eq(collection.all.to_s.gsub(/:[^>]*/, ''))
   end
 
-  it "should give size and count" do
+  it 'should give size and count' do
     expect(Drugs.new.size).to eq(3)
     expect(Drugs.new.count).to eq(3)
   end
 
-  it "should give first" do
+  it 'should give first' do
     expect(Drugs.new.first).to eq(Drug.new(id: 1))
   end
 
-  it "should give last" do
+  it 'should give last' do
     expect(Drugs.new.last).to eq(Drug.new(id: 2))
   end
 
-  it "should reject" do
-    expect(Drugs.new.reject{|m| m.id == 2}).to eq([Drug.new(id: 1), Drug.new(id: 3)])
+  it 'should reject' do
+    expect(Drugs.new.reject { |m| m.id == 2 }).to eq([Drug.new(id: 1), Drug.new(id: 3)])
   end
 
-  it "should select" do
-    expect(Drugs.new.select{|m| m.id == 2}).to eq([Drug.new(id: 2)])
+  it 'should select' do
+    expect(Drugs.new.select { |m| m.id == 2 }).to eq([Drug.new(id: 2)])
   end
 
-  it "should slice" do
-    expect(Drugs.new.slice(0,2)).to eq([Drug.new(id: 1), Drug.new(id: 3, name: "tom")])
+  it 'should slice' do
+    expect(Drugs.new.slice(0, 2)).to eq([Drug.new(id: 1), Drug.new(id: 3, name: 'tom')])
   end
 
-  it "should ==" do
+  it 'should ==' do
     Drugs.new.all == Drugs.new.all
   end
 end

data/spec/dirty_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Cistern::Model#dirty" do
+describe 'Cistern::Model#dirty' do
   class DirtySpec < Sample::Model
     identity :id
 
@@ -12,25 +12,25 @@ describe "Cistern::Model#dirty" do
     end
   end
 
-  it "should mark a existing record as dirty" do
-    model = DirtySpec.new(id: 1, name: "steve")
+  it 'should mark a existing record as dirty' do
+    model = DirtySpec.new(id: 1, name: 'steve')
     expect(model.changed).to be_empty
 
-    expect {
+    expect do
       model.properties = [1]
-    }.to change { model.dirty? }.to(true)
+    end.to change { model.dirty? }.to(true)
 
     expect(model.changed).to eq(properties: [nil, [1]])
     expect(model.dirty_attributes).to eq(properties: [1])
 
-    expect {
+    expect do
       model.properties = [2]
-    }.to change { model.changed }.to(properties: [nil, [2]])
+    end.to change { model.changed }.to(properties: [nil, [2]])
     expect(model.dirty_attributes).to eq(properties: [2])
 
-    expect {
+    expect do
       model.save
-    }.to change { model.dirty? }.to(false)
+    end.to change { model.dirty? }.to(false)
 
     expect(model.changed).to eq({})
     expect(model.dirty_attributes).to eq({})

data/spec/formatter_spec.rb

@@ -12,18 +12,18 @@ end
 class Inspectors < Sample::Collection
   model Inspector
 
-  def all(options={})
+  def all(options = {})
     merge_attributes(options)
-    self.load([{id: 1, name: "2"},{id: 3, name: "4"}])
+    load([{ id: 1, name: '2' }, { id: 3, name: '4' }])
   end
 end
 
 describe Cistern::Formatter::Default do
   before { Cistern.formatter = described_class }
 
-  it "formats a model" do
+  it 'formats a model' do
     expect(
-      Inspector.new(id: 1, name: "name").inspect
+      Inspector.new(id: 1, name: 'name').inspect
     ).to match(
       /<Inspector:0x[a-z0-9]+> {:id=>1, :name=>\"name\"}/
     )
@@ -31,7 +31,7 @@ describe Cistern::Formatter::Default do
     Anon.inspect
   end
 
-  it "formats a collection" do
+  it 'formats a collection' do
     expect(
       Inspectors.new.all.inspect
     ).to match(
@@ -43,15 +43,15 @@ end
 describe Cistern::Formatter::AwesomePrint do
   before { Cistern.formatter = described_class }
 
-  it "formats a model" do
+  it 'formats a model' do
     expect(
-      Inspector.new(id: 1, name: "name").inspect
+      Inspector.new(id: 1, name: 'name').inspect
     ).to match(
       /(?x-mi:\#<Inspector:0x[0-9a-f]+>\ {\n\ \ \ \ \ \ :id\x1B\[0;37m\ =>\ \x1B\[0m\x1B\[1;34m1\x1B\[0m,\n\ \ \ \ :name\x1B\[0;37m\ =>\ \x1B\[0m\x1B\[0;33m"name"\x1B\[0m\n})/
     )
   end
 
-  it "formats a collection" do
+  it 'formats a collection' do
     expect(Inspectors.new.all.inspect).to match(/Inspectors\s+{.*}$/m) # close enough
   end
 end
@@ -59,17 +59,17 @@ end
 describe Cistern::Formatter::Formatador do
   before { Cistern.formatter = described_class }
 
-  it "formats a model" do
+  it 'formats a model' do
     Cistern.formatter = Cistern::Formatter::Formatador
 
-    expect(Inspector.new(id: 1, name: "name").inspect).to eq(%q{  <Inspector
+    expect(Inspector.new(id: 1, name: 'name').inspect).to eq('  <Inspector
     id=1,
     name="name"
-  >})
+  >')
   end
 
-  it "formats a collection" do
-    expect(Inspectors.new.all.inspect).to eq(%q{  <Inspectors
+  it 'formats a collection' do
+    expect(Inspectors.new.all.inspect).to eq('  <Inspectors
     [
       <Inspector
         id=1,
@@ -80,6 +80,6 @@ describe Cistern::Formatter::Formatador do
         name="4"
       >
     ]
-  >})
+  >')
   end
 end

data/spec/hash_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
-describe "Cistern::Hash" do
-  describe "#slice" do
+describe 'Cistern::Hash' do
+  describe '#slice' do
     let(:input) do
-      { one: "one", two: "two", three: "three" }
+      { one: 'one', two: 'two', three: 'three' }
     end
 
-    it "returns a new hash with only the specified keys" do
-      expect(Cistern::Hash.slice(input, :one, :two)).to eq({ one: "one", two: "two" })
+    it 'returns a new hash with only the specified keys' do
+      expect(Cistern::Hash.slice(input, :one, :two)).to eq(one: 'one', two: 'two')
     end
 
     it "skips keys that aren't in the original hash" do
@@ -15,13 +15,13 @@ describe "Cistern::Hash" do
     end
   end
 
-  describe "#except" do
+  describe '#except' do
     let(:input) do
-      { one: "one", two: "two", three: "three" }
+      { one: 'one', two: 'two', three: 'three' }
     end
 
-    it "returns a new hash without the specified keys" do
-      expect(Cistern::Hash.except(input, :one, :two)).to eq({three: "three"})
+    it 'returns a new hash without the specified keys' do
+      expect(Cistern::Hash.except(input, :one, :two)).to eq(three: 'three')
     end
 
     it "skips keys that aren't in the original hash" do
@@ -29,22 +29,22 @@ describe "Cistern::Hash" do
     end
   end
 
-  describe "#stringify_keys" do
+  describe '#stringify_keys' do
     let(:input) do
-      { one: "one", two: "two" }
+      { one: 'one', two: 'two' }
     end
 
-    it "returns a new hash with stringed keys" do
-      expect(Cistern::Hash.stringify_keys(input)).to eq({ "one" => "one", "two" => "two" })
+    it 'returns a new hash with stringed keys' do
+      expect(Cistern::Hash.stringify_keys(input)).to eq('one' => 'one', 'two' => 'two')
     end
 
-    context "with nested hashes or arrays" do
+    context 'with nested hashes or arrays' do
       let(:input) do
-        { hash: { one: "one" }, array: [{ two: "two" }] }
+        { hash: { one: 'one' }, array: [{ two: 'two' }] }
       end
 
-      it "stringifies all of the keys" do
-        expect(Cistern::Hash.stringify_keys(input)).to eq({ "hash" => { "one" => "one" }, "array" => [{ "two" => "two" }]})
+      it 'stringifies all of the keys' do
+        expect(Cistern::Hash.stringify_keys(input)).to eq('hash' => { 'one' => 'one' }, 'array' => [{ 'two' => 'two' }])
       end
     end
   end

data/spec/mock_data_spec.rb

@@ -19,50 +19,49 @@ describe 'mock data' do
     end
   end
 
-  shared_examples "mock_data#backend" do |backend, options|
-    it "should store mock data" do
+  shared_examples 'mock_data#backend' do |backend, options|
+    it 'should store mock data' do
       Sample.mock!
       Sample::Mock.store_in(backend, options)
       Sample.reset!
 
       p = Sample.new
-      p.diagnosis("sick")
-      expect(p.data[:diagnosis]).to eq(["sick"])
+      p.diagnosis('sick')
+      expect(p.data[:diagnosis]).to eq(['sick'])
 
       p.reset!
 
       expect(p.data[:diagnosis]).to eq([])
 
-      p.treat("healthy")
-      expect(p.data[:treatments]).to eq(["healthy"])
+      p.treat('healthy')
+      expect(p.data[:treatments]).to eq(['healthy'])
 
       Sample.reset!
 
       expect(p.data[:treatments]).to eq([])
     end
-
   end
 
-  context "with a storage backend" do
-    describe "Cistern::Data::Hash" do
-      include_examples "mock_data#backend", :hash
+  context 'with a storage backend' do
+    describe 'Cistern::Data::Hash' do
+      include_examples 'mock_data#backend', :hash
     end
 
-    describe "Cistern::Data::Redis" do
-      include_examples "mock_data#backend", :redis
+    describe 'Cistern::Data::Redis' do
+      include_examples 'mock_data#backend', :redis
 
-      context "with an explicit client" do
-        before(:each) {
-          @other = Redis::Namespace.new("other_cistern", Redis.new)
-          @other.set("x", "y")
-        }
+      context 'with an explicit client' do
+        before(:each) do
+          @other = Redis::Namespace.new('other_cistern', Redis.new)
+          @other.set('x', 'y')
+        end
 
-        include_examples "mock_data#backend", :redis, client: Redis::Namespace.new("cistern", Redis.new)
+        include_examples 'mock_data#backend', :redis, client: Redis::Namespace.new('cistern', Redis.new)
 
-        after(:each) {
-          expect(@other.get("x")).to eq("y")
-          @other.del("x")
-        }
+        after(:each) do
+          expect(@other.get('x')).to eq('y')
+          @other.del('x')
+        end
       end
     end
   end