scorpio 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 772f6b246d831d6737118bed2f363358ac6b62dc055c3503f0a96e04d416985e
-  data.tar.gz: 20e4a1d856105a0c2f25d80fb252afd7b91bc35f71babc47f2d8ab3fbd46b2df
+  metadata.gz: 7d8f3fb8a266157352a5f4054b732210bbbff161fb11d780828a3fbbdbf6922d
+  data.tar.gz: 7ba1d3d214decdfa3c8b40df5d3d63377a160b8a6cb937090f8c3b67e47d4f45
 SHA512:
-  metadata.gz: 8796f5f5227d3a70c374ae94b30cb6be1d7ad4dad71fb399c37c6c74e21117442d582a44d3417c828f156e42690d8f34a692bc3de5fcae4070431583ba1e5d88
-  data.tar.gz: 5d1b897306c6a43e16016e13f125e81d0408e3aca0c94009a2d8804aef0835b3a5cec144441de2979b51c9436e2fff016f0a1046e65d25dcc17471f60cda5869
+  metadata.gz: 2ed9a28136c4661fab6bbe9309533e3521df809f8146e3e92eb397baf37f7880a80d7d3491d8d2d5670e06189653c6fac51fff349409af46402be6f29658efff
+  data.tar.gz: a4cd19c9266a038a93330d42aa1bb407b4d493dad6f7ddd3e1c61e5803c4fa84a65cf3802b7ceeba9d859e9cb5ed20b3124d140ed215d087d338b8e60fae579a

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.2.3
+- fix mutability of SchemaInstanceBase with #[]=; instance is modified in place
+- add mutability to JSON::Node with #[]=
+- fix problems with initialize extending SchemaInstanceBase instances with Enumerable; just include it on SchemaInstanceBase itself
+
 # v0.2.2
 - Scorpio::SchemaInstanceJSONCoder
 

data/lib/scorpio/json/node.rb

@@ -66,6 +66,14 @@ module Scorpio
         end
       end
 
+      def []=(k, v)
+        if v.is_a?(Node)
+          content[k] = v.content
+        else
+          content[k] = v
+        end
+      end
+
       def deref
         content = self.content
 
@@ -203,6 +211,7 @@ module Scorpio
         to_a
       end
 
+      include Enumerable
       include Arraylike
 
       def as_json(*opt) # needs redefined after including Enumerable
@@ -231,6 +240,7 @@ module Scorpio
         inject({}) { |h, (k, v)| h[k] = v; h }
       end
 
+      include Enumerable
       include Hashlike
 
       def as_json(*opt) # needs redefined after including Enumerable

data/lib/scorpio/schema_instance_base.rb

@@ -5,6 +5,7 @@ module Scorpio
   # base class for representing an instance of an instance described by a schema
   class SchemaInstanceBase
     include Memoize
+    include Enumerable
 
     class << self
       def schema_id
@@ -58,18 +59,16 @@ module Scorpio
       elsif @instance.is_a?(Scorpio::JSON::ArrayNode)
         extend SchemaInstanceBaseArray
       end
-      # certain methods need to be redefined after we are extended by Enumerable
-      extend OverrideFromExtensions
-    end
-
-    module OverrideFromExtensions
-      def as_json(*opt)
-        Typelike.as_json(instance, *opt)
-      end
     end
 
     attr_reader :instance
 
+    # each is overridden by SchemaInstanceBaseHash or SchemaInstanceBaseArray when appropriate. the base
+    # #each is not actually implemented, along with all the methods of Enumerable.
+    def each
+      raise NoMethodError, "Enumerable methods and #each not implemented for instance that is not like a hash or array: #{instance.pretty_inspect.chomp}"
+    end
+
     def parents
       parent = @origin
       (@origin.instance.path.size...self.instance.path.size).map do |i|
@@ -130,6 +129,10 @@ module Scorpio
       instance.object_group_text
     end
 
+    def as_json(*opt)
+      Typelike.as_json(instance, *opt)
+    end
+
     def fingerprint
       {class: self.class, instance: instance}
     end
@@ -137,11 +140,8 @@ module Scorpio
 
     private
     def instance=(thing)
-      clear_memo(:[])
       if instance_variable_defined?(:@instance)
-        if @instance.class != thing.class
-          raise(Scorpio::Bug, "will not accept instance of different class #{thing.class} to current instance class #{@instance.class} on #{self.class.inspect}")
-        end
+        raise(Scorpio::Bug, "overwriting instance is not supported")
       end
       if thing.is_a?(SchemaInstanceBase)
         warn "assigning instance to a SchemaInstanceBase instance is incorrect. received: #{thing.pretty_inspect.chomp}"
@@ -152,6 +152,15 @@ module Scorpio
         @instance = Scorpio::JSON::Node.new_by_type(Scorpio.deep_stringify_symbol_keys(thing), [])
       end
     end
+
+    def subscript_assign(subscript, value)
+      clear_memo(:[], subscript)
+      if value.is_a?(SchemaInstanceBase)
+        instance[subscript] = value.instance
+      else
+        instance[subscript] = value
+      end
+    end
   end
 
   # this module is just a namespace for schema classes.
@@ -211,7 +220,7 @@ module Scorpio
           end
 
           if schema.describes_hash?
-            instance_method_modules = [m, SchemaInstanceBase, SchemaInstanceBaseArray, SchemaInstanceBaseHash, SchemaInstanceBase::OverrideFromExtensions]
+            instance_method_modules = [m, SchemaInstanceBase, SchemaInstanceBaseArray, SchemaInstanceBaseHash]
             instance_methods = instance_method_modules.map do |mod|
               mod.instance_methods + mod.private_instance_methods
             end.inject(Set.new, &:|)
@@ -271,11 +280,8 @@ module Scorpio
         end
       end
     end
-
     def []=(property_name, value)
-      self.instance = instance.modified_copy do |hash|
-        hash.merge(property_name => value)
-      end
+      subscript_assign(property_name, value)
     end
   end
 
@@ -313,11 +319,7 @@ module Scorpio
       end
     end
     def []=(i, value)
-      self.instance = instance.modified_copy do |ary|
-        ary.each_with_index.map do |el, ary_i|
-          ary_i == i ? value : el
-        end
-      end
+      subscript_assign(i, value)
     end
   end
 end

data/lib/scorpio/typelike_modules.rb

@@ -33,8 +33,6 @@ module Scorpio
     end
   end
   module Hashlike
-    include Enumerable
-
     # safe methods which can be delegated to #to_hash (which the includer is assumed to have defined).
     # 'safe' means, in this context, nondestructive - methods which do not modify the receiver.
 
@@ -99,8 +97,6 @@ module Scorpio
     end
   end
   module Arraylike
-    include Enumerable
-
     # safe methods which can be delegated to #to_ary (which the includer is assumed to have defined).
     # 'safe' means, in this context, nondestructive - methods which do not modify the receiver.
 

data/lib/scorpio/util.rb

@@ -74,9 +74,15 @@ module Scorpio
       @memos[key][args_]
     end
 
-    def clear_memo(key)
+    def clear_memo(key, *args)
       @memos ||= {}
-      @memos[key].clear if @memos[key]
+      if @memos[key]
+        if args.empty?
+          @memos[key].clear
+        else
+          @memos[key].delete(args)
+        end
+      end
     end
   end
   extend Memoize

data/lib/scorpio/version.rb

@@ -1,3 +1,3 @@
 module Scorpio
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/scorpio.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "faraday"
   # we are monkey patching json-schema with a fix that has not been merged in a timely fashion.
   spec.add_dependency "json-schema", "~> 2.8"
+  spec.add_dependency "api_hammer"
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
@@ -32,7 +33,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rack", "~> 1.0"
   spec.add_development_dependency "rack-accept"
   spec.add_development_dependency "rack-test"
-  spec.add_development_dependency "api_hammer"
   spec.add_development_dependency "activerecord"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "database_cleaner"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scorpio
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Ethan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-06 00:00:00.000000000 Z
+date: 2018-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
+- !ruby/object:Gem::Dependency
+  name: api_hammer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -164,20 +178,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: api_hammer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement