copy 0.1.5 → 0.1.6

data/README.md

@@ -6,19 +6,17 @@
     ├── Gemfile              <- Uncomment the gems you need for storage.
     ├── config.ru            <- Configure storage, user, and password here.
     ├── public               <- The public root of your new site.
-    │   ├── favicon.ico         Ships with a few helpful defaults.
+    │   ├── favicon.ico      <- A blank favicon, replace with your own.
     │   ├── images
     │   ├── javascripts
-    │   │   └── main.js
-    │   ├── robots.txt
+    │   │   └── main.js      <- A good place for your basic scripts.
+    │   ├── robots.txt       <- Read file for details.
     │   └── stylesheets
-    │       └── main.css
+    │       └── main.css     <- Toss some CSS styles in here.
     └── views                <- Your views, layouts, and partials live here.
         ├── index.html.erb
-        └── layout.html.erb
+        └── layout.html.erb  <- Optional global layout file.
         
-The layout (`layout.html.erb`) yields to all the views. It's not required so delete it if your views contain full html documents.
-
 Copy automatically maps URLs to files in your `views` directory.
 
 * `/` &rarr; `index.html.erb`
@@ -35,7 +33,7 @@ Copy lets you define blocks of editable text in your views.
 
 The text provided in the block will be saved and can then be edited live on the site. All content is formatted with Markdown. [See demo](http://copy-demo.heroku.com) for a live example or [view the source](https://github.com/javan/copy-demo).
 
-Single line blocks will be edited in a text field as opposed to a textarea. Perfect for headlines.
+Single line blocks will be rendered in a span (by default). Perfect for headlines.
 
     <h1><% copy :title do %>Like a boss!<% end %></h1>
 
@@ -65,4 +63,4 @@ Browse to `/_copy` and drag the "Edit Copy" link to your bookmarks bar. Return t
 
 ----
 
-&copy; 2011 Javan Makhmali
+[![Build Status](http://travis-ci.org/javan/copy.png)](http://travis-ci.org/javan/copy) &mdash; &copy; 2011 Javan Makhmali

data/copy.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |s|
   s.add_dependency "redcarpet"
   
   s.add_development_dependency "mocha"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rack-test"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/copy/admin/copy.css

@@ -19,6 +19,7 @@
 }
 
 #_copy {
+  font-size: 11px;
   overflow: hidden;
 }
 
@@ -30,32 +31,36 @@
   font-family: monaco, menlo, monospace;
 }
 
-#_copy p._copy_footer {
-  font-size: 11px;
+#_copy p {
   margin: 10px 0;
   padding: 0;
 }
 
-#_copy p._copy_footer_left {
-  float: left;
-}
-
-#_copy p._copy_footer_right {
-  float: right;
-  text-align: right;
-}
-
 #_copy a._copy_cancel {
   text-decoration: underline;
 }
 
-#_copy textarea,
-#_copy input[type="text"] {
+#_copy textarea {
+  display: none;
   font-size: 13px;
   width: 490px;
   padding: 5px;
+  -webkit-transition: height 0.2s ease-out;
+  -moz-transition: height 0.2s ease-out;
+  -o-transition: height 0.2s ease-out;
+  transition: height 0.2s ease-out;
+}
+
+#_copy textarea._copy_small {
+  resize: none;
+  overflow: hidden;
+  height: 18px;
+}
+
+#_copy textarea._copy_medium {
+  height: 150px;
 }
 
-#_copy textarea { 
+#_copy textarea._copy_large { 
   height: 300px;
 }

data/lib/copy/admin/edit.html.erb

@@ -1,16 +1,12 @@
 <div id="_copy">
   <form class="_copy_edit_form" data-content-name="<%= @name %>" action="/_copy/<%= @name %>">
-    <% if @doc =~ /\n/ || @doc.length > 40 %>
-      <textarea name="content"><%=h @doc %></textarea>
-    <% else %>
-      <input type="text" name="content" value="<%=h @doc %>" />
-    <% end %>
-    <p class="_copy_footer _copy_footer_left">
+    <p>
+      Format text with <a href="http://daringfireball.net/projects/markdown/syntax" target="_blank">markdown</a>.
+    </p>
+    <textarea name="content"><%=h @doc %></textarea>
+    <p>
       <input class="_copy_submit" type="submit" value="Save" />
       or <a class="_copy_cancel" href="#">cancel</a>
     </p>
-    <p class="_copy_footer _copy_footer_right">
-      Format text with <a href="http://daringfireball.net/projects/markdown/syntax" target="_blank">markdown</a>.
-    </p>
   </form>
 </div>

data/lib/copy/admin/index.js.erb

@@ -15,14 +15,39 @@ jQuery.noConflict();
     
     function clickable() {
       $('._copy_editable').addClass('_copy_clickable');
+      $('._copy_clickable:empty').text('(add copy)');
     }
     
     function unclickable() {
       $('._copy_editable').removeClass('_copy_clickable');
     }
     
+    // Apply sizing rules (css classes) to the textarea based
+    // on the length of the content and presence of newlines.
+    function resizeTextarea() {
+      var textarea = $('#_copy textarea');
+      var content = textarea.val();
+      
+      textarea.removeClass('_copy_small _copy_medium _copy_large');
+      
+      if (/\n/.test(content) || content.length > 55) {
+        if (content.length > 300) {
+          textarea.addClass('_copy_large');
+        } else {
+          textarea.addClass('_copy_medium');
+        }
+      } else {
+        textarea.addClass('_copy_small');
+      }
+      
+      textarea.show();
+    }
+    $('#_copy textarea').live('keydown keyup keypress change paste focus', resizeTextarea);
+    
+    // Apply the styles.
     $('head').append('<style><%= File.read(settings.root + '/admin/copy.css').gsub(/\n/, " \\\n") %></style>');
-
+    
+    // When a clickable region is clicked, load the content into the editor.
     $('._copy_clickable').live('click', function() {
       var copy = $(this);
       unclickable();
@@ -31,8 +56,7 @@ jQuery.noConflict();
         success: function(html) {
           $('body').prepend(html);
           $('#_copy').css({ margin:'-'+($('#_copy').height() / 2)+'px 0 0 -'+($('#_copy').width() / 2)+'px' });
-          $('#_copy [name="content"]').get(0).focus();
-        }
+          $('#_copy textarea').focus();        }
       });
     });
     
@@ -42,12 +66,14 @@ jQuery.noConflict();
       event.preventDefault();
     });
     
-    $('._copy_cancel').live('click', function() {
+    // Hide the editor and make everything clickable if cancel is pressed.
+    $('._copy_cancel').live('click', function(event) {
+      event.preventDefault();
       $('#_copy').remove();
       clickable();
-      return false;
     });
     
+    // Save the content when the submit button is pressed.
     $('._copy_edit_form').live('submit', function() {
       var form = $(this);
       var original = $('[data-name="'+form.attr('data-content-name')+'"]');
@@ -55,7 +81,7 @@ jQuery.noConflict();
       $.ajax({
         type: 'PUT',
         url: form.attr('action'),
-        data: { content: form.find('[name="content"]').val(), wrap_tag: original.get(0).tagName.toLowerCase() },
+        data: { content: form.find('textarea').val(), wrap_tag: original.get(0).tagName.toLowerCase() },
         success: function(html) {
           $('#_copy').remove();
           original.replaceWith(html);
@@ -64,6 +90,7 @@ jQuery.noConflict();
       return false;
     })
     
+    // Make the editable regions clickable.
     clickable();
     window._copy_initialized = true;
   });

data/lib/copy/version.rb

@@ -1,3 +1,3 @@
 module Copy
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

data/test/server_test.rb

@@ -162,17 +162,11 @@ class ServerAdminTest < Test::Unit::TestCase
   
   test "GET /_copy/:name" do
     Copy::Storage.stubs(:connected?).returns(true)
-    Copy::Storage.expects(:get).with('fun').returns('"party"')
+    Copy::Storage.expects(:get).with('fun').returns("<b>party\n")
     
     authorize!
     get '/_copy/fun'
     assert last_response.ok?, last_response.errors
-    # Single line content renders in a text field
-    assert_match 'value="&quot;party&quot;"', last_response.body
-    
-    # Multiline renders in a textarea
-    Copy::Storage.expects(:get).with('fun').returns("<b>party\n")
-    get '/_copy/fun'
     assert_match "&lt;b&gt;party\n</textarea>", last_response.body
   end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: copy
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Javan Makhmali
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-18 00:00:00 -04:00
+date: 2011-06-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,6 +62,34 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: Serves mostly static pages with blocks of editable copy.
 email: 
 - javan@javan.us