Merge pull request #1 from hyperstack-org/edge

Update to head

Author: Tim-Blokdijk

docs/dsl-client/hyper-component.md

@@ -1322,6 +1322,62 @@ end
 
 Note that the `rename` directive can be used to rename both components and sublibraries, giving you full control over the ruby names of the components and libraries.
 
+### Importing Webpack Images
+
+If you store your images in app/javascript/images directory and want to display them in components, please add the following code to app/javascript/packs/application.js
+
+```javascript
+var webpackImagesMap = {};
+var imagesContext = require.context('../images/', true, /\.(gif|jpg|png|svg)$/i);
+
+function importAll (r) {
+  r.keys().forEach(key => webpackImagesMap[key] = r(key));
+}
+
+importAll(imagesContext);
+
+global.webpackImagesMap = webpackImagesMap;
+```
+
+The above code creates an images map and stores it in webpackImagesMap variable. It looks something like this
+
+```javascript
+{
+     "./logo.png": "/packs/images/logo-3e11ad2e3d31a175aec7bb2f20a7e742.png",
+     ...
+}
+```
+Add the following helper
+
+```ruby
+# app/hyperstack/helpers/images_import.rb
+
+module ImagesImport
+  def img_src(filepath)
+    img_map = Native(`webpackImagesMap`) 
+    img_map["./#{filepath}"]
+  end
+end
+```
+
+Include it into HyperComponent
+
+```ruby
+require 'helpers/images_import'
+class HyperComponent
+  ...
+  include ImagesImport
+end
+```
+
+After that you will be able to display the images in your components like this
+
+```ruby
+IMG(src: img_src('logo.png'))               # app/javascript/images/logo.png
+IMG(src: img_src('landing/some_image.png')) # app/javascript/images/landing/some_image.png
+```
+
+
 ### Auto Import
 
 If you use a lot of libraries and are using a Javascript tool chain with Webpack, having to import the libraries in both Hyperstack and Webpack is redundant and just hard work.

install/rails-webpacker.rb

@@ -73,10 +73,14 @@ class ApplicationRecord < ActiveRecord::Base
 
 # useful for debugging
 module Hyperstack
-  def self.on_error(*args)
-    ::Rails.logger.debug "\033[0;31;1mHYPERSTACK APPLICATION ERROR: #{args.join(", ")}\n"\\
-                         "To further investigate you may want to add a debugging "\\
-                         "breakpoint in config/initializers/hyperstack.rb\033[0;30;21m"
+  def self.on_error(operation, err, params, formatted_error_message)
+    ::Rails.logger.debug(
+      "\#{formatted_error_message}\\n\\n" +
+      Pastel.new.red(
+        'To further investigate you may want to add a debugging '\\
+        'breakpoint to the on_error method in config/initializers/hyperstack.rb'
+      )
+    )
   end
 end if Rails.env.development?
 CODE

ruby/hyper-i18n/Gemfile.lock

@@ -27,6 +27,7 @@ PATH
       hyper-component (= 1.0.alpha1.2)
       mutations
       opal-activesupport (~> 0.3.1)
+      tty-table
 
 PATH
   remote: ../hyper-spec
@@ -162,6 +163,7 @@ GEM
     crass (1.0.4)
     diff-lcs (1.3)
     equalizer (0.0.11)
+    equatable (0.5.0)
     erubi (1.7.1)
     execjs (2.7.0)
     ffi (1.9.25)
@@ -199,6 +201,7 @@ GEM
     minitest (5.11.3)
     mutations (0.8.3)
       activesupport
+    necromancer (0.4.0)
     nio4r (2.3.1)
     nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
@@ -230,6 +233,9 @@ GEM
     parallel (1.12.1)
     parser (2.3.3.1)
       ast (~> 2.2)
+    pastel (0.7.2)
+      equatable (~> 0.5.0)
+      tty-color (~> 0.4.0)
     powerpack (0.1.2)
     procto (0.0.3)
     pry (0.11.3)
@@ -320,15 +326,29 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
+    strings (0.1.4)
+      strings-ansi (~> 0.1.0)
+      unicode-display_width (~> 1.4.0)
+      unicode_utils (~> 1.4.0)
+    strings-ansi (0.1.0)
     thor (0.20.0)
     thread_safe (0.3.6)
     tilt (2.0.8)
     timecop (0.8.1)
+    tty-color (0.4.3)
+    tty-screen (0.6.5)
+    tty-table (0.10.0)
+      equatable (~> 0.5.0)
+      necromancer (~> 0.4.0)
+      pastel (~> 0.7.2)
+      strings (~> 0.1.0)
+      tty-screen (~> 0.6.4)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uglifier (4.1.19)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.4.0)
+    unicode_utils (1.4.0)
     unparser (0.2.8)
       abstract_type (~> 0.0.7)
       adamantium (~> 0.2.0)

ruby/hyper-model/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: ../hyper-component
   specs:
-    hyper-component (1.0.alpha1.1)
-      hyper-state (= 1.0.alpha1.1)
-      hyperstack-config (= 1.0.alpha1.1)
+    hyper-component (1.0.alpha1.2)
+      hyper-state (= 1.0.alpha1.2)
+      hyperstack-config (= 1.0.alpha1.2)
       libv8 (~> 6.3.0)
       mini_racer (~> 0.1.15)
       opal (>= 0.11.0, < 0.12.0)
@@ -13,23 +13,24 @@ PATH
 PATH
   remote: ../hyper-operation
   specs:
-    hyper-operation (1.0.alpha1.1)
+    hyper-operation (1.0.alpha1.2)
       activerecord (>= 4.0.0)
-      hyper-component (= 1.0.alpha1.1)
+      hyper-component (= 1.0.alpha1.2)
       mutations
       opal-activesupport (~> 0.3.1)
+      tty-table
 
 PATH
   remote: ../hyper-state
   specs:
-    hyper-state (1.0.alpha1.1)
-      hyperstack-config (= 1.0.alpha1.1)
+    hyper-state (1.0.alpha1.2)
+      hyperstack-config (= 1.0.alpha1.2)
       opal (>= 0.11.0, < 0.12.0)
 
 PATH
   remote: ../hyperstack-config
   specs:
-    hyperstack-config (1.0.alpha1.1)
+    hyperstack-config (1.0.alpha1.2)
       libv8 (~> 6.3.0)
       listen (~> 3.0)
       mini_racer (~> 0.1.15)
@@ -41,11 +42,11 @@ PATH
 PATH
   remote: .
   specs:
-    hyper-model (1.0.alpha1.1)
+    hyper-model (1.0.alpha1.2)
       activemodel
       activerecord (>= 4.0.0)
-      hyper-component (= 1.0.alpha1.1)
-      hyper-operation (= 1.0.alpha1.1)
+      hyper-component (= 1.0.alpha1.2)
+      hyper-operation (= 1.0.alpha1.2)
 
 GEM
   remote: https://rubygems.org/
@@ -141,6 +142,7 @@ GEM
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     equalizer (0.0.11)
+    equatable (0.5.0)
     erubi (1.7.1)
     eventmachine (1.2.7)
     execjs (2.7.0)
@@ -189,6 +191,7 @@ GEM
     mutations (0.8.3)
       activesupport
     mysql2 (0.5.2)
+    necromancer (0.4.0)
     nio4r (2.3.1)
     nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
@@ -220,6 +223,9 @@ GEM
     parallel (1.12.1)
     parser (2.3.3.1)
       ast (~> 2.2)
+    pastel (0.7.2)
+      equatable (~> 0.5.0)
+      tty-color (~> 0.4.0)
     powerpack (0.1.2)
     procto (0.0.3)
     pry (0.11.3)
@@ -271,8 +277,8 @@ GEM
       rake
     rake (12.3.1)
     rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
     react-rails (2.4.7)
       babel-transpiler (>= 0.7.0)
       connection_pool
@@ -343,6 +349,11 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
+    strings (0.1.4)
+      strings-ansi (~> 0.1.0)
+      unicode-display_width (~> 1.4.0)
+      unicode_utils (~> 1.4.0)
+    strings-ansi (0.1.0)
     thin (1.7.2)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
@@ -351,11 +362,20 @@ GEM
     thread_safe (0.3.6)
     tilt (2.0.8)
     timecop (0.8.1)
+    tty-color (0.4.3)
+    tty-screen (0.6.5)
+    tty-table (0.10.0)
+      equatable (~> 0.5.0)
+      necromancer (~> 0.4.0)
+      pastel (~> 0.7.2)
+      strings (~> 0.1.0)
+      tty-screen (~> 0.6.4)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uglifier (4.1.19)
+    uglifier (4.1.20)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.4.0)
+    unicode_utils (1.4.0)
     unparser (0.2.8)
       abstract_type (~> 0.0.7)
       adamantium (~> 0.2.0)

ruby/hyper-model/lib/active_record_base.rb

@@ -29,7 +29,7 @@ def self._synchromesh_scope_args_check(args)
     class ReactiveRecordPsuedoRelationArray < Array
       attr_accessor :__synchromesh_permission_granted
       attr_accessor :acting_user
-      def __secure_collection_check(_acting_user)
+      def __secure_collection_check(*)
         self
       end
     end
@@ -39,11 +39,13 @@ def __secure_collection_check(_acting_user)
     class Relation
       attr_accessor :__synchromesh_permission_granted
       attr_accessor :acting_user
-      def __secure_collection_check(acting_user)
+
+      def __secure_collection_check(cache_item)
         return self if __synchromesh_permission_granted
-        return self if __secure_remote_access_to_all(self, acting_user).__synchromesh_permission_granted
-        return self if __secure_remote_access_to_unscoped(self, acting_user).__synchromesh_permission_granted
-        Hyperstack::InternalPolicy.raise_operation_access_violation(:scoped_permission_not_granted, "Last relation: #{self}, acting_user: #{acting_user}")
+        return self if __secure_remote_access_to_all(self, cache_item.acting_user).__synchromesh_permission_granted
+        return self if __secure_remote_access_to_unscoped(self, cache_item.acting_user).__synchromesh_permission_granted
+        Hyperstack::InternalPolicy.raise_operation_access_violation(
+          :scoped_permission_not_granted, "Access denied for #{cache_item}")
       end
     end
     # Monkey patches and extensions to base
@@ -90,6 +92,9 @@ def finder_method(name, &block)
               this.acting_user = old
             end
           end
+          singleton_class.send(:define_method, "_#{name}") do |*args|
+            all.instance_exec(*args, &block)
+          end
           singleton_class.send(:define_method, name) do |*args|
             all.instance_exec(*args, &block)
           end

ruby/hyper-model/lib/reactive_record/active_record/class_methods.rb

@@ -261,10 +261,10 @@ def unscoped
     end
 
     def finder_method(name)
-      ReactiveRecord::ScopeDescription.new(self, "_#{name}", {})
+      ReactiveRecord::ScopeDescription.new(self, "_#{name}", {}) # was adding _ to front
       [name, "#{name}!"].each do |method|
         singleton_class.send(:define_method, method) do |*vargs|
-          all.apply_scope("_#{method}", *vargs).first
+          all.apply_scope("_#{method}", *vargs).first # was adding _ to front
         end
       end
     end

ruby/hyper-model/lib/reactive_record/active_record/reactive_record/isomorphic_base.rb

@@ -316,21 +316,23 @@ def send_save_to_server(save, validate, force, &block)
 
     else
 
-      def self.find_record(model, id, vector, save)
+      def self.find_record(model, id, acting_user, vector, save)
         if !save
           found = vector[1..-1].inject(vector[0]) do |object, method|
             if object.nil? # happens if you try to do an all on empty scope followed by more scopes
               object
-            elsif method.is_a? Array
+            elsif method.is_a? Array #__secure_remote_access_to_
               if method[0] == 'new'
                 object.new
-              else
+              elsif method[0] == 'find_by'
                 object.send(*method)
+              else
+                object.send(:"__secure_remote_access_to_#{method[0]}", object, acting_user, *method[1..-1])
               end
-            elsif method.is_a? String and method[0] == '*'
+            elsif method.is_a?(String) && method[0] == '*'
               object[method.gsub(/^\*/,'').to_i]
             else
-              object.send(method)
+              object.send(:"__secure_remote_access_to_#{method}", object, acting_user)
             end
           end
           if id and (found.nil? or !(found.class <= model) or (found.id and found.id.to_s != id.to_s))
@@ -362,13 +364,13 @@ def self.save_records(models, associations, acting_user, validate, save)
           id = attributes.delete(model.primary_key) if model.respond_to? :primary_key # if we are saving existing model primary key value will be present
           vector = model_to_save[:vector]
           vector = [vector[0].constantize] + vector[1..-1].collect do |method|
-            if method.is_a?(Array) and method.first == "find_by_id"
+            if method.is_a?(Array) && method.first == "find_by_id"
               ["find", method.last]
             else
               method
             end
           end
-          reactive_records[model_to_save[:id]] = vectors[vector] = record = find_record(model, id, vector, save) # ??? || validate ???
+          reactive_records[model_to_save[:id]] = vectors[vector] = record = find_record(model, id, acting_user, vector, save) # ??? || validate ???
           next unless record
           if attributes.empty?
             dont_save_list << record unless save
@@ -507,7 +509,7 @@ def self.save_records(models, associations, acting_user, validate, save)
         if save || validate
           {success: false, saved_models: saved_models, message: e}
         else
-          {}
+          raise e # was returning {} TODO verify that just raising the error at least reports the error
         end
       end
 

ruby/hyper-model/lib/reactive_record/active_record/reactive_record/operations.rb

@@ -65,8 +65,9 @@ class Fetch < Base
         ]
       end
       failed do |e|
-        # AccessViolations are already sent to on_error
-        Hyperstack.on_error(e, :fetch_error, params.to_h) unless e.is_a? Hyperstack::AccessViolation
+        e.define_singleton_method(:__hyperstack_on_error) do |operation, params, fmted_message|
+          Hyperstack.on_error(operation, self, params, fmted_message)
+        end
         raise e
       end
     end