hyper-model 1.0.alpha1.6 → 1.0.alpha1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2f63052beefadb742e008e12976afe889105a0cdbd864ea49902654eb82be51
-  data.tar.gz: 2bdf35fb8b4ccd7fd00144be9ba52d8a133797e47825b91cf6acae8dc0673043
+  metadata.gz: d85eab56099328a86bb19e2911f16bd1b5b9a6e98a79d7c912898dce7775e876
+  data.tar.gz: cf0f2c03f22c84710e76e5177f8f54f8847c9e1e671f3c5aab38b8c77abbfc8f
 SHA512:
-  metadata.gz: 2e7481f8e04d3d464507d7c25c20b3dc55167dd6b8cb368f28113e9f52b4ba95815611b8f4fe740d207860f1bc60cdb4ddcdafb996d83ddf2d51afb8cc397fb5
-  data.tar.gz: e0e5fb04e304496c3d0ef8353a9ed0bd36a303257e3f062d9ed61e75b4af8d1ded8ed18defd37e7e44dd79b618b221d129287a39d9e331bb20b9cc648c668124
+  metadata.gz: 8095f00d457423d733f0d1f8ea0118a47b5084b282bc224b9a3a7b90e8ea9321487e849932b48a4f2fe0d75ee1047033150da036019cdc7be0556d7fe3d71eb2
+  data.tar.gz: b734954d84ae3b363a9fceff250b0a49a4062ec5d893a96197d4c9cd9f6ccb3adbdd90d8f41f325a51faffaef08c7b976217005fdd3b85c98e9fd219575dd1ec

data/hyper-model.gemspec

@@ -52,7 +52,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'rspec-steps', '~> 2.1.1'
   spec.add_development_dependency 'rspec-wait'
-  spec.add_development_dependency 'rubocop', '~> 0.51.0'
+  spec.add_development_dependency 'rubocop' #, '~> 0.51.0'
   spec.add_development_dependency 'shoulda'
   spec.add_development_dependency 'shoulda-matchers'
   spec.add_development_dependency 'spring-commands-rspec', '~> 1.0.4'

data/lib/active_record_base.rb

@@ -14,7 +14,7 @@ module ActiveRecord
                else
                  { server: args[0] }
                end
-        return opts if opts && opts[:server].respond_to?(:call)
+        return opts if opts[:server].respond_to?(:call) || RUBY_ENGINE == 'opal'
         raise 'must provide either a proc as the first arg or by the '\
               '`:server` option to scope and default_scope methods'
       end
@@ -392,6 +392,10 @@ module ActiveRecord
           nil
         end
       end
+
+      scope :__hyperstack_internal_where_hash_scope, ->(*args) { where(*args) }
+
+      scope :__hyperstack_internal_where_sql_scope, ->(*args) { where(*args) }
     end
   end
 

data/lib/enumerable/pluck.rb

@@ -1,6 +1,7 @@
 # Add pluck to enumerable... its already done for us in rails 5+
 module Enumerable
-  def pluck(key)
-    map { |element| element[key] }
+  def pluck(*keys)
+    map { |element| keys.map { |key| element[key] } }
+      .flatten(keys.count > 1 ? 0 : 1)
   end
 end unless Enumerable.method_defined? :pluck

data/lib/hyper_model/version.rb

@@ -1,3 +1,3 @@
 module HyperModel
-  VERSION = '1.0.alpha1.6'
+  VERSION = '1.0.alpha1.7'
 end

data/lib/reactive_record/active_record/base.rb

@@ -10,6 +10,21 @@ module ActiveRecord
     finder_method :__hyperstack_internal_scoped_last
     scope :__hyperstack_internal_scoped_last_n, ->(n) { last(n) }
 
+    def self.where(*args)
+      if args[0].is_a? Hash
+        # we can compute membership in the scope when the arg is a hash
+        __hyperstack_internal_where_hash_scope(args[0])
+      else
+        # otherwise the scope has to always be computed on the server
+        __hyperstack_internal_where_sql_scope(*args)
+      end
+    end
+
+    scope :__hyperstack_internal_where_hash_scope,
+          client: ->(attrs) { !attrs.detect { |k, v| self[k] != v } }
+
+    scope :__hyperstack_internal_where_sql_scope
+
     ReactiveRecord::ScopeDescription.new(
       self, :___hyperstack_internal_scoped_find_by,
       client: ->(attrs) { !attrs.detect { |attr, value| attributes[attr] != value } }

data/lib/reactive_record/active_record/public_columns_hash.rb

@@ -6,39 +6,38 @@ module ActiveRecord
   # adds method to get the HyperMesh public column types
   # this works because the public folder is currently required to be eager loaded.
   class Base
+    @@hyper_stack_public_columns_hash_mutex = Mutex.new
     def self.public_columns_hash
-      return @public_columns_hash if @public_columns_hash && Rails.env.production?
-      files = []
-      Hyperstack.public_model_directories.each do |dir|
-        dir_length = Rails.root.join(dir).to_s.length + 1
-        Dir.glob(Rails.root.join(dir, '**', '*.rb')).each do |file|
-          require_dependency(file) # still the file is loaded to make sure for development and test env
-          files << file[dir_length..-4]
+      @@hyper_stack_public_columns_hash_mutex.synchronize do
+        return @public_columns_hash if @public_columns_hash && Rails.env.production?
+        files = []
+        Hyperstack.public_model_directories.each do |dir|
+          dir_length = Rails.root.join(dir).to_s.length + 1
+          Dir.glob(Rails.root.join(dir, '**', '*.rb')).each do |file|
+            require_dependency(file) # still the file is loaded to make sure for development and test env
+            files << file[dir_length..-4]
+          end
         end
-      end
-      @public_columns_hash = {}
-      # descendants only works for already loaded models!
-      descendants.each do |model|
-        if files.include?(model.name.underscore) && model.name.underscore != 'application_record'
-          @public_columns_hash[model.name] = model.columns_hash rescue nil # why rescue?
+        @public_columns_hash = {}
+        # descendants only works for already loaded models!
+        descendants.each do |model|
+          if files.include?(model.name.underscore) && model.name.underscore != 'application_record'
+            @public_columns_hash[model.name] = model.columns_hash rescue nil # why rescue?
+          end
         end
-        # begin
-        #   @public_columns_hash[model.name] = model.columns_hash if model.table_name
-        # rescue Exception => e
-        #   binding.pry
-        #   @public_columns_hash = nil
-        #   raise $!, "Could not read 'columns_hash' for #{model}: #{$!}", $!.backtrace
-        # end if files.include?(model.name.underscore) && model.name.underscore != 'application_record'
+        @public_columns_hash
       end
-      @public_columns_hash
     end
 
+    @@hyper_stack_public_columns_hash_as_json_mutex = Mutex.new
     def self.public_columns_hash_as_json
-      return @public_columns_hash_json if @public_columns_hash_json && Rails.env.production?
-      pch = public_columns_hash
-      return @public_columns_hash_json if @prev_public_columns_hash == pch
-      @prev_public_columns_hash = pch
-      @public_columns_hash_json = pch.to_json
+      @@hyper_stack_public_columns_hash_as_json_mutex.synchronize do
+        return @public_columns_hash_json if @public_columns_hash_json && Rails.env.production?
+        pch = public_columns_hash
+        return @public_columns_hash_json if @prev_public_columns_hash == pch
+        @prev_public_columns_hash = pch
+        @public_columns_hash_json = pch.to_json
+      end
     end
   end
 end

data/lib/reactive_record/active_record/reactive_record/collection.rb

@@ -677,10 +677,19 @@ To determine this sync_scopes first asks if the record being changed is in the s
         all.send(method, *args, &block)
       elsif ScopeDescription.find(@target_klass, method)
         apply_scope(method, *args)
-      elsif @target_klass.respond_to?(method) && ScopeDescription.find(@target_klass, "_#{method}")
+      elsif !@target_klass.respond_to?(method)
+        super
+      elsif ScopeDescription.find(@target_klass, "_#{method}")
         apply_scope("_#{method}", *args).first
       else
-        super
+        # create a subclass of the original target class that responds to all
+        # by returning our collection back
+        fake_class = Class.new(@target_klass)
+        fake_class.instance_variable_set("@all", self)
+        # Opal 0.11 does not handle overridding the original @target_klass
+        # with an accessor, so we define the accessor as a method.
+        fake_class.define_singleton_method(:all) { @all }
+        fake_class.send(method, *args, &block)
       end
     end
 

data/lib/reactive_record/active_record/reactive_record/isomorphic_base.rb

@@ -1,5 +1,3 @@
-require 'json'
-
 module ReactiveRecord
 
   class Base
@@ -557,13 +555,21 @@ module ReactiveRecord
         if !data_loading? && (id || vector)
           Operations::Destroy.run(model: ar_instance.model_name.to_s, id: id, vector: vector)
           .then do |response|
-            Broadcast.to_self ar_instance
+            #[reactive_record_id, model.class.name, attributes, messages] model.errors.messages
+
+            if response[:success]
+              @destroyed = true
+              Broadcast.to_self ar_instance
+            else
+              errors! response[:messages]
+            end
             yield response[:success], response[:message] if block
             promise.resolve response
           end
         else
           destroy_associations
           # sync_unscoped_collection! # ? should we do this here was NOT being done before hypermesh integration
+          @destroyed = true
           yield true, nil if block
           promise.resolve(success: true)
         end
@@ -575,8 +581,6 @@ module ReactiveRecord
         # sync!
         # and modify server_data_cache so that it does NOT call destroy
 
-        @destroyed = true
-
         promise
       end
 
@@ -590,10 +594,9 @@ module ReactiveRecord
                    ServerDataCache.new(acting_user, {})[*vector].value
                  end
 
-        record.check_permission_with_acting_user(acting_user, :destroy_permitted?).destroy
-        { success: true, attributes: {} }
+        success = record.check_permission_with_acting_user(acting_user, :destroy_permitted?).destroy
+        { success: success, attributes: {}, messages: record.errors.messages }
       rescue Exception => e
-        # ReactiveRecord::Pry.rescued(e)
         { success: false, record: record, message: e }
       end
     end

data/lib/reactive_record/server_data_cache.rb

@@ -506,7 +506,7 @@ keys:
 
             target.send "#{method}=", value.first
           elsif value.is_a? Array
-            target.send("_hyperstack_internal_setter_#{method}", value.first) unless method == target.class.primary_key
+            target.send("_hyperstack_internal_setter_#{method}", value.first) unless [target.class.primary_key, :id].include? method
           elsif value.is_a?(Hash) && value[:id] && value[:id].first && (association = target.class.reflect_on_association(method))
             # not sure if its necessary to check the id above... is it possible to for the method to be an association but not have an id?
             klass = value[:model_name] ? Object.const_get(value[:model_name].first) : association.klass

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyper-model
 version: !ruby/object:Gem::Version
-  version: 1.0.alpha1.6
+  version: 1.0.alpha1.7
 platform: ruby
 authors:
 - Mitch VanDuyn
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-29 00:00:00.000000000 Z
+date: 2021-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.6
+        version: 1.0.alpha1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.6
+        version: 1.0.alpha1.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -101,28 +101,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.6
+        version: 1.0.alpha1.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.6
+        version: 1.0.alpha1.7
 - !ruby/object:Gem::Dependency
   name: hyper-trace
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.6
+        version: 1.0.alpha1.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.alpha1.6
+        version: 1.0.alpha1.7
 - !ruby/object:Gem::Dependency
   name: mini_racer
   requirement: !ruby/object:Gem::Requirement
@@ -397,16 +397,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement