populate-me 0.0.2 → 0.0.3

data/lib/populate_me/mongo/crushyform.rb

@@ -210,7 +210,7 @@ module PopulateMe
       def to_thumb(c)
         current = @doc[c]
         if current.respond_to?(:[])
-          "<img src='/gridfs/#{@doc[c]['stash_thumb.gif']}' width='100' onerror=\"this.style.display='none'\" />\n"
+          "<img src='/gridfs/#{@doc[c]['stash_thumb_gif']}' width='100' onerror=\"this.style.display='none'\" />\n"
         end
       end
       # Reset dropdowns on hooks

data/lib/populate_me/mongo/plug.rb

@@ -42,7 +42,7 @@ module PopulateMe
         # def minilist_view
         #   o = "<ul class='minilist'>\n"
         #   self.collection.find.each_mutant do |m|
-        #     thumb = m.respond_to?(:to_populate_thumb) ? m.to_populate_thumb('stash_thumb.gif') : m.placeholder_thumb('stash_thumb.gif')
+        #     thumb = m.respond_to?(:to_populate_thumb) ? m.to_populate_thumb('stash_thumb_gif') : m.placeholder_thumb('stash_thumb_gif')
         #     o << "<li title='#{m.to_label}' id='mini-#{m.id}'>#{thumb}<div>#{m.to_label}</div></li>\n"
         #   end
         #   o << "</ul>\n"
@@ -65,10 +65,10 @@ module PopulateMe
       module InstanceMethods
 
     	  def after_stash(col)
-      	  convert(col, "-resize '100x75^' -gravity center -extent 100x75", 'stash_thumb.gif')
+      	  convert(col, "-resize '100x75^' -gravity center -extent 100x75", 'stash_thumb_gif')
       	end
 
-        def generic_thumb(img , size='stash_thumb.gif', obj=self)
+        def generic_thumb(img , size='stash_thumb_gif', obj=self)
           return placeholder_thumb(size) if obj.nil?
       	  current = obj.doc[img]
       		if !current.nil? && !current[size].nil?
@@ -79,7 +79,7 @@ module PopulateMe
       	end
 	
       	def placeholder_thumb(size)
-          "/_public/img/placeholder.#{size}"
+          "/_public/img/placeholder.#{size.gsub(/^(.*)_([a-zA-Z]+)$/, '\1.\2')}"
         end
 	
       	def to_nutshell
@@ -88,7 +88,7 @@ module PopulateMe
       	    'id'=>@doc['_id'].to_s,
       	    'foreign_key_name'=>model.foreign_key_name,
       	    'title'=>self.to_label,
-      	    'thumb'=>self.respond_to?(:to_populate_thumb) ? self.to_populate_thumb('stash_thumb.gif') : nil,
+      	    'thumb'=>self.respond_to?(:to_populate_thumb) ? self.to_populate_thumb('stash_thumb_gif') : nil,
       	    'children'=>nutshell_children,
       	  }
         end
@@ -96,7 +96,7 @@ module PopulateMe
       	def in_nutshell
           o = model.list_options
       		out = "<div class='in-nutshell'>\n"
-      		out << self.to_populate_thumb('nutshell.jpg') if self.respond_to?(:to_populate_thumb)
+      		out << self.to_populate_thumb('nutshell_jpg') if self.respond_to?(:to_populate_thumb)
       		cols = model.populate_config[:quick_update_fields] || nutshell_backend_columns.select{|col| 
       		  [:boolean,:select].include?(model.schema[col][:type]) && !model.schema[col][:multiple] && !model.schema[col][:no_quick_update]
       		}

data/lib/populate_me/mongo/stash.rb

@@ -71,7 +71,7 @@ module PopulateMe
     	def convert(col, convert_steps, style)
     	  return if @doc[col].nil?
     	  if @temp_attachments.nil? || @temp_attachments[col].nil?
-    	    f = GRID.get(@doc[col]['original'])
+    	    f = model.gridfs.get(@doc[col]['original'])
     	    return unless f.content_type[/^image\//]
     	    src = Tempfile.new('MongoStash_src')
     	    src.binmode
@@ -86,7 +86,7 @@ module PopulateMe
     		  src = @temp_attachments[col][:tempfile]
     		end
     	  model.gridfs.delete(@doc[col][style]) unless @doc[col][style].nil?
-    		ext = style[/\..*$/]
+    		ext = style[/[a-zA-Z]+$/].insert(0,'.')
     		dest = Tempfile.new(['MongoStash_dest', ext])
     		dest.binmode
     		dest.close
@@ -103,6 +103,7 @@ module PopulateMe
     	class << self
     	  attr_accessor :classes
     		Stash.classes = []
+    		
     		def all_after_stash
     		  Stash.classes.each do |m|
     			  m.collection.find.each do |i|
@@ -112,6 +113,36 @@ module PopulateMe
     				end
     			end
     		end
+    		
+    		def fix_dots_in_keys(c, for_real=false)
+          puts "\n#{c}" unless for_real
+          img_keys = c.schema.select{|k,v| v[:type]==:attachment }.keys
+          c.find({}, {:fields=>img_keys}).each do |e|
+            old_hash = e.doc.select{|k,v| img_keys.include?(k) }
+            fixed_hash = Marshal.load(Marshal.dump(old_hash))
+            img_keys.each do |k|
+              (fixed_hash[k]||{}).keys.each do |style|
+                fixed_hash[k][style.tr('.','_')] = fixed_hash[k].delete(style)
+              end
+            end
+            next if old_hash==fixed_hash
+
+            if for_real
+              c.collection.update({'_id'=>e.id}, {'$set'=>fixed_hash})
+            else
+              puts old_hash.inspect
+              puts fixed_hash.inspect
+            end
+
+          end
+        end
+        
+        def all_fix_dots_in_keys(for_real=false)
+          Stash.classes.each do |c|
+            Stash.fix_dots_in_keys(c, for_real)
+          end
+        end
+
     	end
 
     end

data/populate-me.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s| 
   s.name = 'populate-me'
-  s.version = "0.0.2"
+  s.version = "0.0.3"
   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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: populate-me
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-11 00:00:00.000000000 Z
+date: 2012-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-golem