hippo-fw 0.9.3 → 0.9.4

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hippo-fw
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Nathan Stitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2017-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -39,19 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
-  name: actioncable
+  name: litecable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 0.4.1
+- !ruby/object:Gem::Dependency
+  name: websocket
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.4
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -649,7 +663,6 @@ files:
 - README.md
 - Rakefile
 - bin/hippo
-- client/extension.js
 - client/hippo/__mocks__/config.js
 - client/hippo/access/index.js
 - client/hippo/access/login-dialog.jsx
@@ -737,6 +750,8 @@ files:
 - client/hippo/components/toolbar/index.js
 - client/hippo/components/toolbar/styles.scss
 - client/hippo/components/warning-notification.jsx
+- client/hippo/config.android.js
+- client/hippo/config.ios.js
 - client/hippo/config.js
 - client/hippo/extensions/EarlyExtensions.js.erb
 - client/hippo/extensions/LateLoaded.js.erb
@@ -754,16 +769,19 @@ files:
 - client/hippo/lib/bootstrap.js
 - client/hippo/lib/index.js.erb
 - client/hippo/lib/loader.js
+- client/hippo/lib/pub_sub.js
 - client/hippo/lib/request-assets.js
 - client/hippo/lib/smooth-scroll.js
 - client/hippo/lib/util.js
-- client/hippo/models/PubSub.js
 - client/hippo/models/__mocks__/sync.js
 - client/hippo/models/asset.js
 - client/hippo/models/base.js
 - client/hippo/models/collection.js
+- client/hippo/models/config.js
 - client/hippo/models/decorators.js
 - client/hippo/models/index.js
+- client/hippo/models/pub_sub.js
+- client/hippo/models/pub_sub/channel.js
 - client/hippo/models/query.js
 - client/hippo/models/query/array-result.js
 - client/hippo/models/query/clause.js
@@ -906,7 +924,6 @@ files:
 - docs/todo-example-part-1.md
 - docs/welcome.md
 - hippo-fw.gemspec
-- lib/generators/hippo/migrations/install_generator.rb
 - lib/hippo-fw.rb
 - lib/hippo.rb
 - lib/hippo/access.rb
@@ -1006,7 +1023,7 @@ files:
 - lib/hippo/mailer.rb
 - lib/hippo/model.rb
 - lib/hippo/numbers.rb
-- lib/hippo/rails_engine.rb
+- lib/hippo/rails.rb
 - lib/hippo/rake_tasks.rb
 - lib/hippo/redis.rb
 - lib/hippo/reloadable_sinatra.rb
@@ -1030,6 +1047,7 @@ files:
 - lib/hippo/workspace.rb
 - lib/hippo/workspace/config/screens.rb
 - log/.gitkeep
+- package-lock.json
 - package.json
 - spec/client/.eslintrc.js
 - spec/client/access/login-dialog.spec.jsx
@@ -1050,6 +1068,7 @@ files:
 - spec/client/models/asset.spec.js
 - spec/client/models/base.spec.js
 - spec/client/models/collection.spec.js
+- spec/client/models/pub_sub.spec.js
 - spec/client/models/query.spec.js
 - spec/client/models/sync.spec.js
 - spec/client/models/system-setting.spec.js

data/client/hippo/models/PubSub.js

@@ -1,208 +0,0 @@
-import { find, remove, extend } from 'lodash';
-import { logger } from '../lib/logger';
-import {
-    BaseModel,
-} from '../models/base';
-
-import User from '../user';
-import Config from '../config';
-
-const ActionCable  = {};
-
-class ModelConfig {
-
-    constructor(type, model) {
-        this.type = type;
-        this.id = model.getId();
-        this.channel = `${model.identifiedBy}/${this.id}`;
-        this.count = 0;
-        this.models = [];
-    }
-
-    add(model) {
-        if (0 === this.count) {
-//            Hippo.Models.PubSub.channel.subscribe(this.channel);
-            // __guard__(Hippo.Models.PubSub.channel, x => x
-//                .subscribe(this.channel)); // , @mbCallBack(@models))
-        }
-        this.count += 1;
-        const config = this.modelConfig(model);
-        return (config.count += 1);
-    }
-
-    modelConfig(model) {
-        let config = find(this.models, { model });
-        if (!config) {
-            config = { model, count: 0 };
-            this.models.push(config);
-        }
-        return config;
-    }
-
-    remove(model) {
-        const config = find(this.models, { model });
-        if (!config) { return null; }
-        this.count -= 1;
-        if (0 === this.count) { // all removed, just unsubscribe
-            return this.unsubscribe();
-        }
-        config.count -= 1;
-        if (0 === config.count) { return remove(this.models, { model }); }
-        return null;
-    }
-
-    unsubscribe() {
-        // __guard__(Hippo.Models.PubSub.channel, x => x.unsubscribe(this.channel));
-        return delete this.type.records[this.id];
-    }
-
-    onChange(data) {
-        return Array.from(this.models).map(config => config.model.addChangeSet(data));
-    }
-}
-
-class ModelType {
-
-    constructor(attr) {
-        extend(this, attr);
-        this.records = {};
-    }
-
-    add(model) {
-        const config = this.records[model.id] || (
-            this.records[model.id] = new ModelConfig(this, model)
-        );
-        return config.add(model);
-    }
-
-    remove(model) {
-        return this.records[model.id] && this.records[model.id].remove(model);
-    }
-
-    onChange(id, data) {
-        return this.records[id].onChange(data);
-    }
-
-    unsubscribeAll() {
-        return (() => {
-            const result = [];
-            this.recoards.forEach((record) => {
-                result.push(record.unsubscribe());
-            });
-            return result;
-        })();
-    }
-}
-
-class ModelTypesCollection extends BaseModel {
-    static initClass() {
-        this.prototype.model = ModelType;
-    }
-
-    forModel(model) {
-        const path = model.identifiedBy;
-        return this.get(path) || this.add({ id: path });
-    }
-}
-ModelTypesCollection.initClass();
-
-const CableChannel = {};
-
-const PubSub = {
-
-    types: new ModelTypesCollection(),
-
-    add(model) {
-        //        if (!__guardMethod__(model, 'isPersistent',
-        // o => o.isPersistent())) { return; }
-        return this.types.forModel(model).add(model);
-    },
-
-    remove(model) {
-        // if (!model || !__guardMethod__(model, 'isPersistent',
-        //  o => o.isPersistent())) { return; }
-        return this.types.forModel(model).remove(model);
-    },
-
-    // instanceFor(model_klass, id) {
-    //     // const path = _.result(model_klass.prototype, 'api_path');
-    //     //return __guard__(__guard__(__guard__(this.types.get(path),
-    //     // x2 => x2.records[id]), x1 => x1.models[0]), x => x.model);
-    // },
-
-    // clear() {
-    //     return this.types = new ModelTypesCollection();
-    // },
-
-    // initialize() {
-    //     Hippo.current_user.on('change:isLoggedIn', _.bind(this.onLoginChange, this));
-    //     if (Hippo.current_user.isLoggedIn) { return this.onLoginChange(); }
-    // },
-
-    // onChange(path, id, data) {
-    //     return this.types.get(path).onChange(id, data);
-    // },
-
-    onLoginChange() {
-        if (User.isLoggedIn) {
-            const url = `${Config.api_host}${Config.api_path}/ws`;
-            this.cable = ActionCable.createConsumer(url);
-            this.channel = this.cable.subscriptions.create(
-                'Hippo::API::PubSub', CableChannel,
-            );
-        }
-        PubSub.types.each(t => t.unsubscribeAll());
-        delete this.channel;
-        this.cable.disconnect();
-        return delete this.cable;
-    },
-
-};
-
-const CHANNEL_SPLITTER = new RegExp('^(.*):(.*)/([^/]+)$');
-
-extend(CableChannel, {
-    connected() {
-//        return this.subscribe('file-change', () => HotReload.initiate(changes));
-    },
-
-    subscribe(channel) {
-        logger.info(`[pubsub] subscribe to: ${channel}`);
-        return this.perform('on', { channel });
-    },
-
-    unsubscribe(channel) {
-        logger.info(`[pubsub] unsubscribe from: ${channel}`);
-        return this.perform('off', { channel });
-    },
-
-    received(data) {
-        const [channel, _, model, id] = Array.from(
-            data.channel.match(CHANNEL_SPLITTER),
-        );
-        logger.info(`[pubsub] change recvd for: ${channel}`);
-        PubSub.onChange(
-            model, id, _.omit(data, 'channel'),
-        );
-    },
-
-});
-
-export function start() {
-    // PubSub.initialize();
-}
-
-export function stop() {
-    PubSub.kill();
-}
-
-
-function __guard__(value, transform) {
-    return ('undefined' !== typeof value && null !== value) ? transform(value) : undefined;
-}
-function __guardMethod__(obj, methodName, transform) {
-    if ('undefined' !== typeof obj && null !== obj && 'function' === typeof obj[methodName]) {
-        return transform(obj, methodName);
-    }
-    return undefined;
-}

data/lib/generators/hippo/migrations/install_generator.rb

@@ -1,42 +0,0 @@
-require 'hippo/db/migrations'
-
-module Hippo
-
-    module Migrations
-
-        class InstallGenerator < Rails::Generators::Base
-            include Rails::Generators::Migration
-
-            source_root Hippo::DB::Migrations.paths.first
-
-            Hippo::DB::Migrations.paths.slice(1..-1).each do | source_path |
-                source_paths << source_path
-            end
-
-            desc "Install Stockor migrations"
-            def self.next_migration_number(path)
-                unless @prev_migration_nr
-                    @prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
-                else
-                    @prev_migration_nr += 1
-                end
-                @prev_migration_nr.to_s
-            end
-
-            def copy_migrations
-                Hippo::DB::Migrations.paths.each do | source_path |
-
-                    Pathname.glob( source_path.join('*') ).each do | migration |
-                        from = File.basename( migration )
-                        dest = from.gsub(/^\d+_(.*).rb$/,'\\1.rb')
-                        if self.class.migration_exists?("db/migrate", "#{dest}")
-                            say_status("skipped", "Migration #{dest} already exists")
-                        else
-                            migration_template( from, "db/migrate/#{dest}" )
-                        end
-                    end
-                end
-            end
-        end
-    end
-end

data/lib/hippo/rails_engine.rb

@@ -1,5 +0,0 @@
-module Hippo::Core
-    class RailsEngine < Rails::Engine
-        config.autoload_paths += Dir["#{config.root}/lib/**/"]
-    end
-end