radiant-archive_tabs-extension 1.0.0 → 1.0.1

data/app/views/admin/pages/_redirect_cancel.html.haml

@@ -1,7 +1,7 @@
-- if extracted?(model.parent)
+- if archive_page?(model.parent)
   :javascript
     function redirect_cancel(event) {
-      window.location = "#{url_for index_page_for_model_with_extract}"
+      window.location = "#{url_for index_page_for_model_with_archive}"
       event.stop()
     }
 

data/archive_tabs_extension.rb

@@ -1,4 +1,5 @@
 require 'radiant-archive_tabs-extension/version'
+require 'radiant-archive_tabs-extension/application_helper'
 require 'radiant-archive_tabs-extension/admin/node_helper'
 require 'radiant-archive_tabs-extension/admin/pages_controller'
 
@@ -8,6 +9,7 @@ class ArchiveTabsExtension < Radiant::Extension
   url "http://github.com/jsntv200/radiant-archive_tabs-extension"
 
   def activate
+    ApplicationHelper.send :include, RadiantArchiveTabsExtension::ApplicationHelper
     Admin::NodeHelper.send :include, RadiantArchiveTabsExtension::Admin::NodeHelper
     Admin::PagesController.send :include, RadiantArchiveTabsExtension::Admin::PagesController
 

data/lib/radiant-archive_tabs-extension/admin/node_helper.rb

@@ -3,36 +3,31 @@ module RadiantArchiveTabsExtension
     module NodeHelper
       def self.included(base)
         base.class_eval do
-          # TODO: duplicated in pages_controller
-          def extracted?(page)
-            page.class == ArchivePage
-          end
-
-          alias_method_chain :expanded, :extract
-          alias_method_chain :expander, :extract
-          alias_method_chain :children_class, :extract
-          alias_method_chain :children_for, :extract
+          alias_method_chain :expanded, :archive
+          alias_method_chain :expander, :archive
+          alias_method_chain :children_class, :archive
+          alias_method_chain :children_for, :archive
         end
       end
 
       # Never render the children on admin/pages
-      def expanded_with_extract
-        extracted?(@current_node) ? false : expanded_without_extract
+      def expanded_with_archive
+        archive_page?(@current_node) ? false : expanded_without_archive
       end
 
       # Don't display the expander arrow on admin/pages
-      def expander_with_extract(level)
-        extracted?(@current_node) ? '' : expander_without_extract(level)
+      def expander_with_archive(level)
+        archive_page?(@current_node) ? '' : expander_without_archive(level)
       end
 
       # Force the no_children class to diable the SiteMapBehavior js on admin/pages
-      def children_class_with_extract
-        extracted?(@current_node) ? ' no_children' : children_class_without_extract
+      def children_class_with_archive
+        archive_page?(@current_node) ? ' no_children' : children_class_without_archive
       end
 
       # Disable adding children on the index page, admin/pages/:page_id/children
-      def children_for_with_extract(page)
-        page.respond_to?(:parent) && extracted?(page.parent) ? [] : children_for_without_extract(page)
+      def children_for_with_archive(page)
+        page.respond_to?(:parent) && archive_page?(page.parent) ? [] : children_for_without_archive(page)
       end
     end
   end

data/lib/radiant-archive_tabs-extension/admin/pages_controller.rb

@@ -3,41 +3,41 @@ module RadiantArchiveTabsExtension
     module PagesController
       def self.included(base)
         base.class_eval do
-          # TODO: duplicated in node_helper
-          def extracted?(page)
+          # TODO: duplicated in application_helper
+          def archive_page?(page)
             page.class == ArchivePage
           end
 
-          helper_method :extracted?, :index_page_for_model_with_extract
-          alias_method_chain :load_models, :extract
-          alias_method_chain :index, :extract
-          alias_method_chain :index_page_for_model, :extract
+          helper_method :archive_page?, :index_page_for_model_with_archive
+          alias_method_chain :load_models, :archive
+          alias_method_chain :index, :archive
+          alias_method_chain :index_page_for_model, :archive
        end
       end
 
-      def load_models_with_extract
+      def load_models_with_archive
         if params[:page_id]
           self.model = Page.find(params[:page_id])
 
-          if extracted?(self.model)
+          if archive_page?(self.model)
             acts_as_tree_options
             self.class.paginate_models :per_page => Radiant.config['admin.pagination.per_page']
           end
         end
 
-        load_models_without_extract
+        load_models_without_archive
       end
 
-      def index_with_extract
-        if extracted?(self.model)
+      def index_with_archive
+        if archive_page?(self.model)
           render :action => 'archive_index'
         else
-          index_without_extract
+          index_without_archive
         end
       end
 
-      def index_page_for_model_with_extract
-        if model && extracted?(model.parent)
+      def index_page_for_model_with_archive
+        if model && archive_page?(model.parent)
           acts_as_tree_options
           parts = {:action => "index", :page_id => model.parent_id}
 
@@ -48,7 +48,7 @@ module RadiantArchiveTabsExtension
 
           parts
         else
-          index_page_for_model_without_extract
+          index_page_for_model_without_archive
         end
       end
 

data/lib/radiant-archive_tabs-extension/application_helper.rb

@@ -0,0 +1,31 @@
+module RadiantArchiveTabsExtension
+  module ApplicationHelper
+    def self.included(base)
+      base.class_eval do
+        # TODO: duplicated in pages_controller
+        def archive_page?(page)
+          page.class == ArchivePage
+        end
+
+        alias_method_chain :current_url?, :archive
+      end
+    end
+
+    def current_url_with_archive?(options)
+      if current_object.respond_to?(:parent) && archive_page?(current_object.parent)
+        parent_url = url_for index_page_for_model_with_archive
+
+        url = case options
+        when Hash
+          url_for options
+        else
+          options.to_s
+        end
+
+        parent_url == clean(url)
+      else
+        current_url_without_archive?(options)
+      end
+    end
+  end
+end

data/lib/radiant-archive_tabs-extension/version.rb

@@ -1,3 +1,3 @@
 module RadiantArchiveTabsExtension
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-archive_tabs-extension
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Jason Taylor
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-23 00:00:00 +10:00
+date: 2011-05-26 00:00:00 +10:00
 default_executable: 
 dependencies: []
 
@@ -39,6 +39,7 @@ files:
 - lib/radiant-archive_tabs-extension.rb
 - lib/radiant-archive_tabs-extension/admin/node_helper.rb
 - lib/radiant-archive_tabs-extension/admin/pages_controller.rb
+- lib/radiant-archive_tabs-extension/application_helper.rb
 - lib/radiant-archive_tabs-extension/version.rb
 - lib/tasks/archive_tabs_extension_tasks.rake
 - radiant-archive_tabs-extension.gemspec
@@ -51,7 +52,7 @@ has_rdoc: true
 homepage: http://github.com/jsntv200/radiant-archive_tabs-extension
 licenses: []
 
-post_install_message: "\n  Edit your Radiant environment.rb file and add the following :\n\n  1. Ensure Archive Tabs is loaded last\n\n    config.extensions = [ :all, :archive_tabs ]\n\n  2. Load Archive Tabs by adding the gem\n\n    config.gem 'radiant-archive_tabs-extension', :version => '1.0.0'\n  "
+post_install_message: "\n  Edit your Radiant environment.rb file and add the following :\n\n  1. Ensure Archive Tabs is loaded last\n\n    config.extensions = [ :all, :archive_tabs ]\n\n  2. Load Archive Tabs by adding the gem\n\n    config.gem 'radiant-archive_tabs-extension', :version => '1.0.1'\n  "
 rdoc_options: []
 
 require_paths: 
@@ -77,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Archive tabs extension for Radiant CMS