tablesalt 0.8.4 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4f0e11454d95394d0070ffa386056836628db24f0070be4524ea5cf70a17912
-  data.tar.gz: 1b27619517487c59c84324b3c8313755ad2274a15eecba5b8ff1e17355cae3e7
+  metadata.gz: 98464db22a1b0b302a57d7000038552ca3e8752c2266afd130531ed933b188e9
+  data.tar.gz: bc6ca9ddaa87e1ab9d690d11693a14a82bacd6b5992323967887a6f430d1b766
 SHA512:
-  metadata.gz: 92d11b14fe9b71135e9b75e23bc885070854fac486982be65802aec6b2462b9a724fc75d5e5345985b0cd7e973cd213ecfa285c5089827632759501b3b3773c2
-  data.tar.gz: 11a193ee36b492d3c3167cb9ad6668de036b99dd8341924c05b47ec7e63d847b53855d83e416c8ee9cb146cd8350b015ef9a612afef780621ef9e240d05a442e
+  metadata.gz: 848bb9e33da015bd099640490ae46894f50c0c96b5c91c9dfc3bfa5402ca6b46d45e88c3ff58a8a202b72bcfffa79cc70a0b078b095ee2e5dda99d48224435de
+  data.tar.gz: b8b37008b442ce4be113d64fbdf573300e7eb8ec3e19dd0cf2db27d95c608a0782cadca93e0ca9c50df6165ab582ca22da8ebbebe279b3e7523b6a51aa103f08

data/lib/tablesalt/redis_hash/adapter.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+# Adapter which handles the storage and retrieval of hash data in Redis.
+module Tablesalt
+  module RedisHash
+    module Adapter
+      extend ActiveSupport::Concern
+
+      included do
+        attr_reader :redis_key, :redis
+
+        delegate :del, :hdel, :hexists, :hget, :hgetall, :hkeys, :hlen, :hmget, :hmset, :hset, :hvals, to: :redis
+        delegate :default_redis, :default_redis_key, to: :class
+
+        private
+
+        def initialize_redis(redis, redis_key)
+          @redis = redis || default_redis
+          @redis_key = redis_key || default_redis_key
+        end
+      end
+
+      class_methods do
+        def default_redis
+          Redis.new
+        end
+
+        def default_redis_key
+          SecureRandom.hex
+        end
+      end
+    end
+  end
+end

data/lib/tablesalt/redis_hash/core.rb

@@ -6,25 +6,10 @@ module Tablesalt
     module Core
       extend ActiveSupport::Concern
 
-      included do
-        attr_reader :redis_key, :redis
-        delegate :del, :hdel, :hexists, :hget, :hgetall, :hkeys, :hlen, :hmget, :hmset, :hset, :hvals, to: :redis
-
-        private
-
-        def set_default(default, &block)
-          self.default = default if default.present?
-          self.default_proc = block if block_given?
-        end
-      end
-
-      def initialize(default = nil, redis_key: SecureRandom.hex, redis: Redis.new, &block)
-        raise ArgumentError, "cannot specify both block and static default" if block_given? && default.present?
-
+      def initialize(default = nil, redis_key: nil, redis: nil, &block)
         run_callbacks(:initialize) do
-          set_default(default, &block)
-          @redis_key = redis_key
-          @redis = redis
+          initialize_default(default, &block)
+          initialize_redis(redis, redis_key)
         end
       end
     end

data/lib/tablesalt/redis_hash/default.rb

@@ -11,6 +11,17 @@ module Tablesalt
 
         private
 
+        def initialize_default(default, &block)
+          raise ArgumentError, "cannot specify both block and static default" if block_given? && default.present?
+
+          set_default(default, &block)
+        end
+
+        def set_default(default, &block)
+          self.default = default if default.present?
+          self.default_proc = block if block_given?
+        end
+
         def to_default(field = nil, allow_nil_field: true)
           @default.presence || (default_proc&.call(self, field) if !field.nil? || allow_nil_field)
         end

data/lib/tablesalt/redis_hash_base.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative "redis_hash/adapter"
 require_relative "redis_hash/default"
 require_relative "redis_hash/callbacks"
 require_relative "redis_hash/core"
@@ -16,6 +17,7 @@ require_relative "redis_hash/converters"
 module Tablesalt
   class RedisHashBase
     include Technologic
+    include Tablesalt::RedisHash::Adapter
     include Tablesalt::RedisHash::Default
     include Tablesalt::RedisHash::Callbacks
     include Tablesalt::RedisHash::Core

data/lib/tablesalt/version.rb

@@ -2,5 +2,5 @@
 
 module Tablesalt
   # This constant is managed by spicerack
-  VERSION = "0.8.4"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tablesalt
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.9.0
 platform: ruby
 authors:
 - Jordan Minneti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-15 00:00:00.000000000 Z
+date: 2019-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -64,6 +64,7 @@ files:
 - README.md
 - lib/tablesalt.rb
 - lib/tablesalt/redis_hash/accessors.rb
+- lib/tablesalt/redis_hash/adapter.rb
 - lib/tablesalt/redis_hash/callbacks.rb
 - lib/tablesalt/redis_hash/comparisons.rb
 - lib/tablesalt/redis_hash/converters.rb
@@ -77,7 +78,7 @@ files:
 - lib/tablesalt/redis_hash/predicates.rb
 - lib/tablesalt/redis_hash_base.rb
 - lib/tablesalt/version.rb
-homepage: https://www.freshly.com
+homepage: https://github.com/Freshly/spicerack/tree/master/tablesalt
 licenses:
 - MIT
 metadata: {}