kredis 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 678d0983bf3cb50abb7732dc3c3e4da93764173dbdf03ce367254dbdb9297ef2
-  data.tar.gz: 7209773f020b0d1055171f30f6ff204786f3edf84e5938cd09f55789fd86e934
+  metadata.gz: f26f56df1898716dc3a37d357857dcf9418709d826a5efdbf7d46f03bac29fcb
+  data.tar.gz: efb14c911678c9205c54aa06030371a8b0a12944bb93b9e4ba2d83d259321a10
 SHA512:
-  metadata.gz: 2aa0b22042910eaa558f1bf8e5fed47aa7385d16ba46f63024f9311760a4f2ee74c42dadb3f333388755d1862a04999ca83cc016bf023a3e1a48491f089c7e03
-  data.tar.gz: ff37e6f461fc3117fd7d02116da43931550683581c6327a176f58d3f09ba06b2da538cd27976f01d7922a7ce7bf9768a8c03445b25e3dc62e635f3ac953093e0
+  metadata.gz: ea3c23f42567b578efe70cf266c13202b1c8f51284baabaec040091268ec7b6804939892cf99883dd7601c380efd3eb3ec76092945b89d77b0e412c1f4749b35
+  data.tar.gz: 3b44e4b1d721374be329e567623e1a0d40918173897ca0b688f1bc4c9d2452791ffce2361c95d51f82fd9b726c1a6be7abb636fd5d4907e334227ab9051cedd8

data/lib/kredis/attributes.rb

@@ -30,6 +30,10 @@ module Kredis::Attributes
       end
     end
 
+    def kredis_float(name, key: nil, config: :shared, after_change: nil)
+      kredis_connection_with __method__, name, key, config: config, after_change: after_change
+    end
+
     def kredis_enum(name, key: nil, values:, default:, config: :shared, after_change: nil)
       kredis_connection_with __method__, name, key, values: values, default: default, config: config, after_change: after_change
     end

data/lib/kredis/type/datetime.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Kredis
+  module Type
+    class DateTime < ActiveModel::Type::DateTime
+      def serialize(value)
+        super&.iso8601(9)
+      end
+
+      def cast_value(value)
+        super&.to_datetime
+      end
+    end
+  end
+end

data/lib/kredis/type/json.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Kredis
+  module Type
+    class Json < ActiveModel::Type::Value
+      def type
+        :json
+      end
+
+      def cast_value(value)
+        JSON.load(value)
+      end
+
+      def serialize(value)
+        JSON.dump(value)
+      end
+    end
+  end
+end

data/lib/kredis/type_casting.rb

@@ -1,47 +1,35 @@
 require "json"
+require "active_model/type"
+require "kredis/type/json"
+require "kredis/type/datetime"
 
 module Kredis::TypeCasting
   class InvalidType < StandardError; end
 
-  VALID_TYPES = %i[ string integer decimal float boolean datetime json ]
-
-  def type_to_string(value)
-    case value
-    when nil
-      ""
-    when Integer
-      value.to_s
-    when BigDecimal
-      value.to_d
-    when Float
-      value.to_s
-    when TrueClass, FalseClass
-      value ? "t" : "f"
-    when Time, DateTime, ActiveSupport::TimeWithZone
-      value.iso8601(9)
-    when Hash
-      JSON.dump(value)
-    else
-      value
-    end
+  TYPES = {
+    string: ActiveModel::Type::String.new,
+    integer: ActiveModel::Type::Integer.new,
+    decimal: ActiveModel::Type::Decimal.new,
+    float: ActiveModel::Type::Float.new,
+    boolean: ActiveModel::Type::Boolean.new,
+    datetime: Kredis::Type::DateTime.new,
+    json: Kredis::Type::Json.new
+  }
+
+  def type_to_string(value, type)
+    raise InvalidType if type && !TYPES.key?(type)
+
+    TYPES[type || :string].serialize(value)
   end
 
   def string_to_type(value, type)
-    raise InvalidType if type && !VALID_TYPES.include?(type)
-
-    case type
-    when nil, :string then value
-    when :integer     then value.to_i
-    when :decimal     then value.to_d
-    when :float       then value.to_f
-    when :boolean     then value == "t" ? true : false
-    when :datetime    then Time.iso8601(value)
-    when :json        then JSON.load(value)
-    end if value.present?
+    raise InvalidType if type && !TYPES.key?(type)
+
+    TYPES[type || :string].cast(value)
   end
 
-  def types_to_strings(values)
-    Array(values).flatten.map { |value| type_to_string(value) }
+  def types_to_strings(values, type)
+    Array(values).flatten.map { |value| type_to_string(value, type) }
   end
 
   def strings_to_types(values, type)

data/lib/kredis/types/enum.rb

@@ -1,3 +1,5 @@
+require "active_support/core_ext/object/inclusion"
+
 class Kredis::Types::Enum < Kredis::Types::Proxying
   proxying :set, :get, :del
 

data/lib/kredis/types/hash.rb

@@ -13,9 +13,8 @@ class Kredis::Types::Hash < Kredis::Types::Proxying
     update key => value
   end
 
-
   def update(**entries)
-    hset types_to_strings(entries) if entries.flatten.any?
+    hset entries.transform_values{ |val| type_to_string(val, typed) } if entries.flatten.any?
   end
 
   def values_at(*keys)
@@ -23,11 +22,11 @@ class Kredis::Types::Hash < Kredis::Types::Proxying
   end
 
   def delete(*keys)
-    hdel types_to_strings(keys) if keys.flatten.any?
+    hdel keys if keys.flatten.any?
   end
 
   def remove
-    del 
+    del
   end
 
   def entries

data/lib/kredis/types/list.rb

@@ -9,15 +9,15 @@ class Kredis::Types::List < Kredis::Types::Proxying
   alias to_a elements
 
   def remove(*elements)
-    types_to_strings(elements).each { |element| lrem 0, element }
+    types_to_strings(elements, typed).each { |element| lrem 0, element }
   end
 
   def prepend(*elements)
-    lpush types_to_strings(elements) if elements.flatten.any?
+    lpush types_to_strings(elements, typed) if elements.flatten.any?
   end
 
   def append(*elements)
-    rpush types_to_strings(elements) if elements.flatten.any?
+    rpush types_to_strings(elements, typed) if elements.flatten.any?
   end
   alias << append
 end

data/lib/kredis/types/scalar.rb

@@ -4,12 +4,12 @@ class Kredis::Types::Scalar < Kredis::Types::Proxying
   attr_accessor :typed, :default, :expires_in
 
   def value=(value)
-    set type_to_string(value), ex: expires_in
+    set type_to_string(value, typed), ex: expires_in
   end
 
   def value
     value_after_casting = string_to_type(get, typed)
-    
+
     if value_after_casting.nil?
       default
     else

data/lib/kredis/types/set.rb

@@ -9,12 +9,12 @@ class Kredis::Types::Set < Kredis::Types::Proxying
   alias to_a members
 
   def add(*members)
-    sadd types_to_strings(members) if members.flatten.any?
+    sadd types_to_strings(members, typed) if members.flatten.any?
   end
   alias << add
 
   def remove(*members)
-    srem types_to_strings(members) if members.flatten.any?
+    srem types_to_strings(members, typed) if members.flatten.any?
   end
 
   def replace(*members)
@@ -25,7 +25,7 @@ class Kredis::Types::Set < Kredis::Types::Proxying
   end
 
   def include?(member)
-    sismember type_to_string(member)
+    sismember type_to_string(member, typed)
   end
 
   def size

data/lib/kredis/version.rb

@@ -1,3 +1,3 @@
 module Kredis
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kredis
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Kasper Timm Hansen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-04 00:00:00.000000000 Z
+date: 2021-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -68,6 +68,8 @@ files:
 - lib/kredis/migration.rb
 - lib/kredis/namespace.rb
 - lib/kredis/railtie.rb
+- lib/kredis/type/datetime.rb
+- lib/kredis/type/json.rb
 - lib/kredis/type_casting.rb
 - lib/kredis/types.rb
 - lib/kredis/types/callbacks_proxy.rb