populate-me 0.0.27 → 0.0.32

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: c06dba10c3a16aaecd4bff9aa43dd9b85be0253c0f5456a69dd05c6a8d22d9ae
+  data.tar.gz: e8b380b450715787fcc60e1d69181cc1d98bed44be5d5a064c2856f481f8e18f
+SHA512:
+  metadata.gz: '0905a6876cd39098d7c30fc86f5604abf64d8a75086b267c8b05b098d8f60e4b023461c0a9718ecd5f3f0f46c610437cc7e2ba9f83bd411172344050e331b05c'
+  data.tar.gz: ebe75ce21a787a0ba8bec25665089a3b9e5217e88e768f937cabf038b74353b885c6d09a4b6769a65da630f79fc35524eaf76751bcf79299b692f98751e61cde

data/.gitignore

@@ -0,0 +1,8 @@
+.DS_STORE
+*.swp
+.ruby-version
+pkg/
+*.gem
+Gemfile.lock
+.bundle/
+

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+gemspec
+

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2017 Mickael Riga
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+

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

@@ -9,8 +9,8 @@ module PopulateMe
       def self.included(weak)
         weak.extend(MutateClass)
         weak.db = DB if defined?(DB)
-        weak.schema = BSON::OrderedHash.new
-        weak.relationships = BSON::OrderedHash.new
+        weak.schema = {}
+        weak.relationships = {}
       end
 
       module MutateClass
@@ -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)
@@ -45,30 +52,36 @@ module PopulateMe
         def find_one(spec_or_object_id=nil,opts={})
           spec_or_object_id.nil? ? spec_or_object_id = opts.delete(:selector) : spec_or_object_id.update(opts.delete(:selector)||{})
           opts = {:sort=>self.sorting_order}.update(opts)
-          item = collection.find_one(spec_or_object_id,opts)
+          item = collection.find(spec_or_object_id,opts).first
           item.nil? ? nil : self.new(item)
         end
         def count(opts={}); collection.count(opts); end
 
         def sorting_order
           @sorting_order ||= if @schema.key?('position')&&!@schema['position'][:scope].nil?
-            [[@schema['position'][:scope], :asc], ['position', :asc]]
+            {@schema['position'][:scope] => 1, 'position' => 1}
           elsif @schema.key?('position')
-            [['position', :asc],['_id', :asc]]
+            {'position' => 1, '_id' => 1}
           else
-            ['_id', :asc]
+            {'_id' => 1}
           end
         end
 
-        def sort(id_list)
-          id_list.each_with_index do |id, position|
-            collection.update(ref(id), {'$set' => {'position'=>position}})
+        def sort(ids)
+          requests = ids.each_with_index.inject([]) do |list, (id, i)|
+            list << {update_one: 
+              {
+                filter: ref(id), 
+                update: {'$set'=>{'position'=>i}}
+              }
+            }
           end
+          collection.bulk_write requests
         end
 
         # CRUD
-        def get(id, opts={}); doc = collection.find_one(ref(id), opts); doc.nil? ? nil : self.new(doc); end
-        def delete(id); collection.remove(ref(id)); end
+        def get(id, opts={}); doc = collection.find(ref(id), opts).first; doc.nil? ? nil : self.new(doc); end
+        def delete(id); collection.delete_one(ref(id)); end
 
         def get_multiple(ids, opts={})
           corrected_ids = ids.map{|id| correct_id_class(id) }
@@ -169,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
@@ -181,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
@@ -206,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
@@ -256,16 +274,18 @@ module PopulateMe
         before_save
         if new?
           before_create
-          id = model.collection.insert(@doc)
-          @doc['_id'] = id
+          result = model.collection.insert_one(@doc)
+          if result.ok? and @doc['_id'].nil?
+            @doc['_id'] = result.inserted_id
+          end
           after_create
         else
           before_update
-          id = model.collection.update({'_id'=>@doc['_id']}, @doc)
+          result = model.collection.update_one({'_id'=>@doc['_id']}, @doc)
           after_update
         end
         after_save
-        id.nil? ? nil : self
+        result.ok? ? self : nil
       end
       def before_save; end
       def before_create; end
@@ -283,9 +303,16 @@ module PopulateMe
         # so we should extend on demand.
         # Meaning the cursor object should be extended, not the cursor class.
         # @mutant_class should be defined before extending
-        def next
-          n = super
-          n.nil? ? nil : @mutant_class.new(n)
+        #
+        # def next
+        #   n = super
+        #   n.nil? ? nil : @mutant_class.new(n)
+        # end
+        #
+        def each
+          super do |doc|
+            yield @mutant_class.new(doc)
+          end if block_given?
         end
         # legacy
         def each_mutant(&b); each(&b); end

data/lib/populate_me/mongo/stash.rb

@@ -45,8 +45,14 @@ module PopulateMe
           delete_files_for(k) unless new?
           @temp_attachments ||= {}
           @temp_attachments[k] = v
-          attachment_id = model.gridfs.put(v[:tempfile], {:filename=>v[:filename], :content_type=>v[:type]})
+          attachment_id = model.gridfs.upload_from_stream(
+            v[:filename],
+            v[:tempfile], {
+              :content_type=>v[:type]
+            })
           @doc[k] = {'original'=>attachment_id}
+        else # Untouched
+          @doc[k] = @old_doc[k]
         end
       end
 
@@ -80,17 +86,17 @@ module PopulateMe
       def convert(col, convert_steps, style)
         return if @doc[col].nil?
         if @temp_attachments.nil? || @temp_attachments[col].nil?
-          f = model.gridfs.get(@doc[col]['original']) rescue nil
+          f = model.gridfs.find({'_id'=>@doc[col]['original']}).first
           return if f.nil?
-          return unless f.content_type[/^image\//]
           src = Tempfile.new('MongoStash_src')
           src.binmode
-          src.write(f.read(4096)) until f.eof?
+          model.gridfs.download_to_stream(@doc[col]['original'], src)
+          return unless f['contentType'].to_s[/^image\//]
           src.close
           @temp_attachments ||= {}
           @temp_attachments[col] ||= {}
           @temp_attachments[col][:tempfile] = src
-          @temp_attachments[col][:type] = f.content_type
+          @temp_attachments[col][:type] = f['contentType']
         else
           return unless @temp_attachments[col][:type][/^image\//]
           src = @temp_attachments[col][:tempfile]
@@ -107,9 +113,13 @@ module PopulateMe
         dest.close
         system "convert \"#{src.path}\" #{convert_steps} \"#{dest.path}\""
         filename = "#{model.name}/#{self.id}/#{style}"
-        attachment_id = model.gridfs.put(dest.open, {:filename=>filename, :content_type=>content_type})
+        attachment_id = model.gridfs.upload_from_stream(
+          filename,
+          dest.open, 
+          {:content_type=>content_type}
+        )
         @doc[col] = @doc[col].update({style=>attachment_id})
-        model.collection.update({'_id'=>@doc['_id']}, @doc)
+        model.collection.update_one({'_id'=>@doc['_id']}, @doc)
         #src.close!
         dest.close!
       end
@@ -138,7 +148,7 @@ module PopulateMe
             next if old_hash==fixed_hash
 
             if for_real
-              c.collection.update({'_id'=>e.id}, {'$set'=>fixed_hash})
+              c.collection.update_one({'_id'=>e.id}, {'$set'=>fixed_hash})
             else
               puts old_hash.inspect
               puts fixed_hash.inspect

data/populate-me.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s| 
   s.name = 'populate-me'
-  s.version = "0.0.27"
+  s.version = '0.0.32'
   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."
@@ -9,7 +9,16 @@ Gem::Specification.new do |s|
   s.author = "Mickael Riga"
   s.email = "mig@mypeplum.com"
   s.homepage = "https://github.com/mig-hub/populate-me"
-  s.add_dependency('rack-golem')
-  s.add_dependency('json')
+  s.licenses = ['MIT']
+
+  s.add_dependency 'rack-golem', '~> 0'
+  s.add_dependency 'json', '~> 2.1'
+  s.add_dependency 'mongo', '~> 2.0'
+
+  s.add_development_dependency 'bundler', '~> 1.13'
+  s.add_development_dependency 'bacon', '~> 1.2'
+  s.add_development_dependency 'rack-test', '~> 0.6'
+  s.add_development_dependency 'racksh', '~> 1.0'
+
 end
 

data/test/spec_ext.rb

@@ -26,3 +26,4 @@ describe 'String' do
     end
   end
 end
+

data/test/spec_mongo_mutation.rb

@@ -8,12 +8,12 @@ require 'rack/utils'
 $:.unshift './lib'
 require 'populate_me/mongo'
 
-MONGO = ::Mongo::MongoClient.new
+MONGO = Mongo::Client.new([ '127.0.0.1:27017' ], :database => 'test-mongo-mutation')
 class NoDB
   include PopulateMe::Mongo::Plug
   def self.human_name; 'No DB'; end
 end
-DB  = MONGO['test-mongo-mutation']
+DB  = MONGO.database
 
 class Naked; include PopulateMe::Mongo::Plug; end
 
@@ -54,21 +54,21 @@ describe "PopulateMe::Mongo::Mutation" do
     end
   end
   
-  shared "Empty BSON" do
-    it "Should be set to an empty BSON ordered hash by default" do
-      @bson.class.should==::BSON::OrderedHash
+  shared "Empty Hash" do
+    it "Should be set to an empty hash by default" do
+      @bson.class.should==Hash
       @bson.empty?.should==true
     end
   end
   
   describe ".schema" do
     before { @bson = Naked.schema }
-    behaves_like "Empty BSON"
+    behaves_like "Empty Hash"
   end
   
   describe ".relationships" do
     before { @bson = Naked.relationships }
-    behaves_like "Empty BSON"
+    behaves_like "Empty Hash"
   end
 
   describe ".human_name" do
@@ -102,9 +102,14 @@ describe "PopulateMe::Mongo::Mutation" do
       BSON::ObjectId.legal?(string_id).should==true
       Address.ref(string_id).should=={'_id'=>BSON::ObjectId.from_string(string_id)}
     end
+    it 'Makes a selector for multiple docs if argument is an Array' do
+      Address.ref([]).should=={'_id'=>{'$in'=>[]}}
+      id = BSON::ObjectId.new
+      string_id = '000000000000000000000000'
+      Address.ref([id,string_id]).should=={'_id'=>{'$in'=>[id,BSON::ObjectId.from_string(string_id)]}}
+    end
     it 'Just put an empty string in selector for any invalid argument' do
       Address.ref('abc').should=={'_id'=>''}
-      Address.ref([]).should=={'_id'=>''}
     end
   end
   
@@ -262,11 +267,13 @@ describe "PopulateMe::Mongo::Mutation" do
   describe 'CursorMutation' do
     it 'Should give the correct class of object on iterations' do
       Address.new('body'=>'42').save
-      Address.find.to_a[0].model.name.should=='Address'
+      Address.find.each do |a|
+        a.model.name.should=='Address'
+      end
     end
   end
 
 end
 
-MONGO.drop_database('test-mongo-mutation')
+DB.drop
 

metadata

@@ -1,48 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: populate-me
 version: !ruby/object:Gem::Version
-  version: 0.0.27
-  prerelease: 
+  version: 0.0.32
 platform: ruby
 authors:
 - Mickael Riga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2020-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-golem
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: mongo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+- !ruby/object:Gem::Dependency
+  name: bacon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: racksh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 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.
@@ -51,6 +116,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- Gemfile
+- LICENSE
 - README.md
 - lib/populate_me/control.rb
 - lib/populate_me/control/_public/css/main.css
@@ -98,27 +166,26 @@ files:
 - test/spec_ext.rb
 - test/spec_mongo_mutation.rb
 homepage: https://github.com/mig-hub/populate-me
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
-- ./lib
+- "./lib"
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 3.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ALPHA !!! Populate Me is relatively complete but simple CMS
 test_files: []