spina 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4e4b1784b564edca7a13a364f7650ce835944cc
-  data.tar.gz: 4351a34d95b556208ae978dcd164e46a051ed3e7
+  metadata.gz: 8050dae6944a2f6eab52fd1cacefc622d0cbd867
+  data.tar.gz: d192030943c6f20cee65e9a668034a9f75dc25a2
 SHA512:
-  metadata.gz: 7dbe816464e53e80105ec9cefe092f5de007200b7554cae73ee69008605ab6b5ed0fceb826f99daa8a9b7367fd9b4da581c7a9b30541f3493ac45aa6f84dbeda
-  data.tar.gz: f5293cd7192fb2ac5f63db3a838d4f4d57c8c60aa569b0a60fb176b9318113b0f1af053409b899233f7b03f8dde2b6a68a7d6e27e42e0c40c1c6b22e46522735
+  metadata.gz: 67d7777dd5978acc9f3d6cfb65273e16725a353e31e5f66c75abc5e3fc76e048e63a08cf8c3fcc50d77d0aa47870ba8dbb53c7eb79dfa837c5a0892366930992
+  data.tar.gz: b50e5baecdf2803b9c9524c1ea83865ce2119e034b085e67e010474797a6440de737961d196562da9ad15618c200ecd0cab72717de29b0270786acdce020baf0

data/app/assets/javascripts/spina/admin/{pages.js.coffee → pages.js.coffee.erb}

@@ -1,4 +1,8 @@
 ready = ->
+  if $.isFunction($.fn.nestable)
+    $('.dd').nestable
+      maxDepth: "<%= Spina.config.max_page_depth %>"
+
   if $('.page-template').length > 0
     page_parts = $('.page-template').data('page-parts')
     show_page_parts(page_parts)

data/app/controllers/spina/admin/pages_controller.rb

@@ -58,12 +58,7 @@ module Spina
 
       def sort
         params[:list].each_pair do |parent_pos, parent_node|
-          if parent_node[:children].present?
-            parent_node[:children].each_pair do |child_pos, child_node|
-              child_node[:children].each_pair { |grand_child_pos, grand_child| update_page_position(grand_child, grand_child_pos, child_node[:id]) } if child_node[:children].present?
-              update_page_position(child_node, child_pos, parent_node[:id])
-            end
-          end
+          update_child_pages_position(parent_node)
           update_page_position(parent_node, parent_pos, nil)
         end
         render nothing: true
@@ -89,6 +84,15 @@ module Spina
         Page.update(page[:id], position: position.to_i + 1, parent_id: parent_id )
       end
 
+      def update_child_pages_position(node)
+        if node[:children].present?
+          node[:children].each_pair do |child_pos, child_node|
+            update_child_pages_position(child_node) if child_node[:children].present?
+            update_page_position(child_node, child_pos, node[:id])
+          end
+        end
+      end
+
       def page_params
         params.require(:page).permit!
       end

data/app/models/spina/page.rb

@@ -86,17 +86,10 @@ module Spina
     end
 
     def generate_materialized_path
-      if self.name == 'homepage'
-        "/"
+      if root?
+        name == 'homepage' ? '/' : "/#{url_title}"
       else
-        case self.depth
-        when 0
-          "/#{url_title}"
-        when 1
-          "/#{self.parent.url_title}/#{url_title}"
-        when 2
-          "/#{self.parent.parent.url_title}/#{self.parent.url_title}/#{url_title}"
-        end
+        ancestors.collect(&:url_title).append(url_title).join('/').prepend('/')
       end
     end
 

data/lib/generators/spina/install_generator.rb

@@ -41,7 +41,6 @@ module Spina
       directory "app/assets/stylesheets/#{theme}"
       directory "app/views/#{theme}"
       directory "app/views/layouts/#{theme}"
-      directory "app/views/layouts/#{theme}"
     end
 
 

data/lib/generators/spina/templates/app/views/default/shared/_navigation.html.haml

@@ -0,0 +1,5 @@
+- pages = current_user.present? ? Spina::Page.active : Spina::Page.live
+- menu = Spina::Pages::MenuPresenter.new(pages.in_menu.arrange(order: :position), self, @page)
+- menu.list_class = 'nav'
+- menu.list_item_css = 'nav-item'
+= menu.to_html

data/lib/generators/spina/templates/config/initializers/spina.rb

@@ -10,6 +10,12 @@ Spina.configure do |config|
   # Specify a backend path. Defaults to /admin.
   # config.backend_path = 'admin'
 
+  # Pages Options
+  # ===============
+
+  # Note that you might need to remove cached asset after changing this value
+  # config.max_page_depth = 5
+
   # Storage Options
   # ===============
 

data/lib/spina.rb

@@ -5,12 +5,14 @@ module Spina
 
   include ActiveSupport::Configurable
 
-  config_accessor :backend_path, :storage
+  config_accessor :backend_path, :storage, :max_page_depth
 
   self.backend_path = 'admin'
 
   self.storage = :file
 
+  self.max_page_depth = 5
+
   class << self
 
     @@themes = []

data/lib/spina/version.rb

@@ -1,3 +1,3 @@
 module Spina
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spina
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Bram Jetten
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -265,7 +265,7 @@ files:
 - app/assets/javascripts/spina/admin/application.js
 - app/assets/javascripts/spina/admin/aviary.js.coffee
 - app/assets/javascripts/spina/admin/confirm_delete.js.coffee.erb
-- app/assets/javascripts/spina/admin/pages.js.coffee
+- app/assets/javascripts/spina/admin/pages.js.coffee.erb
 - app/assets/javascripts/spina/admin/spina.infinite_scroll.coffee
 - app/assets/javascripts/spina/admin/spina.scaffold.coffee
 - app/assets/javascripts/spina/admin/spina.trix.js.coffee
@@ -306,7 +306,6 @@ files:
 - app/models/spina/photo_collection.rb
 - app/models/spina/photo_collections_photo.rb
 - app/models/spina/rewrite_rule.rb
-- app/models/spina/spina.rb
 - app/models/spina/structure.rb
 - app/models/spina/structure_item.rb
 - app/models/spina/structure_part.rb
@@ -430,6 +429,7 @@ files:
 - lib/generators/spina/templates/app/assets/stylesheets/demo/application.css.sass
 - lib/generators/spina/templates/app/views/default/pages/homepage.html.haml
 - lib/generators/spina/templates/app/views/default/pages/show.html.haml
+- lib/generators/spina/templates/app/views/default/shared/_navigation.html.haml
 - lib/generators/spina/templates/app/views/demo/pages/demo.html.haml
 - lib/generators/spina/templates/app/views/demo/pages/homepage.html.haml
 - lib/generators/spina/templates/app/views/demo/pages/show.html.haml

data/app/models/spina/spina.rb

@@ -1,7 +0,0 @@
-module Spina
-  module Spina
-    def self.table_name_prefix
-      'spina_'
-    end
-  end
-end