specs should be passing with new APIs

Author: catmando

ruby/hyper-model/Gemfile

@@ -2,7 +2,8 @@ source 'https://rubygems.org'
 #gem "opal-jquery", git: "https://github.com/opal/opal-jquery.git", branch: "master"
 # hyper-model is still using an ancient inlined version of hyper-spec
 #gem 'hyper-spec',       path: '../hyper-spec'
-gem 'hyperloop-config', path: '../hyperloop-config'
+gem 'hyperstack-config', path: '../hyperstack-config'
+gem 'hyper-state',      path: '../hyper-state'
 gem 'hyper-store',      path: '../hyper-store'
 gem 'hyper-component',  path: '../hyper-component'
 gem 'hyper-operation',  path: '../hyper-operation'

ruby/hyper-model/Gemfile.lock

@@ -1,17 +1,9 @@
-GIT
-  remote: https://github.com/opal/opal-jquery.git
-  revision: 6249dfaf406ecd7199079b4f4d9dc67cfdf4d602
-  branch: master
-  specs:
-    opal-jquery (0.4.3)
-      opal (>= 0.10.0, < 0.12.0)
-
 PATH
   remote: ../hyper-component
   specs:
-    hyper-component (1.0.0.lap28)
-      hyper-store (= 1.0.0.lap28)
-      hyperloop-config (= 1.0.0.lap28)
+    hyper-component (0.1)
+      hyper-state (= 0.1)
+      hyperstack-config (= 0.1)
       libv8 (~> 6.3.0)
       mini_racer (~> 0.1.15)
       opal (>= 0.11.0, < 0.12.0)
@@ -21,37 +13,48 @@ PATH
 PATH
   remote: ../hyper-operation
   specs:
-    hyper-operation (1.0.0.lap28)
+    hyper-operation (0.1)
       activerecord (>= 4.0.0)
-      hyper-component (= 1.0.0.lap28)
+      hyper-component (= 0.1)
       mutations
       opal-activesupport (~> 0.3.1)
 
+PATH
+  remote: ../hyper-state
+  specs:
+    hyper-state (0.1)
+      hyperstack-config (= 0.1)
+      opal (>= 0.11.0, < 0.12.0)
+
 PATH
   remote: ../hyper-store
   specs:
-    hyper-store (1.0.0.lap28)
-      hyperloop-config (= 1.0.0.lap28)
+    hyper-store (0.1)
+      hyper-state (= 0.1)
+      hyperstack-config (= 0.1)
       opal (>= 0.11.0, < 0.12.0)
 
 PATH
-  remote: ../hyperloop-config
+  remote: ../hyperstack-config
   specs:
-    hyperloop-config (1.0.0.lap28)
+    hyperstack-config (0.1)
       libv8 (~> 6.3.0)
+      listen (~> 3.0)
       mini_racer (~> 0.1.15)
       opal (>= 0.11.0, < 0.12.0)
       opal-browser (~> 0.2.0)
       uglifier
+      websocket
 
 PATH
   remote: .
   specs:
-    hyper-model (1.0.0.lap28)
+    hyper-model (0.1)
       activemodel
       activerecord (>= 4.0.0)
-      hyper-component (= 1.0.0.lap28)
-      hyper-operation (= 1.0.0.lap28)
+      hyper-component (= 0.1)
+      hyper-operation (= 0.1)
+      hyper-store (= 0.1)
 
 GEM
   remote: https://rubygems.org/
@@ -161,19 +164,6 @@ GEM
     hike (1.2.3)
     http_parser.rb (0.6.0)
     httpclient (2.8.3)
-    hyper-spec (1.0.0.lap28)
-      capybara
-      chromedriver-helper
-      method_source
-      opal (>= 0.11.0, < 0.12.0)
-      parser (>= 2.3.3.1)
-      pry
-      rspec-rails
-      selenium-webdriver
-      timecop (~> 0.8.1)
-      uglifier
-      unparser
-      webdrivers
     i18n (1.1.0)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
@@ -184,6 +174,10 @@ GEM
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     libv8 (6.3.292.48.1)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
     loofah (2.2.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -217,6 +211,8 @@ GEM
     opal-browser (0.2.0)
       opal
       paggio
+    opal-jquery (0.4.3)
+      opal (>= 0.10.0, < 0.12.0)
     opal-rails (0.9.5)
       jquery-rails
       opal (>= 0.11.0, < 0.12)
@@ -283,6 +279,9 @@ GEM
     rainbow (2.2.2)
       rake
     rake (12.3.1)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
     react-rails (2.4.7)
       babel-transpiler (>= 0.7.0)
       connection_pool
@@ -329,6 +328,7 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.10.0)
+    ruby_dep (1.5.0)
     rubyzip (1.2.2)
     selenium-webdriver (3.14.0)
       childprocess (~> 0.5)
@@ -373,10 +373,7 @@ GEM
       equalizer (~> 0.0.9)
       parser (>= 2.3.1.2, < 2.6)
       procto (~> 0.0.2)
-    webdrivers (3.4.0)
-      nokogiri (~> 1.6)
-      rubyzip (~> 1.0)
-      selenium-webdriver (~> 3.0)
+    websocket (1.2.8)
     websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
@@ -395,13 +392,14 @@ DEPENDENCIES
   hyper-component!
   hyper-model!
   hyper-operation!
-  hyper-spec (= 1.0.0.lap28)
+  hyper-state!
   hyper-store!
-  hyperloop-config!
+  hyperstack-config!
+  libv8 (~> 6.3.0)
+  mini_racer (~> 0.1.15)
   mysql2
   opal-activesupport (~> 0.3.1)
   opal-browser (~> 0.2.0)
-  opal-jquery!
   opal-rails (~> 0.9.4)
   parser
   pry
@@ -421,6 +419,7 @@ DEPENDENCIES
   rspec-steps (~> 2.1.1)
   rspec-wait
   rubocop (~> 0.51.0)
+  selenium-webdriver
   shoulda
   shoulda-matchers
   spring-commands-rspec

ruby/hyper-model/hyper-model.gemspec

@@ -13,11 +13,11 @@ Gem::Specification.new do |spec|
                        'API. HyperModel also implements push notifications (via a number of '\
                        'possible technologies) so changes to records on the server are '\
                        'dynamically updated on all authorised clients.'
-  spec.homepage      = 'http://ruby-hyperloop.org'
+  spec.homepage      = 'http://ruby-hyperstack.org'
   spec.license       = 'MIT'
   # spec.metadata      = {
-  #   "homepage_uri" => 'http://ruby-hyperloop.org',
-  #   "source_code_uri" => 'https://github.com/ruby-hyperloop/hyper-component'
+  #   "homepage_uri" => 'http://ruby-hyperstack.org',
+  #   "source_code_uri" => 'https://github.com/ruby-hyperstack/hyper-component'
   # }
 
   spec.files          = `git ls-files`.split("\n").reject { |f| f.match(%r{^(examples|gemfiles|pkg|reactive_record_test_app|spec)/}) }
@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activerecord', '>= 4.0.0'
   spec.add_dependency 'hyper-component', HyperModel::VERSION
   spec.add_dependency 'hyper-operation', HyperModel::VERSION
+  spec.add_dependency 'hyper-store', HyperModel::VERSION # only for Hyperstack::Internal::Store::State which should be moved
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'capybara'
   spec.add_development_dependency 'chromedriver-helper', '1.2.0'

ruby/hyper-model/lib/active_record_base.rb

@@ -1,6 +1,6 @@
 # Monkey patches to ActiveRecord for scoping, security, and to synchronize models
 module ActiveRecord
-  # hyperloop adds new features to scopes to allow for computing scopes on client side
+  # hyperstack adds new features to scopes to allow for computing scopes on client side
   # and for hinting at what joins are involved in a scope.  _synchromesh_scope_args_check
   # processes these arguments, and the will always leave the true server side scoping
   # proc in the `:server` opts.   This method is common to client and server.
@@ -43,7 +43,7 @@ def __secure_collection_check(acting_user)
         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
-        Hyperloop::InternalPolicy.raise_operation_access_violation(:scoped_permission_not_granted, "Last relation: #{self}, acting_user: #{acting_user}")
+        Hyperstack::InternalPolicy.raise_operation_access_violation(:scoped_permission_not_granted, "Last relation: #{self}, acting_user: #{acting_user}")
       end
     end
     # Monkey patches and extensions to base
@@ -53,11 +53,11 @@ class << self
         # __secure_remote_access_to_
 
         # The wrapper method may simply return the normal result or may act to secure the data.
-        # The simpliest case is for the method to call `denied!` which will raise a Hyperloop
+        # The simpliest case is for the method to call `denied!` which will raise a Hyperstack
         # access protection fault.
 
         def denied!
-          Hyperloop::InternalPolicy.raise_operation_access_violation(:scoped_denied, "#{self} regulation denies scope access.  Called from #{caller_locations(1)}")
+          Hyperstack::InternalPolicy.raise_operation_access_violation(:scoped_denied, "#{self} regulation denies scope access.  Called from #{caller_locations(1)}")
         end
 
         # Here we set up the base `all` and `unscoped` methods.  See below for more on how
@@ -199,7 +199,7 @@ def regulate_default_scope(*args, &block)
           regulate_scope(:all, &block)
         end
 
-        # monkey patch scope and default_scope macros to process hyperloop special opts,
+        # monkey patch scope and default_scope macros to process hyperstack special opts,
         # and add regulations if present
 
         alias pre_synchromesh_scope scope
@@ -276,7 +276,7 @@ def __secure_remote_access_to_find_by(_self, _acting_user, *args)
       end
 
       def denied!
-        Hyperloop::InternalPolicy.raise_operation_access_violation(:scoped_denied, "#{self.class} regulation denies scope access.  Called from #{caller_locations(1)}")
+        Hyperstack::InternalPolicy.raise_operation_access_violation(:scoped_denied, "#{self.class} regulation denies scope access.  Called from #{caller_locations(1)}")
       end
 
       # call do_not_synchronize to block synchronization of a model
@@ -314,9 +314,9 @@ def synchromesh_after_destroy
         ReactiveRecord::Broadcast.after_commit :destroy, self
       end
 
-      def __hyperloop_secure_attributes(acting_user)
+      def __hyperstack_secure_attributes(acting_user)
         accessible_attributes =
-          Hyperloop::InternalPolicy.accessible_attributes_for(self, acting_user)
+          Hyperstack::InternalPolicy.accessible_attributes_for(self, acting_user)
         attributes.select { |attr| accessible_attributes.include? attr.to_sym }
       end
 

ruby/hyper-model/lib/hyper-model.rb

@@ -1,5 +1,5 @@
 require 'set'
-require 'hyperloop-config'
+require 'hyperstack-config'
 require 'hyper-component'
 if RUBY_ENGINE == 'opal'
   require 'hyper-operation'
@@ -9,6 +9,8 @@
   require 'kernel/itself' unless Object.instance_methods.include?(:itself)
   require 'object/tap'
   require 'active_model_client_stubs'
+  require 'hyper-state'
+  require 'hyper-store'
   require "reactive_record/active_record_error"
   require "reactive_record/active_record/errors"
   require "reactive_record/active_record/error"
@@ -36,14 +38,14 @@
   require "reactive_record/active_record/instance_methods"
   require "reactive_record/active_record/base"
   require 'hyper_react/input_tags'
-  require 'hyperloop/model/load'
+  require 'hyperstack/model/load'
   require_relative 'hyper_model/version'
   require_relative 'opal/parse_patch'
   require_relative 'opal/set_patches'
   require_relative 'opal/equality_patches'
-  React::IsomorphicHelpers.log(
+  Hyperstack::Component::IsomorphicHelpers.log(
     "The gem 'hyper-mesh' is deprecated.  Use gem 'hyper-model' instead.", :warning
-  ) unless defined? Hyperloop::Model
+  ) unless defined? Hyperstack::Model
 else
   require 'opal'
   require 'hyper-operation'

ruby/hyper-model/lib/hyper_model/version.rb

@@ -1,3 +1,3 @@
 module HyperModel
-  VERSION = '0.99.3'
+  VERSION = '0.1'
 end

ruby/hyper-model/lib/hyper_react/input_tags.rb

@@ -7,40 +7,43 @@
 # flag then we know that within that expression there is a value still being loaded, and the react
 # key will be set accordingly.
 
-module React
-  module Component
-    module Tags
-      %i[INPUT SELECT TEXTAREA].each do |component|
-        remove_method component
-        send(:remove_const, component)
-        tag = component.downcase
-        klass = Class.new(Hyperloop::Component) do
-          collect_other_params_as :opts
-          render do
-            opts = props.dup  # should be opts = params.opts.dup but requires next release candiate of hyper-react
-            default_value = opts[:defaultValue] || opts[:defaultChecked]
-            if default_value.respond_to? :call
-              begin
-                saved_waiting_on_resources = React::RenderingContext.waiting_on_resources
-                React::RenderingContext.waiting_on_resources = false
-                default_value = default_value.call
-                opts[:key] = React::RenderingContext.waiting_on_resources
-                if opts[:defaultValue]
-                  opts[:defaultValue] = default_value
-                else
-                  opts[:defaultChecked] = default_value
+module Hyperstack
+  module Internal
+    module Component
+      module Tags
+        %i[INPUT SELECT TEXTAREA].each do |component|
+          remove_method component
+          send(:remove_const, component)
+          tag = component.downcase
+          klass = Class.new do
+            include Hyperstack::Component
+            collect_other_params_as :opts
+            render do
+              opts = props.dup  # should be opts = params.opts.dup but requires next release candiate of hyper-react
+              default_value = opts[:defaultValue] || opts[:defaultChecked]
+              if default_value.respond_to? :call
+                begin
+                  saved_waiting_on_resources = Hyperstack::Internal::Component::RenderingContext.waiting_on_resources
+                  Hyperstack::Internal::Component::RenderingContext.waiting_on_resources = false
+                  default_value = default_value.call
+                  opts[:key] = Hyperstack::Internal::Component::RenderingContext.waiting_on_resources
+                  if opts[:defaultValue]
+                    opts[:defaultValue] = default_value
+                  else
+                    opts[:defaultChecked] = default_value
+                  end
+                ensure
+                  Hyperstack::Internal::Component::RenderingContext.waiting_on_resources = !!saved_waiting_on_resources
                 end
-              ensure
-                React::RenderingContext.waiting_on_resources = !!saved_waiting_on_resources
+              else
+                opts[:key] = !!default_value.loading?
               end
-            else
-              opts[:key] = !!default_value.loading?
+              opts[:value] = opts[:value].to_s if opts.key? :value  # this may not be needed
+              Hyperstack::Internal::Component::RenderingContext.render(tag, opts) { children.each(&:render) }
             end
-            opts[:value] = opts[:value].to_s if opts.key? :value  # this may not be needed
-            React::RenderingContext.render(tag, opts) { children.each(&:render) }
           end
+          const_set component, klass
         end
-        const_set component, klass
       end
     end
   end

…/hyper-model/lib/hyperloop/model/load.rb …hyper-model/lib/hyperstack/model/load.rbruby/hyper-model/lib/hyperloop/model/load.rb renamed to ruby/hyper-model/lib/hyperstack/model/load.rb ruby/hyper-model/lib/hyperloop/model/load.rb renamed to ruby/hyper-model/lib/hyperstack/model/load.rb

@@ -1,4 +1,4 @@
-module Hyperloop
+module Hyperstack
   module Model
     def self.load(&block)
       ReactiveRecord.load(&block)