populate-me 0.0.28 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ed06edf0120a1daf291849f203063ec826302f8e
-  data.tar.gz: a3fcd26ccae3347c8ecac05afcd6030967e434b7
+SHA256:
+  metadata.gz: 8164c457284a0daa762745f768ba56acead4592eab6fca62547dfff4d56ad7da
+  data.tar.gz: f8fa01c9478a8be7fe04c4628f0c3785d4f089203c6eb8961565defbae6e0b66
 SHA512:
-  metadata.gz: 53dcf1737422f6c1fa10bfdd32d13650ee8dad526ac9561b5d77ca50cd97ebb7bab6c91a4e9d58ad0919220a6b797762075db1939bd135f85c9a66f0a437711c
-  data.tar.gz: a1b50ab8e0ea8ebd9647695420296f10cc912cb6a3c5cac306c45bca0bb6b1867fa264ea7a2f93fe3352894a2d1c6aa90c331cc408cf3ea46e90b2ce56422246
+  metadata.gz: 66160cda7918beb24097e28de0189a381c7c72eaea16c184ca8a2e0e2dbb848df73a7af41feb9f195e5942090e483622961386000597a7a625becea4a3208e9b
+  data.tar.gz: cb4972cd6d06fc192ece77899110fc33533e5f2b02116562d55b60b6f7a6c62e8c4f854e654ebd047828a9ecf9cb0104278aab7cae252f8030d7d5994d1bef54

data/lib/populate_me/mongo/crushyform.rb

@@ -76,7 +76,7 @@ module PopulateMe
             end,
             :attachment => proc do |m,c,o|
               deleter = "<input type='checkbox' name='#{o[:input_name]}' class='deleter' value='nil' /> Delete this file<br />" unless m.doc[c].nil?
-              "%s%s<input type='file' name='%s' id='%s' class='%s' />%s\n" % [m.to_thumb(c), deleter, o[:input_name], m.field_id_for(c), o[:input_class], o[:required]]
+              "%s<input type='file' name='%s' id='%s' class='%s' />%s %s\n" % [m.to_thumb(c), o[:input_name], m.field_id_for(c), o[:input_class], o[:required], deleter]
             end,
             :select => proc do |m,c,o|
               # starter ensures it sends something when multiple is empty
@@ -100,13 +100,13 @@ module PopulateMe
                 select_options.each do |op|
                   key,val = op.kind_of?(Array) ? [op[0],op[1]] : [op,op]
                   if key==:optgroup
-                    out << "<optgroup label='%s'>\n" % [val]
+                    out << "<optgroup label=\"%s\">\n" % [val]
                   elsif key==:closegroup
                     out << "</optgroup>\n"
                   else
                     # Array case is for multiple select
                     selected = 'selected' if (val==o[:input_value] || (o[:input_value].kind_of?(Array)&&o[:input_value].include?(val)))
-                    out << "<option value='%s' %s>%s</option>\n" % [val,selected,key]
+                    out << "<option value=\"%s\" %s>%s</option>\n" % [val,selected,key]
                   end
                 end
               end
@@ -188,7 +188,7 @@ module PopulateMe
         end
         def dropdown_cache
           @dropdown_cache ||= self.find({},:fields=>['_id',label_column]).inject([]) do |out,row|
-            out.push([row.to_label, row.id.to_s, "<option value='#{row.id}' ", ">#{row.to_label}</option>\n"])
+            out.push([row.to_label, row.id.to_s, "<option value=\"#{row.id}\" ", ">#{row.to_label}</option>\n"])
           end
         end
         def reset_dropdown_cache; @dropdown_cache = nil; end

data/lib/populate_me/mongo/mutation.rb

@@ -38,6 +38,13 @@ module PopulateMe
         def find(selector={},opts={})
           selector.update(opts.delete(:selector)||{})
           opts = {:sort=>self.sorting_order}.update(opts)
+          if opts.key?(:fields)
+            opts[:projection] = opts[:fields].inject({}) do |h, f|
+              h[f.to_sym] = 1
+              h
+            end
+            opts.delete(:fields)
+          end
           cur = collection.find(selector,opts)
           cur.instance_variable_set('@mutant_class', self)
           cur.extend(CursorMutation)
@@ -175,7 +182,7 @@ module PopulateMe
       def children_count(k,sel={})
         k = resolve_class(k)
         slot_name = sel.delete(:slot_name) || model.foreign_key_name
-        k.collection.count(:query => {slot_name=>@doc['_id'].to_s}.update(sel))
+        k.collection.count({slot_name=>@doc['_id'].to_s}.update(sel))
       end
 
       # CRUD
@@ -187,7 +194,12 @@ module PopulateMe
 
       # saving and hooks
       def new?; @is_new ||= !@doc.key?('_id'); end
-      def update_doc(fields); @old_doc = @doc.dup; @doc.update(fields); @is_new = false; self; end
+      def update_doc(fields)
+        @old_doc = @doc.dup
+        @doc.update(fields)
+        @is_new = false
+        self
+      end
       # Getter and setter in one
       def errors_on(col,message=nil)
         message.nil? ? @errors[col] : @errors[col] = (@errors[col]||[]) << message
@@ -212,7 +224,7 @@ module PopulateMe
           next unless model.schema.key?(k)
           type = k=='_id' ? :primary_key : model.schema[k][:type]
           fix_method = "fix_type_#{type}"
-          if v==''
+          if v=='' and type!=:attachment
             default = model.schema[k][:default]
             @doc[k] = default.is_a?(Proc) ? default.call : default
           else

data/lib/populate_me/mongo/stash.rb

@@ -51,6 +51,8 @@ module PopulateMe
               :content_type=>v[:type]
             })
           @doc[k] = {'original'=>attachment_id}
+        else # Untouched
+          @doc[k] = @old_doc[k]
         end
       end
 
@@ -58,7 +60,8 @@ module PopulateMe
         obj = (@old_doc||@doc)[col]
         if obj.respond_to?(:each)
           obj.each do |k,v|
-            model.gridfs.delete(v)
+            gridfile = model.gridfs.find(_id: v).first
+            model.gridfs.delete(v) unless gridfile.nil?
           end
         end
       end

data/populate-me.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s| 
   s.name = 'populate-me'
-  s.version = "0.0.28"
+  s.version = '0.0.33'
   s.platform = Gem::Platform::RUBY
   s.summary = "ALPHA !!! Populate Me is relatively complete but simple CMS"
   s.description = "ALPHA !!! Populate Me is relatively complete but simple CMS. It includes a Rack middleware for putting in your Rack stack, and a bespoke MongoDB ODM. But Populate Me is not really finished yet."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: populate-me
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.33
 platform: ruby
 authors:
 - Mickael Riga
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-05-11 00:00:00.000000000 Z
+date: 2020-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-golem
@@ -169,7 +169,7 @@ homepage: https://github.com/mig-hub/populate-me
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - "./lib"
@@ -184,9 +184,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: ALPHA !!! Populate Me is relatively complete but simple CMS
 test_files: []