locomotivecms_mounter 1.0.0.alpha4 → 1.0.1

data/lib/locomotive/mounter/engine_api.rb

@@ -33,6 +33,11 @@ module Locomotive
           raise WrongCredentials.new("#{response['message']} (#{response.code})")
         end
       end
+      
+      def self.teardown
+        Locomotive::Mounter::EngineApi.default_options[:base_uri] = nil
+        Locomotive::Mounter::EngineApi.default_options[:default_params] = {}
+      end
 
     end
 

data/lib/locomotive/mounter/fields.rb

@@ -48,10 +48,11 @@ module Locomotive
 
         attributes.each do |name, value|
           unless self.class._fields.key?(name.to_sym) || self.respond_to?(:"#{name}=")
+            next if name.to_s == 'id'
             raise FieldDoesNotExistException.new "[#{self.class.inspect}] setting an unknown attribute '#{name}' with the value '#{value.inspect}'"
           end
 
-          if self.localized?(name) && value.is_a?(Hash)
+          if self.localized_field?(name) && value.is_a?(Hash)
             self.send(:"#{name}_translations=", value)
           else
             self.send(:"#{name}=", value)
@@ -103,7 +104,7 @@ module Locomotive
       #
       # @return [ Boolean ] True if the field is localized
       #
-      def localized?(name)
+      def localized_field?(name)
         method_name = :"#{name}_localized?"
         self.respond_to?(method_name) && self.send(method_name)
       end
@@ -171,10 +172,9 @@ module Locomotive
       def getter(name, options = {})
         value = self.instance_variable_get(:"@#{name}")
         if options[:localized]
-          (value || {})[Locomotive::Mounter.locale]
-        else
-          value
+          value = (value || {})[Locomotive::Mounter.locale]
         end
+        value
       end
 
       def setter(name, value, options = {})

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

@@ -6,11 +6,12 @@ module Locomotive
 
         include Locomotive::Mounter::Fields
 
-        attr_accessor :_id, :mounting_point
+        attr_accessor :_id, :mounting_point, :created_at, :updated_at
 
         ## methods ##
 
         def initialize(attributes = {})
+          self.created_at = self.updated_at = Time.now
           self.mounting_point = attributes.delete(:mounting_point)
           super
         end

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

@@ -20,11 +20,20 @@ module Locomotive
         alias :_permalink= :_slug=
 
         ## callbacks ##
-        # set_callback :initialize, :after, :set_slug
         set_callback :initialize, :after, :set_default_main_locale
 
         ## methods ##
 
+        # By definition, if the label field defined in the content type is
+        # localized, then the content entry will be considered as localized.
+        #
+        # @return [ Boolean ] True if the label field is localized.
+        #
+        def localized?
+          field = self.content_type.label_field
+          !!field.try(:localized)
+        end
+
         # Return the internal label used to identify a content entry
         # in a YAML file for instance. It is based on the first field
         # of the related content type.
@@ -80,10 +89,6 @@ module Locomotive
 
           self.dynamic_fields.each do |field|
             value = self.localized_dynamic_attribute_value(field)
-
-            # value = (self.dynamic_attributes || {})[field.name.to_sym]
-            # value = value.try(:[], Locomotive::Mounter.locale) unless field.is_relationship? || !field.localized
-
             block.call(field, value)
           end
         end
@@ -231,12 +236,35 @@ module Locomotive
               self._slug = self.next_unique_slug if self.slug_already_taken?
             end
           end
+
+          self.fill_with_default_slug
+        end
+
+        # In case the content entry is not localized, we need to make sure
+        # it has an non empty slug for each locale of the site.
+        #
+        def fill_with_default_slug
+          return if self.localized?
+
+          # we do not want to add a new translation because the content entry
+          # is not truly "localized".
+          __locales = self._locales.dup
+
+          default_slug = self._slug_translations[self.mounting_point.default_locale]
+
+          self.mounting_point.locales.each do |locale|
+            Locomotive::Mounter.with_locale(locale) do
+              self._slug = default_slug if self._slug.blank?
+            end
+          end
+
+          self._locales = __locales
         end
 
         # Once the entry has been initialized, we keep track of the current locale
         #
         def set_default_main_locale
-          self.main_locale = Locomotive::Mounter.locale
+          self.main_locale = self.content_type.mounting_point.default_locale
         end
 
         # Return the next available unique slug as a string

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

@@ -12,6 +12,7 @@ module Locomotive
         field :position,  default: 0
         field :required,  default: false
         field :localized, default: false
+        field :class_slug
 
         # text
         field :text_formatting
@@ -27,6 +28,7 @@ module Locomotive
 
         alias :target :class_name
         alias :target= :class_name=
+        alias :raw_select_options= :select_options=
 
         ## callbacks ##
         set_callback :initialize, :after, :prepare_attributes

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

@@ -58,6 +58,9 @@ module Locomotive
         #
         def build_entry(attributes)
           ContentEntry.new(content_type: self).tap do |entry|
+            # set the link to the mounting point
+            entry.mounting_point = self.mounting_point
+
             # do not forget that we are manipulating dynamic fields
             attributes.each do |k, v|
               begin

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

@@ -98,6 +98,17 @@ module Locomotive
           self._locales = locales.map(&:to_sym)
         end
 
+        # Set the content type, attribute required for templatized page.
+        # @deprecated. Use content_type= instead.
+        #
+        # @param [ Object ] content_type The content type
+        #
+        def model=(content_type)
+          Locomotive::Mounter.logger.warn 'The model attribute is deprecated. Use content_type instead.'
+          self.content_type = content_type
+        end
+
+
         # Modified setter in order to set correctly the slug
         #
         # @param [ String ] fullpath The fullpath
@@ -354,7 +365,7 @@ module Locomotive
         # @return [ Hash ] The safe params
         #
         def to_safe_params
-          fields = %w(listed published handle cache_strategy redirect_url response_type templatized content_type_id position)
+          fields = %w(title slug listed published handle cache_strategy redirect_url response_type templatized content_type_id position)
 
           params = self.attributes.delete_if do |k, v|
             !fields.include?(k.to_s) || (!v.is_a?(FalseClass) && v.blank?)

data/lib/locomotive/mounter/reader/api/content_assets_reader.rb

@@ -28,7 +28,7 @@ module Locomotive
           protected
 
           def safe_attributes
-            %w(_id url)
+            %w(_id url created_at updated_at)
           end
 
         end

data/lib/locomotive/mounter/reader/api/content_entries_reader.rb

@@ -76,7 +76,7 @@ module Locomotive
           # @return [ Object] The attributes understandable by the content entry
           #
           def filter_attributes(content_type, original_attributes)
-            attributes = original_attributes.clone.keep_if { |k, v| %w(_id _slug seo_title meta_keywords meta_description _position).include?(k) }
+            attributes = original_attributes.clone.keep_if { |k, v| %w(_id _slug seo_title meta_keywords meta_description _position created_at updated_at).include?(k) }
 
             content_type.fields.each do |field|
               value = (case field.type
@@ -85,7 +85,7 @@ module Locomotive
               when :text
                 self.replace_urls_by_content_assets(original_attributes[field.name])
               when :select
-                field.name_for_select_option(original_attributes[field.name])
+                field.find_select_option(original_attributes[field.name]).try(:name)
               when :date
                 original_attributes["formatted_#{field.name}"]
               when :belongs_to, :many_to_many
@@ -101,7 +101,7 @@ module Locomotive
             end
 
             attributes
-          end        
+          end
 
           # Some entries have what it is called "relationships" field
           # which can be only resolved once all the entries have been fetched
@@ -127,6 +127,7 @@ module Locomotive
           # @return [ String ] The content with local urls
           #
           def replace_urls_by_content_assets(content)
+            return "" unless content
             self.mounting_point.content_assets.each do |path, asset|
               content.gsub!(path, asset.local_filepath)
             end

data/lib/locomotive/mounter/reader/api/content_types_reader.rb

@@ -55,15 +55,15 @@ module Locomotive
           def enable_relationships
             self.items.each do |_, content_type|
               content_type.fields.find_all(&:is_relationship?).each do |field|
-                # look for the target content type from its class name
-                target = self.items.values.find { |_content_type| _content_type.klass_name == field.class_name }
-                field.class_name = target.slug
+                # look for the target content type from its slug
+                target = self.items.keys.find { |k| k == field.class_slug }
+                field.class_name = target
               end
             end
           end
 
           def safe_attributes
-            %w(name slug description order_by order_direction label_field_name group_by_field_id public_submission_accounts entries_custom_fields klass_name)
+            %w(name slug description order_by order_direction label_field_name group_by_field_id public_submission_accounts entries_custom_fields klass_name created_at updated_at)
           end
 
         end

data/lib/locomotive/mounter/reader/api/pages_reader.rb

@@ -98,7 +98,7 @@ module Locomotive
 
               # content type
               if content_type_slug = attributes.delete('target_klass_slug')
-                attributes['content_type'] = self.mounting_point.content_types[content_type_slug] #.values.find { |ct| ct._id == content_type_id }              
+                attributes['content_type'] = self.mounting_point.content_types[content_type_slug] #.values.find { |ct| ct._id == content_type_id }
               end
 
               self.pages[fullpath] = Locomotive::Mounter::Models::Page.new(attributes)
@@ -128,7 +128,7 @@ module Locomotive
           end
 
           # Only keep the minimal attributes from a list of
-          # editable elements hashes. It also replaces the url to 
+          # editable elements hashes. It also replaces the url to
           # content assets by their corresponding local ones.
           #
           # @param [ Array ] list The list of the editable elements with all the attributes
@@ -149,7 +149,8 @@ module Locomotive
             %w(_id title slug handle fullpath translated_in target_klass_slug
             published listed templatized editable_elements
             redirect_url cache_strategy response_type position
-            seo_title meta_keywords meta_description raw_template)
+            seo_title meta_keywords meta_description raw_template
+            created_at updated_at)
           end
 
           # Output simply the tree structure of the pages.

data/lib/locomotive/mounter/reader/api/site_reader.rb

@@ -26,7 +26,7 @@ module Locomotive
           end
 
           def safe_attributes
-            %w(name locales seo_title meta_keywords meta_description domains subdomain)
+            %w(name locales seo_title meta_keywords meta_description domains subdomain created_at updated_at)
           end
 
         end

data/lib/locomotive/mounter/reader/api/snippets_reader.rb

@@ -48,7 +48,7 @@ module Locomotive
           end
 
           def safe_attributes
-            %w(_id name slug template)
+            %w(_id name slug template created_at updated_at)
           end
 
         end

data/lib/locomotive/mounter/reader/api/theme_assets_reader.rb

@@ -30,7 +30,7 @@ module Locomotive
           protected
 
           def safe_attributes
-            %w(_id folder url)
+            %w(_id folder url created_at updated_at)
           end
 
         end

data/lib/locomotive/mounter/reader/api/translations_reader.rb

@@ -14,10 +14,10 @@ module Locomotive
               Locomotive::Mounter::Models::Translation.new(attributes)
             end
           end
-          
+
           protected
           def safe_attributes
-            %w[_id key values]
+            %w[_id key values created_at updated_at]
           end
         end
 

data/lib/locomotive/mounter/reader/api.rb

@@ -10,6 +10,10 @@ module Locomotive
         def self.instance
           @@instance ||= Runner.new(:api)
         end
+        
+        def self.teardown
+          @@instance = nil
+        end
 
         class Runner < Locomotive::Mounter::Reader::Runner
 

data/lib/locomotive/mounter/reader/file_system/pages_reader.rb

@@ -108,7 +108,10 @@ module Locomotive
               attributes[:title]    = File.basename(fullpath).humanize
               attributes[:fullpath] = fullpath
 
-              self.pages[fullpath]  = Locomotive::Mounter::Models::Page.new(attributes)
+              page = Locomotive::Mounter::Models::Page.new(attributes)
+              page.mounting_point = self.mounting_point
+
+              self.pages[fullpath] = page
             end
 
             self.pages[fullpath]

data/lib/locomotive/mounter/version.rb

@@ -2,7 +2,7 @@
 module Locomotive
   module Mounter #:nodoc
 
-    VERSION = '1.0.0.alpha4'
+    VERSION = '1.0.1'
 
   end
 end

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

@@ -12,6 +12,8 @@ module Locomotive
 
           delegate :default_locale, :locales, :site, to: :mounting_point
 
+          delegate :force?, to: :runner
+
           def initialize(mounting_point, runner)
             self.mounting_point = mounting_point
             self.runner         = runner
@@ -24,16 +26,6 @@ module Locomotive
             self.output_title
           end
 
-          # By setting the force option to true, some resources (site, content assets, ...etc)
-          # may overide the content of the remote engine during the push operation.
-          # By default, its value is false.
-          #
-          # @return [ Boolean ] True if the force option has been set to true
-          #
-          def force?
-            self.runner.parameters[:force] || false
-          end
-
           # By setting the data option to true, user content (content entries and
           # editable elements from page) can be pushed too.
           # By default, its value is false.
@@ -253,6 +245,7 @@ module Locomotive
             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
 

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

@@ -63,6 +63,7 @@ module Locomotive
             success = page.persisted? ? self.update_page(page) : self.create_page(page)
 
             self.output_resource_op_status page, success ? :success : :error
+
             self.flush_log_buffer
           end
 

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

@@ -37,27 +37,36 @@ module Locomotive
               self.output_resource_op theme_asset
 
               status  = :skipped
+              errors  = []
               file    = self.build_temp_file(theme_asset)
               params  = theme_asset.to_params.merge(source: file, performing_plain_text: false)
 
-              if theme_asset.persisted?
-                # we only update it if the size has changed or if the force option has been set.
-                if self.force? || self.theme_asset_changed?(theme_asset, file)
-                  response = self.put :theme_assets, theme_asset._id, params
-
-                  status = self.response_to_status(response)
+              begin
+                if theme_asset.persisted?
+                  # we only update it if the size has changed or if the force option has been set.
+                  if self.force? || self.theme_asset_changed?(theme_asset, file)
+                    response  = self.put :theme_assets, theme_asset._id, params
+                    status    = self.response_to_status(response)
+                  else
+                    status = :same
+                  end
+                else
+                  response  = self.post :theme_assets, params, nil, true
+                  status    = self.response_to_status(response)
+                end
+              rescue Exception => e
+                if self.force?
+                  status, errors = :error, e.message
+                else
+                  raise e
                 end
-              else
-                response = self.post :theme_assets, params, nil, true
-
-                status = self.response_to_status(response)
               end
 
               # very important. we do not want a huge number of non-closed file descriptor.
               file.close
 
               # track the status
-              self.output_resource_op_status theme_asset, status
+              self.output_resource_op_status theme_asset, status, errors
             end
 
             # make the stuff like they were before

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

@@ -13,7 +13,7 @@ module Locomotive
             super
 
             # set the unique identifier to each local translation
-            self.get(:translations, nil, true).each do |attributes|
+            (self.get(:translations, nil, true) || []).each do |attributes|
               translation = self.translations[attributes['key']]
 
               translation._id = attributes['id'] if translation

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

@@ -11,6 +11,10 @@ module Locomotive
           @@instance ||= Runner.new(:api)
         end
 
+        def self.teardown
+          @@instance = nil
+        end
+
         class Runner < Locomotive::Mounter::Writer::Runner
 
           attr_accessor :uri

data/lib/locomotive/mounter/writer/file_system/translations_writer.rb

@@ -11,8 +11,8 @@ module Locomotive
 
           def write
             self.open_file('config/translations.yml') do |file|
-              file.write self.mounting_point.translations.inject({}) do |memo,translation|
-                memo.merge!(translation.key => translation.values)
+              file.write self.mounting_point.translations.each_with_object({}) do |hash,translation|
+                hash[translation.key] = translation.values
               end.to_yaml
             end
           end

data/lib/locomotive/mounter/writer/runner.rb

@@ -48,19 +48,29 @@ module Locomotive
             "#{name}_writer".camelize
           end.try(:insert, 0, 'SiteWriter')
 
-          begin
-            self.writers.each do |klass|
-              next if only && !only.include?(klass.name.demodulize)
-              writer = klass.new(self.mounting_point, self)
-              writer.prepare
+          self.writers.each do |klass|
+            next if only && !only.include?(klass.name.demodulize)
+            writer = klass.new(self.mounting_point, self)
+            writer.prepare
+            begin
               writer.write
+            rescue Exception => e
+              Locomotive::Mounter.logger.error e.backtrace
+              puts "\n\nBlocking Error: #{e.message.colorize(:red)}"
             end
-          rescue Exception => e
-            Locomotive::Mounter.logger.error e.backtrace
-            puts "\n\nBlocking Error: #{e.message.colorize(:red)}"
           end
         end
 
+        # By setting the force option to true, some resources (site, content assets, ...etc)
+        # may overide the content of the remote engine during the push operation.
+        # By default, its value is false.
+        #
+        # @return [ Boolean ] True if the force option has been set to true
+        #
+        def force?
+          self.parameters[:force] || false
+        end
+
       end
 
     end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_mounter
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha4
-  prerelease: 6
+  version: 1.0.1
+  prerelease: 
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-01 00:00:00.000000000 Z
+date: 2013-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -379,6 +379,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.1
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.9.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.9.3
 description: Mount any LocomotiveCMS site, from a template on the filesystem, a zip
   file or even an online engine
 email:
@@ -471,7 +503,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4090664391938544491
+      hash: -3971524882032378901
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: