kea-rails 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62878c06064a75c5ba32b0124fd8075bfbb61d9c
-  data.tar.gz: 9065346008a3ce4a18efbca79ddb4a0d5f131afd
+  metadata.gz: db25fa7e45c049047b286a2ac55bbf6e54453dfb
+  data.tar.gz: 57183ee67ad44d8544dbe545e5cebe9e5b153bce
 SHA512:
-  metadata.gz: d4934d1984fa982d4c5a3d47813e3cf076a8bb055072513c7f50603908381156faf1a6304de92837990cf50f4d6a199d0c811f533e3de1aa500df245ed657d7c
-  data.tar.gz: 95dc7203b13a0e1e1cd11b020048a75c8bb5404411fc39dfc8c49c2aab8ee690c3a2f24add3b1b3249e0223aba97b5e99f0ec37c75cc95d998c67c50c37c9f5e
+  metadata.gz: d0c5da927c46a7d09bda7211ea2683b526a869c5efbc2f5a210befd08003c950eeeeb9e3bef9619b835c1870c581dccac0b15cc85211f273c736a85c1f5267ac
+  data.tar.gz: 1b6238338f64629bd0f9f563082860d185d429f06a91b9a9cda39bd84df331a6d49568235e2b31a2b6abf8f7674619d80e28c0acc79fffa669e33719c6bd4039

data/app/assets/javascripts/kea/bindings/sherlock.js

@@ -4,12 +4,12 @@
   ko.bindingHandlers.sherlock = {
     init: function(element, valueAccessor, allBindingsAccessor, viewModel, bindingContext) {
       var $container  = $(element),
-          options     = ko.unwrap(valueAccessor()),
+          options     = typeof ko.unwrap(valueAccessor()) === 'object' ? ko.unwrap(valueAccessor()) : {},
           $providerSearchField,
           sherlockVm;
       
       sherlockVm = new app.sherlock.SherlockVm();
-      sherlockVm.setup();
+      sherlockVm.setup(options);
       
       sherlockVm.params.subscribe(function(params) {
         bindingContext.$data.sherlockParams(params);

data/app/assets/javascripts/kea/viewmodels/sherlock.js

@@ -9,11 +9,12 @@
 
     var that = this;
 
-    this.providers                        = ko.observableArray([]);
-    this.providerSearchTerm               = ko.observable('').extend({ rateLimit: { timeout: 500, method: "notifyWhenChangesStop" } });
-    this.providerSearchActive             = ko.observable(false);
-    this.showLiveSearchWidgets            = ko.observable(false);
-    this.activeFragments                  = ko.observableArray([]);
+    this.options               = ko.observable();
+    this.providers             = ko.observableArray([]);
+    this.providerSearchTerm    = ko.observable('').extend({ rateLimit: { timeout: 500, method: "notifyWhenChangesStop" } });
+    this.providerSearchActive  = ko.observable(false);
+    this.showLiveSearchWidgets = ko.observable(false);
+    this.activeFragments       = ko.observableArray([]);
     
     this.params = ko.computed(function() {
       var params = {};
@@ -216,11 +217,23 @@
       }
     });
     
-    this.setup = function setup() {
-      for (var providerName in app.sherlock.providers) {
-        if (app.sherlock.providers.hasOwnProperty(providerName)) {
+    this.setup = function setup(options) {
+      that.options(options || {});
+      
+      if (that.options().providers) {
+        
+        that.options().providers.forEach(function(providerName) {
           that.providers.push( new app.sherlock.providers[providerName]() );
-        }
+        });
+        
+      } else {
+        
+       for (var providerName in app.sherlock.providers) {
+         if (app.sherlock.providers.hasOwnProperty(providerName)) {
+           that.providers.push( new app.sherlock.providers[providerName]() );
+         }
+       }
+
       }
     };
   };

data/app/views/sherlock/_templates.html.erb

@@ -0,0 +1,54 @@
+<script id="sherlock-container-template" type="text/html">
+  <!-- ko foreach: activeFragments -->
+    <div class="fragment" data-bind="template: {name: provider.fragment_template_name, afterRender: function(nodes, fragment) { if (!fragment.searchValue()) { $(nodes).filter('[data-focus-after-render]').focus(); } }}, click: function(fragment, ev) { ev.stopPropagation(); return true; }"></div>
+  <!-- /ko -->
+  <div data-bind="sherlockProviderSearch: $data" class="provider-search-field">
+    <input type="text" data-bind="value: providerSearchTerm, valueUpdate: 'keyup'">
+    <div class="provider-search-dropdown">
+      <ul data-bind="foreach: orderedFragmentsForSearchTerm">
+        <li data-bind="html: displayString, click: $parent.selectFragment.bind($parent, $data), css: { 'has-focus': hasFocus }, clickBubble: false"></li>
+      </ul>
+      <div data-bind="foreach: liveSearchProviders, visible: showLiveSearchWidgets">
+        <!-- ko template: livesearch_template_name --><!-- /ko -->
+      </div>
+    </div>
+  </div>
+</script>
+
+<script id="sherlock-base-fragment-template" type=="text/html">
+  <span class="fragment-name" data-bind="text: provider.displayName + ':'"></span>
+  <!-- ko if: changeable -->
+    <!-- ko if: predicateOptions().length > 0 -->
+      <select class="fragment-predicate" data-bind="value: predicate, options: predicateOptions, optionsText: 'label', optionsValue: 'value'" data-focus-after-render="true"></select>
+      <input type="text" data-bind="value: searchValue" class="fragment-search-value">
+    <!-- /ko -->
+    <!-- ko if: predicateOptions().length === 0 -->
+      <input type="text" data-bind="value: searchValue" data-focus-after-render="true" class="fragment-search-value">
+    <!-- /ko -->
+  <!-- /ko -->
+  <!-- ko if: !changeable -->
+  <div class="fragment-search-value-display" data-bind="text: searchValueDisplay"></div>
+  <!-- /ko -->
+  <button class="icon-button fragment-remove" data-bind="click: $parent.removeFragment.bind($parent, $data), clickBubble: false"><i class="icon-cancel-circled"></i></button>
+</script>
+
+<script id="sherlock-base-dropdown-fragment-template" type=="text/html">
+  <span class="fragment-name" data-bind="text: provider.displayName + ':'"></span>
+  <!-- ko if: changeable -->
+  <select class="fragment-search-value" data-bind="value: searchValue, options: searchValueOptions, optionsText: 'label', optionsValue: 'value'" data-focus-after-render="true"></select>
+  <!-- /ko -->
+  <!-- ko if: !changeable -->
+  <div class="fragment-search-value-display" data-bind="text: searchValueDisplay"></div>
+  <!-- /ko -->
+  <button class="icon-button fragment-remove" data-bind="click: $parent.removeFragment.bind($parent, $data), clickBubble: false"><i class="icon-cancel-circled"></i></button>
+</script>
+
+<script id="sherlock-base-livesearch-template" type=="text/html">
+  <article data-bind="visible: liveSearchVisible">
+    <h2 data-bind="text: displayName"></h2>
+    <span data-bind="activity: liveSearchAjaxActivity" class="activity-indicator"></span>
+    <ul data-bind="foreach: liveSearchFragments">
+      <li data-bind="html: displayString, click: $parents[1].selectFragment.bind($parents[1], $data), css: { 'has-focus': hasFocus }, clickBubble: false"></li>
+    </ul>
+  </article>
+</script>

data/lib/generators/kea/install/templates/_sherlock.sass

@@ -40,7 +40,7 @@ $standard-border-color-on-dark: $grey-10 !default
       background-color: $primary-highlight-color
       color: $text-on-dark
       line-height: 40px
-    .fragment-search-value
+    .fragment-search-value, .fragment-predicate
       padding: 0 0.5rem
       font-size: $base-font-size
       border: none

data/lib/generators/kea/viewmodel/templates/viewmodel.js.erb

@@ -1,4 +1,4 @@
-(function(app, ko) {
+(function(app, kea, ko) {
   "use strict";
 
   var viewmodel_name = '<%= name.camelize %>',
@@ -70,4 +70,4 @@
 
   app.viewmodels[viewmodel_name] = ViewmodelClass;
 
-})(window.app, ko);
+})(window.app, window.kea, ko);

data/lib/kea-rails/version.rb

@@ -1,3 +1,3 @@
 module Kea
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kea-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Jan-Christian Foeh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-31 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,6 +66,7 @@ files:
 - app/assets/javascripts/kea/viewmodels/sherlock.js
 - app/assets/stylesheets/kea/kea.css.sass
 - app/helpers/kea/application_helper.rb
+- app/views/sherlock/_templates.html.erb
 - lib/generators/kea/install/USAGE
 - lib/generators/kea/install/install_generator.rb
 - lib/generators/kea/install/templates/_komplete.sass
@@ -79,7 +80,7 @@ files:
 - lib/generators/kea/model/templates/model.js.erb
 - lib/generators/kea/service/USAGE
 - lib/generators/kea/service/service_generator.rb
-- lib/generators/kea/service/templates/model.js.erb
+- lib/generators/kea/service/templates/service.js.erb
 - lib/generators/kea/viewmodel/USAGE
 - lib/generators/kea/viewmodel/templates/viewmodel.js.erb
 - lib/generators/kea/viewmodel/viewmodel_generator.rb