radiant-concurrent_draft-extension 1.0.7 → 1.0.8

data/Rakefile

@@ -34,7 +34,7 @@ unless defined? RADIANT_ROOT
 end
 
 require 'rake'
-require 'rake/rdoctask'
+require 'rdoc/task'
 require 'rake/testtask'
 
 rspec_base = File.expand_path(RADIANT_ROOT + '/vendor/plugins/rspec/lib')

data/VERSION

@@ -1 +1 @@
-1.0.7
+1.0.8

data/concurrent_draft_extension.rb

@@ -7,23 +7,32 @@ class ConcurrentDraftExtension < Radiant::Extension
   url "https://github.com/avonderluft/radiant-concurrent_draft-extension"
 
   def activate
-    [Page, Snippet, Layout, PagePart].each do |klass|
+    [Page, Layout, PagePart].each do |klass|
       klass.send :include, ConcurrentDraft::ModelExtensions
     end
     Page.send :include, ConcurrentDraft::PageExtensions
     Page.send :include, ConcurrentDraft::Tags
-    [Admin::PagesController, Admin::SnippetsController, Admin::LayoutsController].each do |klass|
+    [Admin::PagesController, Admin::LayoutsController].each do |klass|
       klass.send :include, ConcurrentDraft::AdminControllerExtensions
       klass.class_eval do
         helper ConcurrentDraft::HelperExtensions
       end
     end
     SiteController.send :include, ConcurrentDraft::SiteControllerExtensions
-    %w{page snippet layout}.each do |view|
+    %w{page 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'
     end
+    # Snippets have been extracted from core
+    if defined?(SnippetsExtension)
+      Snippet.send :include, ConcurrentDraft::ModelExtensions
+      Admin::SnippetsController.send :include, ConcurrentDraft::AdminControllerExtensions
+      Admin::SnippetsController.class_eval { helper ConcurrentDraft::HelperExtensions }
+      admin.snippet.edit.add :main, "admin/draft_controls", :before => "edit_header"
+      admin.snippet.edit.form_bottom.delete 'edit_buttons'
+      admin.snippet.edit.add :form_bottom, 'admin/edit_buttons'
+    end
     # 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

data/lib/concurrent_draft/tags.rb

@@ -3,9 +3,11 @@ module ConcurrentDraft::Tags
 
   def self.included(base)
     base.class_eval do
-      %w{content snippet}.each do |t|
-        alias_method "tag:old_#{t}", "tag:#{t}"
-        alias_method "tag:#{t}", "tag:concurrent_draft_#{t}"
+      alias_method "tag:old_content", "tag:content"
+      alias_method "tag:content", "tag:concurrent_draft_content"
+      if defined?(SnippetsExtension)
+        alias_method "tag:old_snippet", "tag:snippet"
+        alias_method "tag:snippet", "tag:concurrent_draft_snippet"
       end
     end
   end
@@ -35,22 +37,25 @@ module ConcurrentDraft::Tags
     tag.globals.page.render_snippet(part) unless part.nil?
   end
 
-  tag 'concurrent_draft_snippet' do |tag|
-    if name = tag.attr['name']
-      if snippet = Snippet.find_by_name(name.strip)
-        tag.locals.yield = tag.expand if tag.double?
-        ###      CONCURRENT DRAFTS CHANGE      ###
-        # Show the draft content on the dev site #
-        # Promote the snippet if it needs to be  #
-        snippet.promote_draft! if snippet.draft_should_be_promoted?
-        snippet.content = snippet.draft_content if dev?(tag.globals.page.request)
-        ###    END CONCURRENT DRAFTS CHANGE    ###
-        tag.globals.page.render_snippet(snippet)
+  if defined?(SnippetsExtension)
+    tag 'concurrent_draft_snippet' do |tag|
+      if name = tag.attr['name']
+        if snippet = Snippet.find_by_name(name.strip)
+          tag.locals.yield = tag.expand if tag.double?
+          ###      CONCURRENT DRAFTS CHANGE      ###
+          # Show the draft content on the dev site #
+          # Promote the snippet if it needs to be  #
+          snippet.promote_draft! if snippet.draft_should_be_promoted?
+          snippet.content = snippet.draft_content if dev?(tag.globals.page.request)
+          ###    END CONCURRENT DRAFTS CHANGE    ###
+          tag.globals.page.render_snippet(snippet)
+        else
+          raise StandardTags::TagError.new("snippet not found: #{name}")
+        end
       else
-        raise StandardTags::TagError.new("snippet not found: #{name}")
+        raise StandardTags::TagError.new("`snippet' tag must contain `name' attribute")
       end
-    else
-      raise StandardTags::TagError.new("`snippet' tag must contain `name' attribute")
     end
   end
+  
 end

data/radiant-concurrent_draft-extension.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{radiant-concurrent_draft-extension}
-  s.version = "1.0.7"
+  s.name = "radiant-concurrent_draft-extension"
+  s.version = "1.0.8"
 
   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-07-11}
-  s.description = %q{Enables draft versions of pages, snippets and layouts, which can be scheduled for promotion.}
-  s.email = %q{avonderluft@avlux.net}
+  s.date = "2013-01-29"
+  s.description = "Enables draft versions of pages, snippets and layouts, which can be scheduled for promotion."
+  s.email = "avonderluft@avlux.net"
   s.extra_rdoc_files = [
     "README.textile"
   ]
@@ -67,19 +67,10 @@ Gem::Specification.new do |s|
     "vendor/plugins/12_hour_time/test/12_hour_time_test.rb",
     "vendor/plugins/12_hour_time/test/test_helper.rb"
   ]
-  s.homepage = %q{https://github.com/avonderluft/radiant-concurrent_draft-extension}
+  s.homepage = "https://github.com/avonderluft/radiant-concurrent_draft-extension"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
-  s.summary = %q{Concurrent Draft Extension for Radiant CMS}
-  s.test_files = [
-    "spec/controllers/admin_controller_extensions_spec.rb",
-    "spec/controllers/site_controller_extensions_spec.rb",
-    "spec/matchers/concurrent_draft_matcher.rb",
-    "spec/models/model_extensions_spec.rb",
-    "spec/models/page_extensions_spec.rb",
-    "spec/models/tags_spec.rb",
-    "spec/spec_helper.rb"
-  ]
+  s.rubygems_version = "1.8.24"
+  s.summary = "Concurrent Draft Extension for Radiant CMS"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/spec/controllers/admin_controller_extensions_spec.rb

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+# require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 shared_examples_for 'controller with scheduled draft promotion' do
   dataset :users
@@ -181,8 +182,10 @@ describe Admin::PagesController, "with concurrent_draft functions" do
   it_should_behave_like 'controller with scheduled draft promotion'
 end
 
-describe Admin::SnippetsController, "with concurrent_draft functions" do
-  it_should_behave_like 'controller with scheduled draft promotion'
+if defined?(SnippetsExtension)
+  describe Admin::SnippetsController, "with concurrent_draft functions" do
+    it_should_behave_like 'controller with scheduled draft promotion'
+  end
 end
 
 describe Admin::LayoutsController, "with concurrent_draft functions" do

data/spec/controllers/site_controller_extensions_spec.rb

@@ -1,4 +1,6 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+# require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
+
 require 'site_controller'
 SiteController.module_eval { def rescue_action(e); raise e; end }
 

data/spec/models/model_extensions_spec.rb

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+# require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 share_examples_for "model with concurrent draft" do
   it "should be invalid with a draft promotion schedule date in the past" do
@@ -60,16 +61,18 @@ share_examples_for "model with concurrent draft" do
   end
 end
 
-describe Snippet, "with concurrent draft" do
-  dataset :snippets
-  before :each do
-    @object = snippets(:first)
-    @object.update_attributes(:content => 'content test', :draft_content => 'draft content')
-  end
-  it "should not be publishable" do
-    @object.publishable?.should_not be_true
+if defined?(SnippetsExtension)
+  describe Snippet, "with concurrent draft" do
+    dataset :snippets
+    before :each do
+      @object = snippets(:first)
+      @object.update_attributes(:content => 'content test', :draft_content => 'draft content')
+    end
+    it "should not be publishable" do
+      @object.publishable?.should_not be_true
+    end
+    it_should_behave_like 'model with concurrent draft'
   end
-  it_should_behave_like 'model with concurrent draft'
 end
 
 describe Layout, "with concurrent draft" do

data/spec/models/page_extensions_spec.rb

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+# require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Page, "with concurrent draft" do
   dataset :pages_with_layouts

data/spec/models/tags_spec.rb

@@ -1,7 +1,8 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+# require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe "ConcurrentDraft::Tags" do
-  dataset :pages, :snippets
+  dataset :pages
   describe '<r:content>' do
     before :each do
       @page = pages(:home)
@@ -17,27 +18,30 @@ describe "ConcurrentDraft::Tags" do
     end
   end
   
-  describe "<r:snippet>" do
-    before :each do
-      @snippet = snippets(:first)
-      @snippet.update_attribute(:draft_content, 'Draft content.')
-      @page = pages(:home)
-    end
+  if defined?(SnippetsExtension)
+    describe "<r:snippet>" do
+      dataset :snippets
+      before :each do
+        @snippet = snippets(:first)
+        @snippet.update_attribute(:draft_content, 'Draft content.')
+        @page = pages(:home)
+      end
 
-    it "should render published snippet content on the live site" do
-      @page.should render('<r:snippet name="first" />').as('test')
-    end
+      it "should render published snippet content on the live site" do
+        @page.should render('<r:snippet name="first" />').as('test')
+      end
 
-    it "should render draft snippet content on the dev site" do
-      @page.should render('<r:snippet name="first" />').as('Draft content.').on('dev.host')
-    end
+      it "should render draft snippet content on the dev site" do
+        @page.should render('<r:snippet name="first" />').as('Draft content.').on('dev.host')
+      end
     
-    it "should promote the draft body if it is scheduled" do
-      @snippet.update_attribute(:draft_promotion_scheduled_at, 1.second.from_now)
-      sleep 2
-      @page.should render('<r:snippet name="first" />').as('Draft content.')
-      @snippet.reload
-      @snippet.should be_has_draft_promoted
+      it "should promote the draft body if it is scheduled" do
+        @snippet.update_attribute(:draft_promotion_scheduled_at, 1.second.from_now)
+        sleep 2
+        @page.should render('<r:snippet name="first" />').as('Draft content.')
+        @snippet.reload
+        @snippet.should be_has_draft_promoted
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -12,6 +12,7 @@ end
 require "#{RADIANT_ROOT}/spec/spec_helper"
 
 Dataset::Resolver.default << (File.dirname(__FILE__) + "/datasets")
+Dataset::Resolver.default << (SnippetsExtension.root + "/spec/datasets") if defined?(SnippetsExtension)
 if File.directory?(File.dirname(__FILE__) + "/scenarios")
   Scenario.load_paths.unshift File.dirname(__FILE__) + "/scenarios"
 end

metadata

@@ -1,51 +1,41 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: radiant-concurrent_draft-extension
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 1.0.8
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 7
-  version: 1.0.7
 platform: ruby
-authors: 
+authors:
 - Andrew vonderLuft
 - Sean Cribbs
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-11 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2013-01-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: radiant
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15424049
-        segments: 
-        - 1
-        - 0
-        - 0
-        - rc
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0.rc2
-  name: radiant
-  version_requirements: *id001
+  type: :runtime
   prerelease: false
-description: Enables draft versions of pages, snippets and layouts, which can be scheduled for promotion.
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0.rc2
+description: Enables draft versions of pages, snippets and layouts, which can be scheduled
+  for promotion.
 email: avonderluft@avlux.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.textile
-files: 
+files:
 - HELP.rdoc
 - README.textile
 - Rakefile
@@ -96,45 +86,31 @@ files:
 - vendor/plugins/12_hour_time/lib/12_hour_time.rb
 - vendor/plugins/12_hour_time/test/12_hour_time_test.rb
 - vendor/plugins/12_hour_time/test/test_helper.rb
-has_rdoc: true
 homepage: https://github.com/avonderluft/radiant-concurrent_draft-extension
 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: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1967068690405520845
+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: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Concurrent Draft Extension for Radiant CMS
-test_files: 
-- spec/controllers/admin_controller_extensions_spec.rb
-- spec/controllers/site_controller_extensions_spec.rb
-- spec/matchers/concurrent_draft_matcher.rb
-- spec/models/model_extensions_spec.rb
-- spec/models/page_extensions_spec.rb
-- spec/models/tags_spec.rb
-- spec/spec_helper.rb
+test_files: []