kea-rails 2.0.0.pre.alpha1 → 2.0.0.pre.alpha2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d318d6587c37b80be0e5b445d30e98b24823cd4
-  data.tar.gz: 5f299d6ec9ddd4773ea906cb33e0ea9a48bbab29
+  metadata.gz: 5b12b0bc6e3f3b5f8b20b62b358b442d693509fe
+  data.tar.gz: e9173287dc4924671a300b414d93d1fe496e1cd4
 SHA512:
-  metadata.gz: c9ebfc93950958bd732d2aa3ed4293fc6b54a1e8eeae4efd1a1e9248383ab8855c7e51eae0617a2f437051b33f71e543293d4f7fc8ecc11ab3a769fba7f70acb
-  data.tar.gz: 8cf68356acd861629aeb45ee5cfa2d9ea3ef14223b4145c45cf5343c5ba8f9aada74de13b32e885e31a3f265bfa66818f4561e7225ae2602f248a4097ef0d921
+  metadata.gz: 3ad4d41e85feb75d4d6b7b1450491260e659a29fd35b81fdc73d6c2f1de157b59c4747b70e45a35b94e0277e95da5a93c3be53a5098b8f156c414d080027ea8d
+  data.tar.gz: d3da1ac2dc35410a95b31ff8680dfd85834b549407443e1644660e86867a0879d3cd950cc415318560e1316b66e48bcb1a91968b146bc6a2518259841691232a

data/app/assets/javascripts/kea/extenders/date.js

@@ -0,0 +1,31 @@
+(function(ko, $, moment) {
+  "use strict";
+
+  ko.extenders.date = function(target, options) {
+
+      options = options || {
+        internal: 'YYYY-MM-DD',
+        external: 'YYYY-MM-DD'
+      };
+      
+      options.external = options.external || options.internal;
+
+      target.date = ko.computed({
+        read: function() {
+          var m = moment(target(), options.internal);
+          
+          return m && m.isValid() ? m.format(options.external) : null;
+        },
+        write: function(newValue) {
+          var m         = moment(newValue, options.external),
+              formatted = m && m.isValid() ? m.format(options.internal) : newValue;
+              
+          target(formatted);
+        }
+      }, this);
+   
+      //return the original observable
+      return target;
+  };
+
+})(ko, $, moment);

data/app/assets/javascripts/kea/extenders/external_validator.js

@@ -7,6 +7,7 @@
       var defaults = {
         message: "",
         validator: function(v) {},
+        skipBlank: false,
         dependencies: []
       };
 
@@ -14,9 +15,15 @@
    
       target.validate = function validate(newValue) {
         var validatableValue  = typeof newValue === 'undefined' ? target() : newValue,
-            validatorResponse = options.validator(validatableValue),
+            validatorResponse,
             validatorResponseHandler;
 
+        if (options.skipBlank && target.isBlank(validatableValue)) {
+          return;
+        }
+
+        validatorResponse = options.validator(validatableValue);
+
         validatorResponseHandler = function validatorResponseHandler(response) {
           var result, message;
 

data/app/assets/javascripts/kea/extenders/valid_date.js

@@ -5,16 +5,35 @@
       ko.utils.validatorBase(target);
 
       var defaults = {
-        message: ""
+        message: "",
+        allowBlank: true,
+        format: 'YYYY-MM-DD',
+        min: null,
+        max: null
       };
 
       options = $.extend({}, defaults, options);
    
       target.validate = function validate(newValue) {
         var validatableValue  = typeof newValue === 'undefined' ? target() : newValue,
-            m                 = moment(validatableValue, ["DD MM", "DD MM YY", "DD MM YYYY"]);
+            m                 = moment(validatableValue, options.format);
 
-        if ( m === null || !m.isValid() || m.isBefore(moment().startOf('day')) ) {
+        if (options.allowBlank && target.isBlank(validatableValue)) {
+          target.markValid();
+          return;
+        }
+
+        if ( m === null || !m.isValid()) {
+          target.markInvalid(options.message);
+          return false;
+        }
+        
+        if (options.min && m.isBefore(options.min)) {
+          target.markInvalid(options.message);
+          return false;
+        }
+        
+        if (options.max && m.isAfter(options.max)) {
           target.markInvalid(options.message);
           return false;
         }

data/app/assets/javascripts/kea/extenders/validator_base.js

@@ -33,6 +33,14 @@
         target.validate.apply(target, args);
       };
     }
+    
+    if (typeof target.isBlank === 'undefined') {
+      target.isBlank = function isBlank(value) {
+        value = arguments.length === 0 ? target() : value;
+        
+        return typeof value === 'undefined' || value === null || value === '';
+      };
+    }
 
     if (typeof target.markValid === 'undefined') {
       target.markValid = function markValid() {

data/app/assets/javascripts/kea/models/base.js

@@ -196,7 +196,8 @@
   };
   
   Base.prototype.serialize = function serialize(options) {
-    var result = {},
+    var that = this,
+        result = {},
         defaultOptions,
         attributeList,
         attributeOptions,
@@ -221,7 +222,7 @@
     shouldIncludeAttribute = function shouldIncludeAttribute(name, value) {
       var skipBlank = typeof attributeOptions(name).skipBlank !== 'undefined' ? attributeOptions(name).skipBlank : options.skipBlank;
       
-      if ( this._serializeableAttributes.indexOf(name) === -1) {
+      if ( that._serializableAttributes.indexOf(name) === -1) {
         return false;
       } else if (skipBlank && isBlank(value)) {
         return false;
@@ -238,11 +239,7 @@
       result._destroy = true;
     }
     
-    this._serializeableAttributes.forEach(function(name) {
-      if (typeof this.associations[name] !== 'undefined' || typeof this.hasManyAssociations[name] !== 'undefined') {
-        return;
-      }
-      
+    this._serializableAttributes.forEach(function(name) {
       var value = this[name]();
       
       if (shouldIncludeAttribute(name, value)) {
@@ -258,7 +255,7 @@
         value = this[attributeName]() ? this[attributeName]().id : null;
         key   = attributeName + '_id';
       } else {
-        value = this[attributeName]().serialize();
+        value = this[attributeName]() ? this[attributeName]().serialize() : null;
         key   = attributeName;
       }
 
@@ -267,7 +264,7 @@
       }
     });
     
-    this.forEachHasManyAssocation('serializableHasMany', function(attributeName, modelName) {
+    this.forEachAssocation('serializableHasMany', function(attributeName, modelName) {
       var value = this[attributeName]().map(function(association) { return association.serialize(); } );
       
       if (shouldIncludeAttribute(attributeName, value)) {

data/lib/generators/kea/model/model_generator.rb

@@ -43,26 +43,33 @@ class Kea::ModelGenerator < Rails::Generators::NamedBase
   end
   
   def attribute_initializers
-    max_string_length        = 0
-    attribute_initializers   = []
-    association_initializers = []
+    unserializable_attributes = []
+    serializable_attribute_strings = ""
+    attribute_initializers    = []
     
-    attribute_initializers = @model_attributes.collect do |attribute_name|
-      ["this.#{attribute_name}", "ko.observable();"]
+    ['created_at', 'updated_at'].each do |attribute|
+      unserializable_attributes << attribute if @klass.attribute_names.include?(attribute)
     end
     
-    association_initializers = @model_associations.collect do |assoc|
-      if assoc.macro == :has_one
-        ["this.#{assoc.name}", "ko.observable();"]
-      elsif assoc.macro == :has_many
-        ["this.#{assoc.name}", "ko.observableArray([]);"]
-      end
+    attribute_initializers << "this.unserializable_attributes(#{unserializable_attributes.collect { |a| "'#{a}'"}.join(", ")});"
+    
+    @model_attributes.in_groups_of(5, false) do |group|
+      serializable_attribute_strings << '      ' + group.collect { |attribute| "'#{attribute}'" }.join(', ') + ",\n"
     end
     
-    initializers = attribute_initializers + association_initializers
+    serializable_attribute_strings.gsub!(/,\n\z/, "\n")
     
-    max_string_length = initializers.map { |a| a.first.length }.max
+    attribute_initializers << "this.serializable_attributes(\n#{serializable_attribute_strings}    );"
+    
+    @model_associations.each do |assoc|
+      attribute_initializers << case assoc.macro
+                                when :has_one
+                                  "this.hasOne('#{assoc.name.to_s.singularize.camelize}');"
+                                when :has_many
+                                  "this.hasMany('#{assoc.name.to_s.singularize.camelize}', '#{assoc.name}');"
+                                end
+    end
     
-    initializers.map { |i| [i.first.ljust(max_string_length + 1), " = ", i.last].join('') }
+    attribute_initializers
   end
 end

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

@@ -4,20 +4,22 @@
   var model_name = '<%= name.camelize %>',
       ModelClass;
 
-  ModelClass = function <%= name.camelize %>(json) {
+  ModelClass = function <%= name.camelize %>(data) {
+    kea.models.Base.call(this);
 <% if options[:validatable] -%>
     kea.models.Validatable.call(this);
 <% end -%>
     
     var that = this;
 
-    this.id            = null;
-    this.resource_path = null;
-
 <% if @klass -%>
 <% @attribute_initializers.each do |attribute| -%>
     <%= attribute %>
 <% end -%>
+
+    // this.addAttribute('foo', { array: true, deserialize: false, serialize: { skipBlank: true } });
+    // this.addAssociation('Foo', 'foo', 'hasOne', { serialize: { idOnly: true } });
+    // this.serializationOptions = { includeId: true };
 <% end -%>
 <% if options[:validatable] && @validators.any? -%>
 
@@ -37,53 +39,8 @@
     };
 <% end -%>
 
-    this.fromJSON = function fromJSON(json) {
-      this.id            = json.id;
-      this.resource_path = json.resource_path;
-      
-<% if @klass -%>
-<% @model_attributes.each do |attribute| -%>
-      this.<%= attribute %>( json.<%= attribute %> );
-<% end -%>
-<% @model_associations.each do |assoc| -%>
-<% if assoc.macro == :has_one -%>
-
-      if (json.<%= assoc.name %>) {
-        this.<%= assoc.name %>( new app.models.<%= assoc.name.to_s.singularize.camelize %>(json.<%= assoc.name %>) );
-      }
-<% elsif assoc.macro == :has_many -%>
-
-      if (json.<%= assoc.name %>) {
-        this.<%= assoc.name %>.removeAll();
-        
-        json.<%= assoc.name %>.forEach(function(<%= assoc.name.to_s.singularize %>) {
-          that.<%= assoc.name %>.push( new app.models.<%= assoc.name.to_s.singularize.camelize %>(<%= assoc.name.to_s.singularize %>) );
-        });
-      }
-<% end -%>
-<% end -%>
-<% end -%>
-    };
-    
-    this.serialize = function serialize() {
-      return {
-<% if @klass -%>
-<% @model_attributes.each do |attribute| -%>
-        <%= attribute %>: this.<%= attribute %>(),
-<% end -%>
-<% @model_associations.each do |assoc| -%>
-<% if assoc.macro == :has_one -%>
-        <%= assoc.name %>: this.<%= assoc.name %>().serialize(),
-<% elsif assoc.macro == :has_many -%>
-        <%= assoc.name %>: this.<%= assoc.name %>().map(function(<%= assoc.name.to_s.singularize %>) { <%= assoc.name.to_s.singularize %>.serialize(); }),
-<% end -%>
-<% end -%>
-<% end -%>
-      };
-    };
-
-    if (json) {
-      this.fromJSON(json);
+    if (data) {
+      this.deserialize(data);
     }
   };
 

data/lib/kea-rails/version.rb

@@ -1,3 +1,3 @@
 module Kea
-  VERSION = "2.0.0-alpha1"
+  VERSION = "2.0.0-alpha2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kea-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.alpha1
+  version: 2.0.0.pre.alpha2
 platform: ruby
 authors:
 - Jan-Christian Foeh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,6 +44,7 @@ files:
 - app/assets/javascripts/kea/bindings/validation_state.js
 - app/assets/javascripts/kea/bindings/wait_for_vm.js
 - app/assets/javascripts/kea/components/confirmation_button.js
+- app/assets/javascripts/kea/extenders/date.js
 - app/assets/javascripts/kea/extenders/equals.js
 - app/assets/javascripts/kea/extenders/external_validator.js
 - app/assets/javascripts/kea/extenders/min_length.js