bolton-cms-padrino 0.2.8 → 0.2.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODVjYTQyNGY3ZTIxYWJjNjJmNWY0ZTY5YzAxZWNkNDYzOWUwNWIxZQ==
+    OGY0N2JhYjZmYjJmN2IxODk1NTY5ZmE0NzJjMGU3ZGE1YzM5YThjNA==
   data.tar.gz: !binary |-
-    NTAwZWE5M2Q5Zjk1MjUyYzA0OTU2NjBiMTQzOGNiMzI5YzQxMmVmMQ==
+    MDVmNTRlZTM3NDQ2NjYwYjBmMmI1OGQ1YmU0MDM2MmYyOWUwNWJmZQ==
 SHA512:
   metadata.gz: !binary |-
-    NzFhN2E4ZjUxNzc3Y2Q0ZGYwN2IwZTIzMTA1NmNmMGJlYjZkYTgwNWVkOWFj
-    OTk0ZDg5NmUzOWY4MjM4MDVjN2YwM2VjNDI0MjU5NjM4NTE3ODI0YzM1NzFj
-    YWZlMTg0ZWUyMWU2YzJkMDg2NjdkZjkxZjgxYzhiZWVkODFiMjA=
+    NjMwYTUyZDc0YjA3OTMyNTE2Y2VlNDA5ZmQxZmEzYzMwYzIzZjE1N2ViNzcx
+    NDhkM2NjM2JmMWE2MGExYWE5YzRhNzlmNjZhYzExYzJlMjQ0NWE5ODNiNTBi
+    ZjIxNDBhMTlhZTg1Yzk4NDY1ZTRkMDM5ZGZhZGVkMGI0ZWUxOTg=
   data.tar.gz: !binary |-
-    OGVlZTczMDg5Nzc3MDFmMjBiNDA1ZjhlZmFiZmQxMGJkODE3MTkxYTU5OGQ2
-    OGQ2YWFiMTMyOWM2YTIzYmJhZTQyMjQxMmJmYWQ4MzhmMjczZGRmZTJhZTNh
-    OGZhYjU4Yzg0NDkxYTNiOWU4YzcxOGVmMzcxZjBhMDFhNDIxYWE=
+    YWQxODgzZWZlNTg0ZjNjZWM4Yjc5YTNlMzliYjVjYTM0N2FhNDcwNTMwMGVh
+    YTg0NDVjYzBkZjgwNTY5MTQxZWJhMGJlZTU2OWIxODUxODk1NDAxYmZlODk5
+    MzJiZjMyZWQ2YjQ5YzJlMmEwYWU4OGJmYjUwN2U0MjZhN2UyNWE=

data/bolton_cms/display/helpers/helper.rb

@@ -40,7 +40,7 @@ BoltonCms::Display.helpers do
   def render_active_fragments(page, wrapper_entity=:section)
     output = ''
 
-    BoltonCms::TEMPLATES[page.template.to_s]['fragments'].each do |label|
+    page.active_fragments.each do |label|
       if fragment = @page.find_fragment(label)
         output << content_tag(
           wrapper_entity,

data/bolton_cms/manage/controllers/accounts.rb

@@ -22,7 +22,6 @@ BoltonCms::Manage.controllers :accounts do
       flash[:success] = "Account #{@account.name} (#{@account.email}) created"
       params[:save_and_continue] ? redirect(url(:accounts, :index)) : redirect(url(:accounts, :edit, id: @account.id))
     else
-      logger.info @account.errors.to_json
       flash.now[:error] = "Account #{@account.name} (#{@account.email}) could not be created"
       render 'accounts/new'
     end

data/bolton_cms/manage/controllers/pages.rb

@@ -65,7 +65,6 @@ BoltonCms::Manage.controllers :pages do
 
       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"
 

data/bolton_cms/manage/controllers/sessions.rb

@@ -5,7 +5,6 @@ BoltonCms::Manage.controllers :sessions do
   end
 
   post :create do
-    logger.info "#{params[:email]}, #{params[:password]}"
     if account = Account.authenticate(params[:email], params[:password])
       set_current_account(account)
       redirect url(:base, :index)

data/lib/bolton_cms/models/page.rb

@@ -69,6 +69,8 @@ class Page
       fragments << Fragment.new(label: fragment)
     end
 
+    inactive_fragments.where(body: '').destroy_all
+
     save
   end
 

data/lib/bolton_cms/version.rb

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

data/spec/models/page_spec.rb

@@ -8,7 +8,7 @@ describe Page do
     @grandchild_page = Page.new(template: :default, title: 'Grandchild')
     @default_fragments = ['Fragment 1', 'Fragment 2']
     @default_fragments.each do |label|
-      @page.fragments << Fragment.new(label: label, body: '')
+      @page.fragments << Fragment.new(label: label, body: 'test')
     end
     @attachment1 = File.open(Padrino.root('spec/fixtures/files/test1.jpg'))
     @attachment2 = File.open(Padrino.root('spec/fixtures/files/test2.jpg'))
@@ -78,6 +78,12 @@ describe Page do
     @page.inactive_fragments.size.must_equal 1
   end
 
+  it 'should just delete an inactive fragment if it\'s empty' do
+    @page.fragments.first.body = ''
+    @page.manage_fragments(['Fragment 2'])
+    @page.inactive_fragments.size.must_equal 0
+  end
+
   it 'should have page body' do
     @page.must have_field(:body)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolton-cms-padrino
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Charles Hudson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-28 00:00:00.000000000 Z
+date: 2014-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -372,6 +372,7 @@ files:
 - config/mongoid.yml
 - db/seeds.rb
 - gems/bolton-cms-padrino-0.2.7.gem
+- gems/bolton-cms-padrino-0.2.8.gem
 - lib/bolton-cms-padrino.rb
 - lib/bolton_cms/attachment_uploader.rb
 - lib/bolton_cms/config.rb