slices 1.0.5 → 2.0.0

data/lib/generators/slices/install_generator.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'rails/generators'
 require 'thor'
 
@@ -24,8 +22,20 @@ module Slices
       copy_file "application.html.erb", "app/views/layouts/default.html.erb"
     end
 
+    def create_admin_nav_partials
+      create_file "app/views/admin/shared/_custom_navigation.html.erb", <<-END
+      <%# Place custom navbar controls here i.e. %>
+      <%#= admin_nav_link 'Example', example_path %>
+      END
+
+      create_file "app/views/admin/shared/_custom_links.html.erb", <<-END
+      <%# Place custom navbar links here i.e. %>
+      <%#= content_tag :li, link_to('Example', example_path) %>
+      END
+    end
+
     def optionally_create_mongoid_yaml
-      copy_file "mongoid.yml", "config/mongoid.yml"
+      generate 'mongoid:config'
     end
 
     def delete_superfluous_files

data/lib/generators/slices/templates/slices.rb

@@ -3,9 +3,8 @@
 #   avatar:           '30x30#',
 # )
 
-# Configure the Google Apps domain to use for quick auth.
-# Press the '=' key on the admin sign-in screen to authenticate via
-# a Google Apps account within the domain configured here.
-# Slices::Config.google_apps_domain = 'example.com'
+# Configure templates for new page fields and page actions
+# Slices::Config.page_fields_template = 'slices/page_fields'
+# Slices::Config.page_actions_template = 'slices/page_actions'
 
 ActionView::Base.send(:include, AssetsHelper)

data/lib/mongo_search.rb

@@ -29,7 +29,7 @@ module MongoSearch
         self.search_fields = args
 
         field :_keywords, type: Array
-        index :_keywords
+        index({ _keywords: 1 }, { background: true })
 
         before_save :set_keywords
       end

data/lib/slices.rb

@@ -2,6 +2,7 @@ require 'devise'
 require 'devise/orm/mongoid'
 require 'mongoid'
 require 'mongoid_paperclip'
+require 'will_paginate_mongoid'
 require 'RedCloth'
 require 'redcarpet'
 require 'stringex'
@@ -10,8 +11,6 @@ require 'slices/paperclip'
 require 'slices/version'
 
 require 'mongo_search'
-require 'ext/file_store_cache'
-
 module Slices
   autoload :Config,                     'slices/config'
   autoload :CmsFormBuilder,             'slices/cms_form_builder'
@@ -20,6 +19,7 @@ module Slices
   autoload :GeneratorMacros,            'slices/generator_macros'
   autoload :HasSlices,                  'slices/has_slices'
   autoload :HasAttachments,             'slices/has_attachments'
+  autoload :LocalizedFields,            'slices/localized_fields'
   autoload :PageAsJSON,                 'slices/page_as_json'
   autoload :Renderer,                   'slices/renderer'
   autoload :PositionHelper,             'slices/position_helper'
@@ -45,17 +45,10 @@ module Slices
 end
 
 require 'slices/engine' if defined?(Rails)
-require 'slices/i18n'
-require 'slices/will_paginate_mongoid'
 require 'slices/will_paginate'
-require 'set_link_renderer'
 
 Slices::Config.use_snippets!
 
-if Rails.env.test? || Rails.env.development?
-  require 'standard_tree'
-end
-
 Mime::Type.register_alias 'text/plain', :hbs
 Time::DATE_FORMATS.merge!(
   day_month_year: '%d %B %Y'

data/lib/slices/asset/maker.rb

@@ -17,9 +17,9 @@ module Slices
       end
 
       def find_matching_asset(new_asset)
-        ::Asset.first(conditions: {
+        ::Asset.where({
           file_fingerprint: new_asset.file_fingerprint, :_id.ne => new_asset.id
-        })
+        }).first
       end
 
       def tempfile_stored_on_s3?
@@ -44,7 +44,6 @@ module Slices
 
         if matching_asset.present?
           new_asset.destroy
-          matching_asset.soft_restore!
           matching_asset
         else
           new_asset

data/lib/slices/available_slices.rb

@@ -29,7 +29,14 @@ module Slices
 
         klass.fields.each do |name, field|
           next if Slice.fields[name]
-          fields[name] = field.default
+          fields[name] = field.default_val
+        end
+
+        if klass.respond_to?(:attachment_fields)
+          klass.attachment_fields.each do |name|
+            meta = klass.reflect_on_association(name)
+            fields[name.to_s] = meta.many? ? [] : nil
+          end
         end
 
         slices << [basename, fields]

data/lib/slices/config.rb

@@ -35,6 +35,13 @@ module Slices
       @snippets || false
     end
 
+    def self.i18n?
+      !!(
+        I18n.available_locales.many? ||
+          Rails.application.config.i18n.available_locales.try(:many?)
+      )
+    end
+
     def self.s3_storage?
       Paperclip::Attachment.default_options[:storage].to_sym == :fog
     end
@@ -57,18 +64,52 @@ module Slices
       }
     end
 
-    # Google Apps domain for quick auth.
+    # Page fields template path.
+    #
+    # @return [String] the path
+    def self.page_fields_template
+      @page_fields_template || 'admin/pages/fields'
+    end
+
+    # Set page fields template path.
+    #
+    # @param [String] the path
+    def self.page_fields_template=(path)
+      @page_fields_template = path
+    end
+
+    # Page actions template path.
     #
-    # @return [String] the domain
-    def self.google_apps_domain
-      @google_apps_domain
+    # @return [String] the path
+    def self.page_actions_template
+      @page_actions_template || 'admin/site_maps/page_actions'
+    end
+
+    # Set page actions template path.
+    #
+    # @param [String] the path
+    def self.page_actions_template=(path)
+      @page_actions_template = path
+    end
+
+    # Options for devise_for.
+    #
+    # @return [Hash] the options
+    def self.devise_for_options
+      @devise_options ||= {
+        path: 'admin',
+        controllers: {
+          passwords:  'admin/auth/passwords',
+          sessions:   'admin/auth/sessions',
+        }
+      }
     end
 
-    # Set Google Apps domain for quick auth.
+    # Set options for devise_for.
     #
-    # @param [String] the domain
-    def self.google_apps_domain=(domain)
-      @google_apps_domain = domain
+    # @param [Hash] the options
+    def self.devise_for_options=(options = {})
+      @devise_options = options
     end
 
     private

data/lib/slices/engine.rb

@@ -9,10 +9,6 @@ module Slices
       config.mongoid.observers.concat [:page_observer, :asset_observer]
     end
 
-    initializer :slices_will_paginate_active_view, after:  'will_paginate.action_view' do
-      load Slices.gem_path + '/lib/set_link_renderer.rb'
-    end
-
     initializer :slices_precompile_hook do |app|
       app.config.assets.precompile += %w(slices/slices.css slices/slices.js)
     end

data/lib/slices/has_attachments.rb

@@ -5,32 +5,8 @@ module Slices
     module ClassMethods
 
       def has_attachments(embed_name = :attachments, options = {})
-        klass = if options.has_key?(:class_name)
-                  options[:class_name].constantize
-                else
-                  Attachment
-                end
-
-        default = options[:default] || options[:singular] ? nil : []
-        type = options[:singular] ? Hash : Array
-
-        if options[:singular]
-          define_method embed_name do
-            if embed = read_attribute(embed_name)
-              klass.new embed
-            end
-          end
-        else
-          define_method embed_name do
-            (read_attribute(embed_name) || []).collect do |embed|
-              klass.new embed
-            end
-          end
-        end
-
         attachment_fields << embed_name
-
-        field embed_name, type: type, default: default
+        embeds_many embed_name, {class_name: "Attachment", as: :object}.merge(options)
       end
 
       def attachment_fields
@@ -44,11 +20,10 @@ module Slices
     end
 
     module PageInstanceMethods
-
       def attachment_assets
         attachment_asset_ids.inject([]) do |memo, asset_id|
           begin
-            memo << ::Asset.find(asset_id)
+            memo << ::Asset.find(asset_id.to_s)
           rescue Mongoid::Errors::DocumentNotFound
           end
           memo
@@ -68,6 +43,17 @@ module Slices
       end
       alias :attachment_asset_ids :slice_attachment_asset_ids
 
+      def remove_asset(asset)
+        remove_asset_from_slices(asset)
+      end
+
+      def remove_asset_from_slices(asset)
+        slices.each { |slice|
+          if slice.respond_to?(:remove_asset)
+            slice.remove_asset(asset)
+          end
+        }
+      end
     end
 
     def as_json options = nil
@@ -76,14 +62,7 @@ module Slices
 
     def attachments_as_json
       self.class.attachment_fields.inject({}) do |hash, name|
-        value = send name
-
-        hash[name] = if value.respond_to?(:map)
-                       value.map &:as_json
-                     else
-                       value.as_json
-                     end
-
+        hash[name] = send(name).map(&:as_json)
         hash
       end
     end
@@ -105,7 +84,16 @@ module Slices
       end.flat_map {|i| i }
     end
 
-  end
+    def remove_asset(asset)
+      super if defined?(super)
 
-end
+      asset_id = asset.id
 
+      self.class.attachment_fields.each do |field_name|
+        send(field_name).each do |attachment|
+          attachment.destroy if attachment.asset_id == asset_id
+        end
+      end
+    end
+  end
+end

data/lib/slices/has_slices.rb

@@ -27,15 +27,22 @@ module Slices
     end
 
     def update_attributes(attributes)
-      [:slices, :set_slices].each do |type|
-        next if attributes[type].nil?
+      [:slices, :set_slices].each do |embed_name|
+        next if attributes[embed_name].nil?
 
-        attributes[type] = attributes[type].map { |slice|
-          slice = slice.symbolize_keys
-          next if slice[:_destroy]
-          slice.delete :_new
-          klass = (slice[:type] + '_slice').camelize.constantize
-          klass.new(slice)
+        attributes[embed_name] = attributes[embed_name].map { |slice_attributes|
+          slice_attributes = slice_attributes.symbolize_keys
+          next if slice_attributes[:_destroy]
+          slice_attributes.delete :_new
+
+          if slice_attributes[:id].present?
+            slice = slices_for(embed_name).find(slice_attributes[:id])
+            slice.write_attributes(slice_attributes)
+          else
+            class_name = slice_attributes[:type].to_s.camelize + 'Slice'
+            slice = class_name.constantize.new(slice_attributes)
+          end
+          slice
         }.compact
       end
 

data/lib/slices/localized_fields.rb

@@ -0,0 +1,9 @@
+module Slices
+  module LocalizedFields
+    def localized_field_names
+      fields.select { |name, field| field.localized? }.map do |name, field|
+        name.to_sym
+      end
+    end
+  end
+end

data/lib/slices/page_as_json.rb

@@ -1,10 +1,12 @@
 module Slices
   # We keep this method in here to facilate easier overriding when re-opening Page.
   module PageAsJSON
+    include Slices::LocalizedFields
+
     def as_json(options = {})
       options ||= {}
 
-      hash = attributes.symbolize_keys.except(:_id, :_type, :_keywords, :set_slices, :site_id).merge(
+      hash = attributes.symbolize_keys.except(:_id, :_type, :_keywords, :set_slices).merge(
         id:        id,
         permalink: permalink,
         slices:    ordered_slices_for(options[:slice_embed]).map {|slice| slice.as_json },
@@ -12,6 +14,10 @@ module Slices
         author: author
       )
 
+      localized_field_names.each do |name|
+        hash.merge!(name => send(name))
+      end
+
       keys = options[:only]
       keys ? hash.slice(keys) : hash
     end

data/lib/slices/renderer.rb

@@ -27,8 +27,8 @@ module Slices
       render_slices slices.where(container: container)
     end
 
-    def render_to_string(*args)
-      @controller.render_to_string(*args)
+    def render_to_string(template, options)
+      @controller.render_to_string(template, { layout: nil }.merge(options))
     end
 
     def fragment_exist?(cache_key)

data/lib/slices/tree.rb

@@ -39,8 +39,8 @@ module Slices
       field :position, type: Integer
       field :show_in_nav, type: Boolean, default: false
 
-      scope :minimal, only: %w(page_id path external_url name has_content)
-      index :path
+      scope :minimal, ->{ only(%w(_type page_id path external_url name has_content)) }
+      index({ path: 1 }, { unique: true })
 
       belongs_to :page
 
@@ -66,7 +66,9 @@ module Slices
       # @return [Page]
       #
       def find_by_path(path)
-        first(conditions: { path: path }) || (raise Page::NotFound.new(path))
+        find_by(path: path)
+      rescue Mongoid::Errors::DocumentNotFound
+        raise Page::NotFound.new(path)
       end
       alias :f :find_by_path
 
@@ -279,6 +281,13 @@ module Slices
       end
     end
 
+    # Don't store permalink
+    #
+    # @return nil
+    #
+    def permalink=(args)
+    end
+
     private
 
     # Make sure that a page's path is unique amoungst it's siblings, if there is

data/lib/slices/version.rb

@@ -1,4 +1,4 @@
 module Slices
-  VERSION = '1.0.5'
+  VERSION = '2.0.0'
 end
 

data/lib/tasks/db.rake

@@ -1,16 +1,12 @@
 module Slices
   module Tasks
     def self.create_indexes
-      [
-        Slices.gem_path + '/app/models/**/*.rb',
-        Rails.root.join('app/slices/**/*.rb')
-      ].each do |pattern|
-        Dir.glob(pattern).each do |file|
-          model = determine_model(file)
-          if model
-            model.create_indexes
-            Logger.new($stdout).info("Generated indexes for #{model}")
-          end
+      pattern = Rails.root.join('app/slices/**/*.rb')
+      Dir.glob(pattern).each do |file|
+        model = determine_model(file)
+        if model
+          model.create_indexes
+          Logger.new($stdout).info("Generated indexes for #{model}")
         end
       end
     end