populate-me 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10a0d904a55bc88de4e01af6c15816cc3c943a78
-  data.tar.gz: cc36c361bd647861681d153f5bf2e9d9046a7e73
+  metadata.gz: b5d6a2a8ba2877bb7de857c1befde67845b87fd6
+  data.tar.gz: 38ff9b163189c90109d325815ffd2cde81ca55ac
 SHA512:
-  metadata.gz: 34f55a27c047c8e0204eaf10a9a8c4d62b3ab06e9672812f4522f6b474b48261bf6521a538383770a3be5d1106651d48c5d4502c74d3dcd282bb87bcba7c075b
-  data.tar.gz: 901ce3866a5c98053a4b92f5f53fac015d7b4424f0c32c89b0a4418104b904083c1901f0a5e44606aa8c7677ac24e45aa20921a470c6548774c8be0ca67d1b61
+  metadata.gz: c2d852eeff231cbb2d85865ba5f097d63fd8ed9d65279820189ea234bb2721bd610b53ec3b64b11de006d826aeb87fde5f0e2572c9d38b57f768ec2190372485
+  data.tar.gz: d2af5a7f0e800f73c126fff0329aea00ba5c6b47727c36de2de84b1c476141cd38062de253eb37a4294fb3b2a9e7116989cfe17ad3c241704422b8159f9f1e49

data/lib/populate_me/document_mixins/admin_adapter.rb

@@ -90,6 +90,10 @@ module PopulateMe
           docs
         end
 
+        def admin_find_first o={}
+          self.admin_find(o)[0]
+        end
+
         def admin_distinct field, o={}
           self.admin_find(o).map{|d| d.__send__ field}.compact.uniq
         end

data/lib/populate_me/document_mixins/schema.rb

@@ -89,6 +89,16 @@ module PopulateMe
           o[:foreign_key] = o[:foreign_key].to_sym
           WebUtils.ensure_key! o, :dependent, true
           self.relationships[name] = o
+
+          define_method(name) do
+            var = "@cached_#{name}"
+            instance_variable_set(var, instance_variable_get(var)||WebUtils.resolve_class_name(o[:class_name]).admin_find(query: {o[:foreign_key]=>self.id}))
+          end
+
+          define_method("#{name}_first".to_sym) do
+            var = "@cached_#{name}_first"
+            instance_variable_set(var, instance_variable_get(var)||WebUtils.resolve_class_name(o[:class_name]).admin_find_first(query: {o[:foreign_key]=>self.id}))
+          end
         end
 
       end

data/lib/populate_me/mongo.rb

@@ -76,6 +76,10 @@ module PopulateMe
         self.cast{ collection.find(query, o) }
       end
 
+      def admin_find_first o={}
+        self.admin_find(o.merge({limit: 1}))[0]
+      end
+
       def admin_distinct field, o={}
         query = o.delete(:query) || {}
         self.collection.distinct field, query, o

data/lib/populate_me/version.rb

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

data/test/test_document_admin_adapter.rb

@@ -65,6 +65,46 @@ describe PopulateMe::Document, 'AdminAdapter' do
     end
   end
 
+  describe '::admin_find ::admin_find_first' do
+    
+    class FindablePerson < PopulateMe::Document
+      field :first_name
+      field :last_name
+    end
+    
+    before do
+      FindablePerson.documents = []
+      FindablePerson.new(first_name: 'Bobby', last_name: 'Peru').save
+      FindablePerson.new(first_name: 'John', last_name: 'Doe').save
+      FindablePerson.new(first_name: 'John', last_name: 'Turturo').save
+    end
+
+    it 'Finds everything' do
+      people = FindablePerson.admin_find
+      assert_equal Array, people.class
+      assert_equal 3, people.size
+      assert_equal FindablePerson.documents, people
+    end
+
+    it 'Finds with query' do
+      people = FindablePerson.admin_find query: {first_name: 'John'}
+      assert_equal Array, people.class
+      assert_equal 2, people.size
+      assert_equal 'Doe', people[0].last_name
+    end
+
+    it 'Finds first' do
+      person = FindablePerson.admin_find_first
+      assert_equal 'Bobby', person.first_name
+    end
+
+    it 'Finds first with query' do
+      person = FindablePerson.admin_find_first query: {first_name: 'John'}
+      assert_equal 'Doe', person.last_name
+    end
+
+  end
+
   describe '::admin_distinct' do
 
     class Distinction < PopulateMe::Document

data/test/test_document_schema.rb

@@ -13,6 +13,16 @@ describe PopulateMe::Document, 'Schema' do
       relationship :friends, label: 'Budies', class_name: 'Budy', foreign_key: :budy_id, dependent: false
     end
 
+    class Relative::Sibling < PopulateMe::Document
+      field :size
+      field :relative_id, type: :parent
+    end
+
+    before do
+      Relative.documents = []
+      Relative::Sibling.documents = []
+    end
+
     it "Defaults class name" do
       assert_equal "Relative::Sibling", Relative.relationships[:siblings][:class_name]
       assert_equal "Relative::HomeRemedy", Relative.relationships[:home_remedies][:class_name]
@@ -39,6 +49,32 @@ describe PopulateMe::Document, 'Schema' do
       refute Relative.relationships[:friends][:dependent]
     end
 
+    it "Creates a getter for cached items" do
+      relative = Relative.new(id: 10)
+      relative.save
+      Relative::Sibling.new(relative_id: 10, size: 'S').save
+      Relative::Sibling.new(relative_id: 10, size: 'M').save
+      Relative::Sibling.new(relative_id: 10, size: 'L').save
+      assert relative.respond_to? :siblings
+      assert_nil relative.instance_variable_get('@cached_siblings')
+      siblings = relative.siblings
+      assert_equal 3, siblings.size
+      assert_equal siblings, relative.instance_variable_get('@cached_siblings')
+    end
+
+    it "Creates a getter for cached first item" do
+      relative = Relative.new(id: 10)
+      relative.save
+      Relative::Sibling.new(relative_id: 10, size: 'S').save
+      Relative::Sibling.new(relative_id: 10, size: 'M').save
+      Relative::Sibling.new(relative_id: 10, size: 'L').save
+      assert relative.respond_to? :siblings_first
+      assert_nil relative.instance_variable_get('@cached_siblings_first')
+      sibling = relative.siblings_first
+      assert_equal 'S', sibling.size
+      assert_equal sibling, relative.instance_variable_get('@cached_siblings_first')
+    end
+
   end
 
 end

data/test/test_mongo.rb

@@ -125,10 +125,29 @@ describe 'PopulateMe::Mongo' do
     end
 
     it 'Should admin_find correctly' do
-      LowFish.collection.insert_one(_id: 42, name: "H2G2")
-      assert LowFish.admin_find.is_a?(Array)
-      assert_equal LowFish.collection.find(name: 'H2G2').count, LowFish.admin_find(query: {name: 'H2G2'}).size
-      assert_equal 42, LowFish.admin_find(query: {name: 'H2G2'})[0].id
+      LowFish.collection.insert_one(_id: 10, name: "Arya")
+      LowFish.collection.insert_one(_id: 20, name: "Bran")
+      LowFish.collection.insert_one(_id: 30, name: "Arya")
+      LowFish.collection.insert_one(_id: 40, name: "Bran")
+      items = LowFish.admin_find
+      assert items.is_a?(Array)
+      assert 4, items.count
+      assert_equal 10, items[0].id
+      items = LowFish.admin_find query: {name: 'Bran'}
+      assert items.is_a?(Array)
+      assert 2, items.count
+      assert_equal 20, items[0].id
+    end
+
+    it 'Should admin_find_first correctly' do
+      LowFish.collection.insert_one(_id: 10, name: "Arya")
+      LowFish.collection.insert_one(_id: 20, name: "Bran")
+      LowFish.collection.insert_one(_id: 30, name: "Arya")
+      LowFish.collection.insert_one(_id: 40, name: "Bran")
+      item = LowFish.admin_find_first
+      assert_equal 10, item.id
+      item = LowFish.admin_find_first query: {name: "Bran"}
+      assert_equal 20, item.id
     end
 
     it 'Should admin_find while turning fields option into a projection option' do

data/test/test_s3_attachment.rb

@@ -10,6 +10,14 @@ PopulateMe::S3Attachment.set :bucket, s3_bucket
 describe 'PopulateMe::S3Attachment' do
   # parallelize_me!
 
+  def check_if_public_read(object)
+    grant = object.acl.grants.find do |g|
+      g.grantee.uri=="http://acs.amazonaws.com/groups/global/AllUsers"
+    end
+    raise "grant not found" if grant.nil?
+    ['READ','FULL_CONTROL'].include? grant.permission
+  end
+
   class S3Book < PopulateMe::Document
     field :cover, type: :attachment, variations: [
       PopulateMe::Variation.new_image_magick_job(:thumb, :gif, "-resize '300x'")
@@ -83,7 +91,7 @@ describe 'PopulateMe::S3Attachment' do
 
     vars3file = s3_bucket.object('public/s-3-book/story.upcase.txt')
     assert_equal 'text/plain', vars3file.content_type
-    # assert_equal 'public-read', vars3file.acl
+    assert check_if_public_read(vars3file)
     assert_equal 's-3-book', vars3file.metadata['parent_collection']
     assert_equal 'HELLO', vars3file.get.body.read
 

metadata

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