tandem 0.2.0 → 0.2.1

data/README.rdoc

@@ -1,6 +1,6 @@
 = Tandem CMS
 
-Tandme is a content management system (CMS) for Rails 3.1+. We felt like it was 
+Tandem is a content management system (CMS) for Rails 3.1+. We felt like it was 
 needed because too many of the CMS options for Rails are either 
 unpolished—something we wouldn't want to put in front of our clients or bloated
 and heavy, causing many headaches when trying to integrate into existing 

data/app/helpers/tandem/contents_helper.rb

@@ -6,7 +6,6 @@ module Tandem
     end
 
     def image_content_tag(image_content, options = {}, format = :original)
-      options = {style: ""}.merge(options) if format == :thumb
       image_tag image_content_url(image_content, format), options
     end
 

data/app/helpers/tandem/pages_helper.rb

@@ -172,35 +172,39 @@ module Tandem
       end
     end
 
-    def tandem_page_links(options ={})
-      return if cannot?(:create, @page) && cannot?(:update, @page) && cannot?(:destroy, @page)
+    def tandem_page_links(options = {})
+      using_tandem_abilities do
+        return if cannot?(:create, @page) && cannot?(:update, @page) && cannot?(:destroy, @page) && cannot?(:index, ::Tandem::Page)
 
-      options[:id] ||= 'tandem_page_links'
+        options[:id] ||= 'tandem_page_links'
 
-      content_tag(:ul, options) do
-        links = []
-        
-        if can?(:create, @page)
-          links << link_to('New Page', tandem.new_page_path(parent_id: @page.id), :class => :page_link, :id => :page_new_link)
-        end
+        content_tag(:ul, options) do
+          links = []
+          
+          if can?(:create, ::Tandem::Page)
+            links << link_to('New Page', tandem.new_page_path(parent_id: @page.try(:id)), :class => :page_link, :id => :page_new_link)
+          end
 
-        if @page.persisted? && can?(:update, @page)
-          links << link_to('Edit Page', tandem.edit_page_path(@page), :class => :page_link, :id => :page_edit_link)
-        end
+          if @page.present?
+            if @page.persisted? && can?(:update, @page)
+              links << link_to('Edit Page', tandem.edit_page_path(@page), :class => :page_link, :id => :page_edit_link)
+            end
 
-        if @page.persisted? && can?(:destroy, @page)
-          links << link_to('Destroy Page', tandem.page_path(@page), :confirm => 'Are you sure?', :method => :delete)
-        end
+            if @page.persisted? && can?(:destroy, @page)
+              links << link_to('Destroy Page', tandem.page_path(@page), :confirm => 'Are you sure?', :method => :delete)
+            end
+          end
 
-        if can?(:index, ::Tandem::Page)
-          links << link_to('Page Listing', tandem.pages_path)
-        end
+          if can?(:index, ::Tandem::Page)
+            links << link_to('Page Listing', tandem.pages_path)
+          end
 
-        links.collect! do |link|
-          content_tag(:li, link)
-        end
+          links.collect! do |link|
+            content_tag(:li, link)
+          end
 
-        raw(links.join)
+          raw(links.join)
+        end
       end
     end
 

data/lib/tandem/version.rb

@@ -1,3 +1,3 @@
 module Tandem
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tandem
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-19 00:00:00.000000000 Z
+date: 2012-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -111,22 +111,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: cucumber-rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement