bolton-cms-padrino 0.2.7 → 0.2.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Nzk4ZTllYTdhZTRkNmZmZGRkNDUzNjA3ZDQyYjY1MTM5ODUyYTI3Yw==
+    ODVjYTQyNGY3ZTIxYWJjNjJmNWY0ZTY5YzAxZWNkNDYzOWUwNWIxZQ==
   data.tar.gz: !binary |-
-    NmFhODg0Y2ExYzdiOTRlM2IzNzc4OWM1N2VkMGY3ODQyZmZmNjkzYg==
+    NTAwZWE5M2Q5Zjk1MjUyYzA0OTU2NjBiMTQzOGNiMzI5YzQxMmVmMQ==
 SHA512:
   metadata.gz: !binary |-
-    NmRjOTBiYTAwNzlmNDBhNDQwMWZiNjEwZmEwM2I5Nzc1NjcwOTE2MWQ2NTEx
-    YjRmZWNhZTRkM2I0NDNkYTI3Y2M1NTMxYTI3Y2Y0NTY4MjlhOWRmY2M0ZjEx
-    Mzc5YjhhMWEyMWI4MTc5NjdhNjNlYWUxY2JiZjRlMDdmMTEzNTk=
+    NzFhN2E4ZjUxNzc3Y2Q0ZGYwN2IwZTIzMTA1NmNmMGJlYjZkYTgwNWVkOWFj
+    OTk0ZDg5NmUzOWY4MjM4MDVjN2YwM2VjNDI0MjU5NjM4NTE3ODI0YzM1NzFj
+    YWZlMTg0ZWUyMWU2YzJkMDg2NjdkZjkxZjgxYzhiZWVkODFiMjA=
   data.tar.gz: !binary |-
-    YzA4ZmQ5YWVlMjMyZjE2NzY1MzY2ZDhhNmYzZDJjMTYyOGU4OGJhOTA5Yjk2
-    MDZhZGViOWYyMjE1MzI4MGY5ZmMxY2ZlZjE1YWVjODYxN2Q4MjE2ODg0YTA1
-    N2JmMmE0NzQ2NjY3MjEzZTExYjdlOGY3NDY5Yzc2MDZjYWM4NTY=
+    OGVlZTczMDg5Nzc3MDFmMjBiNDA1ZjhlZmFiZmQxMGJkODE3MTkxYTU5OGQ2
+    OGQ2YWFiMTMyOWM2YTIzYmJhZTQyMjQxMmJmYWQ4MzhmMjczZGRmZTJhZTNh
+    OGZhYjU4Yzg0NDkxYTNiOWU4YzcxOGVmMzcxZjBhMDFhNDIxYWE=

data/bolton_cms/manage/assets/javascripts/application.js

@@ -46,13 +46,17 @@ $(window).load(function() {
 
     if ($.ui) {
 
-      $(".accordion-container .collapsible:not(.collapsed)").addClass("collapsed", 250);
-      $parent.removeClass("collapsed", 250);
+      if ($parent.hasClass("collapsed")) {
+        $parent.parent(".accordion-container").find(".collapsible:not(.collapsed)").addClass("collapsed", 250);
+        $parent.removeClass("collapsed", 250);
+      } else {
+        $parent.addClass("collapsed", 250);
+      }
 
     } else {
 
       if ($parent.hasClass("collapsed")) {
-        var $open = $(".accordion-container .collapsible:not(.collapsed) .collapsible-content");
+        var $open = $parent.parent(".accordion-container").find(".collapsible:not(.collapsed) .collapsible-content");
         var height = $open.innerHeight();
 
         $open.css({

data/bolton_cms/manage/assets/stylesheets/base/_typography.scss

@@ -32,3 +32,8 @@ a, .form-link input[type=submit] {
 img {
   vertical-align: middle;
 }
+
+hr {
+  margin: 3ex 0;
+  border-width: 1px 0 0;
+}

data/bolton_cms/manage/controllers/pages.rb

@@ -14,7 +14,7 @@ BoltonCms::Manage.controllers :pages do
     @page = Page.new
 
     @page.template = :default
-    @page.create_fragments
+    @page.manage_fragments BoltonCms::TEMPLATES[@page.template.to_s]['fragments'].clone
 
     render 'pages/new'
   end
@@ -22,6 +22,7 @@ BoltonCms::Manage.controllers :pages do
   post :create do
     @page = Page.new(params[:page])
     @page.creator = current_account
+    @page.manage_fragments BoltonCms::TEMPLATES[@page.template.to_s]['fragments'].clone
 
     if @page.save
       flash[:success] = "Page '#{@page.title}' created"
@@ -51,17 +52,21 @@ BoltonCms::Manage.controllers :pages do
 
   put :update, with: :id do
     @page = Page.find(params[:id])
-    @page.updater = current_account
-
-    if @page && params[:new_asset][:file]
-      @page.assets << Asset.new(
-        gravity: params[:new_asset][:gravity],
-        attachment: params[:new_asset][:file]
-      )
-    end
 
     if @page
+      @page.updater = current_account
+
+      if params[:new_asset][:file]
+        @page.assets << Asset.new(
+          gravity: params[:new_asset][:gravity],
+          attachment: params[:new_asset][:file]
+        )
+      end
+
       if @page.update_attributes(params[:page])
+        @page.manage_fragments BoltonCms::TEMPLATES[@page.template.to_s]['fragments'].clone
+        logger.info @page.inactive_fragments
+
         flash[:success] = "Page '#{@page.title}' saved"
 
         params[:save_and_continue] ?

data/bolton_cms/manage/views/pages/_form.slim

@@ -34,21 +34,36 @@ fieldset.page-options
         = f.select :filter, options: BoltonCms::RENDERERS.collect { |v| [v.to_s.titleize, v] }
 
   - f.fields_for :fragments do |pf|
-    fieldset.page-fragment.collapsible.collapsed
-      legend.collapsible-header = pf.object.label
+    - if pf.object.active
+      fieldset.page-fragment.collapsible.collapsed
+        legend.collapsible-header = pf.object.label
 
-      .collapsible-content
-        = pf.hidden_field :label
+        .collapsible-content
+          = pf.hidden_field :label
+
+          = labeled_field pf, :body, label: 'Content', class: "content-field"
+            = pf.text_area :body, rows: 8
+
+          = labeled_field pf, :filter, class: 'control'
+            = pf.select :filter, options: BoltonCms::RENDERERS.collect { |v| [v.to_s.titleize, v] }
+    - else # Padrino fields_for is broken in the case there's no content passed in the block
+      = nil
 
-        - inactive = !BoltonCms::TEMPLATES[@page.template.to_s]['fragments'].include?(pf.object.label)
-        - if inactive
-          p.warning This fragment is inactive for the given template
+- if f.object.inactive_fragments.size > 0
+  .accordion-container.inactive
+    fieldset.page-content.collapsible.collapsed
+      legend.collapsible-header Inactive Fragments
+
+      .collapsible-content
+        - f.object.inactive_fragments.each_with_index do |pf, i|
+          - if i > 0
+            hr
 
-        = labeled_field pf, :body, label: 'Content', class: "content-field#{' inactive' if inactive}"
-          = pf.text_area :body, rows: 8
+          p
+            label for="#{pf.id}" = pf.label
+            textarea id="#{pf.id}" readonly='readonly' = pf.body
 
-        = labeled_field pf, :filter, class: 'control'
-          = pf.select :filter, options: BoltonCms::RENDERERS.collect { |v| [v.to_s.titleize, v] }
+          p Filter: #{pf.filter}
 
 = partial 'pages/asset_form', locals: { f: f }
 

data/lib/bolton_cms/models/fragment.rb

@@ -8,6 +8,7 @@ class Fragment
   field :label,  type: String
   field :body,   type: String, default: ''
   field :filter, type: Symbol, default: :markdown
+  field :active, type: Boolean, default: true
 
   index({ label: 1 }, { unique: true })
 

data/lib/bolton_cms/models/page.rb

@@ -34,7 +34,6 @@ class Page
 
   before_rearrange :set_slug
   after_rearrange  :rebuild_path
-  before_save      :create_fragments
   before_save      :destroy_flagged_assets
   before_save      :flag_used_assets
   before_destroy   :move_children_to_parent
@@ -47,14 +46,30 @@ class Page
     assets.where(used: false)
   end
 
+  def active_fragments
+    fragments.where(active: true)
+  end
+
+  def inactive_fragments
+    fragments.where(active: false)
+  end
+
   def find_fragment(label)
     fragments.find_by(label: label) unless label.blank?
   end
 
-  def create_fragments
-    BoltonCms::TEMPLATES[template.to_s]['fragments'].each do |fragment|
-      fragments << Fragment.new(label: fragment) unless find_fragment(fragment)
+  def manage_fragments(configured_fragments = [])
+    fragments.each do |fragment|
+      if fragment.active = configured_fragments.include?(fragment.label)
+        configured_fragments.delete fragment.label
+      end
+    end
+
+    configured_fragments.each do |fragment|
+      fragments << Fragment.new(label: fragment)
     end
+
+    save
   end
 
   private

data/lib/bolton_cms/version.rb

@@ -1,3 +1,3 @@
 module BoltonCms
-  VERSION = '0.2.7'
+  VERSION = '0.2.8'
 end

data/spec/models/fragment_spec.rb

@@ -22,6 +22,10 @@ describe Fragment do
     @fragment.must have_field(:body)
   end
 
+  it 'should have an active field' do
+    @fragment.must have_field(:active)
+  end
+
   it 'should have an index on label' do
     @fragment.must have_index_for(:label)
   end

data/spec/models/page_spec.rb

@@ -58,12 +58,26 @@ describe Page do
     @page.find_fragment(@default_fragments.first).label.must_equal @default_fragments.first
   end
 
-  it 'should add configured fragments on save' do
-    BoltonCms::TEMPLATES['default']['fragments'] << 'test fragment'
-    @page.save
+  it 'should add configured fragments' do
+    @page.manage_fragments(['Fragment 1', 'Fragment 2', 'test fragment'])
     @page.find_fragment('test fragment').nil?.must_equal false
   end
 
+  it 'should mark unconfigured fragments' do
+    @page.manage_fragments(['Fragment 1'])
+    @page.find_fragment('Fragment 2').active.must_equal false
+  end
+
+  it 'should only return active fragments' do
+    @page.manage_fragments(['Fragment 1'])
+    @page.active_fragments.size.must_equal 1
+  end
+
+  it 'should retrieve inactive fragments' do
+    @page.manage_fragments(['Fragment 1'])
+    @page.inactive_fragments.size.must_equal 1
+  end
+
   it 'should have page body' do
     @page.must have_field(:body)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bolton-cms-padrino
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Charles Hudson
@@ -371,7 +371,7 @@ files:
 - config/database.rb
 - config/mongoid.yml
 - db/seeds.rb
-- gems/bolton-cms-padrino-0.2.6.gem
+- gems/bolton-cms-padrino-0.2.7.gem
 - lib/bolton-cms-padrino.rb
 - lib/bolton_cms/attachment_uploader.rb
 - lib/bolton_cms/config.rb