copy 0.1.0 → 0.1.1

data/lib/copy/server.rb

@@ -57,12 +57,16 @@ module Copy
           content = yield
           @_out_buf = old_buffer
           
+          # Remove newlines from the beginning
+          content.gsub!(/^\n/, '')
           # Get the first line from captured text.
           first_line = content.split("\n").first
           # Determine how much white space it has in front.
           white_space = first_line.match(/^(\s)*/)[0]
           # Remove that same amount of white space from the beginning of every line.
           content.gsub!(Regexp.new("^#{white_space}"), '')
+          # Remove all whitespace from the end, but keep the newline if present.
+          content.gsub!(/\s*$/, '') << "\n" if content =~ /\n/
           
           # Save the content so it can be edited.
           Copy::Storage.set(name, content) if Copy::Storage.connected?

data/lib/copy/storage/relational.rb

@@ -9,7 +9,7 @@ module Copy
         property :id,         Serial
         property :name,       String, :unique_index => true
         property :content,    Text
-      end
+      end if defined?(DataMapper::Resource)
       
       def initialize(connection_url)
         DataMapper.setup(:default, connection_url)

data/lib/copy/version.rb

@@ -1,3 +1,3 @@
 module Copy
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/test/server_test.rb

@@ -113,6 +113,16 @@ class ServerCopyHelperTest < Test::Unit::TestCase
     assert_match %Q(<span class="_copy_editable" data-name="headline">Important!</span>), last_response.body
   end
   
+  test "copy helper indented in view" do
+    Copy::Storage.stubs(:connected?).returns(true)
+    Copy::Storage.expects(:get).with(:three).returns(nil)
+    Copy::Storage.expects(:set).with(:three, "three\n").returns(true)
+    
+    get 'indented'
+    assert last_response.ok?, last_response.errors
+    assert_match %Q(<div class="_copy_editable" data-name="three"><p>three</p></div>), last_response.body
+  end
+  
   test "partial rendering" do
     get 'renders_partials'
     assert last_response.ok?, last_response.errors

data/test/test_app/views/indented.html.erb

@@ -0,0 +1,9 @@
+<div>
+  <div class="one">
+    <div class="two">
+      <% copy :three do %>
+        three
+      <% end %>
+    </div>
+  </div>
+</div>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: copy
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Javan Makhmali
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-19 00:00:00 -04:00
+date: 2011-05-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -113,6 +113,7 @@ files:
 - test/test_app/views/about/us.html.erb
 - test/test_app/views/data/people.csv.erb
 - test/test_app/views/data/people.xml.erb
+- test/test_app/views/indented.html.erb
 - test/test_app/views/index.html.erb
 - test/test_app/views/layout.html.erb
 - test/test_app/views/renders_partials.html.erb
@@ -164,6 +165,7 @@ test_files:
 - test/test_app/views/about/us.html.erb
 - test/test_app/views/data/people.csv.erb
 - test/test_app/views/data/people.xml.erb
+- test/test_app/views/indented.html.erb
 - test/test_app/views/index.html.erb
 - test/test_app/views/layout.html.erb
 - test/test_app/views/renders_partials.html.erb