populate-me 0.0.16 → 0.0.17

data/lib/populate_me/mongo/backend_api_plug.rb

@@ -13,16 +13,16 @@ module PopulateMe
       end
   
       module ClassMethods
-    	  def backend_get(id); get(id=='unique' ? '000000000000000000000000' : id); end
-    		def backend_post(doc=nil); inst = new(doc); inst.is_new = true; inst; end
+        def backend_get(id); id=='unique' ? find_one : get(id); end
+    	  def backend_post(doc=nil); inst = new(doc); inst.is_new = true; inst; end
     	end
 	
     	# Instance Methods
 
-    	def backend_delete; delete; end
-    	def backend_put(fields); update_doc(fields); end
-    	def backend_values; @doc; end
-    	def backend_save?; !save.nil?; end
+      def backend_delete; delete; end
+      def backend_put(fields); update_doc(fields); end
+      def backend_values; @doc; end
+      def backend_save?; !save.nil?; end
       def backend_form(url, cols=nil, opts={})
         cols ||= default_backend_columns
         if block_given?
@@ -66,11 +66,11 @@ module PopulateMe
         end
         o
       end
-    	def backend_form_title; self.new? ? "New #{model.human_name}" : "Edit #{self.to_label}"; end
-    	def backend_show; 'OK'; end
-	
-    	def default_backend_columns; model.schema.keys; end
-    	def cloning_backend_columns; default_backend_columns.reject{|c| model.schema[c][:type]==:attachment}; end
+      def backend_form_title; self.new? ? "New #{model.human_name}" : "Edit #{self.to_label}"; end
+      def backend_show; 'OK'; end
+  
+      def default_backend_columns; model.schema.keys; end
+      def cloning_backend_columns; default_backend_columns.reject{|c| model.schema[c][:type]==:attachment}; end
 
     end
   end

data/lib/populate_me/mongo/crushyform.rb

@@ -75,7 +75,7 @@ module PopulateMe
               @crushyform_types[:select].call(m,c,opts)
             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?
+              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]]
             end,
             :select => proc do |m,c,o|
@@ -103,43 +103,43 @@ module PopulateMe
               end
               out << "</select>%s\n" % [o[:required]]
             end,
-    				:string_list => proc do |m,c,o|
-    				  if o[:autocompleted]
-    				    values = o[:autocomplete_options] || m.class.collection.distinct(c)
-    				    js = <<-EOJS
+            :string_list => proc do |m,c,o|
+              if o[:autocompleted]
+                values = o[:autocomplete_options] || m.class.collection.distinct(c)
+                js = <<-EOJS
                 <script type="text/javascript" charset="utf-8">
                   $(function(){
                     $( "##{m.field_id_for(c)}" )
                     .bind( "keydown", function( event ) {
-                    	if ( event.keyCode === $.ui.keyCode.TAB &&
-                    	$( this ).data( "autocomplete" ).menu.active ) {
-                    		event.preventDefault();
-                    	}
+                      if ( event.keyCode === $.ui.keyCode.TAB &&
+                      $( this ).data( "autocomplete" ).menu.active ) {
+                        event.preventDefault();
+                      }
                     })
                     .autocomplete({
-                    	minLength: 0,
-                    	source: function( request, response ) {
-                    		response($.ui.autocomplete.filter(["#{values.join('","')}"], request.term.split(/,\s*/).pop()));
-                    	},
-                    	focus: function() { return false; },
-                    	select: function( event, ui ) {
-                    		var terms = this.value.split(/,\s*/);
-                    		terms.pop();
-                    		terms.push(ui.item.value);
-                    		terms.push("");
-                    		this.value = terms.join( ", " );
-                    		return false;
-                    	}
+                      minLength: 0,
+                      source: function( request, response ) {
+                        response($.ui.autocomplete.filter(["#{values.join('","')}"], request.term.split(/,\s*/).pop()));
+                      },
+                      focus: function() { return false; },
+                      select: function( event, ui ) {
+                        var terms = this.value.split(/,\s*/);
+                        terms.pop();
+                        terms.push(ui.item.value);
+                        terms.push("");
+                        this.value = terms.join( ", " );
+                        return false;
+                      }
                     });
                   });
                 </script>
                 EOJS
                 o[:autocompleted] = false # reset so that it does not autocomplete for :string type below
-    			    end
-    				  tag = @crushyform_types[:string].call(m,c,o.update({:input_value=>(o[:input_value]||[]).join(',')}))
-    				  "#{tag}#{js}"
-    				end,
-    				:permalink => proc do |instance, column_name, options|
+              end
+              tag = @crushyform_types[:string].call(m,c,o.update({:input_value=>(o[:input_value]||[]).join(',')}))
+              "#{tag}#{js}"
+            end,
+            :permalink => proc do |instance, column_name, options|
               values = "<option value=''>Or Browse the list</option>\n"
               tag = @crushyform_types[:string].call(instance, column_name, options)
               return tag if options[:permalink_classes].nil?
@@ -222,8 +222,8 @@ module PopulateMe
       # Reset dropdowns on hooks
       def after_save; model.reset_dropdown_cache; super; end
       def after_delete; model.reset_dropdown_cache; super; end
-    	# Fix types
-    	def fix_type_string_list(k,v); @doc[k] = v.to_s.strip.split(/\s*,\s*/).compact if v.is_a?(String); end
+      # Fix types
+      def fix_type_string_list(k,v); @doc[k] = v.to_s.strip.split(/\s*,\s*/).compact if v.is_a?(String); end
 
   
     end

data/lib/populate_me/mongo/mutation.rb

@@ -6,33 +6,33 @@ module PopulateMe
       # Most important MongoDB module
       # It defines the ODM
   
-    	def self.included(weak)
-    		weak.extend(MutateClass)
-    		weak.db = DB if defined?(DB)
-    		weak.schema = BSON::OrderedHash.new
-    		weak.relationships = BSON::OrderedHash.new
-    	end
+      def self.included(weak)
+        weak.extend(MutateClass)
+        weak.db = DB if defined?(DB)
+        weak.schema = BSON::OrderedHash.new
+        weak.relationships = BSON::OrderedHash.new
+      end
 
       module MutateClass
-    	  attr_accessor :db, :schema, :relationships
-    		attr_writer :label_column, :slug_column, :sorting_order
+        attr_accessor :db, :schema, :relationships
+        attr_writer :label_column, :slug_column, :sorting_order
 
         LABEL_COLUMNS = ['title', 'label', 'fullname', 'full_name', 'surname', 'lastname', 'last_name', 'name', 'firstname', 'first_name', 'login', 'caption', 'reference', 'file_name', 'body', '_id']
-    		def label_column; @label_column ||= LABEL_COLUMNS.find{|c| @schema.keys.include?(c)||c=='_id'}; end
+        def label_column; @label_column ||= LABEL_COLUMNS.find{|c| @schema.keys.include?(c)||c=='_id'}; end
         def slug_column; @slug_column ||= (@schema.find{|k,v| v[:type]==:slug}||[])[0]; end
-    	  def foreign_key_name(plural=false); "id#{'s' if plural}_"+self.name; end
-    		def human_name; self.name.gsub(/([A-Z])/, ' \1')[1..-1]; end
-    		def human_plural_name; human_name+'s'; end
-    		def collection; db[self.name]; end
-    		def ref(id)
-    		  if id.is_a?(String)&&BSON::ObjectId.legal?(id)
-    			  id = BSON::ObjectId.from_string(id)
-    			elsif !id.is_a?(BSON::ObjectId)
-    			  id = ''
-    			end
-    			{'_id'=>id}
-    		end
-    		def find(selector={},opts={})
+        def foreign_key_name(plural=false); "id#{'s' if plural}_"+self.name; end
+        def human_name; self.name.gsub(/([A-Z])/, ' \1')[1..-1]; end
+        def human_plural_name; human_name+'s'; end
+        def collection; db[self.name]; end
+        def ref(id)
+          if id.is_a?(String)&&BSON::ObjectId.legal?(id)
+            id = BSON::ObjectId.from_string(id)
+          elsif !id.is_a?(BSON::ObjectId)
+            id = ''
+          end
+          {'_id'=>id}
+        end
+        def find(selector={},opts={})
           selector.update(opts.delete(:selector)||{})
           opts = {:sort=>self.sorting_order}.update(opts)
           collection.find(selector,opts).extend(CursorMutation)
@@ -46,62 +46,59 @@ module PopulateMe
         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]]
-    			elsif @schema.key?('position')
-    				[['position', :asc],['_id', :asc]]
-    			else
-    				['_id', :asc]
-    			end
-    		end
+          @sorting_order ||= if @schema.key?('position')&&!@schema['position'][:scope].nil?
+            [[@schema['position'][:scope], :asc], ['position', :asc]]
+          elsif @schema.key?('position')
+            [['position', :asc],['_id', :asc]]
+          else
+            ['_id', :asc]
+          end
+        end
 
-    		def sort(id_list)
-    		  id_list.each_with_index do |id, position|
-    			  collection.update(ref(id), {'$set' => {'position'=>position}})
-    			end
-    		end
+        def sort(id_list)
+          id_list.each_with_index do |id, position|
+            collection.update(ref(id), {'$set' => {'position'=>position}})
+          end
+        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
+        # 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 is_unique(doc={})
     		  return unless collection.count==0
-    		  doc = {'_id'=>BSON::ObjectId('000000000000000000000000')}.update(doc)
-    		  d = self.new
-    			d.doc.update(doc)
-    			d.save 
+    		  self.new(doc).save 
     		end
 
-    		private
+        private
         def slot(name,opts={})
           @schema[name] = {:type=>:string}.update(opts)
           define_method(name) { @doc[name] }
           define_method("#{name}=") { |x| @doc[name] = x }
         end
-    		def image_slot(name='image',opts={})
-    		  slot name, {:type=>:attachment}.update(opts)
-    			slot "#{name}_tooltip"
-    			slot "#{name}_alternative_text"
-    		end
-    		def has_many(k,opts={}); @relationships[k] = opts; end
-    	end
-	
-    	# Instance Methods
+        def image_slot(name='image',opts={})
+          slot name, {:type=>:attachment}.update(opts)
+          slot "#{name}_tooltip"
+          slot "#{name}_alternative_text"
+        end
+        def has_many(k,opts={}); @relationships[k] = opts; end
+      end
+  
+      # Instance Methods
 
       attr_accessor :doc, :old_doc, :errors, :is_new
-    	def initialize(document=nil); @errors={}; @doc = document || default_doc; end
-    	def default_doc
-    	  @is_new = true
-    	  out = {}
-    		model.schema.each { |k,v| out.store(k,v[:default].is_a?(Proc) ? v[:default].call : v[:default]) }
-    		out
-    	end
-    	def model; self.class; end
-    	def id; @doc['_id']; end
-    	def [](field); @doc[field]; end
-    	def []=(field,val); @doc[field] = val; end
-    	def to_label;  @doc[model.label_column].to_s.tr("\n\r", ' '); end
+      def initialize(document=nil); @errors={}; @doc = document || default_doc; end
+      def default_doc
+        @is_new = true
+        out = {}
+        model.schema.each { |k,v| out.store(k,v[:default].is_a?(Proc) ? v[:default].call : v[:default]) }
+        out
+      end
+      def model; self.class; end
+      def id; @doc['_id']; end
+      def [](field); @doc[field]; end
+      def []=(field,val); @doc[field] = val; end
+      def to_label;  @doc[model.label_column].to_s.tr("\n\r", ' '); end
       ACCENTS_FROM = 
       "ÀÁÂÃÄÅàáâãäåĀāĂ㥹ÇçĆćĈĉĊċČčÐðĎďĐđÈÉÊËèéêëĒēĔĕĖėĘęĚěĜĝĞğĠġĢģĤĥĦħÌÍÎÏìíîïĨĩĪīĬĭĮįİıĴĵĶķĸĹĺĻļĽľĿŀŁłÑñŃńŅņŇňʼnŊŋÒÓÔÕÖØòóôõöøŌōŎŏŐőŔŕŖŗŘřŚśŜŝŞ"
       ACCENTS_TO = 
@@ -113,25 +110,25 @@ module PopulateMe
       def to_slug; @doc[model.slug_column]||self.auto_slug; end
       # To param will be deprecated
       # Use a URL like .../<id>/<slug> instead
-    	def to_param; "#{@doc['_id']}-#{to_label.scan(/\w+/).join('-')}"; end
+      def to_param; "#{@doc['_id']}-#{to_label.scan(/\w+/).join('-')}"; end
       def field_id_for(col); "%s-%s-%s" % [id||'new',model.name,col]; end
 
-    	# relationships
-    	def resolve_class(k); k.kind_of?(Class) ? k : Kernel.const_get(k); end
-    	def parent(k, opts={})
-    	  if k.kind_of?(String)
-    	    key = k
-    	    klass = resolve_class(model.schema[k][:parent_class]) 
+      # relationships
+      def resolve_class(k); k.kind_of?(Class) ? k : Kernel.const_get(k); end
+      def parent(k, opts={})
+        if k.kind_of?(String)
+          key = k
+          klass = resolve_class(model.schema[k][:parent_class]) 
         else
           klass = resolve_class(k)
           key = klass.foreign_key_name
         end
-    	  klass.get(@doc[key], opts)
-    	end
-    	def slot_children(k, opts={})
-    	  if k.kind_of?(String)
-    	    key = k
-    	    klass = resolve_class(model.schema[k][:children_class]) 
+        klass.get(@doc[key], opts)
+      end
+      def slot_children(k, opts={})
+        if k.kind_of?(String)
+          key = k
+          klass = resolve_class(model.schema[k][:children_class]) 
         else
           klass = resolve_class(k)
           key = klass.foreign_key_name(true)
@@ -143,123 +140,123 @@ module PopulateMe
       end
       def first_slot_child(k, opts={})
         if k.kind_of?(String)
-    	    key = k
-    	    klass = resolve_class(model.schema[k][:children_class]) 
+          key = k
+          klass = resolve_class(model.schema[k][:children_class]) 
         else
           klass = resolve_class(k)
           key = klass.foreign_key_name(true)
         end
         klass.get((@doc[key]||[])[0], opts)
       end
-    	def children(k,opts={})
-    	  k = resolve_class(k)
-    	  slot_name = opts.delete(:slot_name) || model.foreign_key_name
-    	  k.find({slot_name=>@doc['_id'].to_s}, opts)
-    	end
-    	def first_child(k,opts={})
-    	  k = resolve_class(k)
-    	  slot_name = opts.delete(:slot_name) || model.foreign_key_name
-    	  d = k.find_one({slot_name=>@doc['_id'].to_s}, opts)
-    	end
-    	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))
+      def children(k,opts={})
+        k = resolve_class(k)
+        slot_name = opts.delete(:slot_name) || model.foreign_key_name
+        k.find({slot_name=>@doc['_id'].to_s}, opts)
+      end
+      def first_child(k,opts={})
+        k = resolve_class(k)
+        slot_name = opts.delete(:slot_name) || model.foreign_key_name
+        d = k.find_one({slot_name=>@doc['_id'].to_s}, opts)
+      end
+      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))
       end
 
-    	# CRUD
-    	def delete
-    	  before_delete
-    	  model.delete(@doc['_id'])
-    		after_delete
-    	end
+      # CRUD
+      def delete
+        before_delete
+        model.delete(@doc['_id'])
+        after_delete
+      end
 
-    	# 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
-    	# Getter and setter in one
-    	def errors_on(col,message=nil)
-    	  message.nil? ? @errors[col] : @errors[col] = (@errors[col]||[]) << message
+      # 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
+      # Getter and setter in one
+      def errors_on(col,message=nil)
+        message.nil? ? @errors[col] : @errors[col] = (@errors[col]||[]) << message
       end
-    	def before_delete; @old_doc = @doc.dup; end
-    	alias before_destroy before_delete
-    	def after_delete
-    	  model.relationships.each do |k,v|
-    		  Kernel.const_get(k).find({model.foreign_key_name=>@old_doc['_id'].to_s}).each{|m| m.delete} unless v[:independent]
-    		end
-    	end
-    	alias after_destroy after_delete
-    	def valid?
-    		before_validation
-    		validate
-    		after_validation
-    		@errors.empty?
-    	end
-    	def before_validation
-    	  @errors = {}
-    	  @doc.each do |k,v|
-    	    next unless model.schema.key?(k)
-    			type = k=='_id' ? :primary_key : model.schema[k][:type]
-    	    fix_method = "fix_type_#{type}"
-    	    if v==''
-    	      default = model.schema[k][:default]
-    	      @doc[k] = default.is_a?(Proc) ? default.call : default
+      def before_delete; @old_doc = @doc.dup; end
+      alias before_destroy before_delete
+      def after_delete
+        model.relationships.each do |k,v|
+          Kernel.const_get(k).find({model.foreign_key_name=>@old_doc['_id'].to_s}).each{|m| m.delete} unless v[:independent]
+        end
+      end
+      alias after_destroy after_delete
+      def valid?
+        before_validation
+        validate
+        after_validation
+        @errors.empty?
+      end
+      def before_validation
+        @errors = {}
+        @doc.each do |k,v|
+          next unless model.schema.key?(k)
+          type = k=='_id' ? :primary_key : model.schema[k][:type]
+          fix_method = "fix_type_#{type}"
+          if v==''
+            default = model.schema[k][:default]
+            @doc[k] = default.is_a?(Proc) ? default.call : default
           else
-    	      self.__send__(fix_method, k, v) if self.respond_to?(fix_method)
+            self.__send__(fix_method, k, v) if self.respond_to?(fix_method)
           end
         end
-    	end
-    	def validate; end
-    	def after_validation; end
-    	def fix_type_integer(k,v); @doc[k] = v.to_i; end
+      end
+      def validate; end
+      def after_validation; end
+      def fix_type_integer(k,v); @doc[k] = v.to_i; end
       def fix_type_price(k,v)
         @doc[k] = v.respond_to?(:to_price_integer) ? v.to_price_integer : v
       end
-    	def fix_type_boolean(k,v); @doc[k] = (v=='true'||v==true) ? true : false; end
+      def fix_type_boolean(k,v); @doc[k] = (v=='true'||v==true) ? true : false; end
       def fix_type_slug(k,v); @doc[k] = self.auto_slug if v.to_s==''; end
-    	def fix_type_date(k,v)
-    	  if v.is_a?(String)
-    	    if v[/\d\d\d\d-\d\d-\d\d/]
-    	      @doc[k] =  ::Time.utc(*v.split('-'))
+      def fix_type_date(k,v)
+        if v.is_a?(String)
+          if v[/\d\d\d\d-\d\d-\d\d/]
+            @doc[k] =  ::Time.utc(*v.split('-'))
           else
-    	      default = model.schema[k][:default]
+            default = model.schema[k][:default]
             @doc[k] = default.is_a?(Proc) ? default.call : default
           end
-    	  end
-    	end
-    	def fix_type_datetime(k,v)
-    	  if v.is_a?(String)
-    	    if v[/\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d/]
-    	      @doc[k] =  ::Time.utc(*v.split(/[-:\s]/))
+        end
+      end
+      def fix_type_datetime(k,v)
+        if v.is_a?(String)
+          if v[/\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d/]
+            @doc[k] =  ::Time.utc(*v.split(/[-:\s]/))
           else
-    	      default = model.schema[k][:default]
+            default = model.schema[k][:default]
             @doc[k] = default.is_a?(Proc) ? default.call : default
           end
-    	  end
-    	end
+        end
+      end
 
-    	def save
-    	  return nil unless valid?
-    		before_save
-    		if new?
-    		  before_create
-    		  id = model.collection.insert(@doc)
-    			@doc['_id'] = id
-    			after_create
-    		else
-    		  before_update
-    		  id = model.collection.update({'_id'=>@doc['_id']}, @doc)
-    			after_update
-    		end
-    		after_save
-    		id.nil? ? nil : self
-    	end
-    	def before_save; end
-    	def before_create; end
-    	def before_update; end
-    	def after_save; end
-    	def after_create; @is_new = false; end
-    	def after_update; end
+      def save
+        return nil unless valid?
+        before_save
+        if new?
+          before_create
+          id = model.collection.insert(@doc)
+          @doc['_id'] = id
+          after_create
+        else
+          before_update
+          id = model.collection.update({'_id'=>@doc['_id']}, @doc)
+          after_update
+        end
+        after_save
+        id.nil? ? nil : self
+      end
+      def before_save; end
+      def before_create; end
+      def before_update; end
+      def after_save; end
+      def after_create; @is_new = false; end
+      def after_update; end
 
       # ==========
       # = Cursor =

data/lib/populate_me/mongo/plug.rb

@@ -11,17 +11,17 @@ module PopulateMe
   
       # This module is the one that plugs the model to the CMS
   
-    	def self.included(base)
-    	  base.class_eval do
-    	    include PopulateMe::Mongo::Mutation
-    	    include PopulateMe::Mongo::Stash if (base.const_defined?(:WITH_STASH) && base::WITH_STASH)
-    	    include PopulateMe::Mongo::BackendApiPlug
-    	    include PopulateMe::Mongo::Crushyform
-    	    include InstanceMethods
+      def self.included(base)
+        base.class_eval do
+          include PopulateMe::Mongo::Mutation
+          include PopulateMe::Mongo::Stash if (base.const_defined?(:WITH_STASH) && base::WITH_STASH)
+          include PopulateMe::Mongo::BackendApiPlug
+          include PopulateMe::Mongo::Crushyform
+          include InstanceMethods
         end
-    		base.extend(ClassMethods)
-    		base.populate_config = {:nut_tree_class=>'sortable-grid'}
-    	end
+        base.extend(ClassMethods)
+        base.populate_config = {:nut_tree_class=>'sortable-grid'}
+      end
 
       module ClassMethods
     
@@ -36,8 +36,8 @@ module PopulateMe
         #   self.find(@list_options[:filter]||{}).each {|m| out << m.to_nutshell }
         #   out << "</ul>"
         # end
-		
-    		def sortable_on_that_page?(r)
+    
+        def sortable_on_that_page?(r)
           @schema.key?('position') && (@schema['position'][:scope].nil? || (r['filter']||{}).key?(@schema['position'][:scope]))
         end
     
@@ -53,80 +53,80 @@ module PopulateMe
         private
     
         def image_slot(name='image',opts={})
-    		  super(name,opts)
-    			# First image slot is considered the best populate thumb by default
-    			unless instance_methods.include?(:to_populate_thumb)
-    			  define_method :to_populate_thumb do |style|
-    				  generic_thumb(name, style)
-    				end
-    			end
-    		end
+          super(name,opts)
+          # First image slot is considered the best populate thumb by default
+          unless instance_methods.include?(:to_populate_thumb)
+            define_method :to_populate_thumb do |style|
+              generic_thumb(name, style)
+            end
+          end
+        end
 
-    	end
+      end
   
       module InstanceMethods
 
-    	  def after_stash(col)
-      	  convert(col, "-resize '100x75^' -gravity center -extent 100x75", 'stash_thumb_gif')
-      	end
+        def after_stash(col)
+          convert(col, "-resize '100x75^' -gravity center -extent 100x75", 'stash_thumb_gif')
+        end
 
         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?
-      		  "/gridfs/#{current[size]}"
-      		else
-      		  placeholder_thumb(size)
-      		end
-      	end
-	
-      	def placeholder_thumb(size)
+          current = obj.doc[img]
+          if !current.nil? && !current[size].nil?
+            "/gridfs/#{current[size]}"
+          else
+            placeholder_thumb(size)
+          end
+        end
+  
+        def placeholder_thumb(size)
           "/_public/img/placeholder.#{size.gsub(/^(.*)_([a-zA-Z]+)$/, '\1.\2')}"
         end
-	
-      	def to_nutshell
-      	  {
-      	    'class_name'=>model.name,
-      	    '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,
-      	    'children'=>nutshell_children,
-      	  }
+  
+        def to_nutshell
+          {
+            'class_name'=>model.name,
+            '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,
+            'children'=>nutshell_children,
+          }
         end
-	
-      	def in_nutshell
+  
+        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)
-      		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]
-      		}
-      		cols.each do |c|
-      		  column_label = c.to_s.sub(/^id_/, '').tr('_', ' ').capitalize
-      		  out << "<div class='quick-update'><form><span class='column-title'>#{column_label}:</span> #{self.crushyinput(c)}</form></div>\n"
-      	  end
-      		out << "</div>\n"
+          out = "<div class='in-nutshell'>\n"
+          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]
+          }
+          cols.each do |c|
+            column_label = c.to_s.sub(/^id_/, '').tr('_', ' ').capitalize
+            out << "<div class='quick-update'><form><span class='column-title'>#{column_label}:</span> #{self.crushyinput(c)}</form></div>\n"
+          end
+          out << "</div>\n"
         end
 
-      	def nutshell_backend_associations
-      	  model.relationships
-      	end
+        def nutshell_backend_associations
+          model.relationships
+        end
   
         def nutshell_children
-      		nutshell_backend_associations.inject([]) do |arr, (k, opts)|
-      		  unless opts[:hidden]
-        		  klass = Kernel.const_get(k)
-        			arr << {
-        			  'children_class_name'=>k,
-        			  'title'=>opts[:link_text] || "#{klass.human_name}(s)",
-        			  'count'=>self.children_count(klass),
-        			}
-        		end
-      		end
-      	end
-      	
-    	end
+          nutshell_backend_associations.inject([]) do |arr, (k, opts)|
+            unless opts[:hidden]
+              klass = Kernel.const_get(k)
+              arr << {
+                'children_class_name'=>k,
+                'title'=>opts[:link_text] || "#{klass.human_name}(s)",
+                'count'=>self.children_count(klass),
+              }
+            end
+          end
+        end
+        
+      end
 
     end
   end

data/lib/populate_me/mongo/stash.rb

@@ -5,14 +5,14 @@ module PopulateMe
   
       # This module gives models the ability to deal with attachments
   
-    	def self.included(base)
-    	  Stash.classes << base
-    	  base.extend(ClassMethods)
-    		base.gridfs = GRID
-    	end
+      def self.included(base)
+        Stash.classes << base
+        base.extend(ClassMethods)
+        base.gridfs = GRID
+      end
 
       module ClassMethods
-    	  attr_accessor :gridfs
+        attr_accessor :gridfs
         def all_after_stash
           self.collection.find.each do |i|
             self.schema.each do |k,v|
@@ -21,110 +21,110 @@ module PopulateMe
             end
           end
         end
-    	end
-	
-    	# Instance Methods
-	
-    	def build_image_tag(col='image', style='original', html_attributes={})
-    	  return '' if @doc[col].nil?||@doc[col][style].nil?
-    	  title_field, alt_field = col+'_tooltip', col+'_alternative_text'
-    		title = @doc[title_field] if model.schema.keys.include?(title_field)
-    		alt = @doc[alt_field] if model.schema.keys.include?(alt_field)
-    		html_attributes = {:src => "/gridfs/#{@doc[col][style]}", :title => title, :alt => alt}.update(html_attributes)
-    		html_attributes = html_attributes.map do |k,v|
-    		  %{#{k}="#{model.html_escape(v.to_s)}"}
-    		end.join(' ')
-    	  "<img #{html_attributes} />"
-    	end
+      end
+  
+      # Instance Methods
+  
+      def build_image_tag(col='image', style='original', html_attributes={})
+        return '' if @doc[col].nil?||@doc[col][style].nil?
+        title_field, alt_field = col+'_tooltip', col+'_alternative_text'
+        title = @doc[title_field] if model.schema.keys.include?(title_field)
+        alt = @doc[alt_field] if model.schema.keys.include?(alt_field)
+        html_attributes = {:src => "/gridfs/#{@doc[col][style]}", :title => title, :alt => alt}.update(html_attributes)
+        html_attributes = html_attributes.map do |k,v|
+          %{#{k}="#{model.html_escape(v.to_s)}"}
+        end.join(' ')
+        "<img #{html_attributes} />"
+      end
 
-    	def fix_type_attachment(k,v)
-    	  if v=='nil'
+      def fix_type_attachment(k,v)
+        if v=='nil'
           delete_files_for(k) unless new?
-    			@doc[k] = nil
-    	  elsif v.is_a?(Hash)&&v.key?(:tempfile)
-    		  delete_files_for(k) unless new?
-    			@temp_attachments ||= {}
-    			@temp_attachments[k] = v
+          @doc[k] = nil
+        elsif v.is_a?(Hash)&&v.key?(:tempfile)
+          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]})
-    			@doc[k] = {'original'=>attachment_id}
-    		end
-    	end
+          @doc[k] = {'original'=>attachment_id}
+        end
+      end
 
-    	def delete_files_for(col)
-    	  obj = (@old_doc||@doc)[col]
-    		if obj.respond_to?(:each)
-    		  obj.each do |k,v|
-    			  model.gridfs.delete(v)
-    			end
-    		end
-    	end
+      def delete_files_for(col)
+        obj = (@old_doc||@doc)[col]
+        if obj.respond_to?(:each)
+          obj.each do |k,v|
+            model.gridfs.delete(v)
+          end
+        end
+      end
 
-    	def after_delete
-    	  super
+      def after_delete
+        super
         model.schema.each do |k,v|
-    		  delete_files_for(k) if v[:type]==:attachment
-    		end
-    	end
+          delete_files_for(k) if v[:type]==:attachment
+        end
+      end
 
-    	def after_save
-    	  super
-    		unless @temp_attachments.nil?
-    			@temp_attachments.each do |k,v|
-    				after_stash(k)
-    			end
-    		end
-    	end
+      def after_save
+        super
+        unless @temp_attachments.nil?
+          @temp_attachments.each do |k,v|
+            after_stash(k)
+          end
+        end
+      end
 
-    	def after_stash(col); end
+      def after_stash(col); end
 
-    	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
-    	    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?
-    	    src.close
-    	    @temp_attachments ||= {}
-    	    @temp_attachments[col] ||= {}
-    	    @temp_attachments[col][:tempfile] = src
-    	    @temp_attachments[col][:type] = f.content_type
-    		else
-    		  return unless @temp_attachments[col][:type][/^image\//]
-    		  src = @temp_attachments[col][:tempfile]
-    		end
-    	  model.gridfs.delete(@doc[col][style]) unless @doc[col][style].nil?
-    		ext = style[/[a-zA-Z]+$/].insert(0,'.')
-    		content_type = Rack::Mime.mime_type(ext) 
+      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
+          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?
+          src.close
+          @temp_attachments ||= {}
+          @temp_attachments[col] ||= {}
+          @temp_attachments[col][:tempfile] = src
+          @temp_attachments[col][:type] = f.content_type
+        else
+          return unless @temp_attachments[col][:type][/^image\//]
+          src = @temp_attachments[col][:tempfile]
+        end
+        model.gridfs.delete(@doc[col][style]) unless @doc[col][style].nil?
+        ext = style[/[a-zA-Z]+$/].insert(0,'.')
+        content_type = Rack::Mime.mime_type(ext) 
         unless content_type[/^image\//]
           ext = '.jpg'
           content_type = 'image/jpeg'
         end
-    		dest = Tempfile.new(['MongoStash_dest', ext])
-    		dest.binmode
-    		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})
+        dest = Tempfile.new(['MongoStash_dest', ext])
+        dest.binmode
+        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})
         @doc[col] = @doc[col].update({style=>attachment_id})
-    		model.collection.update({'_id'=>@doc['_id']}, @doc)
-    		#src.close!
-    		dest.close!
-    	end
+        model.collection.update({'_id'=>@doc['_id']}, @doc)
+        #src.close!
+        dest.close!
+      end
 
-    	class << self
-    	  attr_accessor :classes
-    		Stash.classes = []
-    		
-    		def all_after_stash
-    		  Stash.classes.each do |m|
+      class << self
+        attr_accessor :classes
+        Stash.classes = []
+        
+        def all_after_stash
+          Stash.classes.each do |m|
             m.all_after_stash
-    			end
-    		end
-    		
-    		def fix_dots_in_keys(c, for_real=false)
+          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|
@@ -153,7 +153,7 @@ module PopulateMe
           end
         end
 
-    	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.16"
+  s.version = "0.0.17"
   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.16
+  version: 0.0.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2013-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-golem