tenon 1.0.54 → 1.0.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bbdf1cfb7234497e600ba4d2733a20f3b3c8cfe
-  data.tar.gz: 0093e9f22e73bb6ef664146f0437dbbb6d87ff5e
+  metadata.gz: a595eb9d310c421bc5d80fda47abfb6a8ca62b4c
+  data.tar.gz: 5bdcfec5911797f26b3cd85f02a0838fe2914f60
 SHA512:
-  metadata.gz: 73a24e69d4367da9803e562dfb1dde85ffcdb7791b204a937b788ffb179e31af54eda46c61156e6cb084983f2b975d5f1886a77492740cf6aea3d522d11d36dd
-  data.tar.gz: c7ddfdafeb1b28101c0b638b0115b3c7895671f0cea4f755ad9d8a78da624fc0b01ab9eb14a852976ab5a48426494f03a22257e7656a6ac07546881420fe8e0b
+  metadata.gz: 365e07dd906fa410d382c951ff1cb55dae626af53e34d7a134dbd19ce8cf3846df79171c15c700c0b972dd075afe43d17bf0cf1fec1aca8a9b33cf25c5bdf35a
+  data.tar.gz: 8bb06bea0ff9c4992b52a72de04065235366f665335ff6a03cb77dea10d03cf3dfe4736f6b21d26a70f37afd423a0a4d2214495f87c25e1bd591faa258641fee

data/app/models/tenon/page.rb

@@ -7,8 +7,10 @@ module Tenon
     tenon_content :content, i18n: true
     default_scope { order('tenon_pages.lft, tenon_pages.list_order') }
     scope :published, -> { where('publish_at <= ?', Time.now) }
-    scope :find_for_menu, -> { published.where('parent_id IS NULL AND show_in_menu = ?', true).includes(:subpages) }
+    scope :for_menu, -> { published.where(show_in_menu: true) }
     scope :top, -> { where(parent_id: nil) }
+    scope :find_for_menu, -> { top.for_menu } # Backwards compatibility
+
 
     # Relationships
     belongs_to :parent, class_name: 'Page', foreign_key: 'parent_id'
@@ -30,12 +32,16 @@ module Tenon
       if subpages.blank?
         siblings_for_menu
       else
-        subpages.where(published: true, show_in_menu: true)
+        subpages.for_menu
       end
     end
 
     def siblings_for_menu
-      parent.subpages_for_menu if parent
+      if parent
+        parent.subpages_for_menu
+      else
+        []
+      end
     end
 
     def self.reorder!(list, parent_id)

data/app/views/tenon/contacts/index.json.jbuilder

@@ -2,8 +2,8 @@ json.records do
   json.array!(@contacts) do |contact|
     json.extract!(contact, :id, :name, :email, :phone, :content, :sent_date, :user_ip, :user_agent, :referrer)
     json.display_link action_link("View Contact Details", '#', 'eye', 'data-modal-target' => "#contact-#{contact.id}", 'data-modal-title' => 'Contact Details')
-    json.read_link toggle_link(contact, 'read', toggle_read_contact_path(contact), ['folder-open-o', 'This is true'], ['folder-o', 'This is false'])
-    json.reply_link toggle_link(contact, 'replied', toggle_replied_contact_path(contact), ['check', 'This is true'], ['reply', 'This is false'])
+    json.read_link toggle_link(contact, 'read', toggle_read_contact_path(contact), ['folder-open-o', 'Mark as Unread'], ['folder-o', 'Mark as Read'])
+    json.reply_link toggle_link(contact, 'replied', toggle_replied_contact_path(contact), ['check', 'Mark as Pending'], ['reply', 'Mark as Replied'])
     json.delete_link delete_link(contact)
   end
 end

data/lib/tenon/version.rb

@@ -1,3 +1,3 @@
 module Tenon
-  VERSION = '1.0.54'
+  VERSION = '1.0.55'
 end

data/spec/models/tenon/page_spec.rb

@@ -23,8 +23,7 @@ describe Tenon::Page do
       end
 
       it 'should grab the subpages that are available for the menu' do
-        args = { published: true, show_in_menu: true }
-        expect(subpages).to receive(:where).with(args)
+        expect(subpages).to receive(:for_menu)
         page.subpages_for_menu
       end
     end
@@ -36,8 +35,8 @@ describe Tenon::Page do
         page.stub(:parent) { nil }
       end
 
-      it 'should return nil' do
-        expect(page.siblings_for_menu).to be_nil
+      it 'should return an empty array' do
+        expect(page.siblings_for_menu).to eq([])
       end
     end
 

data/spec/spec_helper.rb

@@ -14,7 +14,7 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 FactoryGirl.definition_file_paths += %W(lib/tenon/factories)
 FactoryGirl.reload
 
-ActiveRecord::Migration.check_pending! if defined?(ActiveRecord::Migration)
+ActiveRecord::Migration.maintain_test_schema! if defined?(ActiveRecord::Migration)
 
 RSpec.configure do |config|
   config.include Tenon::Engine.routes.url_helpers

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tenon
 version: !ruby/object:Gem::Version
-  version: 1.0.54
+  version: 1.0.55
 platform: ruby
 authors:
 - factor[e] design initiative
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_errors