populate-me 0.0.6 → 0.0.7

data/lib/populate_me/control.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'rack/golem'
 require 'json'
 

data/lib/populate_me/control/_public/css/main.css

@@ -1,23 +1,26 @@
+@import url(http://fonts.googleapis.com/css?family=Lato);
+
 body {
-	font-family: 'gill sans', verdana, sans-serif;
+	font-family: 'Lato', sans-serif;
 	font-size: 12px;
-	color: #888;
-	background-color: #444;
+	color: #fdf6e3;
+	background-color: #002b36;
 	padding: 0px;
 	/* Build column */
 	height: 100%; 
 	margin: 0px; 
   text-align: center; /* for IE7 */
+  -webkit-font-smoothing: antialiased;
 }
 
 img { border: 0px; }
 ul { list-style: none; padding: 0px; margin: 0px; }
-a { color: #89D8EE; }
+a { color: #dc322f; }
 a:hover { text-decoration: none; }
 
 noscript div { 
 	padding: 20px; 
-	background-color: yellow; color: black;
+	background-color: #b58900; color: #002b36;
 }
 
 .shadowed {
@@ -30,10 +33,10 @@ noscript div {
 
 #trunk { margin: 0px auto; text-align: left; width: 100%; max-width: 500px; min-width: 320px; }
 #page-title { 
-  background-color: #89D8EE; color: #444; width: 80%; text-align: center; 
+  background-color: #2aa198; color: #002b36; width: 80%; text-align: center; 
   margin: 0px; padding: 20px 10%;
 }
-#header { background-color: #89D8EE; width: 100%; height: 32px; position: relative; }
+#header { background-color: #2aa198; width: 100%; height: 32px; position: relative; }
 #search-wrap { position: absolute; top: 0px; bottom: 0px; left: 32px; right: 32px; }
 #search { 
   width: 80%; height: 22px; 
@@ -47,10 +50,10 @@ noscript div {
 .btn {
 	display: block;
 	width: 32px; height: 32px;
-	background: transparent url('../img/icons-cms.png') no-repeat left top;
+	background: transparent url('../img/icons-cms-solarized.png') no-repeat left top;
 	margin: 0px auto;
 }
-.btn:hover { background-color: #777; }
+.btn:hover { background-color: #586e75; }
 .back-btn { background-position: 0px -32px; }
 .plus-btn { background-position: 0px -64px; }
 .cross-btn { 
@@ -59,13 +62,14 @@ noscript div {
 	-moz-border-radius: 5px;
 	-webkit-border-radius: 5px;
 }
-.cross-btn:hover { background-color: #89D8EE;}
+.cross-btn:hover { background-color: #dc322f;}
 .further-btn { background-position: 0px -128px; }
 
 .extra-plus {
-	border: 1px dashed black;
+	/* border: 1px dashed #073642; */
 	margin: 10px;
 	width: auto;
+  background-color: #073642;
 	background-position: center -64px;
 	border-radius: 5px;
 	-moz-border-radius: 5px;
@@ -82,11 +86,11 @@ ul.menu-list li {
 
 ul.menu-list li a {
   display: block; padding: 10px;
-  background-color: white; color: #333;
+  background-color: #eee8d5; color: #002b36;
   text-decoration: none;
 }
 ul.menu-list li a:hover {
-  background-color: #CCC;
+  background-color: #93a1a1;
 }
 
 /* ============= */
@@ -106,8 +110,8 @@ ul.nutshell-children li { margin: 0px 10px; }
 }
 
 .nutshell-bar {
-	background-color: white;
-/*  background: white url('../img/handle-pattern.png') repeat left top;*/
+	background-color: #eee8d5;
+/*  background: #fdf6e3 url('../img/grip.png') repeat left top;*/
 	height: 32px;
 	-webkit-border-top-left-radius: 5px;
 	-webkit-border-top-right-radius: 5px;
@@ -118,37 +122,46 @@ ul.nutshell-children li { margin: 0px 10px; }
 }
 
 .sortable-handle {
-  background: transparent url('../img/handle-pattern.png') repeat left top;
+  background: transparent url('../img/grip.png') repeat left top;
   cursor: move;
+  cursor: ns-resize;
+  cursor: -webkit-grab;
+  cursor: -moz-grab;
 }
 
-.further-bar { width: auto; background-color: #89D8EE; border-top: 1px dotted black; }
+.further-bar { width: auto; background-color: #2aa198; border-top: 1px dotted black; }
 
 .nutshell-edit, .further-bar { 
 	display: block; position: relative;
 	padding: 10px 10px 10px 42px; 
 	font-size: 12px; line-height: 12px; height: 12px;
-	color: black; text-decoration: none;
+	color: #002b36; text-decoration: none;
 }
-.nutshell-edit:hover, .further-bar:hover { background-color: #CCC; }
+.nutshell-edit:hover, .further-bar:hover { background-color: #586e75; }
 
 .nutshell-edit { 
-	background-color: white;
+	background-color: #eee8d5;
 	padding: 10px 10px 10px 10px;
+  font-size: 14px; line-height: 14px;
   height: auto;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
+  
+	-webkit-border-bottom-right-radius: 5px;
+	-webkit-border-bottom-left-radius: 5px;
+	-moz-border-radius-bottomright: 5px;
+	-moz-border-radius-bottomleft: 5px;
+	border-bottom-right-radius: 5px;
+	border-bottom-left-radius: 5px;
 }
 .nutshell-edit:hover {
-/*  -moz-box-shadow: 0px 0px 20px black;*/
-/*  -webkit-box-shadow: 0px 0px 20px black;*/
-/*  box-shadow: 0px 0px 20px black;*/
-  background-color: aliceblue;
+  background-color: #93a1a1;
 }
 
+/*
 .nutshell-bottom {
-	background-color: white;
+	background-color: #fdf6e3;
 	height: 10px;
 	-webkit-border-bottom-right-radius: 5px;
 	-webkit-border-bottom-left-radius: 5px;
@@ -156,25 +169,39 @@ ul.nutshell-children li { margin: 0px 10px; }
 	-moz-border-radius-bottomleft: 5px;
 	border-bottom-right-radius: 5px;
 	border-bottom-left-radius: 5px;
-}
+}*/
 
 /* ========= */
 /* = Forms = */
 /* ========= */
 
+input:not([type=file]), textarea, select { 
+  border: 0px;
+  background: #eee8d5; color: #002b36;
+}
+input[type=submit] {
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  -o-border-radius: 3px;
+  border-radius: 3px;
+  background-color: #859900;
+  cursor: pointer;
+}
+input[type=submit]:hover { background-color: #586e75; }
 .backend-form { margin: 10px; padding: 0px; }
 .crushyfield-error input { background-color: #FCC; }
 .crushyfield-error-list { color: #F99; }
-input[type=text] { width: 50%; }
-textarea { width: 70%; height: 150px; }
+input[type=text] { width: 70%; padding: 5px; }
+textarea { width: 70%; height: 150px; padding: 5px; }
+select { padding: 5px; }
 
 /* ========== */
 /* = Footer = */
 /* ========== */
 
 #footer {
-  border-top: 1px solid #555;
-  color: #555; font-size: 10px;
+  border-top: 1px solid #586e75;
+  color: #586e75; font-size: 10px;
   padding: 10px;
 }
-#footer a { color: #555; }
+#footer a { color: #586e75; }

data/lib/populate_me/control/_public/js/main.js

@@ -111,7 +111,7 @@ $(function() {
   // Ajax form
   $('.backend-form').live('submit', function() {
     var $form = $(this);
-    $form.find(':submit').after("<img src='"+admin_path+"/_public/img/small-loader.gif' />").remove();
+    $form.find(':submit').after("<img src='"+admin_path+"/_public/img/small-loader.gif' alt='Loader' />").remove();
     $form.ajaxSubmit({
       success: function(data) {
         if (data.action=='save' || data.match(/ok/i)) { // Success

data/lib/populate_me/control/views/populate_me_layout.erb

@@ -16,7 +16,7 @@
   </script>
   <script id='template-nut-tree' type='text/html'>
     {{#command_plus}}
-      <a href='<%= config[:path] %>/form/{{class_name}}{{query_string}}' class='btn plus-btn extra-plus pushstack'></a>
+      <a href='<%= config[:path] %>/form/{{class_name}}{{query_string}}' class='btn plus-btn extra-plus pushstack' title='Create'></a>
     {{/command_plus}}
     <ul class='nut-tree {{#sortable}}sortable{{/sortable}}'>
       {{#items}}{{>nutshell}}{{/items}}
@@ -27,14 +27,12 @@
       <div class='nutshell-core'>
         <div class='nutshell-bar {{#sortable}}sortable-handle{{/sortable}}'>
           
-          <a href='<%= config[:path] %>/{{class_name}}/{{id}}' class='btn cross-btn nutshell-delete float-right'></a>
+          <a href='<%= config[:path] %>/{{class_name}}/{{id}}' class='btn cross-btn nutshell-delete float-right' title='Delete'></a>
         </div>
-        <a href='<%= config[:path] %>/form/{{class_name}}/{{id}}' class='nutshell-edit pushstack'>
-          {{#thumb}}<img src='{{thumb}}' onerror="this.style.display='none'" />{{/thumb}}
-          {{^thumb}}<img src='/admin/_public/img/placeholder.png' onerror="this.style.display='none'" />{{/thumb}}
+        <a href='<%= config[:path] %>/form/{{class_name}}/{{id}}' class='nutshell-edit pushstack' title='Edit'>
+          {{#thumb}}<img src='{{thumb}}' onerror="this.style.display='none'" alt='Thumb' />{{/thumb}}
           &nbsp;<span class='nutshell-title'>{{title}}</span>
         </a>
-        <div class='nutshell-bottom'></div>
       </div>
       <ul class='nutshell-children'>
         {{#children}}
@@ -48,8 +46,8 @@
   <div id='trunk'>
     <h1 id='page-title' class='shadowed'><%= config[:page_title] %></h1>
     <div id='header' class='shadowed'>
-      <a href='#' class='btn back-btn float-left popstack'></a>
-      <a href='<%= config[:path] %>' class='btn home-btn float-right'></a>
+      <a href='#' class='btn back-btn float-left popstack' title='Back'></a>
+      <a href='<%= config[:path] %>' class='btn home-btn float-right' title='Home'></a>
       <div id='search-wrap'><input type='text' id='search' placeholder='Search' /></div>
     </div>
     <noscript><div>In order to have this content management system working, you need to have javascript enabled.</div></noscript>

data/lib/populate_me/mongo.rb

@@ -1 +1,2 @@
-require 'populate_me/mongo/plug'
+# encoding: utf-8
+require 'populate_me/mongo/plug'

data/lib/populate_me/mongo/backend_api_plug.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module PopulateMe
   module Mongo
     module BackendApiPlug

data/lib/populate_me/mongo/crushyform.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module PopulateMe
   module Mongo
     module Crushyform
@@ -28,6 +29,9 @@ module PopulateMe
               tag = "<input type='%s' name='%s' value=\"%s\" id='%s' class='%s' %s />%s\n" % [o[:input_type]||'text', o[:input_name], o[:input_value], m.field_id_for(c), o[:input_class], o[:required]&&'required', o[:required]]
               "#{tag}#{js}"
             end,
+            :slug => proc do |m,c,o|
+              crushyform_types[:string].call(m,c,o)
+            end,
             :boolean => proc do |m,c,o|
               crushid = m.field_id_for(c)
               s = ['checked', nil]
@@ -210,7 +214,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'\" alt='Thumb' />\n"
         end
       end
       # Reset dropdowns on hooks

data/lib/populate_me/mongo/mutation.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module PopulateMe
   module Mongo
     module Mutation
@@ -14,10 +15,11 @@ module PopulateMe
 
       module MutateClass
     	  attr_accessor :db, :schema, :relationships
-    		attr_writer :label_column, :sorting_order
+    		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 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
@@ -100,6 +102,17 @@ module PopulateMe
     	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 = 
+      "AAAAAAaaaaaaAaAaAaCcCcCcCcCcDdDdDdEEEEeeeeEeEeEeEeEeGgGgGgGgHhHhIIIIiiiiIiIiIiIiIiJjKkkLlLlLlLlLlNnNnNnNnnNnOOOOOOooooooOoOoOoRrRrRrSsSsSsSssT"
+      def auto_slug
+         s = self.to_label.tr(ACCENTS_FROM,ACCENTS_TO).tr(' .,;:?!/\'"()[]{}<>','-').gsub(/&/, 'and')
+        defined?(::Rack::Utils) ? ::Rack::Utils.escape(s) : s
+      end
+      def to_slug; @doc[model.column_slug]||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 field_id_for(col); "%s-%s-%s" % [id||'new',model.name,col]; end
 
@@ -200,6 +213,7 @@ module PopulateMe
     	def after_validation; end
     	def fix_type_integer(k,v); @doc[k] = v.to_i; 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/]

data/lib/populate_me/mongo/plug.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'populate_me/mongo/mutation'
 require 'populate_me/mongo/stash'
 require 'populate_me/mongo/crushyform'

data/lib/populate_me/mongo/stash.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module PopulateMe
   module Mongo
     module Stash
@@ -12,6 +13,14 @@ module PopulateMe
 
       module ClassMethods
     	  attr_accessor :gridfs
+        def all_after_stash
+          self.collection.find.each do |i|
+            self.schema.each do |k,v|
+              obj = self.new(i)
+              obj.after_stash(k) if v[:type]==:attachment&&obj[k].to_s!=''
+            end
+          end
+        end
     	end
 	
     	# Instance Methods
@@ -88,12 +97,16 @@ module PopulateMe
     		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}"
-    		content_type = Rack::Mime.mime_type(ext) 
     		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)
@@ -107,12 +120,7 @@ module PopulateMe
     		
     		def all_after_stash
     		  Stash.classes.each do |m|
-    			  m.collection.find.each do |i|
-    				  m.schema.each do |k,v|
-                obj = m.new(i)
-                obj.after_stash(k) if v[:type]==:attachment&&obj[k].to_s!=''
-    					end
-    				end
+            m.all_after_stash
     			end
     		end
     		

data/populate-me.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s| 
   s.name = 'populate-me'
-  s.version = "0.0.6"
+  s.version = "0.0.7"
   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.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-golem
@@ -70,7 +70,8 @@ files:
 - lib/populate_me/control/_public/css/ui-darkness/images/ui-icons_cccccc_256x240.png
 - lib/populate_me/control/_public/css/ui-darkness/images/ui-icons_ffffff_256x240.png
 - lib/populate_me/control/_public/css/ui-darkness/jquery-ui-1.8.17.custom.css
-- lib/populate_me/control/_public/img/handle-pattern.png
+- lib/populate_me/control/_public/img/grip.png
+- lib/populate_me/control/_public/img/icons-cms-solarized.png
 - lib/populate_me/control/_public/img/icons-cms.png
 - lib/populate_me/control/_public/img/placeholder.png
 - lib/populate_me/control/_public/img/placeholder.stash_thumb.gif