copy 0.0.2 → 0.0.3

data/README.md

@@ -1,6 +1,6 @@
 ## Copy is a sinatra-based content management system.
 
-Copy is similar to [Brochure](https://github.com/sstephenson/brochure) in spirit, but with the edition of editable text blocks.
+Copy is similar to [Brochure](https://github.com/sstephenson/brochure) in spirit, but with the addition of editable text blocks.
 
 More soon.
 

data/bin/copy

@@ -1,9 +1,14 @@
 #!/usr/bin/env ruby
 
-require 'rubygems'
-require 'optparse'
-require 'copy'
+begin
+  require 'copy'
+rescue LoadError
+  require 'rubygems'
+  require 'copy'
+end
+
 require 'copy/version'
+require 'optparse'
 
 OptionParser.new do |opts|
   opts.banner = "Usage: copy [options]"

data/copy.gemspec

@@ -16,7 +16,6 @@ Gem::Specification.new do |s|
   
   s.add_dependency "sinatra", "~> 1.2.6"
   s.add_dependency "redcarpet"
-  s.add_dependency "choice"
   
   s.add_development_dependency "mocha"
 

data/lib/copy/admin/copy.css

@@ -51,6 +51,6 @@
 #_copy textarea {
   font-size: 13px;
   height: 300px;
-  width: 500px;
+  width: 490px;
   padding: 5px;
 }

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

@@ -4,6 +4,15 @@ jQuery.noConflict();
 
 (function($) { 
   $(function() {
+    // Short-circuit if this has run already (bookmarklet clicked twice).
+    if (window._copy_initialized) {
+      // Make the blocks clickable unless the Copy dialog is present.
+      if ($('#_copy').length == 0) {
+        clickable();
+      }
+      return true;
+    }
+    
     function clickable() {
       $('._copy_editable').addClass('_copy_clickable');
     }
@@ -12,7 +21,7 @@ jQuery.noConflict();
       $('._copy_editable').removeClass('_copy_clickable');
     }
     
-    $('head').append('<style style="text/css"><%= File.read(settings.root + '/admin/copy.css').gsub(/\n/, " \\\n") %></style>');
+    $('head').append('<style><%= File.read(settings.root + '/admin/copy.css').gsub(/\n/, " \\\n") %></style>');
 
     $('._copy_clickable').live('click', function() {
       var copy = $(this);
@@ -49,5 +58,6 @@ jQuery.noConflict();
     })
     
     clickable();
+    window._copy_initialized = true;
   });
 })(jQuery);

data/lib/copy/generators/site/config.ru

@@ -1,4 +1,9 @@
-require 'copy'
+begin
+  require 'copy'
+rescue LoadError
+  require 'rubygems'
+  require 'copy'
+end
 
 Copy::Server.config do
   # Sets a Cache-Control header for the duration specified.

data/lib/copy/version.rb

@@ -1,3 +1,3 @@
 module Copy
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: copy
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Javan Makhmali
@@ -48,24 +48,10 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: choice
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -75,7 +61,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id003
 description: Serve mostly static pages with blocks of client-editable text.
 email: 
 - javan@javan.us