structish 0.1.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bc52b972b081a69479e5406a733c7374a725b275e8db0dad081d30eabd0fba5
-  data.tar.gz: f244b3bfb2e1d4b59ab985240e61e64f8f1730091de57e9e0f219c2d8e1ee236
+  metadata.gz: b6d2ba1a7e8fe1d6239b90627d5be7a5ffabae2ec8ed55f075d6794d5bcc387c
+  data.tar.gz: 11bcd0b789e9cf61dea899a3d2eb397e36eee39474054da8580ea4fe1c19a261
 SHA512:
-  metadata.gz: eff36ee49e66cc34660a29d4ffe82e1561c29de8adb7b98ab896fcc15c99c236758463289725336c63236ba1abba5a155ec988ed7511e42235e99c86bef5ba74
-  data.tar.gz: 30086ab0aa74750fbf08079b8e8e5f0ea1611036301577474b5aaf656bbf8512a3633e893e9e694032843617cfc0f6b816c4b9874051e668b4d5361b28d1ec31
+  metadata.gz: c8445eb56faec25e23b09ab4ad2040b3906f313b3e948f27554ba209a200f1e15de6e4fe7a6d32ca5ba2aed0adbaa7a395263ea4a50c964125e4d85b6273d0bb
+  data.tar.gz: 16abf2097b0755ad04fd0783cf9a420cd384cfe82ec7336c182952cc5a272c047e3546923a6ceac2878f470c9ccbf2e4a96d001e9c304f514e467730935e5d82

data/lib/structish.rb

@@ -1,6 +1,8 @@
 
 require 'active_support/core_ext/hash'
 
+require 'structish/config'
+
 require "structish/version"
 require "structish_object_extensions"
 require "structish/validation_error"

data/lib/structish/array.rb

@@ -6,7 +6,11 @@ module Structish
     def initialize(constructor)
       raise(ArgumentError, "Only array-like objects can be used as constructors for Structish::Array") unless constructor.class <= ::Array
       validate_structish(constructor)
-      super(constructor)
+      if self.class.compact?
+        super(constructor.compact)
+      else
+        super(constructor)
+      end
     end
 
     def <<(entry)

data/lib/structish/config.rb

@@ -0,0 +1,21 @@
+module Structish
+  class Config
+
+    def self.config
+      @config ||= {}.with_indifferent_access
+    end
+
+    def self.config=(config_hash)
+      @config = config_hash.with_indifferent_access
+    end
+
+    def self.show_full_trace=(show_full)
+      config["show_full_trace"] = show_full
+    end
+
+    def self.show_full_trace?
+      config["show_full_trace"]
+    end
+
+  end
+end

data/lib/structish/hash.rb

@@ -9,6 +9,7 @@ module Structish
       constructor = self.class.symbolize? ? raw_constructor.symbolize_keys : raw_constructor
       hash = constructor.to_h
       validate_structish(hash)
+      hash = hash.compact if self.class.compact?
       super()
       update(hash)
       self.default = hash.default if hash.default

data/lib/structish/validation_error.rb

@@ -3,6 +3,9 @@ module Structish
     def initialize(message, klass)
       super("#{message} in class #{klass.to_s}")
       set_backtrace(caller)
+      if Config.show_full_trace?
+        puts self.backtrace
+      end
     end
   end
 end

data/lib/structish/validations.rb

@@ -26,7 +26,7 @@ module Structish
       def validate_key_restriction(constructor)
         if self.class.restrict?
           allowed_keys = validations.map { |attribute| attribute[:key] }
-          valid = (constructor.keys - allowed_keys).empty?
+          valid = (keys_for(constructor) - allowed_keys).empty?
           raise(Structish::ValidationError.new("Keys are restricted to #{allowed_keys.join(", ")}", self.class)) unless valid
         end
       end
@@ -48,6 +48,9 @@ module Structish
           key = attribute[:key]
           if attribute[:cast] && constructor[key]
             if attribute[:klass] == ::Array && attribute[:of]
+              unless constructor[key].class <= ::Array
+                raise(Structish::ValidationError.new("Class mismatch for #{attribute[:key]} -> #{constructor[key].class}. Should be a Array", self.class))
+              end
               constructor[key] = constructor[key].map { |v| cast_single(v, attribute[:of]) }
             else
               constructor[key] = cast_single(constructor[key], attribute[:klass])
@@ -93,7 +96,7 @@ module Structish
 
       def global_attributes_for(constructor)
         global_attributes_hash[constructor] = begin
-          constructor_keys = constructor.keys
+          constructor_keys = keys_for(constructor)
           global_validations.each_with_object([]) do |validation, arr|
             constructor_keys.each { |key| arr << validation.merge(key: key) }
           end
@@ -160,10 +163,38 @@ module Structish
         end || []
       end
 
+      def attribute_values
+        if self.class < Array
+          self.to_a.values_at(*self.class.attribute_keys)
+        elsif self.class < Hash
+          self.to_h.slice(*self.class.attribute_keys)
+        end
+      end
+
+      def keys_for(constructor)
+        if constructor.class <= ::Array
+          [*0..constructor.size-1]
+        elsif constructor.class <= ::Hash
+          constructor.keys
+        end
+      end
+
     end
 
     module ClassMethods
 
+      def compact(do_compact)
+        @compact = do_compact
+      end
+
+      def compact?
+        @compact
+      end
+
+      def attribute_keys
+        attributes.map { |attribute| attribute[:key] }
+      end
+
       def structish?
         true
       end

data/lib/structish/version.rb

@@ -1,3 +1,3 @@
 module Structish
-  VERSION = "0.1.1"
+  VERSION = "0.3.0"
 end

data/lib/structish_object_extensions.rb

@@ -6,14 +6,6 @@ class ::Hash
 end
 
 class ::Array
-  def values
-    self.to_a
-  end
-
-  def keys
-    [*0..self.size-1]
-  end
-
   def to_structish(structish_klass)
     raise(ArgumentError, "Class is not a child of Structish::Array") unless structish_klass < Structish::Array
     structish_klass.new(self)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: structish
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Dylan Blakemore
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-29 00:00:00.000000000 Z
+date: 2021-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -71,6 +71,7 @@ files:
 - bin/setup
 - lib/structish.rb
 - lib/structish/array.rb
+- lib/structish/config.rb
 - lib/structish/hash.rb
 - lib/structish/validation.rb
 - lib/structish/validation_error.rb