radiant-concurrent_draft-extension 1.0.1 → 1.0.2

data/README.textile

@@ -1,50 +1,61 @@
-h2. Concurrent Draft
+h1. Concurrent Draft
 
 The *ConcurrentDraft* extension enables draft versions of pages, snippets and layouts, which can be scheduled for promotion to Production.  Every such artifact (page, snippet or layout) can have a concurrent draft version, which will be displayed in development mode, and a promoted live version, which will be displayed in production mode.
 
 Created by: Andrew vonderLuft and Sean Cribbs, August 2008, in Portland Oregon
 
-h3. Version History
+h2. Version History
 
-* 1.0.0 - Compatible with Blade UI - 0.9 and above
+* 1.0.x - Compatible with Blade UI - 0.9 and above
 * 0.8.0 - Compatible with Radiant 0.8.0 and above
 * 0.7.1 - Compatible with Radiant 0.7.1
 
-h3. Requirements
+h2. Requirements
 
-* Radiant 0.7 or greater
+* Radiant 0.9 or greater
+* Radiant 0.7.x - 0.8.x use appropriate tag
 
-h3. Installation
+h2. Installation
 
-h4. With the Radiant Extensions registry:
+h3. From the Radiant Extension Registry
 
-* From your Radiant root run:
+# From your RAILS_ROOT run:
+<pre>script/extension install concurrent_draft</pre>
+# Restart your app
+NOTE: In some earlier versions of Radiant, the migrations may not run, and the assets may not be copied and you may therefore need to run:
+<pre>rake radiant:extensions:concurrent_draft:migrate
+rake radiant:extensions:concurrent_draft:update</pre>
 
-<pre>script/extension install concurrent_draft
+h3. From Github
+
+# From your RAILS_ROOT run:
+<pre>cd vendor/extensions
+git clone git://github.com/avonderluft/radiant-concurrent_draft-extension.git ./concurrent_draft
+cd ../../
 rake radiant:extensions:concurrent_draft:migrate
-rake radiant:extensions:concurrent_draft:update  
+rake radiant:extensions:concurrent_draft:update
 </pre>
+# Restart your app
 
-* Restart your radiant app, and you should be good to go.
-
-h4. Using the gem
-
-* Install the gem
+h3. Using the gem
 
+# Install the gem
 <pre>gem install radiant-concurrent_draft-extension</pre>
-
-* Update your Radiant config:  add to environment.rb with other gem.configs
-
+# Update your Radiant config:  add to environment.rb with other gem.configs
 <pre>config.gem 'radiant-concurrent_draft-extension', :lib => false</pre>
+# Run database migrations
+<pre>rake db:migrate:extensions</pre>
+# Copy assets
+<pre>rake radiant:extensions:update_all</pre>
+# Restart your app
 
-
-h3. Caveats
+h2. Caveats
 
 Scheduled times are dependent on the ActiveRecord time setting.  If you want to use local time, add this to your environment.rb:
 
 <pre>config.active_record.default_timezone = :local</pre>
 
-h3. Acknowledgments
+h2. Acknowledgments
 
 * Andrew conceived of the ideas for this extension and its initial design,  and did model changes, migrations, and initial code for pages.
 * Sean collaborated on its expansion and refactoring to include snippets and layouts, and produced most of the final code, including all of the UI.

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/app/views/admin/_draft_controls.html.haml

@@ -33,7 +33,7 @@
 - content_for :popups do
   - if @controller.authorized_user?
     .popup#schedule-draft-popup{:style => 'display:none'}
-      %h3.title
+      .popup_title
         = image('clock')
         = t('schedule_promotion')
       - form_for @controller.model, :url => {:action => 'schedule_draft_promotion'}, :html => {:method => :post, 'data-onsubmit_status' => "Scheduling promotion of #{resource}"} do |f|
@@ -61,7 +61,7 @@
       width: 300px
       background: #7E7E7E
       table.index
-        margin: 0
+        margin: -2px 0 0 0
         border: none
         tr, td.label, td.actions
           border: none

data/concurrent_draft_extension.rb

@@ -4,7 +4,7 @@ require_dependency 'application_controller'
 class ConcurrentDraftExtension < Radiant::Extension
   version "#{File.read(File.expand_path(File.dirname(__FILE__)) + '/VERSION')}"
   description "Enables default draft versions of pages, snippets and layouts, which can be scheduled for promotion to Production"
-  url "https://github.com/avonderluft/radiant-concurrent_draft-extension/tree/master"
+  url "https://github.com/avonderluft/radiant-concurrent_draft-extension"
 
   def activate
     [Page, Snippet, Layout, PagePart].each do |klass|
@@ -21,10 +21,10 @@ class ConcurrentDraftExtension < Radiant::Extension
     SiteController.send :include, ConcurrentDraft::SiteControllerExtensions
     %w{page snippet layout}.each do |view|
       admin.send(view).edit.add :main, "admin/draft_controls", :before => "edit_header"
-      admin.send(view).edit.form_bottom.delete 'edit_buttons'
-      admin.send(view).edit.add :form_bottom, 'admin/edit_buttons'
+      # admin.send(view).edit.form_bottom.delete 'edit_buttons'
+      # admin.send(view).edit.add :form_bottom, 'admin/edit_buttons'
     end
-    admin.page.edit.add :extended_metadata, 'published_meta'
+    # admin.page.edit.add :extended_metadata, 'published_meta'
     Time::DATE_FORMATS[:long_civilian] = lambda {|time| time.strftime("%B %d, %Y %I:%M%p").gsub(/(\s+)0(\d+)/, '\1\2') }
   end
 end

data/lib/concurrent_draft/helper_extensions.rb

@@ -22,18 +22,18 @@ module ConcurrentDraft::HelperExtensions
     end
   end
 
-  def save_model_button(_model)
-    label = _model.new_record? ? "Create" : "Save"
-    submit_tag "#{label} and Exit", :class => 'button'
-  end
-  
-  def save_model_and_continue_editing_button(_model)
-    label = _model.new_record? ? "Create" : "Save"
-    submit_tag label, :name => 'continue', :class => 'button' 
-  end
-  
-  def save_model_and_promote_button(_model)
-    label = _model.new_record? ? "Create" : "Save"
-    submit_tag "#{label} and Promote Now", :name => 'promote', :class => 'button'
-  end
+  # def save_model_button(_model)
+  #   label = _model.new_record? ? "Create" : "Save"
+  #   submit_tag "#{label} and Exit", :class => 'button'
+  # end
+  # 
+  # def save_model_and_continue_editing_button(_model)
+  #   label = _model.new_record? ? "Create" : "Save"
+  #   submit_tag label, :name => 'continue', :class => 'button' 
+  # end
+  # 
+  # def save_model_and_promote_button(_model)
+  #   label = _model.new_record? ? "Create" : "Save"
+  #   submit_tag "#{label} and Promote Now", :name => 'promote', :class => 'button'
+  # end
 end

data/radiant-concurrent_draft-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-concurrent_draft-extension}
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew vonderLuft", "Sean Cribbs"]
-  s.date = %q{2011-03-28}
+  s.date = %q{2011-04-04}
   s.description = %q{Enables draft versions of pages, snippets and layouts, which can be scheduled for promotion.}
   s.email = %q{avonderluft@avlux.net}
   s.extra_rdoc_files = [
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
     "lib/concurrent_draft/site_controller_extensions.rb",
     "lib/concurrent_draft/tags.rb",
     "lib/tasks/concurrent_draft_extension_tasks.rake",
-    "pkg/radiant-concurrent_draft-extension-1.0.0.gem",
+    "pkg/radiant-concurrent_draft-extension-1.0.1.gem",
     "public/images/admin/cancel.png",
     "public/images/admin/clock.png",
     "public/images/admin/page_delete.png",
@@ -60,9 +60,6 @@ Gem::Specification.new do |s|
     "spec/models/tags_spec.rb",
     "spec/spec.opts",
     "spec/spec_helper.rb",
-    "test/helpers/caching_test_helper.rb",
-    "test/helpers/page_part_test_helper.rb",
-    "test/helpers/page_test_helper.rb",
     "vendor/plugins/12_hour_time/CHANGELOG",
     "vendor/plugins/12_hour_time/README",
     "vendor/plugins/12_hour_time/Rakefile",
@@ -73,7 +70,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{https://github.com/avonderluft/radiant-concurrent_draft-extension}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Concurrent Draft Extension for Radiant CMS}
   s.test_files = [
     "spec/controllers/admin_controller_extensions_spec.rb",
@@ -82,10 +79,7 @@ Gem::Specification.new do |s|
     "spec/models/model_extensions_spec.rb",
     "spec/models/page_extensions_spec.rb",
     "spec/models/tags_spec.rb",
-    "spec/spec_helper.rb",
-    "test/helpers/caching_test_helper.rb",
-    "test/helpers/page_part_test_helper.rb",
-    "test/helpers/page_test_helper.rb"
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-concurrent_draft-extension
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Andrew vonderLuft
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-28 00:00:00 -07:00
+date: 2011-04-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,7 +70,7 @@ files:
 - lib/concurrent_draft/site_controller_extensions.rb
 - lib/concurrent_draft/tags.rb
 - lib/tasks/concurrent_draft_extension_tasks.rake
-- pkg/radiant-concurrent_draft-extension-1.0.0.gem
+- pkg/radiant-concurrent_draft-extension-1.0.1.gem
 - public/images/admin/cancel.png
 - public/images/admin/clock.png
 - public/images/admin/page_delete.png
@@ -88,9 +88,6 @@ files:
 - spec/models/tags_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- test/helpers/caching_test_helper.rb
-- test/helpers/page_part_test_helper.rb
-- test/helpers/page_test_helper.rb
 - vendor/plugins/12_hour_time/CHANGELOG
 - vendor/plugins/12_hour_time/README
 - vendor/plugins/12_hour_time/Rakefile
@@ -128,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Concurrent Draft Extension for Radiant CMS
@@ -140,6 +137,3 @@ test_files:
 - spec/models/page_extensions_spec.rb
 - spec/models/tags_spec.rb
 - spec/spec_helper.rb
-- test/helpers/caching_test_helper.rb
-- test/helpers/page_part_test_helper.rb
-- test/helpers/page_test_helper.rb

data/test/helpers/caching_test_helper.rb

@@ -1,42 +0,0 @@
-class FakeResponseCache
-  attr_accessor :expired_path, :expired_paths
-
-  def initialize
-    @expired_paths = []
-    @cached_responses = {}
-  end
-
-  def clear
-    @cached_responses.clear
-    @cleared = true
-  end
-
-  def cache_response(path, response)
-    @cached_responses[path] = response
-    response
-  end
-
-  def update_response(path, response)
-    if r = @cached_response[path]
-      response.headers.merge!(r.headers)
-      response.body = r.body
-    end
-    response
-  end
-
-  def expire_response(path)
-    @expired_paths << path
-    @expired_path = path
-  end
-
-  def response_cached?(path)
-    @cached_responses.keys.include?(path)
-  end
-
-  def cleared?
-    !!@cleared
-  end
-end
-
-module CachingTestHelper
-end

data/test/helpers/page_part_test_helper.rb

@@ -1,49 +0,0 @@
-module PagePartTestHelper
-  VALID_PAGE_PART_PARAMS = {
-    :name => 'custom',
-    :content => 'Some simple content.',
-    :page_id => '1'
-  }
-
-  def part_params(options = {})
-    params = VALID_PAGE_PART_PARAMS.dup
-    params.delete(:page_id)
-    params.merge!(:name => @part_name) if @part_name
-    params.merge!(options)
-    params
-  end
-
-  def destroy_test_part(title = @part_name)
-    while part = get_test_part(title) do
-      part.destroy
-    end
-  end
-
-  def get_test_part(name = @part_name)
-    PagePart.find_by_name(name)
-  end
-
-  def create_test_part(name = @part_name)
-    params = part_params
-    params.merge!(:name => name)
-    part = PagePart.new(params)
-    if part.save
-      part
-    else
-      raise "part <#{part.inspect}> could not be saved"
-    end
-  end
-
-  # must be included after PageTestHelper to work
-  def create_test_page(options = {})
-    no_part = options.delete(:no_part)
-    page = super(options)
-    unless no_part
-      part = PagePart.new part_params(:name => 'body', :content => 'test')
-      page.parts << part
-      page.save
-      part.save
-    end
-    page
-  end
-end

data/test/helpers/page_test_helper.rb

@@ -1,77 +0,0 @@
-class NoCachePage < Page
-  description 'Turns caching off for testing.'
-
-  def cache?
-    false
-  end
-end
-
-class CustomFileNotFoundPage < FileNotFoundPage
-end
-
-class TestPage < Page
-  description 'this is just a test page'
-
-  tag 'test1' do
-    'Hello world!'
-  end
-
-  tag 'test2' do
-    'Another test.'
-  end
-
-  def headers
-    {
-      'cool' => 'beans',
-      'request' => @request.inspect[20..30],
-      'response' => @response.inspect[20..31]
-    }
-  end
-
-end
-
-class VirtualPage < Page
-  def virtual?
-    true
-  end
-end
-
-module PageTestHelper
-
-  VALID_PAGE_PARAMS = {
-    :title => 'New Page',
-    :slug => 'page',
-    :breadcrumb => 'New Page',
-    :status_id => '1',
-    :parent_id => nil
-  }
-
-  def page_params(options = {})
-    params = VALID_PAGE_PARAMS.dup
-    params.merge!(:title => @page_title) if @page_title
-    params.merge!(:status_id => '5')
-    params.merge!(options)
-  end
-
-  def destroy_test_page(title = @page_title)
-    while page = get_test_page(title) do
-      page.destroy
-    end
-  end
-
-  def get_test_page(title = @page_title)
-    Page.find_by_title(title)
-  end
-
-  def create_test_page(options = {})
-    options[:title] ||= @page_title
-    klass = options.delete(:class_name) || Page
-    klass = Kernel.eval(klass) if klass.kind_of? String
-    page = klass.new page_params(options)
-    if page.save
-      page
-    else
-      raise "page <#{page.inspect}> could not be saved"
-    end
-  end
-end