cistern 2.8.2 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13428a2696bc1c11c76ec323e498a73268070325702dac6b5107ac16786537a8
-  data.tar.gz: 58c19d84a3d6f0b9fd347a10c916aa925136896f91f49634a9c2bbbcc011ed26
+  metadata.gz: 5694e3c035882e211fed481448edf7d039a885fe8873426fad6c03e09e28e6e5
+  data.tar.gz: 1c989dab18e74848c0162c7c54a4b4768b6a9057e23792f0309d10ca6e7f2c04
 SHA512:
-  metadata.gz: 4f8642906b69eb047b6f907b786a3a42c14e6313ba177f5c314994abdc652285dabbba8cd594e8661c651f3fbf4e926dd82d788bf8a3ae2fb9a902e25a3ad604
-  data.tar.gz: 406ed32508a96668915a3485e61dc9f7abd9fc68a9989ff9c1f2ccfb16d5646400501fbad4c29cfdd8d6ee82ef3fe9fffc577d947bcdff4eaf510529e090b22f
+  metadata.gz: dc91cc89774987f5856a5c815a9afb64763febe9c025edd11f4f11437d1ca07eafa11868081211d4811540f4fec8c271be8c7b5482f91e226a30def1529d3756
+  data.tar.gz: 9be18655d0d71b1c0e6583854ec13e109924feb1586cc116b32da723edd6740f27d90ee9dca9940362bb500f7bf8dcfe497b1168e5ca2057aac7fd374e727a1c

data/README.md

@@ -613,12 +613,12 @@ class Blog::GetPost
     [post_id, stringify_keys(parameters)]
   end
 
-  def _mock(*args)
-    mock(*setup(*args))
+  def _mock(*args, **kwargs)
+    mock(*setup(*args, **kwargs))
   end
 
   def _real(post_id, parameters)
-    real(*setup(*args))
+    real(*setup(*args, **kwargs))
   end
 end
 ```

data/lib/cistern/attributes.rb

@@ -2,18 +2,19 @@
 
 module Cistern::Attributes
   PROTECTED_METHODS = [:cistern, :service, :identity, :collection].freeze
-  TRUTHY = ['true', '1'].freeze
+  TRUTHY = [true, 'On', 'ON', 'on', 'True', 'TRUE', 'true', '1', 1].freeze
 
   module ClassMethods
     def parsers
       @parsers ||= {
-        array:   ->(v, _) { [*v] },
-        boolean: ->(v, _) { TRUTHY.include?(v.to_s.downcase) },
-        date:    ->(v, _) { v.is_a?(Date) ? v : v && Date.parse(v.to_s) },
-        float:   ->(v, _) { v && v.to_f },
-        integer: ->(v, _) { v && v.to_i },
-        string:  ->(v, _) { v && v.to_s },
-        time:    ->(v, _) { v.is_a?(Time) ? v : v && Time.parse(v.to_s) },
+        array:          ->(v, _) { [*v] },
+        boolean:        ->(v, _) { TRUTHY.include?(v) },
+        date:           ->(v, _) { v.is_a?(Date) ? v : v && Date.parse(v.to_s) },
+        float:          ->(v, _) { v&.to_f },
+        integer:        ->(v, _) { v&.to_i },
+        strict_integer: ->(v, _) { Integer(v) },
+        string:         ->(v, _) { v&.to_s },
+        time:           ->(v, _) { v.is_a?(Time) ? v : v && Time.parse(v.to_s) },
       }
     end
 
@@ -64,11 +65,11 @@ module Cistern::Attributes
       name_sym
     end
 
-    def identity(*args)
-      args.any? ? @identity = attribute(*args) : (@identity ||= parent_identity)
+    def identity(*args, **kwargs)
+      args.any? ? @identity = attribute(*args, **kwargs) : (@identity ||= parent_identity)
     end
 
-    def ignore_attributes(*args)
+    def ignore_attributes(*args, **kwargs)
       @ignored_attributes = args
     end
 
@@ -228,7 +229,7 @@ module Cistern::Attributes
     #
     # @raise [ArgumentError] if any requested attribute does not have a value
     # @return [Hash] of matching attributes
-    def requires(*args)
+    def requires(*args, **kwargs)
       missing, required = missing_attributes(args)
 
       if missing.length == 1
@@ -244,7 +245,7 @@ module Cistern::Attributes
     #
     # @raise [ArgumentError] if no requested attributes have values
     # @return [Hash] of matching attributes
-    def requires_one(*args)
+    def requires_one(*args, **kwargs)
       missing, required = missing_attributes(args)
 
       if missing.length == args.length

data/lib/cistern/client.rb

@@ -248,11 +248,11 @@ module Cistern::Client
       @_requests ||= []
     end
 
-    def requires(*args)
+    def requires(*args, **kwargs)
       required_arguments.concat(args)
     end
 
-    def recognizes(*args)
+    def recognizes(*args, **kwargs)
       recognized_arguments.concat(args)
     end
 

data/lib/cistern/data.rb

@@ -30,7 +30,7 @@ module Cistern::Data
       data.clear
     end
 
-    def store_in(*args)
+    def store_in(*args, **kwargs)
       @storage = *args
       @data    = nil
     end

data/lib/cistern/hash_support.rb

@@ -1,8 +1,8 @@
 # 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
-  def hash_except!(*args); Cistern::Hash.except!(*args); end
-  def hash_stringify_keys(*args); Cistern::Hash.stringify_keys(*args); end
+  def hash_slice(*args, **kwargs); Cistern::Hash.slice(*args, **kwargs); end
+  def hash_except(*args, **kwargs); Cistern::Hash.except(*args, **kwargs); end
+  def hash_except!(*args, **kwargs); Cistern::Hash.except!(*args, **kwargs); end
+  def hash_stringify_keys(*args, **kwargs); Cistern::Hash.stringify_keys(*args, **kwargs); end
 end

data/lib/cistern/model.rb

@@ -14,7 +14,7 @@ module Cistern::Model
   def self.cistern_model(cistern, klass, name)
     cistern.const_get(:Collections).module_eval <<-EOS, __FILE__, __LINE__
       def #{name}(attributes={})
-    #{klass.name}.new(attributes.merge(cistern: self))
+    #{klass.name}.new({cistern: self}.merge(attributes))
       end
     EOS
   end

data/lib/cistern/request.rb

@@ -24,8 +24,8 @@ module Cistern::Request
     end
 
     method = <<-EOS
-      def #{name}(*args)
-        #{klass}.new(self).call(*args)
+      def #{name}(*args, **kwargs)
+        #{klass}.new(self).call(*args, **kwargs)
       end
     EOS
 
@@ -34,12 +34,12 @@ module Cistern::Request
     cistern::Real.module_eval method, __FILE__, __LINE__
   end
 
-  def self.service_request(*args)
+  def self.service_request(*args, **kwargs)
     Cistern.deprecation(
       '#service_request is deprecated.  Please use #cistern_request',
       caller[0]
     )
-    cistern_request(*args)
+    cistern_request(*args, **kwargs)
   end
 
   attr_reader :cistern
@@ -56,8 +56,8 @@ module Cistern::Request
     @cistern = cistern
   end
 
-  def call(*args)
-    dispatch(*args)
+  def call(*args, **kwargs)
+    dispatch(*args, **kwargs)
   end
 
   def real(*)
@@ -71,7 +71,7 @@ module Cistern::Request
   protected
 
   # @fixme remove _{mock,real} methods and call {mock,real} directly before 3.0 release.
-  def dispatch(*args)
+  def dispatch(*args, **kwargs)
     to = cistern.mocking? ? :mock : :real
 
     legacy_method = :"_#{to}"
@@ -82,9 +82,9 @@ module Cistern::Request
         caller[0]
       )
 
-      public_send(legacy_method, *args)
+      public_send(legacy_method, *args, **kwargs)
     else
-      public_send(to, *args)
+      public_send(to, *args, **kwargs)
     end
   end
 end

data/lib/cistern/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cistern
-  VERSION = '2.8.2'
+  VERSION = '2.10.0'
 end

data/spec/attributes_spec.rb

@@ -204,14 +204,23 @@ describe Cistern::Attributes, 'parsing' do
     expect(subject.new(list: 'item').list).to eq(['item'])
   end
 
-  it 'should parse an integer' do
-    subject.class_eval do
-      attribute :int, type: :integer
+  context 'with type integer' do
+    before do
+      subject.class_eval do
+        attribute :int, type: :integer
+      end
     end
 
-    expect(subject.new(int: '42.5').int).to eq(42)
-    expect(subject.new(int: '42').int).to eq(42)
-    expect(subject.new(int: 42).int).to eq(42)
+    [
+      ['42.5', 42],
+      ['42', 42],
+      [42, 42],
+      ["4f", 4],
+    ].each do |input, output|
+      specify("input of #{input.inspect} casts to #{output.inspect}") do
+        expect(subject.new(int: input).int).to eq(output)
+      end
+    end
   end
 
   it 'should parse a float' do
@@ -250,7 +259,8 @@ describe Cistern::Attributes, 'parsing' do
     expect(subject.new({ 'squash' => { 'type' => 'fred' } }).butternut_id).to be_nil
 
     # override intermediate processing
-    expect(subject.new({ 'squash' => { 'id' => '12', 'type' => 'fred' } }).squash).to eq({ 'id' => '12', 'type' => 'fred' })
+    expect(subject.new({ 'squash' => { 'id' => '12', 'type' => 'fred' } }).squash)
+      .to eq({ 'id' => '12', 'type' => 'fred' })
 
     # alias of override
     expect(subject.new({ 'squash' => { 'id' => '12', 'type' => 'fred' } }).vegetable).to eq({ 'id' => '12', 'type' => 'fred' })

data/spec/hash_spec.rb

@@ -72,11 +72,13 @@ describe Cistern::Collection do
 end
 
 describe Cistern::Singular do
-  subject { Class.new(Sample::Singular) do
-    def reload
-      attributes
-    end
-  end.new({}) }
+  subject do
+    Class.new(Sample::Singular) do
+      def reload
+        attributes
+      end
+    end.new({})
+  end
 
   include_examples 'hash_support'
 end

data/spec/mock_data_spec.rb

@@ -51,20 +51,22 @@ describe 'mock data' do
       include_examples 'mock_data#backend', :hash
     end
 
-    describe 'Cistern::Data::Redis' do
-      include_examples 'mock_data#backend', :redis
-
-      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)
-
-        after(:each) do
-          expect(@other.get('x')).to eq('y')
-          @other.del('x')
+    if ENV.key?('REDIS_URI')
+      describe 'Cistern::Data::Redis' do
+        include_examples 'mock_data#backend', :redis
+
+        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)
+
+          after(:each) do
+            expect(@other.get('x')).to eq('y')
+            @other.del('x')
+          end
         end
       end
     end

data/spec/request_spec.rb

@@ -11,7 +11,7 @@ describe 'Cistern::Request' do
     Sample::Real.class_eval do
       attr_reader :service_args
 
-      def initialize(*args)
+      def initialize(*args, **kwargs)
         @service_args = args
       end
     end
@@ -30,11 +30,11 @@ describe 'Cistern::Request' do
 
   it 'calls the appropriate method' do
     class GetSamples < Sample::Request
-      def real(*args)
+      def real(*args, **kwargs)
         cistern.service_args + args + ['real']
       end
 
-      def mock(*args)
+      def mock(*args, **kwargs)
         args + ['mock']
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cistern
 version: !ruby/object:Gem::Version
-  version: 2.8.2
+  version: 2.10.0
 platform: ruby
 authors:
 - Josh Lane
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-05-02 00:00:00.000000000 Z
+date: 2023-10-20 00:00:00.000000000 Z
 dependencies: []
 description: API client framework extracted from Fog
 email:
@@ -75,7 +75,7 @@ homepage: http://joshualane.com/cistern
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -90,9 +90,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: API client framework
 test_files: