structish 0.1.0 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8edee95c617e99bb439af1073b4b79697d301c487106320c2b075b2246a5bab
-  data.tar.gz: eb452debefdf9b4d6348bb11e6b5c812bdffbe97272d33651be399a4b7d12e4b
+  metadata.gz: fe83835231060abe23b9427547d10a67fb5f6c5575f1f0ba3650346902dd5385
+  data.tar.gz: 9fdb570ed7d576fea0b453b1f3c81c08285c75493816e8dc689e8949b4b6ec4c
 SHA512:
-  metadata.gz: f3ebf97ad136e4f175a5a4fbfb0bb06a8a31d3b63e01df5db44edbee439f8f43eacf4805fd262cb05cc20b51d884d5b6864b4e8b794f3d9c9a3c017b2c21c21d
-  data.tar.gz: 633f3b2c776edc67e49bc8084683e4eaf5e628c1e434631f1e2950636d941b1849c3987dd3e2a5854ff492a98b970c5e932a2b9e3e53447748515e1931a06221
+  metadata.gz: 2877855214b7f57d302f3c8c3fd6f4594b49e35077c00a48108c948f6ba2b0be0ad40e332a6766978bf511c6a3bb71c58969e762506ed7dd31f7c015de9c5007
+  data.tar.gz: 4076538cb93f7fe0aeaf39a94f84da386023a40060a936bd13cdbf75848580e94ecc6925f2d1f66430658d50556e7b4e3888de08d43b57097fd45c9ecc5e715d

data/.github/workflows/{structable-rspec.yml → structish-rspec.yml}

@@ -1,5 +1,5 @@
 env:
-  RUBY_VERSION: '2.6.6'
+  RUBY_VERSION: '2.7.2'
 
 name: Tests
 on: [push, pull_request]

data/.gitignore

@@ -8,3 +8,4 @@
 /tmp/
 /out/
 /Gemfile.lock
+*.gem

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/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/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,30 @@ 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 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.0"
+  VERSION = "0.2.4"
 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)

data/structish.gemspec

@@ -23,8 +23,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "activesupport", "~> 5.0"
+  spec.add_runtime_dependency "activesupport"
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: structish
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.4
 platform: ruby
 authors:
 - Dylan Blakemore
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-12 00:00:00.000000000 Z
+date: 2021-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +42,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 description: |-
   Adds validations, function creation, function delegation,
                             and key restrictions to arrays and hashes so that they may
@@ -62,7 +62,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/structable-rspec.yml"
+- ".github/workflows/structish-rspec.yml"
 - ".gitignore"
 - Gemfile
 - README.md
@@ -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