copy 0.1.7 → 0.2.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Javan Makhmali
+Copyright (c) 2013 Javan Makhmali
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -16,7 +16,7 @@
     └── views                <- Your views, layouts, and partials live here.
         ├── index.html.erb
         └── layout.html.erb  <- Optional global layout file.
-        
+
 Copy automatically maps URLs to files in your `views` directory.
 
 * `/` &rarr; `index.html.erb`
@@ -63,4 +63,4 @@ Browse to `/_copy` and drag the "Edit Copy" link to your bookmarks bar. Return t
 
 ----
 
-[![Build Status](http://travis-ci.org/javan/copy.png)](http://travis-ci.org/javan/copy) &mdash; &copy; 2011 Javan Makhmali
+[![Build Status](http://travis-ci.org/javan/copy.png)](http://travis-ci.org/javan/copy) &mdash; &copy; 2013 Javan Makhmali

data/copy.gemspec

@@ -13,10 +13,10 @@ Gem::Specification.new do |s|
   s.description = %q{Serves mostly static pages with blocks of editable copy.}
 
   s.rubyforge_project = "copy"
-  
-  s.add_dependency "sinatra", "~> 1.2.6"
-  s.add_dependency "redcarpet"
-  
+
+  s.add_dependency "sinatra", "~> 1.3.3"
+  s.add_dependency "redcarpet", "~> 2.2.2"
+
   s.add_development_dependency "mocha"
   s.add_development_dependency "rake"
   s.add_development_dependency "rack-test"

data/lib/copy/server.rb

@@ -2,16 +2,16 @@ require 'sinatra/base'
 require 'erb'
 require 'redcarpet'
 
-module Copy 
-  class Server < Sinatra::Base    
+module Copy
+  class Server < Sinatra::Base
     set :views,  './views'
-    set :public, './public'
+    set :public_folder, './public'
     set :root, File.dirname(File.expand_path(__FILE__))
-    
+
     helpers do
       include Rack::Utils
       alias_method :h, :escape_html
-        
+
       def protected!
         unless authorized?
           response['WWW-Authenticate'] = %(Basic realm="Copy Admin Area")
@@ -24,7 +24,7 @@ module Copy
         @auth ||=  Rack::Auth::Basic::Request.new(request.env)
         @auth.provided? && @auth.basic? && @auth.credentials && @auth.credentials == [settings.copy_username, settings.copy_password]
       end
-      
+
       def set_cache_control_header
         if settings.respond_to?(:cache_time) && settings.cache_time.is_a?(Numeric) && settings.cache_time > 0
           expires settings.cache_time, :public
@@ -32,14 +32,15 @@ module Copy
           cache_control :no_cache
         end
       end
-      
+
       def format_text(name, content, options = {})
         original = content.dup
         # Apply markdown formatting.
-        content = Redcarpet.new(content, :smart).to_html.chomp
-        
+        markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML, :autolink => true, :space_after_headers => true)
+        content = markdown.render(content).chomp
+
         html_attrs = %Q(class="_copy_editable" data-name="#{name}")
-        
+
         if original =~ /\n/ # content with newlines renders in a div
           tag = options[:wrap_tag] || :div
           %Q(<#{tag} #{html_attrs}>#{content}</#{tag}>)
@@ -49,14 +50,14 @@ module Copy
           %Q(<#{tag} #{html_attrs}>#{content}</#{tag}>)
         end
       end
-      
+
       def copy(name, options = {}, &block)
         if !Copy::Storage.connected? || !(content = Copy::Storage.get(name))
           # Side-step the output buffer so we can capture the block, but not output it.
           @_out_buf, old_buffer = '', @_out_buf
           content = yield
           @_out_buf = old_buffer
-          
+
           # Remove newlines from the beginning
           content.gsub!(/^\n/, '')
           # Get the first line from captured text.
@@ -67,56 +68,56 @@ module Copy
           content.gsub!(Regexp.new("^#{white_space}"), '')
           # Remove all whitespace from the end, but keep the newline if present.
           content.gsub!(/\s*\z/, '') << "\n" if content =~ /\n/
-          
+
           # Save the content so it can be edited.
           Copy::Storage.set(name, content) if Copy::Storage.connected?
         end
-        
+
         # Append the output buffer.
         @_out_buf << format_text(name, content, options)
       end
-      
+
       def partial(template)
         template_array = template.to_s.split('/')
         template = template_array[0..-2].join('/') + "/_#{template_array[-1]}.#{@_route.format}"
         send(@_route.renderer, template.to_sym, :layout => false)
       end
     end
-    
+
     def self.config(&block)
       class_eval(&block)
     end
-    
+
     before do
       if settings.respond_to?(:storage) && !Copy::Storage.connected?
         Copy::Storage.connect!(settings.storage)
       end
     end
-    
+
     get '/_copy/?' do
       protected!
       ERB.new(File.read(settings.root + '/admin/index.html.erb')).result(self.send(:binding))
     end
-    
+
     get '/_copy.js' do
       protected!
       content_type(:js)
       ERB.new(File.read(settings.root + '/admin/index.js.erb')).result(self.send(:binding))
     end
-    
+
     get '/_copy/:name' do
       protected!
       @name = params[:name]
       @doc = Copy::Storage.get(params[:name])
       ERB.new(File.read(settings.root + '/admin/edit.html.erb')).result(self.send(:binding))
     end
-    
+
     put '/_copy/:name' do
       protected!
       Copy::Storage.set(params[:name], params[:content])
       format_text(params[:name], Copy::Storage.get(params[:name]), :wrap_tag => params[:wrap_tag])
     end
-    
+
     get '*' do
       @_route = Copy::Router.new(params[:splat].first, settings.views)
       if @_route.success?

data/lib/copy/version.rb

@@ -1,3 +1,3 @@
 module Copy
-  VERSION = '0.1.7'
+  VERSION = '0.2.0'
 end

data/test/test_helper.rb

@@ -7,7 +7,7 @@ begin
   require 'turn'
 rescue LoadError
 end
-require 'mocha'
+require 'mocha/setup'
 require 'copy'
 
 class Test::Unit::TestCase
@@ -18,7 +18,7 @@ class Test::Unit::TestCase
   def self.setup(&block)
     define_method(:setup, &block)
   end
-  
+
   def self.teardown(&block)
     define_method(:teardown, &block)
   end
@@ -28,20 +28,20 @@ module CopyAppSetup
   def app
     Copy::Server
   end
-  
+
   def setup
     app.config do
       set :views, File.dirname(File.expand_path(__FILE__)) + '/test_app/views'
     end
   end
-  
+
   def setup_auth(user, pass)
     app.config do
       set :copy_username, user
       set :copy_password, pass
     end
   end
-  
+
   def authorize!
     setup_auth 'super', 'secret'
     authorize  'super', 'secret'

metadata

@@ -1,105 +1,104 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: copy
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 7
-  version: 0.1.7
 platform: ruby
-authors: 
+authors:
 - Javan Makhmali
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-21 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-01-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sinatra
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 2
-        - 6
-        version: 1.2.6
+      - !ruby/object:Gem::Version
+        version: 1.3.3
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: redcarpet
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.3
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.2
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.2
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Serves mostly static pages with blocks of editable copy.
-email: 
+email:
 - javan@javan.us
-executables: 
+executables:
 - copy
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -149,41 +148,31 @@ files:
 - test/test_app/views/with_copy_helper.html.erb
 - test/test_app/views/with_copy_helper_one_line.html.erb
 - test/test_helper.rb
-has_rdoc: true
 homepage: https://github.com/javan/copy
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: copy
-rubygems_version: 1.4.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Simple, Sinatra-based CMS.
-test_files: 
+test_files:
 - test/router_test.rb
 - test/server_test.rb
 - test/storage_test.rb