locomotivecms_mounter 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd805b0725f79d360e2dca56b557700f21345f3f
-  data.tar.gz: f437f1070d2c438ae866e4bd686b1a5d32407103
+  metadata.gz: c5530907ada5da361eda74b2634561b53f9d2847
+  data.tar.gz: 2df3cb218d697e6494e568517085961ddb239a82
 SHA512:
-  metadata.gz: c65468b6d09942dc0f7628990530d74a5f0467da2e3e6b77479526cade925d1e77c0a563c9d22494f625e8ef531f20ba7f8e4217504455381f6a05ba2a5d2ece
-  data.tar.gz: 223bdc863a4e1acc7dcac5f075807441c81599a4ec292ab3126a94269052335c0212b86162eb08292b16eb95c8d004734ce4b64ee7d0228501d1fa03f4376306
+  metadata.gz: f94b477a217c2c01440f4eb63d519e5bdf95b1470466f1e696fc7060bfdd02225763a0331c51290e5ae3a224dae883f43ce5949b30c0b77b5e1459e2ec8b118c
+  data.tar.gz: 857751a0aab81a19279870a39c47a91514f21621b4fd37158a45176e2c8488235646ca2f282c948f2cbac467b0bc84c99f8d535b706cfaca3a44e0191abca734

data/lib/locomotive/mounter/fields.rb

@@ -139,7 +139,7 @@ module Locomotive
       def to_hash(translations = true)
         hash = translations ? self.attributes_with_translations : self.attributes
 
-        hash.delete_if { |k, v| v.blank? }
+        hash.delete_if { |k, v| (!v.is_a?(FalseClass) && v.blank?) }
 
         hash.each { |k, v| hash[k] = v.to_s if v.is_a?(Symbol) }
 

data/lib/locomotive/mounter/models/page.rb

@@ -15,6 +15,7 @@ module Locomotive
         field :template,          localized: true
         field :handle
         field :listed,            default: false
+        field :searchable
         field :templatized,       default: false
         field :content_type
         field :published,         default: true
@@ -38,6 +39,7 @@ module Locomotive
         alias :listed?      :listed
         alias :published?   :published
         alias :templatized? :templatized
+        alias :searchable?  :searchable
 
         ## methods ##
 
@@ -331,7 +333,7 @@ module Locomotive
         # @return [ String ] The YAML version of the page
         #
         def to_yaml
-          fields = %w(title slug redirect_url redirect_type handle published listed cache_strategy response_type position seo_title meta_description meta_keywords)
+          fields = %w(title slug redirect_url redirect_type handle published listed searchable cache_strategy response_type position seo_title meta_description meta_keywords)
 
           _attributes = self.attributes.delete_if do |k, v|
             !fields.include?(k.to_s) || (!v.is_a?(FalseClass) && v.blank?)
@@ -361,7 +363,7 @@ module Locomotive
         # @return [ Hash ] The params
         #
         def to_params
-          params = self.filter_attributes %w(title parent_id slug redirect_url redirect_type handle listed published cache_strategy
+          params = self.filter_attributes %w(title parent_id slug redirect_url redirect_type handle listed published searchable cache_strategy
             response_type position templatized seo_title meta_description meta_keywords)
 
           # slug
@@ -392,7 +394,7 @@ module Locomotive
         # @return [ Hash ] The safe params
         #
         def to_safe_params
-          fields = %w(title slug listed published handle cache_strategy
+          fields = %w(title slug listed published searchable handle cache_strategy
             redirect_url response_type templatized content_type_id position
             seo_title meta_description meta_keywords)
 

data/lib/locomotive/mounter/version.rb

@@ -2,7 +2,7 @@
 module Locomotive
   module Mounter #:nodoc
 
-    VERSION = '1.3.1'
+    VERSION = '1.3.2'
 
   end
 end

data/lib/locomotive/mounter/writer/api/base.rb

@@ -5,15 +5,14 @@ module Locomotive
 
         class Base
 
-          # @@buffer_enabled  = false
-          # @@buffer_log      = ''
-
           include Locomotive::Mounter::Utils::Output
 
           attr_accessor :mounting_point, :runner
 
           delegate :default_locale, :locales, :site, :sprockets, to: :mounting_point
 
+          delegate :content_assets_writer, to: :runner
+
           delegate :force?, to: :runner
 
           def initialize(mounting_point, runner)
@@ -97,7 +96,7 @@ module Locomotive
               # data.each do |attribute, errors|
               #   self.log "      #{attribute} => #{[*errors].join(', ')}\n".colorize(color: :red)
               # end if data.respond_to?(:keys)
-              # nil
+              # nil # DEBUG
             end
           end
 
@@ -134,7 +133,7 @@ module Locomotive
               # data.each do |attribute, errors|
               #   self.log "\t\t #{attribute} => #{[*errors].join(', ')}".colorize(color: :red)
               # end if data.respond_to?(:keys)
-              # nil
+              # nil # DEBUG
             end
           end
 
@@ -183,22 +182,14 @@ module Locomotive
           def replace_content_assets!(source)
             return source if source.blank?
 
-            source.to_s.gsub(/\/samples\/.*\.[a-zA-Z0-9]+/) do |match|
-              url = self.runner.content_assets_writer.write(match)
+            source.to_s.gsub(/\/samples\/\S*\.[a-zA-Z0-9]+/) do |match|
+              url = self.content_assets_writer.write(match)
               url || match
             end
           end
 
           protected
 
-          # def truncate(string, length = 50, separator = '[...]')
-          #   if string.length > length
-          #     string[0..(length - separator.length)] + separator
-          #   else
-          #     string
-          #   end
-          # end
-
           def response_to_status(response)
             response ? :success : :error
           end
@@ -222,102 +213,6 @@ module Locomotive
             end
           end
 
-          # # Print the the title for each kind of resource.
-          # #
-          # def output_title
-          #   msg = "* Pushing #{self.class.name.gsub(/Writer$/, '').demodulize}"
-          #   self.log msg.colorize(background: :white, color: :black) + "\n"
-          # end
-
-          # # Print the current locale.
-          # #
-          # def output_locale
-          #   locale = Locomotive::Mounter.locale.to_s
-          #   self.log "  #{locale.colorize(background: :blue, color: :white)}\n"
-          # end
-
-          # # Print the message about the creation / update of a resource.
-          # #
-          # # @param [ Object ] resource The resource (Site, Page, ...etc).
-          # #
-          # def output_resource_op(resource)
-          #   self.log self.resource_message(resource)
-          # end
-
-          # # Print the message about the creation / update of a resource.
-          # #
-          # # @param [ Object ] resource The resource (Site, Page, ...etc).
-          # # @param [ Symbol ] status :success, :error, :skipped
-          # # @param [ String ] errors The error messages
-          # #
-          # def output_resource_op_status(resource, status = :success, errors = nil)
-          #   status_label = case status
-          #   when :success         then 'done'.colorize(color: :green)
-          #   when :error           then 'error'.colorize(color: :red)
-          #   when :skipped         then 'skipped'.colorize(color: :magenta)
-          #   when :same            then 'same'.colorize(color: :magenta)
-          #   when :not_translated  then 'not translated (itself or parent)'.colorize(color: :yellow)
-          #   end
-
-          #   spaces = '.' * (80 - self.resource_message(resource).size)
-          #   self.log "#{spaces}[#{status_label}]\n"
-
-          #   if errors && status == :error
-          #     self.log "#{errors.colorize(color: :red)}\n"
-          #   end
-          # end
-
-          # # Return the message about the creation / update of a resource.
-          # #
-          # # @param [ Object ] resource The resource (Site, Page, ...etc).
-          # #
-          # # @return [ String ] The message
-          # #
-          # def resource_message(resource)
-          #   op_label = resource.persisted? ? 'updating': 'creating'
-          #   "    #{op_label} #{truncate(resource.to_s)}"
-          # end
-
-          # # Log a message to the console or the logger depending on the options
-          # # of the runner. Info is the log level if case the logger has been chosen.
-          # #
-          # # @param [ String ] message The message to log.
-          # #
-          # def log(message)
-          #   # puts "buffer ? #{@@buffer_enabled.inspect}"
-          #   if @@buffer_enabled
-          #     @@buffer_log << message
-          #   else
-          #     if self.runner.parameters[:console]
-          #       print message
-          #     else
-          #       Mounter.logger.info message #.gsub(/\n$/, '')
-          #     end
-          #   end
-          # end
-
-          # # Put in a buffer the logs generated when executing the block.
-          # # It means that they will not output unless the flush_log_buffer
-          # # method is called.
-          # #
-          # # @return [ Object ] Thee value returned by the call of the block
-          # #
-          # def buffer_log(&block)
-          #   @@buffer_log = ''
-          #   @@buffer_enabled = true
-          #   if block_given?
-          #     block.call.tap { @@buffer_enabled = false }
-          #   end
-          # end
-
-          # # Flush the logs put in a buffer.
-          # #
-          # def flush_log_buffer
-          #   @@buffer_enabled = false
-          #   self.log(@@buffer_log)
-          #   @@buffer_log = ''
-          # end
-
         end
 
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_mounter
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2013-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt