populate-me 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 526f9c845b23d850f5edf0d19c497710a74e4c06
-  data.tar.gz: 163e32750f2d8b3aa02b2d274a3f25a0bcdebab9
+  metadata.gz: 4e6c7bf4a8f1d514b164c6089193db8fce6bd1f2
+  data.tar.gz: 4881c632f52cd21d084884b6904f4172aee316b0
 SHA512:
-  metadata.gz: be52a79241cb22b829f23d9157ba99e436f56253d4094f9c8a50ac4c8506c3eb4e9f4cf305195f980c465209f10be92049c80dc6dc7162b2d5840fb5f5276380
-  data.tar.gz: da84fd60662a5fb30a5e834b1f29f3c384d6a9217af1554a033c652f13bda65fc3b080c1ec3ab70fac045cddfd802a1104367baacd22e736c01e9ac4476e9b08
+  metadata.gz: 964bc86b0186495bb6cfe0d61461a912dd4b5403ce87cd31855573198bcec269dba26705d6c00df2fedd1e650a6e5149729587b6699ebb061c7401d5ffb104f7
+  data.tar.gz: dc7696a1e6fda80ab3965ac0d67d6205abe9939159a2c79bc0152b9f7152527d049b62d19428ff803ff7361f1e18a0c6299e8b9d363eed5822c6e8cfde730cfc

data/lib/populate_me/document_mixins/admin_adapter.rb

@@ -90,6 +90,10 @@ module PopulateMe
           docs
         end
 
+        def admin_distinct field, o={}
+          self.admin_find(o).map{|d| d.__send__ field}.compact.uniq
+        end
+
         def sort_field_for o={}
           filter = o[:params][:filter]
           return nil if !filter.nil?&&filter.size>1

data/lib/populate_me/document_mixins/callbacks.rb

@@ -31,6 +31,24 @@ module PopulateMe
 
       def ensure_not_new; self._is_new = false; end
 
+      def ensure_position
+        self.class.fields.each do |k,v|
+          if v[:type]==:position
+            return unless self.__send__(k).nil?
+            values = if v[:scope].nil?
+              self.class.admin_distinct k
+            else
+              self.class.admin_distinct(k, query: {
+                v[:scope] => self.__send__(v[:scope])
+              })
+            end
+            val = values.empty? ? 0 : (values.max + 1)
+            self.set k => val
+          end
+        end
+        self
+      end
+
       def ensure_delete_related
         self.class.relationships.each do |k,v|
           if v[:dependent]
@@ -61,6 +79,7 @@ module PopulateMe
             after cb, :recurse_callback
           end
           before :create, :ensure_id
+          before :create, :ensure_position
           after :create, :ensure_not_new
           after :save, :snapshot
           before :delete, :ensure_delete_related

data/lib/populate_me/mongo.rb

@@ -69,6 +69,11 @@ module PopulateMe
         self.cast{ collection.find(query, o) }
       end
 
+      def admin_distinct field, o={}
+        query = o.delete(:query) || {}
+        self.collection.distinct field, query, o
+      end
+
     end
 
     attr_accessor :_id

data/lib/populate_me/version.rb

@@ -1,4 +1,4 @@
 module PopulateMe
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end
 

data/test/test_document_admin_adapter.rb

@@ -1,5 +1,6 @@
 require 'helper'
 require 'populate_me/document'
+require 'populate_me/attachment'
 
 describe PopulateMe::Document, 'AdminAdapter' do
 
@@ -64,4 +65,43 @@ describe PopulateMe::Document, 'AdminAdapter' do
     end
   end
 
+  describe '::admin_distinct' do
+
+    class Distinction < PopulateMe::Document
+      attr_accessor :title, :age
+    end
+
+    before do
+      Distinction.documents = []
+    end
+
+    it 'Can list all distinct values' do
+      Distinction.new(title: 'Lord').save
+      Distinction.new(title: 'Lord').save
+      Distinction.new.save
+      Distinction.new(title: 'Chevalier').save
+      Distinction.new(title: 'Baron').save
+      Distinction.new(title: 'Baron').save
+      result = Distinction.admin_distinct :title
+      assert_instance_of Array, result
+      assert_equal 3, result.size
+      assert_includes result, 'Lord'
+      assert_includes result, 'Chevalier'
+      assert_includes result, 'Baron'
+    end
+
+    it 'Can list all distinct values for a specific selector' do
+      Distinction.new(title: 'Chevalier', age: 33).save
+      Distinction.new(title: 'Chevalier', age: 34).save
+      Distinction.new(title: 'Baron', age: 35).save
+      Distinction.new(title: 'Baron', age: 36).save
+      result = Distinction.admin_distinct :age, query: {title: 'Baron'}
+      assert_instance_of Array, result
+      assert_equal 2, result.size
+      assert_includes result, 35
+      assert_includes result, 36
+    end
+
+  end
+
 end

data/test/test_document_callbacks.rb

@@ -103,5 +103,49 @@ describe PopulateMe::Document, 'Callbacks' do
     assert_equal 'good before_argument after_argument', subject.taste
   end
 
+  describe '#ensure_position' do
+
+    class RaceCar < PopulateMe::Document
+      field :name
+      field :team
+      field :position_by_team, type: :position, scope: :team 
+      position_field
+    end
+
+    before do
+      RaceCar.documents = []
+    end
+
+    it 'Does not change position if already set' do
+      RaceCar.new(name: 'racer3', position: 3, team: 'A', position_by_team: 14).save
+      car = RaceCar.new(name: 'racer1', position: 12, team: 'A', position_by_team: 41)
+      car.ensure_position
+      assert_equal 12, car.position
+      assert_equal 41, car.position_by_team
+    end
+
+    it 'Sets position fields to last position' do
+      RaceCar.new(name: 'racer1', position: 1, team: 'A', position_by_team: 41).save
+      RaceCar.new(name: 'racer2', position: 2, team: 'B', position_by_team: 12).save
+      RaceCar.new(name: 'racer3', position: 3, team: 'B', position_by_team: 14).save
+      car = RaceCar.new(team: 'B').ensure_position
+      assert_equal 4, car.position
+      assert_equal 15, car.position_by_team
+    end
+
+    it 'Returns 0 when first document in scope' do
+      assert_equal 0, RaceCar.new.ensure_position.position
+      RaceCar.new(name: 'racer1', position: 1, team: 'A', position_by_team: 41).save
+      assert_equal 0, RaceCar.new(team: 'B').ensure_position.position_by_team
+    end
+
+    it "Ensures position before creating new document" do
+      car = RaceCar.new
+      car.save
+      assert_equal 0, car.position
+    end
+
+  end
+
 end
 

data/test/test_mongo.rb

@@ -211,6 +211,45 @@ describe 'PopulateMe::Mongo' do
 
   end
 
+  describe '::admin_distinct' do
+
+    class MongoDistinction < PopulateMe::Mongo
+      attr_accessor :title, :age
+    end
+
+    before do
+      MongoDistinction.collection.drop
+    end
+
+    it 'Can list all distinct values' do
+      MongoDistinction.new(title: 'Lord').save
+      MongoDistinction.new(title: 'Lord').save
+      MongoDistinction.new.save
+      MongoDistinction.new(title: 'Chevalier').save
+      MongoDistinction.new(title: 'Baron').save
+      MongoDistinction.new(title: 'Baron').save
+      result = MongoDistinction.admin_distinct :title
+      assert_instance_of Array, result
+      assert_equal 3, result.size
+      assert_includes result, 'Lord'
+      assert_includes result, 'Chevalier'
+      assert_includes result, 'Baron'
+    end
+
+    it 'Can list all distinct values for a specific selector' do
+      MongoDistinction.new(title: 'Chevalier', age: 33).save
+      MongoDistinction.new(title: 'Chevalier', age: 34).save
+      MongoDistinction.new(title: 'Baron', age: 35).save
+      MongoDistinction.new(title: 'Baron', age: 36).save
+      result = MongoDistinction.admin_distinct :age, query: {title: 'Baron'}
+      assert_instance_of Array, result
+      assert_equal 2, result.size
+      assert_includes result, 35
+      assert_includes result, 36
+    end
+
+  end
+
 end
 
 DB.drop

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: populate-me
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Mickael Riga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-04 00:00:00.000000000 Z
+date: 2017-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: web-utils
@@ -236,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: PopulateMe is an admin system for web applications.