yasl 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad1fc5f516869a322107b0bb86c96cf46ea789960e920a14fefbf4173294a52f
-  data.tar.gz: 1bacb014f802c4295ebaa4b4db5ca6a99120f1cd10ac4f469cf77da2457cfcaa
+  metadata.gz: c75bacb520b9e29374e8b3d6b2b4ec369c2be8b73ed99376c63ec08b04c89fed
+  data.tar.gz: ad5b153b427ff38dd35cf4d6c0d1fef18fdc8bead3de3fcd546967f39207dc64
 SHA512:
-  metadata.gz: 97579e85d7bdd8e7d7feec52e0ce6567782c67466dffe103e95261d52628d1c0e3b4a1f40897d39401e5d05d2123ea22b7f4ff98f5134f76a46e32b5103a64a4
-  data.tar.gz: 5f7d04c0a0e821d88bf3cafdba3c497df92f1dd92d4f2e8c8222f5c903cbc866767666d10ee8b09d0fd84d05ad03105ba9fc7f0784e4521060a7aa671005bf77
+  metadata.gz: f2e317ba827131f3bc27ccc893a03a24894251fe6d5b7a4bbbb1cf5e7b6df91397e0df93bfceaa8ba1920b09e9c0490ee343adb5750de5370b2e6f3157a475b5
+  data.tar.gz: d4b4b6fc515a1e26cb5f6992983aabd16305c398cecd7d566231be94b3e3198ea477dbabbc6d9ce1dfc39ee6f5af9ef511340bfff8797d91792d560aa8f31da6

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 0.2.2
+
+- Extracted pure Ruby re-implementation of Struct into the [pure-struct](https://github.com/AndyObtiva/pure-struct) gem.
+
 ## 0.2.1
 
 - Make `YASL::UNSERIALIZABLE_DATA_TYPES` work with regular classes too

data/README.md

@@ -26,7 +26,7 @@ Run:
 Or add to Gemfile:
 
 ```ruby
-gem 'yasl', '~> 0.2.1'
+gem 'yasl', '~> 0.2.2'
 ```
 
 And, run:
@@ -309,10 +309,20 @@ puts car2.inspect
 
 Struct serialization/deserialization works out of the box in standard [MRI Ruby](https://www.ruby-lang.org/) and [JRuby](https://www.jruby.org/).
 
-To avoid some JS and `keyword_init` issues with `Struct` in [Opal](https://opalrb.com/), you may use the optional pure Ruby Struct re-implementation that comes with YASL:
+`Struct` in [Opal](https://opalrb.com/) has some odd JS issues and `keyword_init` gotchas unrelated to YASL. To completely avoid these issues, you may use the optional pure Ruby `Struct` re-implementation in the [pure-struct](https://github.com/AndyObtiva/pure-struct) gem:
 
 ```ruby
-require 'yasl/ext/struct'
+require 'pure-struct' # depends on installing the [pure-struct](https://github.com/AndyObtiva/pure-struct) gem
+require 'yasl'
+```
+
+Optionally, you may code block by the specific [Ruby](https://www.ruby-lang.org/) engine where it is needed (e.g. [Opal](https://opalrb.com/)):
+
+```ruby
+if RUBY_ENGINE == 'opal'
+  require 'pure-struct'
+end
+require 'yasl'
 ```
 
 ## Contributing

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/yasl/dumper.rb

@@ -72,7 +72,9 @@ module YASL
     
     def dump_ruby_basic_data_type_data(obj)
       class_ancestors_names_include = lambda do |*class_names|
-        lambda { |obj| class_names.any? { |class_name| obj.class.ancestors.map(&:name).include?(class_name) } }
+        lambda do |object|
+          class_names.any? { |class_name| obj.class.ancestors.map(&:name).include?(class_name) }
+        end
       end
       case obj
       when class_ancestors_names_include['Time']

data/yasl.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: yasl 0.2.1 ruby lib
+# stub: yasl 0.2.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "yasl".freeze
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Andy Maleh".freeze]
-  s.date = "2021-01-01"
+  s.date = "2021-01-02"
   s.description = "A pure Ruby serialization library that works across different Ruby implementations like Opal and JRuby as an alternative to YAML/Marshal.".freeze
   s.email = "andy.am@gmail.com".freeze
   s.extra_rdoc_files = [
@@ -26,7 +26,6 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/yasl.rb",
     "lib/yasl/dumper.rb",
-    "lib/yasl/ext/struct.rb",
     "lib/yasl/loader.rb",
     "yasl.gemspec"
   ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yasl
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-01 00:00:00.000000000 Z
+date: 2021-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -124,7 +124,6 @@ files:
 - VERSION
 - lib/yasl.rb
 - lib/yasl/dumper.rb
-- lib/yasl/ext/struct.rb
 - lib/yasl/loader.rb
 - yasl.gemspec
 homepage: http://github.com/AndyObtiva/yasl

data/lib/yasl/ext/struct.rb

@@ -1,148 +0,0 @@
-# Copyright (c) 2020 Andy Maleh
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Object.send(:remove_const, :Struct) if Object.constants.include?(:Struct)
-
-# Optional re-implmentation of Struct in Pure Ruby (to get around JS issues in Opal Struct)
-class Struct
-  class << self
-    CLASS_DEFINITION_FOR_ATTRIBUTES = lambda do |attributes, keyword_init|
-      lambda do |defined_class|
-        members_array = attributes
-        
-        define_method(:members) do
-          members_array
-        end
-        
-        def []=(attribute, value)
-          normalized_attribute = attribute.to_s.to_sym
-          raise NameError, "no member #{attribute} in struct" unless members.include?(normalized_attribute)
-          @member_values[normalized_attribute] = value
-        end
-        
-        def [](attribute)
-          normalized_attribute = attribute.to_s.to_sym
-          raise NameError, "no member #{attribute} in struct" unless members.include?(normalized_attribute)
-          @member_values[normalized_attribute]
-        end
-        
-        def each(&block)
-          to_a.each(&block)
-        end
-        
-        def each_pair(&block)
-          @member_values.each_pair(&block)
-        end
-        
-        def to_h
-          @member_values.clone
-        end
-        
-        def to_a
-          @member_values.values
-        end
-        
-        def size
-          members.size
-        end
-        alias length size
-        
-        def dig(*args)
-          @member_values.dig(*args)
-        end
-        
-        def select(&block)
-          to_a.select(&block)
-        end
-        
-        def eql?(other)
-          instance_of?(other.class) &&
-            members.all? { |key| self[key].eql?(other[key]) }
-        end
-        
-        def ==(other)
-          other = coerce(other).first if respond_to?(:coerce, true)
-          other.kind_of?(self.class) &&
-            members.all? { |key| self[key] == other[key] }
-        end
-        
-        def hash
-          self.class.hash +
-            to_a.each_with_index.map {|value, i| (i+1) * value.hash}.sum
-        end
-        
-        if keyword_init
-          def initialize(struct_class_keyword_args = {})
-            @member_values = {}
-            members.each do |attribute|
-              singleton_class.define_method(attribute) do
-                self[attribute]
-              end
-              singleton_class.define_method("#{attribute}=") do |value|
-                self[attribute] = value
-              end
-            end
-            struct_class_keyword_args.each do |attribute, value|
-              self[attribute] = value
-            end
-          end
-        else
-          def initialize(*attribute_values)
-            @member_values = {}
-            members.each do |attribute|
-              singleton_class.define_method(attribute) do
-                self[attribute]
-              end
-              singleton_class.define_method("#{attribute}=") do |value|
-                self[attribute] = value
-              end
-            end
-            attribute_values.each_with_index do |value, i|
-              attribute = members[i]
-              self[attribute] = value
-            end
-          end
-        end
-      end
-    end
-    
-    ARG_VALIDATION = lambda do |class_name_or_attribute, *attributes|
-      class_name_or_attribute.nil? || attributes.any?(&:nil?)
-    end
-    
-    CLASS_NAME_EXTRACTION = lambda do |class_name_or_attribute|
-      if class_name_or_attribute.is_a?(String)
-        raise NameError, "identifier name needs to be constant" unless class_name_or_attribute.match(/^[A-Z]/)
-        class_name_or_attribute
-      end
-    end
-    
-    def new(class_name_or_attribute, *attributes, keyword_init: false)
-      raise 'Arguments cannot be nil' if ARG_VALIDATION[class_name_or_attribute, *attributes]
-      class_name = CLASS_NAME_EXTRACTION[class_name_or_attribute]
-      attributes.unshift(class_name_or_attribute) if class_name.nil?
-      attributes = attributes.map(&:to_sym)
-      struct_class = Class.new(&CLASS_DEFINITION_FOR_ATTRIBUTES[attributes, keyword_init])
-      class_name.nil? ? struct_class : const_set(class_name, struct_class)
-    end
-      
-  end
-end