populate-me 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5d6a2a8ba2877bb7de857c1befde67845b87fd6
-  data.tar.gz: 38ff9b163189c90109d325815ffd2cde81ca55ac
+  metadata.gz: 04d5994053986cb49a277559ebabe1caf7ca5e6a
+  data.tar.gz: 16f1d48e316b78fd11db94d03d70e6c78df8fb30
 SHA512:
-  metadata.gz: c2d852eeff231cbb2d85865ba5f097d63fd8ed9d65279820189ea234bb2721bd610b53ec3b64b11de006d826aeb87fde5f0e2572c9d38b57f768ec2190372485
-  data.tar.gz: d2af5a7f0e800f73c126fff0329aea00ba5c6b47727c36de2de84b1c476141cd38062de253eb37a4294fb3b2a9e7116989cfe17ad3c241704422b8159f9f1e49
+  metadata.gz: 2672c99f4bad24d2c1b30eae320001006e022455fdb0a9d3b638b916c8702a4f9ee45dc3e477d5aefca121ed493de31129e7faec245111df758495b30a8ff289
+  data.tar.gz: 2e93eebd1c02c7a52183f9d257cd888bd9649349ef546295a0a8a9750b2f522278903858d8f6a268338f581d2e68ef9f6679b6c7e20c9682757abe07bcf1a6aa

data/README.md

@@ -80,6 +80,13 @@ Available types are:
 A `:list` type exists as well for nested documents, but it is not 
 fully working yet.
 
+The `field` method creates a getter and a setter for this particular field.
+
+```ruby
+blog_article.published # Returns true or false
+blog_article.published = true
+```
+
 ### Validations
 
 In its simplest form, validations are done by overriding the `#validate` method and declaring errors with the `#error_on` method.
@@ -130,6 +137,19 @@ class BlogArticle::Comment < PopulateMe::Document
 end
 ```
 
+The `relationship` method creates 2 getters for this particular field,
+one with the same name and one with `_first` at the end. Both are cached
+so that the database is queried only once.
+
+```ruby
+blog_article.comments # Returns all the comments for this article
+blog_article.comments_first # Returns the first comment for this article
+```
+
+It uses the `PopulateMe::Document::admin_find` and  
+`PopulateMe::Document::admin_find_first` methods in the background, 
+so default sorting order is respected.
+
 ### Callbacks
 
 There are some classic hooks which trigger the callbacks you declare.

data/example/config.ru

@@ -12,8 +12,8 @@ require 'populate_me/document'
 # DB    = MONGO.database
 # PopulateMe::Mongo.set :db, DB
 
-# require 'populate_me/attachment'
-# PopulateMe::Document.set :default_attachment_class, PopulateMe::Attachment
+require 'populate_me/attachment'
+PopulateMe::Document.set :default_attachment_class, PopulateMe::Attachment
 # require 'populate_me/file_system_attachment'
 # PopulateMe::Document.set :default_attachment_class, PopulateMe::FileSystemAttachment
 #
@@ -21,16 +21,16 @@ require 'populate_me/document'
 # PopulateMe::Mongo.set :default_attachment_class, PopulateMe::GridFS
 # PopulateMe::GridFS.set :db, DB
 
-require 'populate_me/s3_attachment'
-s3_resource = Aws::S3::Resource.new
-s3_bucket = s3_resource.bucket(ENV['BUCKET'])
-PopulateMe::Document.set :default_attachment_class, PopulateMe::S3Attachment
-PopulateMe::S3Attachment.set :bucket, s3_bucket
+# require 'populate_me/s3_attachment'
+# s3_resource = Aws::S3::Resource.new
+# s3_bucket = s3_resource.bucket(ENV['BUCKET'])
+# PopulateMe::Document.set :default_attachment_class, PopulateMe::S3Attachment
+# PopulateMe::S3Attachment.set :bucket, s3_bucket
 
 
 class BlogPost < PopulateMe::Document
   field :title, required: true
-  field :thumbnail, type: :attachment, variations: [
+  field :thumbnail, type: :attachment, max_size: 600000, variations: [
     PopulateMe::Variation.new_image_magick_job(:populate_me_thumb, :jpg, "-resize '400x225^' -gravity center -extent 400x225")
   ]
   field :content, type: :text
@@ -72,7 +72,7 @@ class Admin < PopulateMe::Admin
   ]
 end
 
-# use PopulateMe::Attachment::Middleware
+use PopulateMe::Attachment::Middleware
 # use PopulateMe::FileSystemAttachment::Middleware
 # use PopulateMe::GridFS::Middleware
 run Admin

data/lib/populate_me/admin/__assets__/js/main.js

@@ -101,44 +101,76 @@ $(function() {
     });
   };
 
+  // JS Validations
+  var jsValidationsPassed = function(context) {
+    if (window.File && window.FileReader && window.FileList && window.Blob) {
+      try {
+        var max_size_fields = $('input[type=file][data-max-size]', context);
+        max_size_fields.each(function() {
+          var field = $(this);
+          var max_size = parseInt(field.data('max-size'));
+          if (field[0].files[0]) {
+            var fsize = field[0].files[0].size;
+            var fname = field[0].files[0].name;
+            if (fsize>max_size) {
+              alert('File too big: '+fname+' should be less than '+max_size/1000+'KB.');
+              throw "Validation error";
+            }
+          }
+        });
+      } catch(e) {
+        if (e==='Validation error') { 
+          return false;
+        } else {
+          throw(e);
+        }
+      }
+    }
+    return true;
+  };
+
   // Ajax form
   $('body').on('submit','form.admin-post, form.admin-put', function(e) {
     e.preventDefault();
     var self = $(this);
-    var submit_button = $('input[type=submit]',self);
-    submit_button.hide();
-    $.ajax({
-      url: self.attr('action'),
-      type: (self.is('.admin-put') ? 'put' : 'post'),
-      data: new FormData(this),
-      processData: false,
-      contentType: false,
-      success: function(res) {
-        if (res.success==true) {
-          var reloader = finder.find('> li:nth-last-child(3) .selected')
-          if (reloader.size()>0) {
-            reloader.trigger('click.columnav',[function(cb_object) {
-              var target = $('[data-id='+res.data.id+']', cb_object.column);
-              if (target.size()>0) {
-                scroll_to(target, cb_object.column);
-              }
-            }]);
-          } else {
-            finder.trigger('pop.columnav');
+    if (jsValidationsPassed(self)) {
+
+      var submit_button = $('input[type=submit]',self);
+      submit_button.hide();
+      $.ajax({
+        url: self.attr('action'),
+        type: (self.is('.admin-put') ? 'put' : 'post'),
+        data: new FormData(this),
+        processData: false,
+        contentType: false,
+        success: function(res) {
+          if (res.success==true) {
+            var reloader = finder.find('> li:nth-last-child(3) .selected')
+            if (reloader.size()>0) {
+              reloader.trigger('click.columnav',[function(cb_object) {
+                var target = $('[data-id='+res.data.id+']', cb_object.column);
+                if (target.size()>0) {
+                  scroll_to(target, cb_object.column);
+                }
+              }]);
+            } else {
+              finder.trigger('pop.columnav');
+            }
+          }
+        },
+        error: function(xhr) {
+          res = xhr.responseJSON;
+          if (res.success==false) {
+            $('.invalid',self).removeClass('invalid');
+            $('.errors',self).remove();
+            mark_errors(self,res.data);
+            scroll_to(self.find('.invalid:first'));
+            submit_button.show();
           }
         }
-      },
-      error: function(xhr) {
-        res = xhr.responseJSON;
-        if (res.success==false) {
-          $('.invalid',self).removeClass('invalid');
-          $('.errors',self).remove();
-          mark_errors(self,res.data);
-          scroll_to(self.find('.invalid:first'));
-          submit_button.show();
-        }
-      }
-    });
+      });
+
+    }
   });
 
   // Create nested document

data/lib/populate_me/admin/views/page.erb

@@ -129,7 +129,7 @@
         <button class='attachment-deleter'>x</button>
         <br />
       {{/url}}
-      <input type='file' name='{{input_name}}' {{{build_input_atrributes}}} />
+      <input type='file' name='{{input_name}}' {{#max_size}}data-max-size='{{max_size}}'{{/max_size}} {{{build_input_atrributes}}} />
     </script>
 
     <script id="template-list-field" type="x-tmpl-mustache">

data/lib/populate_me/version.rb

@@ -1,4 +1,4 @@
 module PopulateMe
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: populate-me
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Mickael Riga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-23 00:00:00.000000000 Z
+date: 2018-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: web-utils