jimmy 2.0.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d18b13c6558a49c5a5247d5f4cdc0f7d12805b2583b2bab2557d75c29bd823f
-  data.tar.gz: bc2e9e773f340dbd4ee3bcf07e6f2eb47fed1d6b5ebb1d4e0f9f195e94ab0d2e
+  metadata.gz: c29ca2691ce60d6ca698f214635267bf12a42fa5bac9e11a4b9ac481e0815588
+  data.tar.gz: 47a0adde3910f636342b685fed70b10861e0e2145f3a9bf76267f82ef1b4a537
 SHA512:
-  metadata.gz: 5133ac0b7b56a3b6b4272a02099e8b1cad2a3b58435cea3b0f0984bf8844128f23a8f6d2c5a4970e0335c134638b768c02befc727bc2ca7f0ac4a08dfc486cc9
-  data.tar.gz: d5f0148b17deab8950954970e6a1b6f1964db0144c3121176822b35c140a5a5f7029c95a36a3f62e37366da131a71fc1c9f6687a1cbcf8f529d7e0d90bbe904a
+  metadata.gz: d33b595d483877f6f1617af4c45550447219dc758913586bd956ddae81ae28fd862cd055124f43581a6404747c008a100f0f1aab99606d0966cabb1f17eeaba7
+  data.tar.gz: 9f7a0af3a887108a9ef799979755b4e5a98f6ed951fb2585f74cc327049ffbade07509b040b0edb047b973eb8124797ea0fe2d8b7612dc03448de3b62e2c4254

data/lib/jimmy/declaration.rb

@@ -127,10 +127,7 @@ module Jimmy
       property_name = cast_key(property_name)
       key           = cast_key(key)
       hash          = getset(property_name) { {} }
-      assert !hash.key?(key) do
-        "Property '#{property_name}' already has a member '#{key}'"
-      end
-      schema = cast_schema(schema)
+      schema        = cast_schema(schema)
       yield schema if block_given?
       hash[key] = schema
       self

data/lib/jimmy/json/array.rb

@@ -35,6 +35,13 @@ module Jimmy
 
       alias << push
 
+      # Assign a member to the array at the given index.
+      # @param [Integer] index
+      # @param [Object] value
+      def []=(index, value)
+        @members[index] = cast_value(value)
+      end
+
       # Iterate over items in the array. If a block with a single argument is
       # given, only values will be yielded. Otherwise, indexes and values will
       # be yielded.
@@ -75,6 +82,13 @@ module Jimmy
       alias count length
       alias size length
 
+      # Returns true if the array contains the given +obj+.
+      # @param [Object] obj
+      # @return [true, false]
+      def include?(obj)
+        @members.include? obj
+      end
+
       protected
 
       def export_pairs(pairs)

data/lib/jimmy/json/collection.rb

@@ -67,6 +67,20 @@ module Jimmy
         self
       end
 
+      # Duplicate the collection.
+      # @return [Jimmy::Json::Collection]
+      def dup
+        self.class.new @members
+      end
+
+      # Duplicate the collection and all of its members, recursively.
+      # @return [Jimmy::Json::Collection]
+      def deep_dup(index = {})
+        return index[object_id] if index.key? object_id
+
+        deep_dup_enumerable(self, index) { |new, k, v| new[k] = v }
+      end
+
       protected
 
       def cast_value(value)
@@ -82,6 +96,18 @@ module Jimmy
           value.as_json
         end
       end
+
+      def deep_dup_value(value = self, index = {})
+        return value.deep_dup(index) if value.is_a? Collection
+
+        value.dup
+      end
+
+      def deep_dup_enumerable(value, index)
+        index[value.object_id] = new = value.class.new
+        value.each { |*args, v| yield new, *args, deep_dup_value(v, index) }
+        new
+      end
     end
   end
 end

data/lib/jimmy/schema.rb

@@ -115,6 +115,19 @@ module Jimmy
       PROPERTY_SEQUENCE.fetch(key) { raise KeyError, 'Not a valid schema key' }
     end
 
+    # Duplicate the schema with a shallow copy. Collections like properties,
+    # enum, etc, will be shared with the duplicate.
+    # @return [Jimmy::Json::Schema]
+    def dup
+      nothing? ? self.class.new.nothing : super
+    end
+
+    # Duplicate the schema.
+    # @return [Jimmy::Json::Schema]
+    def deep_dup(*)
+      nothing? ? self.class.new.nothing : super
+    end
+
     protected
 
     def schema

data/lib/jimmy/schema/object.rb

@@ -58,7 +58,9 @@ module Jimmy
         if name.is_a? Hash
           self.properties name, required: true, &block
         else
-          getset('required') { Set.new } << validate_property_name(name)
+          arr  = getset('required') { [] }
+          name = validate_property_name(name)
+          arr << name unless arr.include? name
         end
       end
       self

data/lib/jimmy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Jimmy
-  VERSION = '2.0.3'
+  VERSION = '2.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jimmy
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0
 platform: ruby
 authors:
 - Neil E. Pearson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-02 00:00:00.000000000 Z
+date: 2020-06-10 00:00:00.000000000 Z
 dependencies: []
 description: Jimmy the Gem
 email: