smithycms 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e488b0b840e5746ecfb42f5afdc5c406759a13d
-  data.tar.gz: 981f62d7db553a5328609359a3d4a0af906cc68c
+  metadata.gz: 48c2bf0cb616167e95c7ff8a531ecdf5e3ede173
+  data.tar.gz: a152a575809aa47063b903a5d3e193bda06aa24b
 SHA512:
-  metadata.gz: 612329465b66651222def0240823a9504d5675cca25f04cb1bd857cad8272bf505e0e7706111b55e616ad20ba7d56ff7623337bd122838c625589b94e2f57fa8
-  data.tar.gz: 33550ffcc8c8cbff5e6a11776f30729b23a025841442124db7d96d14d6dee4239d7acbaed6cdcdb99d8f5e83fef0571f8e013cd22e52657af8e90f5c982450b0
+  metadata.gz: 69b3055518a5aa13e82b8602388443f8f9425072bc7238c23ed34a4f0b9d125fb044edb59cc47c3871da77562d5d915fa8faf9e4d22943a7c95a904b7a090466
+  data.tar.gz: 2268cd87caa8ab7a80b1d55116188c235d9a03f66a945d6ae7726679d9f72eb6971e92fd53f98700a4f3a72633ec668ae395b4c8ca5da35c0051d00ddb635f49

data/app/controllers/smithy/pages_controller.rb

@@ -27,6 +27,7 @@ module Smithy
     end
 
     def create
+      @page.duplicate_content_from(params[:page][:copy_content_from]) if params[:page][:copy_content_from].present? && @page.valid?
       @page.save
       flash.notice = "Your page was created #{@page.published? ? 'and published' : 'as a draft'}" if @page.persisted?
       respond_with @page do |format|
@@ -52,13 +53,8 @@ module Smithy
 
     def duplicate
       old_page = @page
-      @page = old_page.dup
-      @page.duplicate_page = old_page.id
-      @page.title << " (Copy)"
-      @page.permalink.clear
-      @page.browser_title.clear
-      @page.keywords.clear
-      @page.description.clear
+      @page = @page.shallow_copy
+      @page.copy_content_from = old_page.id
       respond_with @page do |format|
         format.html { render(action: :new) }
       end
@@ -92,7 +88,7 @@ module Smithy
       end
 
       def load_page
-        @page = Page.includes(:contents).find(params[:id])
+        @page = Page.includes(contents: [:content_block, :content_block_template]).find(params[:id])
         @root = @page if Page.root == @page
         set_publish
       end

data/app/models/smithy/page.rb

@@ -3,7 +3,7 @@ module Smithy
     validates_presence_of :template, :title
     validate :validate_one_root
     validate :validate_exclusion_of_reserved_words
-    validate :validate_duplicate_page_exists
+    validate :validate_page_to_copy_exists
 
     belongs_to :template
     has_many :containers, :through => :template
@@ -15,14 +15,13 @@ module Smithy
 
     before_save :build_permalink
     before_save :set_published_at
-    before_save :copy_content_from_duplicate, on: :create, if: -> { self.duplicate_page.present? }
 
-    accepts_nested_attributes_for :contents, :reject_if => lambda {|a| a['label'].blank? || a['container'].blank? || a['content_block'].blank? }, :allow_destroy => true
+    accepts_nested_attributes_for :contents, :reject_if => lambda {|a| a['label'].blank? || a['container'].blank? || a['content_block_type'].blank? }, :allow_destroy => true
 
     scope :included_in_navigation, -> { where("show_in_navigation=? AND published_at <= ?", true, Time.now) }
     scope :published, -> { where('published_at <= ?', Time.now) }
 
-    attr_accessor :publish, :duplicate_page
+    attr_accessor :publish, :copy_content_from
     attr_reader :liquid_context
 
     def self.page_selector_options
@@ -44,6 +43,15 @@ module Smithy
       self.contents.publishable.for_container(container_name)
     end
 
+    def duplicate_content_from(page_id)
+      page = Page.find(page_id)
+      self.contents = page.contents.map(&:amoeba_dup)
+      self.contents.each do |content|
+        content.content_block = content.content_block.amoeba_dup
+      end
+      self
+    end
+
     def normalize_friendly_id(value) # normalize_friendly_id overrides the default creator for friendly_id
       return "/" if self.parent.blank?
       value = self.permalink? ? self.permalink.parameterize : value.to_s.parameterize
@@ -70,6 +78,16 @@ module Smithy
       end
     end
 
+    def shallow_copy
+      self.dup.tap do |p|
+        p.title << " (Copy)"
+        p.permalink.clear
+        p.browser_title.clear
+        p.keywords.clear
+        p.description.clear
+      end
+    end
+
     def site
       @site ||= Smithy::Site.instance
     end
@@ -98,20 +116,13 @@ module Smithy
         self.permalink = self.root? ? title.parameterize : path.split('/').last unless self.permalink?
       end
 
-      def copy_content_from_duplicate
-        duplicate_page = Page.find(self.duplicate_page)
-        duplicate_page.contents.each do |content|
-          self.contents << content.dup
-        end
-      end
-
       def set_published_at
         self.published_at = Time.now if self.publish.present?
         self.published_at = nil if self.publish == false
       end
 
-      def validate_duplicate_page_exists
-        errors.add(:duplicate_page, "this page could not be found. Please choose another and try again.") if self.duplicate_page.present? && Page.find_by(id: self.duplicate_page).blank?
+      def validate_page_to_copy_exists
+        errors.add(:copy_content_from, "this page could not be found. Please choose another and try again.") if self.copy_content_from.present? && Page.find_by(id: self.copy_content_from).blank?
       end
 
       def validate_exclusion_of_reserved_words

data/app/models/smithy/page_content.rb

@@ -11,6 +11,10 @@ module Smithy
     before_update :set_publishable
 
     accepts_nested_attributes_for :content_block, :allow_destroy => true
+    amoeba do
+      enable
+      include_association :content_block
+    end
 
     default_scope -> { order(:position).order(:id) }
     scope :for_container, ->(container) { where(:container => container) }

data/app/models/smithy/permitted_params.rb

@@ -38,7 +38,7 @@ module Smithy
     end
 
     def page_attributes
-      [ :browser_title, :cache_length, :description, :external_link, :keywords, :permalink, :publish, :published_at, :show_in_navigation, :title, :parent_id, :template_id, :duplicate_page ]
+      [ :browser_title, :cache_length, :description, :external_link, :keywords, :permalink, :publish, :published_at, :show_in_navigation, :title, :parent_id, :template_id, :copy_content_from ]
     end
 
     def page_content_attributes

data/app/views/smithy/pages/_content_tab.html.erb

@@ -1,5 +1,5 @@
 <%= f.input :title %>
-<%= f.input :parent, :include_blank => false, :collection => tree_for_select unless !@page.parent_id? %>
+<%= f.input :parent, :include_blank => false, :collection => tree_for_select unless !@page.parent_id? && @page.persisted? %>
 <%= f.input :show_in_navigation, :label => "Show page in site navigation" %>
 <%= f.input :template, :as => :select, :collection => Smithy::Template.templates, :include_blank => false %>
 
@@ -10,5 +10,5 @@
     <%= f.input :external_link, :hint => "This page is currently being redirected to #{link_to @page.external_link, @page.external_link}".html_safe %>
   <% end %>
 <% else %>
-  <%= f.input :duplicate_page, as: :select, label: "Copy Content From", collection: tree_for_select %>
+  <%= f.input :copy_content_from, as: :select, label: "Copy Content From", collection: tree_for_select %>
 <% end %>

data/app/views/smithy/pages/_page_related.html.erb

@@ -17,7 +17,8 @@
   </dl>
 </div>
 
-<%= content_tag :p, link_to("View Page", @page.path, class: 'btn btn-primary') if @page.persisted? && @page.published? %></p>
-<%= content_tag :p, link_to("Delete Page", page_path(@page.id), method: :delete, data: { confirm: "Are you sure you want to delete this page?" }, class: 'btn btn-danger') if @page.persisted? %></p>
-<%= content_tag :p, link_to("Duplicate", duplicate_page_path(@page.id), method: :post, class: 'btn btn-info') if @page.persisted? %></p>
+
+<%= link_to("View Page", @page.path, class: 'btn btn-primary btn-block') if @page.persisted? && @page.published? %>
+<%= link_to("Duplicate Page", duplicate_page_path(@page.id), method: :post, class: 'btn btn-info btn-block') if @page.persisted? %>
+<%= link_to("Delete Page", page_path(@page.id), method: :delete, data: { confirm: "Are you sure you want to delete this page?" }, class: 'btn btn-danger btn-block') if @page.persisted? %>
 <% end %>

data/lib/smithy/content_blocks/model.rb

@@ -6,6 +6,11 @@ module Smithy
         has_many :page_contents, :as => :content_block, class_name: '::Smithy::PageContent'
         has_many :pages, through: :page_contents, class_name: '::Smithy::Page'
         Smithy::ContentBlocks::Registry.register self
+        amoeba do
+          enable
+          exclude_association :pages
+          exclude_association :page_contents
+        end
       end
 
       module ClassMethods

data/lib/smithy/dependencies.rb

@@ -1,5 +1,6 @@
 require 'rack/cache'
 
+require 'amoeba'
 require 'awesome_nested_set'
 require 'bootstrap-sass'
 require 'awesome_nested_set'

data/lib/smithy/version.rb

@@ -1,3 +1,3 @@
 module Smithy
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smithycms
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Tim Glen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,6 +44,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: amoeba
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: autoprefixer-rails
   requirement: !ruby/object:Gem::Requirement
@@ -1181,12 +1195,13 @@ files:
 - vendor/cache/activerecord-4.1.10.gem
 - vendor/cache/activesupport-4.1.10.gem
 - vendor/cache/addressable-2.3.8.gem
+- vendor/cache/amoeba-3.0.0.gem
 - vendor/cache/arel-5.0.1.20140414130214.gem
-- vendor/cache/autoprefixer-rails-6.3.5.gem
+- vendor/cache/autoprefixer-rails-6.3.6.1.gem
 - vendor/cache/awesome_nested_set-3.0.3.gem
-- vendor/cache/aws-sdk-2.2.31.gem
-- vendor/cache/aws-sdk-core-2.2.31.gem
-- vendor/cache/aws-sdk-resources-2.2.31.gem
+- vendor/cache/aws-sdk-2.3.4.gem
+- vendor/cache/aws-sdk-core-2.3.4.gem
+- vendor/cache/aws-sdk-resources-2.3.4.gem
 - vendor/cache/bcrypt-3.1.10.gem
 - vendor/cache/bootstrap-sass-3.2.0.2.gem
 - vendor/cache/builder-3.2.2.gem
@@ -1198,7 +1213,7 @@ files:
 - vendor/cache/coffee-script-2.4.1.gem
 - vendor/cache/coffee-script-source-1.10.0.gem
 - vendor/cache/columnize-0.9.0.gem
-- vendor/cache/concurrent-ruby-1.0.1.gem
+- vendor/cache/concurrent-ruby-1.0.2.gem
 - vendor/cache/coveralls-0.7.12.gem
 - vendor/cache/crass-1.0.2.gem
 - vendor/cache/database_cleaner-1.4.1.gem
@@ -1224,13 +1239,13 @@ files:
 - vendor/cache/fog-aws-0.9.2.gem
 - vendor/cache/fog-brightbox-0.10.1.gem
 - vendor/cache/fog-cloudatcost-0.1.2.gem
-- vendor/cache/fog-core-1.36.0.gem
+- vendor/cache/fog-core-1.39.0.gem
 - vendor/cache/fog-dynect-0.0.3.gem
 - vendor/cache/fog-ecloud-0.3.0.gem
 - vendor/cache/fog-google-0.1.0.gem
 - vendor/cache/fog-json-1.0.2.gem
 - vendor/cache/fog-local-0.3.0.gem
-- vendor/cache/fog-openstack-0.1.2.gem
+- vendor/cache/fog-openstack-0.1.5.gem
 - vendor/cache/fog-powerdns-0.1.1.gem
 - vendor/cache/fog-profitbricks-0.0.5.gem
 - vendor/cache/fog-rackspace-0.1.1.gem
@@ -1238,15 +1253,15 @@ files:
 - vendor/cache/fog-riakcs-0.1.0.gem
 - vendor/cache/fog-sakuracloud-1.7.5.gem
 - vendor/cache/fog-serverlove-0.1.2.gem
-- vendor/cache/fog-softlayer-1.1.0.gem
+- vendor/cache/fog-softlayer-1.1.1.gem
 - vendor/cache/fog-storm_on_demand-0.1.1.gem
 - vendor/cache/fog-terremark-0.1.0.gem
 - vendor/cache/fog-vmfusion-0.1.0.gem
 - vendor/cache/fog-voxel-0.1.0.gem
-- vendor/cache/fog-vsphere-0.6.3.gem
+- vendor/cache/fog-vsphere-0.7.0.gem
 - vendor/cache/fog-xenserver-0.2.3.gem
 - vendor/cache/fog-xml-0.1.2.gem
-- vendor/cache/font-awesome-sass-4.5.0.gem
+- vendor/cache/font-awesome-sass-4.6.2.gem
 - vendor/cache/formatador-0.2.5.gem
 - vendor/cache/formtastic-3.1.4.gem
 - vendor/cache/formtastic-bootstrap-3.1.1.gem
@@ -1263,11 +1278,12 @@ files:
 - vendor/cache/i18n-0.7.0.gem
 - vendor/cache/inflecto-0.0.2.gem
 - vendor/cache/ipaddress-0.8.3.gem
-- vendor/cache/jmespath-1.1.3.gem
+- vendor/cache/jmespath-1.2.4.gem
 - vendor/cache/jquery-rails-3.1.4.gem
 - vendor/cache/json-1.8.2.gem
+- vendor/cache/json_pure-1.8.3.gem
 - vendor/cache/kaminari-0.16.3.gem
-- vendor/cache/kramdown-1.10.0.gem
+- vendor/cache/kramdown-1.11.1.gem
 - vendor/cache/launchy-2.4.3.gem
 - vendor/cache/letter_opener-1.3.0.gem
 - vendor/cache/liquid-2.6.3.gem
@@ -1325,14 +1341,14 @@ files:
 - vendor/cache/slodown-0.1.3.gem
 - vendor/cache/slop-3.6.0.gem
 - vendor/cache/smithycms-auth-0.4.2.gem
-- vendor/cache/sprockets-3.5.2.gem
+- vendor/cache/sprockets-3.6.0.gem
 - vendor/cache/sprockets-rails-2.3.3.gem
 - vendor/cache/sqlite3-1.3.10.gem
 - vendor/cache/term-ansicolor-1.3.0.gem
 - vendor/cache/terminal-notifier-guard-1.6.4.gem
 - vendor/cache/thor-0.19.1.gem
 - vendor/cache/thread_safe-0.3.5.gem
-- vendor/cache/tilt-2.0.2.gem
+- vendor/cache/tilt-2.0.4.gem
 - vendor/cache/timers-4.0.1.gem
 - vendor/cache/tins-1.3.5.gem
 - vendor/cache/trollop-2.1.2.gem