strum 0.0.45 → 0.0.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7bb30342859374b985c24a047dc052fe725222770777bcbf1c7105f02b2197f
-  data.tar.gz: ffc06d34e9c00e1816b091cd5535af45de5ed3de9266488eddc008480f59ac68
+  metadata.gz: 0dff86c480a8f43b04d4895e092a70054147c22220f50680fe955c781b2478ad
+  data.tar.gz: 753d4347e3900071ce55a9d5f27be89f9f90a5761ca25ff3233a1562fc883e19
 SHA512:
-  metadata.gz: 6c9a50e0d2ccf3b63fe3c898f6ffb33e87b9f955b733185e0430c455bf5fd058dbeae0fcb81ad284ddc221cb69188975f474adfa286ca903cd22902a0c558bd4
-  data.tar.gz: 024d94ae252ce046cbd899de5205f45d7251dafd320bfc08b3d5e91ba8ed71ba7ac0fd964dcd5c5a56591ebb0e10c617bed1693a1518e9cb23bcda9782a46d4c
+  metadata.gz: 47de68438dbfdd3db056e9d597d588a5273768d0a3faa896e347e1d8e865917dcbe60bb44b58ba2c3e99bb36a960ad80b5af6ea386b4e58144bbedd60b7c320f
+  data.tar.gz: bec9ac9eab2fc9488131cecbfb7c9bab0d77a9b3d90d44c89ddae077511d98e62f3d69e6045ef613da4e23e9870b1f0316e30aac3fb0fddedcf2e1184b8a374d

data/Gemfile.lock

@@ -3,14 +3,42 @@ PATH
   specs:
     strum (0.0.45)
       dry-inflector (~> 0.2.0)
+      dry-struct (~> 1.2)
       thor (~> 0.20)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.0)
+    concurrent-ruby (1.1.5)
     diff-lcs (1.3)
+    dry-configurable (0.9.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.4, >= 0.4.7)
+    dry-container (0.7.2)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.1, >= 0.1.3)
+    dry-core (0.4.9)
+      concurrent-ruby (~> 1.0)
+    dry-equalizer (0.3.0)
     dry-inflector (0.2.0)
+    dry-logic (1.0.5)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.2)
+      dry-equalizer (~> 0.2)
+    dry-struct (1.2.0)
+      dry-core (~> 0.4, >= 0.4.3)
+      dry-equalizer (~> 0.3)
+      dry-types (~> 1.0)
+      ice_nine (~> 0.11)
+    dry-types (1.2.2)
+      concurrent-ruby (~> 1.0)
+      dry-container (~> 0.3)
+      dry-core (~> 0.4, >= 0.4.4)
+      dry-equalizer (~> 0.3)
+      dry-inflector (~> 0.1, >= 0.1.2)
+      dry-logic (~> 1.0, >= 1.0.2)
+    ice_nine (0.11.2)
     io-console (0.5.5)
     irb (1.2.1)
       reline (>= 0.0.1)

data/lib/strum/json_serializer.rb

@@ -2,6 +2,7 @@
 
 require "strum/serializer_class"
 require "dry/inflector"
+require "dry/struct"
 
 module Strum
   module JsonSerializer
@@ -15,11 +16,19 @@ module Strum
         end
 
         define_method :model do
-          input.is_a?(Sequel::Model) ? input : input[:model]
+          return input if input.is_a?(Sequel::Model)
+          return input if input.is_a?(Dry::Struct)
+          return input if input.is_a?(Array) && input.first.is_a?(Sequel::Model)
+
+          input[:model]
         end
 
         define_method :options do
-          input.is_a?(Sequel::Model) ? {} : input.except(:model)
+          return {} if input.is_a?(Sequel::Model)
+          return {} if input.is_a?(Dry::Struct)
+          return {} if input.is_a?(Array)
+
+          input.except(:model)
         end
       end
     end

data/lib/strum/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Strum
-  VERSION = "0.0.45"
+  VERSION = "0.0.46"
 end

data/strum.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "dry-inflector", "~> 0.2.0"
+  spec.add_dependency "dry-struct", "~> 1.2"
   spec.add_dependency "thor", "~> 0.20"
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "irb"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strum
 version: !ruby/object:Gem::Version
-  version: 0.0.45
+  version: 0.0.46
 platform: ruby
 authors:
 - Serhiy Nazarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-08 00:00:00.000000000 Z
+date: 2020-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-inflector
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: dry-struct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement