Merge branch 'issue-126' into issue-194

Author: catmando

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

@@ -4,11 +4,11 @@ module ReactiveRecord
   # the appropriate string.  The order of execution is important!
   module BackingRecordInspector
     def inspection_details
-      return error_details    unless errors.empty?
-      return new_details      if new?
+      return error_details     unless errors.empty?
+      return new_details       if new?
       return destroyed_details if destroyed
-      return loading_details  unless @attributes.key? primary_key
-      return dirty_details    unless changed_attributes.empty?
+      return loading_details   unless @attributes.key? primary_key
+      return dirty_details     unless changed_attributes.empty?
       "[loaded id: #{id}]"
     end
 

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

@@ -540,7 +540,7 @@ def internal_replace(new_array)
         @dummy_collection.notify
         array = new_array.is_a?(Collection) ? new_array.collection : new_array
         @collection.each_with_index do |r, i|
-          r.id = new_array[i].id if array[i] and array[i].id and !r.new? and r.backing_record.vector.last =~ /^\*[0-9]+$/
+          r.id = new_array[i].id if array[i] and array[i].id and !r.new_record? and r.backing_record.vector.last =~ /^\*[0-9]+$/
         end
       end
       # the following makes sure that the existing elements are properly removed from the collection

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

@@ -233,7 +233,7 @@ def self.gather_records(records_to_process, force, record_being_saved)
               if association.collection?
                 # following line changed from .all to .collection on 10/28
                 [*value.collection, *value.unsaved_children].each do |assoc|
-                  add_new_association.call(record, attribute, assoc.backing_record) if assoc.changed?(association.inverse_of(assoc)) or assoc.new?
+                  add_new_association.call(record, attribute, assoc.backing_record) if assoc.changed?(association.inverse_of(assoc)) or assoc.new_record?
                 end
               elsif record.new? || record.changed?(attribute) || (record == record_being_saved && force)
                 if value.nil?

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

@@ -72,7 +72,7 @@ class SendPacket < Hyperstack::ServerOp
 
     def self.to_self(record, data = {})
       # simulate incoming packet after a local save
-      operation = if record.new?
+      operation = if record.new_record?
                     :create
                   elsif record.destroyed?
                     :destroy

ruby/rails-hyperstack/rails-hyperstack.gemspec

@@ -23,34 +23,36 @@ Gem::Specification.new do |spec|
 
 Welcome to Hyperstack!
 
-For a complete install run
+For a quick start simply add a component using one of the generators:
 
-bundle exec rails hyperstack:install
+  >> bundle exec rails generate hyper:component CompName --add-route=/test/(*others)
+     # Add a new component named CompName and route to it with /test/
 
-You can also add components directly using generators:
-
-bundle exec rails generate hyper:component CompName --add-route=/test/(*others)
-# Add a new component named CompName and route to it with /test/
-
-bundle exec rails generate hyper:router CompName --add-route=/test/(*others)
-# Add a top level router named CompName
-bundle exec rails
+  >> bundle exec rails generate hyper:router CompName --add-route=/test/(*others)
+     # Add a top level router named CompName
 
 The generators will insure you have the minimal additions to your system for the
 new component to run.  And note: --add-route is optional.
 
-The hyperstack:install task also has options to control how much of the `Stack
-gets installed:
+For a complete install run the hyperstack install task:
+
+  >> bundle exec rails hyperstack:install
+
+This will add everything you need including the hotloader, webpack integration,
+hyper-model (active record model client synchronization) and a top level
+component to get you started.
+
+You can control how much of the stack gets installed using these options:
 
---skip-hotloader   # don't add the hotloader
---skip-webpack     # don't add webpack
---skip-hyper-model # don't add hyper-model and default policy files
+  --skip-hotloader   # don't add the hotloader
+  --skip-webpack     # don't add webpack
+  --skip-hyper-model # don't add hyper-model and default policy files
 
 You can always install these pieces later using these options:
 
---hotloader-only   # just add the hotloader
---webpack-only     # just add webpack
---hyper-model-only # just add hyper-model, and default policy files
+  --hotloader-only   # just add the hotloader
+  --webpack-only     # just add webpack
+  --hyper-model-only # just add hyper-model, and default policy files
 
 *******************************************************************************
 }