locomotivecms_mounter 1.0.4 → 1.1.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    M2M1YjM0MTBkNjA5MmRiZmIyNzUyMTEyNjY1ZDE2M2MwMzg1NDk5OQ==
+  data.tar.gz: !binary |-
+    ZDA2MzhmMzA3NTdjZDIxNTk3ZmVmNDIzN2M1ZTAwNzNlMmVkNDI2ZQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZTRjOGE0OTBiNWEyYzM4Yjg2OGFkMjg2YjZmNGY0MDQ2ZGUxMmM5ZmFmODIz
+    MzFiMDU2MzExODE2OGE2NmYyZGMyYjU3MmM4NzhkNjMxODFjOGRkN2FjZmJl
+    NjdiNzllNWQzNzBkMDkzNzU4OGZkNjk4NjY5YzE5MDg4YTc4YjM=
+  data.tar.gz: !binary |-
+    M2UzZjczZWIxYjMxYmM0OTA1ZDAwYWYxNzVhMDFmYTYwZWQxMDNlMzA0M2M3
+    MGVmZDAzMDI4MmRmYTgzZTY0OWNmNjU2NWZkMzI3YTVkOGIxOTkzZWU2ZmZl
+    OTQyZjkxYzNlM2RmYTkxMDQyODA1NzQ2ZDhiNWQ0OWUzNTVkNWE=

data/lib/locomotive/mounter/engine_api.rb

@@ -11,20 +11,16 @@ module Locomotive
       # this class. It raises an exception if the operation fails.
       # Example of the base uri: locomotivecms.com, nocoffee.fr.
       #
-      # @param [ Hash / Array ] *args A hash or parameters in that order: uri, email, password
+      # @param [ Hash / Array ] *args A hash or parameters in that order: uri, email, password or uri, api_key
       #
       # @return [ String ] The new token
       #
       def self.set_token(*args)
-        uri, email, password = (if args.first.is_a?(Hash)
-          [args.first[:uri], args.first[:email], args.first[:password]]
-        else
-          [*args]
-        end)
+        _credentials = self.credentials(args)
 
-        self.base_uri uri
+        self.base_uri _credentials.delete(:uri)
 
-        response = post('/tokens.json', body: { email: email, password: password })
+        response = post('/tokens.json', body: _credentials) #{ email: email, password: password })
 
         if response.code < 400
           self.default_params auth_token: response['token']
@@ -39,6 +35,22 @@ module Locomotive
         Locomotive::Mounter::EngineApi.default_options[:default_params] = {}
       end
 
+      protected
+
+      def self.credentials(args)
+        if args.first.is_a?(Hash)
+          args.first
+        elsif args.size == 3
+          # uri, email, password
+          { uri: args[0], email: args[1], password: args[2] }
+        elsif args.size == 2
+          # uri, api_key
+          { uri: args[0], api_key: args[1] }
+        else
+          {}
+        end
+      end
+
     end
 
   end

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

@@ -117,8 +117,6 @@ module Locomotive
           value = self.localized_dynamic_attribute_value(field)
 
           case field.type
-          when :string, :text, :select, :boolean, :category
-            value
           when :date
             value.is_a?(String) ? Date.parse(value) : value
           when :file
@@ -129,6 +127,9 @@ module Locomotive
             field.klass.find_entries_by(field.inverse_of, [self._label, self._permalink])
           when :many_to_many
             field.klass.find_entries_among(value)
+          else
+            # :string, :text, :select, :boolean, :email, :integer, :float, :tags
+            value
           end
         end
 
@@ -172,7 +173,7 @@ module Locomotive
           end
         end
 
-        # Returns a hash with the label_field value as the key and the other fields as the value
+        # Return a hash with the label_field value as the key and the other fields as the value
         #
         # @param [ Boolean ] nested True to have a hash of hash (whose key is the label)
         #
@@ -191,10 +192,14 @@ module Locomotive
           # no need of the translation of the field name in the current locale
           label_field = self.content_type.label_field
 
-          if label_field.localized && !hash[label_field.name].empty?
-            hash[label_field.name].delete(Locomotive::Mounter.locale.to_s)
+          if label_field.localized
+            if !hash[label_field.name].empty?
+              hash[label_field.name].delete(Locomotive::Mounter.locale.to_s)
 
-            hash.delete(label_field.name) if hash[label_field.name].empty?
+              hash.delete(label_field.name) if hash[label_field.name].empty?
+            end
+          else
+            hash.delete(label_field.name)
           end
 
           nested ? { self._label => hash } : hash

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

@@ -75,16 +75,6 @@ module Locomotive
           self.select_options.detect { |option| option.name.to_s == name_or_id.to_s || option._id == name_or_id }
         end
 
-        # Instead of returning a simple hash, it returns a hash with name as the key and
-        # the remaining attributes as the value.
-        #
-        # @return [ Hash ] A hash of hash
-        #
-        def to_hash
-          hash = super.delete_if { |k, v| %w(name position).include?(k) }
-          { self.name => hash }
-        end
-
         # Return the params used for the API.
         #
         # @return [ Hash ] The params
@@ -112,6 +102,28 @@ module Locomotive
           params
         end
 
+        # Instead of returning a simple hash, it returns a hash with name as the key and
+        # the remaining attributes as the value.
+        #
+        # @return [ Hash ] A hash of hash
+        #
+        def to_hash
+          hash = super.delete_if { |k, v| %w(name position).include?(k) }
+
+          # class_name is chosen over class_slug
+          if self.is_relationship?
+            hash['class_name'] ||= hash['class_slug']
+            hash.delete('class_slug')
+          end
+
+          # select options
+          if self.type == :select
+            hash['select_options'] = self.select_options_to_hash
+          end
+
+          { self.name => hash }
+        end
+
         protected
 
         # Clean up useless properties depending on its type
@@ -123,6 +135,23 @@ module Locomotive
           self.text_formatting = nil unless self.type == :text
         end
 
+        def select_options_to_hash
+          locales = self.select_options.map { |option| option.translated_in }.flatten.uniq
+          options = self.select_options.sort { |a, b| a.position <=> b.position }
+
+          if locales.size > 1
+            {}.tap do |by_locales|
+              locales.each do |locale|
+                options.each do |option|
+                  (by_locales[locale.to_s] ||= []) << option.name_translations[locale]
+                end
+              end
+            end
+          else
+            options.map(&:name)
+          end
+        end
+
       end
 
     end

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

@@ -46,7 +46,7 @@ module Locomotive
         # @return [ Object ] The group_by field
         #
         def group_by_field
-          self.fields.find_field(self.group_by_field_name)
+          self.find_field(self.group_by_field_name)
         end
 
         # Build a content entry and add it to the list of entries of the content type.
@@ -102,6 +102,14 @@ module Locomotive
           self.fields.select { |field| !field.is_relationship? }
         end
 
+        # Return the list of file fields.
+        #
+        # @return [ Array ] The list of file fields.
+        #
+        def file_fields
+          self.fields.select { |field| field.type == :file }
+        end
+
         # Find a field by its name (string or symbol) or its id (API)
         #
         # @param [ String / Symbol] name_or_id Name or Id of the field
@@ -171,6 +179,25 @@ module Locomotive
           params
         end
 
+        # Return a hash with sanitized attributes. It will be used to generate
+        # the corresponding yaml file.
+        #
+        # @return [ Hash ] A hash used by the to_yaml method
+        #
+        def to_hash
+          fields = %w(name slug description label_field_name order_by order_by_direction public_submission_enabled public_submission_accounts raw_item_template)
+
+          _attributes = self.attributes.delete_if { |k, v| !fields.include?(k.to_s) || v.blank? }.deep_stringify_keys
+
+          # group by
+          _attributes['group_by'] = self.group_by_field.name if self.group_by_field
+
+          # custom fields
+          _attributes['fields'] = self.fields
+
+          _attributes
+        end
+
         def to_s
           self.name
         end
@@ -205,7 +232,7 @@ module Locomotive
           end
 
           # define group_by_field from group_by_field_id
-          if self.group_by_field_id
+          if self.group_by_field_name.blank? && self.group_by_field_id.present?
             self.group_by_field_name = self.find_field(self.group_by_field_id)
           end
 

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

@@ -14,8 +14,8 @@ module Locomotive
         field :redirect_type,     default: 301
         field :template,          localized: true
         field :handle
-        field :listed
-        field :templatized
+        field :listed,            default: false
+        field :templatized,       default: false
         field :content_type
         field :published,         default: true
         field :cache_strategy
@@ -318,7 +318,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)
+          fields = %w(title slug redirect_url redirect_type handle published listed cache_strategy response_type position seo_title meta_description meta_keywords)
 
           _attributes = self.attributes.delete_if { |k, v| !fields.include?(k.to_s) || v.blank? }.deep_stringify_keys
 
@@ -346,7 +346,8 @@ 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 response_type position templatized)
+          params = self.filter_attributes %w(title parent_id slug redirect_url redirect_type handle listed published cache_strategy
+            response_type position templatized seo_title meta_description meta_keywords)
 
           # slug
           params.delete(:slug) if self.depth == 0
@@ -376,7 +377,9 @@ module Locomotive
         # @return [ Hash ] The safe params
         #
         def to_safe_params
-          fields = %w(title slug 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
+            seo_title meta_description meta_keywords)
 
           params = self.attributes.delete_if do |k, v|
             !fields.include?(k.to_s) || (!v.is_a?(FalseClass) && v.blank?)

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

@@ -19,7 +19,7 @@ module Locomotive
         end
 
         def to_s
-          self.key
+          "Translation {#{self.key}: #{self.values}}"
         end
 
       end

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

@@ -1,49 +1,70 @@
 module Locomotive
   module Mounter
     module Reader
-     module Api
+      module Api
 
-       class Base
+        class Base
 
-         attr_accessor :runner, :items
+          attr_accessor :runner, :items
 
-         def initialize(runner)
-           self.runner  = runner
-           self.items   = {}
-         end
+          delegate :uri, :uri_with_scheme, to: :runner
+          delegate :locales, to: :mounting_point
 
-         def mounting_point
-           self.runner.mounting_point
-         end
+          def initialize(runner)
+            self.runner  = runner
+            self.items   = {}
+          end
 
-         def locales
-           self.mounting_point.locales
-         end
+          def mounting_point
+            self.runner.mounting_point
+          end
 
-         def get(resource_name, locale = nil, raw = false)
-           params = { query: {} }
+          def get(resource_name, locale = nil, raw = false)
+            params = { query: {} }
 
-           params[:query][:locale] = locale if locale
+            params[:query][:locale] = locale if locale
 
-           response = Locomotive::Mounter::EngineApi.get("/#{resource_name}.json", params).parsed_response
+            response = Locomotive::Mounter::EngineApi.get("/#{resource_name}.json", params).parsed_response
 
-           return response if raw
+            return response if raw
 
-           case response
-           when Hash then response.to_hash.delete_if { |k, _| !self.safe_attributes.include?(k) }
-           when Array
-             response.map do |row|
-               # puts "#{row.inspect}\n---" # DEBUG
-               row.delete_if { |k, _| !self.safe_attributes.include?(k) }
-             end
-           else
-             response
-           end
-         end
+            case response
+            when Hash then response.to_hash.delete_if { |k, _| !self.safe_attributes.include?(k) }
+            when Array
+              response.map do |row|
+                # puts "#{row.inspect}\n---" # DEBUG
+                row.delete_if { |k, _| !self.safe_attributes.include?(k) }
+              end
+            else
+              response
+            end
+          end
 
-       end
+          # Build a new content asset from an url and a folder and add it
+          # to the global list of the content assets.
+          #
+          # @param [ String ] url The url of the content asset.
+          # @param [ String ] folder The folder of the content asset (optional).
+          #
+          # @return [ String ] The local path (not absolute) of the content asset.
+          #
+          def add_content_asset(url, folder = nil)
+            content_assets = self.mounting_point.resources[:content_assets]
 
-     end
-   end
- end
+            if (url =~ /^https?:\/\//).nil?
+              url = URI.join(self.uri_with_scheme, url)
+            end
+
+            asset = Locomotive::Mounter::Models::ContentAsset.new(uri: url, folder: folder)
+
+            content_assets[url.to_s] = asset
+
+            asset.local_filepath
+          end
+
+        end
+
+      end
+    end
+  end
 end

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

@@ -5,19 +5,19 @@ module Locomotive
 
         class ContentAssetsReader < Base
 
-          # Build the list of theme assets from the public folder with eager loading.
+          # Build the list of content assets from the public folder with eager loading.
           #
           # @return [ Array ] The cached list of theme assets
           #
           def read
             base_uri = self.runner.uri.split('/').first
-            base_uri = "http://#{base_uri}" unless base_uri =~ /^http:\/\//
+            base_uri = "http://#{base_uri}" unless base_uri =~ /^https?:\/\//
 
             self.get(:content_assets).each do |attributes|
               url = attributes.delete('url')
 
               attributes['folder']  = 'samples/assets'
-              attributes['uri']     = URI(url =~ /http:\/\// ? url : "#{base_uri}#{url}")
+              attributes['uri']     = URI(url =~ /^https?:\/\// ? url : "#{base_uri}#{url}")
 
               self.items[url] = Locomotive::Mounter::Models::ContentAsset.new(attributes)
             end

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

@@ -80,21 +80,24 @@ module Locomotive
 
             content_type.fields.each do |field|
               value = (case field.type
-              when :string, :boolean
+              when
                 original_attributes[field.name]
               when :text
-                self.replace_urls_by_content_assets(original_attributes[field.name])
+                replace_urls_by_content_assets(original_attributes[field.name])
               when :select
                 field.find_select_option(original_attributes[field.name]).try(:name)
               when :date
                 original_attributes["formatted_#{field.name}"]
+              when :file
+                retrieve_file_path(content_type, field, original_attributes)
               when :belongs_to, :many_to_many
                 # push a relationship in the waiting line in order to be resolved at last
                 target_field_name = field.type == :belongs_to ? "#{field.name}_id" : "#{field.name}_ids"
                 self.relationships << { id: attributes['_id'], field: field.name, target_ids: original_attributes[target_field_name] }
                 nil
               else
-                nil
+                # :string, :boolean, :email, :integer, :float, :tags
+                original_attributes[field.name]
               end)
 
               attributes[field.name] = value unless value.nil?
@@ -134,6 +137,24 @@ module Locomotive
             content
           end
 
+          def retrieve_file_path(content_type, field, attributes)
+            value = attributes[field.name]
+
+            return nil if value.blank?
+
+            base_folder = File.join('/', 'samples', content_type.slug, attributes['_slug'])
+
+            if value.is_a?(Hash)
+              {}.tap do |translations|
+                value.each do |locale, url|
+                  translations[locale] = self.add_content_asset(url, File.join(base_folder, locale))
+                end
+              end
+            else
+              self.add_content_asset(value, base_folder)
+            end
+          end
+
         end
 
       end

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

@@ -63,7 +63,7 @@ module Locomotive
           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 created_at updated_at)
+            %w(name slug description order_by order_direction label_field_name group_by_field_name public_submission_accounts entries_custom_fields klass_name created_at updated_at)
           end
 
         end

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

@@ -144,9 +144,14 @@ module Locomotive
           #
           def filter_editable_elements(list)
             list.map do |attributes|
+              type = attributes['type']
               attributes.keep_if { |k, _| %w(_id block slug content).include?(k) }.tap do |hash|
-                self.mounting_point.content_assets.each do |path, asset|
-                  hash['content'].gsub!(path, asset.local_filepath)
+                if type == 'EditableFile'
+                  hash['content'] = self.add_content_asset(hash['content'], '/samples/pages')
+                else
+                  self.mounting_point.content_assets.each do |path, asset|
+                    hash['content'].gsub!(path, asset.local_filepath)
+                  end
                 end
               end
             end

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

@@ -16,12 +16,12 @@ module Locomotive
           #
           def read
             base_uri = self.runner.uri.split('/').first
-            base_uri = "http://#{base_uri}" unless base_uri =~ /^http:\/\//
+            base_uri = "http://#{base_uri}" unless base_uri =~ /^https?:\/\//
 
             self.items = self.get(:theme_assets).map do |attributes|
               url = attributes.delete('url')
 
-              attributes['uri'] = URI(url =~ /http:\/\// ? url : "#{base_uri}#{url}")
+              attributes['uri'] = URI(url =~ /^https?:\/\// ? url : "#{base_uri}#{url}")
 
               Locomotive::Mounter::Models::ThemeAsset.new(attributes)
             end

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

@@ -10,8 +10,8 @@ module Locomotive
           # @return [ Array ] The cached list of theme assets
           #
           def read
-            self.items = get(:translations).map do |attributes|
-              Locomotive::Mounter::Models::Translation.new(attributes)
+            self.items = get(:translations).each_with_object({}) do |attributes,hash|
+              hash[attributes['key']] = Locomotive::Mounter::Models::Translation.new(attributes)
             end
           end
 

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

@@ -10,7 +10,7 @@ module Locomotive
         def self.instance
           @@instance ||= Runner.new(:api)
         end
-        
+
         def self.teardown
           @@instance = nil
         end
@@ -22,16 +22,11 @@ module Locomotive
           # Call the LocomotiveCMS engine to get a token for
           # the next API calls
           def prepare
-            self.uri  = self.parameters.delete(:uri)
-            email     = self.parameters.delete(:email)
-            password  = self.parameters.delete(:password)
-
-            if uri.blank? || email.blank? || password.blank?
-              raise Locomotive::Mounter::ReaderException.new("one or many API credentials (uri, email, password) are missing")
-            end
+            credentials = self.parameters.select { |k, _| %w(uri email password api_key).include?(k.to_s) }
+            self.uri    = credentials[:uri]
 
             begin
-              Locomotive::Mounter::EngineApi.set_token(uri, email, password)
+              Locomotive::Mounter::EngineApi.set_token(credentials)
             rescue Exception => e
               raise Locomotive::Mounter::ReaderException.new("unable to get an API token: #{e.message}")
             end
@@ -45,6 +40,14 @@ module Locomotive
             [SiteReader, ContentAssetsReader, SnippetsReader, ContentTypesReader, ContentEntriesReader, PagesReader, ThemeAssetsReader, TranslationsReader]
           end
 
+          # Return the uri with the scheme (http://)
+          #
+          # @return [ String ] The uri starting by http://
+          #
+          def uri_with_scheme
+            self.uri =~ /^http/ ? self.uri : "http://#{self.uri}"
+          end
+
         end
 
       end

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

@@ -10,7 +10,7 @@ module Locomotive
           # @return [ Array ] The list of content assets
           #
           def read
-            self.items = [] # prefer an array over a hash
+            self.items = {} # prefer an array over a hash
 
             self.fetch_from_pages
 
@@ -66,7 +66,7 @@ module Locomotive
             source.to_s.match(/\/samples\/.*\.[a-zA-Z0-9]+/) do |match|
               filepath  = File.join(self.root_dir, match.to_s)
               folder    = File.dirname(match.to_s)
-              self.items << Locomotive::Mounter::Models::ContentAsset.new(filepath: filepath, folder: folder)
+              self.items[source] = Locomotive::Mounter::Models::ContentAsset.new(filepath: filepath, folder: folder)
             end
           end
 

data/lib/locomotive/mounter/version.rb

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

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

@@ -188,6 +188,14 @@ module Locomotive
           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
@@ -248,7 +256,7 @@ module Locomotive
             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"
 
@@ -265,7 +273,7 @@ module Locomotive
           #
           def resource_message(resource)
             op_label = resource.persisted? ? 'updating': 'creating'
-            "    #{op_label} #{resource.to_s}"
+            "    #{op_label} #{truncate(resource.to_s)}"
           end
 
           # Log a message to the console or the logger depending on the options

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

@@ -14,9 +14,17 @@ module Locomotive
           # Other local attributes
           attr_accessor :tmp_folder
 
+          # store checksums of remote assets. needed to check if an asset has to be updated or not
+          attr_accessor :checksums
+
+          # the assets stored in the engine have the same base url
+          attr_accessor :remote_base_url
+
           def prepare
             super
 
+            self.checksums = {}
+
             # prepare the place where the assets will be stored temporarily.
             self.create_tmp_folder
 
@@ -25,8 +33,13 @@ module Locomotive
               remote_path = File.join('/', attributes['folder'], File.basename(attributes['local_path']))
 
               if theme_asset = self.theme_assets[remote_path]
-                theme_asset._id   = attributes['id']
-                theme_asset.size  = attributes['raw_size'].to_i
+                theme_asset._id                 = attributes['id']
+                self.checksums[theme_asset._id] = attributes['checksum']
+              end
+
+              if remote_base_url.nil?
+                attributes['url'] =~ /(.*\/sites\/[0-9a-f]+\/theme)/
+                self.remote_base_url = $1
               end
             end
           end
@@ -44,7 +57,7 @@ module Locomotive
               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)
+                  if self.force? || self.theme_asset_changed?(theme_asset)
                     response  = self.put :theme_assets, theme_asset._id, params
                     status    = self.response_to_status(response)
                   else
@@ -129,36 +142,28 @@ module Locomotive
             self.theme_assets.values.sort { |a, b| a.priority <=> b.priority }
           end
 
-          # Tell if the theme_asset has changed in order to update it
+          # Tell if the theme_asset has been changed in order to update it
           # if so or simply skip it.
           #
           # @param [ Object ] theme_asset The theme asset
-          # @param [ Object ] tmp_file The size of the file (after precompilation if required)
           #
-          # @return [ Boolean ] True if the source of the 2 assets (local and remote) is different.
+          # @return [ Boolean ] True if the checksums of the local and remote files are different.
           #
-          def theme_asset_changed?(theme_asset, tmp_file)
-            if theme_asset.stylesheet_or_javascript?
-              # we need to compare compiled contents (sass, coffeescript) with the right urls
-              tmp_content = ''
+          def theme_asset_changed?(theme_asset)
+            content = theme_asset.content
 
-              begin
-                File.open(tmp_file, 'rb') do |file|
-                  tmp_content = file.read.encode('utf-8', replace: nil)
-                end
-              rescue Encoding::UndefinedConversionError => e
-                # in the doubt, we prefer to return true
-                return true
-              end
+            if theme_asset.stylesheet_or_javascript?
+              # we need to compare compiled contents (sass, coffeescript) with the right urls inside
+              content = content.gsub(/[("'](\/(stylesheets|javascripts|images|media|others)\/(([^;.]+)\/)*([a-zA-Z_\-0-9]+)\.[a-z]{2,3})[)"']/) do |path|
+                sanitized_path = path.gsub(/[("')]/, '').gsub(/^\//, '')
+                sanitized_path = File.join(self.remote_base_url, sanitized_path)
 
-              tmp_content = tmp_content.gsub(/[("']([^)"']*)\/sites\/[0-9a-f]{24}\/theme\/(([^;.]+)\/)*([a-zA-Z_\-0-9]+\.[a-z]{2,3})[)"']/) do |path|
-                "#{path.first}/#{$2 + $4}#{path.last}"
+                "#{path.first}#{sanitized_path}#{path.last}"
               end
-
-              tmp_content != theme_asset.content
-            else
-              Digest::SHA1.file(tmp_file).hexdigest != Digest::SHA1.file(theme_asset.filepath).hexdigest
             end
+
+            # compare local checksum with the remote one
+            Digest::MD5.hexdigest(content) != self.checksums[theme_asset._id]
           end
 
         end

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

@@ -5,11 +5,12 @@ module Locomotive
 
         # Push translations to a remote LocomotiveCMS engine.
         #
-        # The force option is not used.
+        # Only pushes if force_translations flag is set
         #
         class TranslationsWriter < Base
 
           def prepare
+            return unless force_translations?
             super
 
             # set the unique identifier to each local translation
@@ -22,6 +23,7 @@ module Locomotive
 
           # Write all the translations to the remote destination
           def write
+            return unless force_translations?
             self.translations.each do |key, translation|
               self.output_resource_op translation
 
@@ -34,6 +36,9 @@ module Locomotive
 
           protected
 
+          def force_translations?
+            self.runner.parameters[:force_translations] || false
+          end
           # Persist a translation by calling the API. The returned id
           # is then set to the translation itself.
           #

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

@@ -25,16 +25,11 @@ module Locomotive
             # by default, do not push data (content entries and editable elements)
             self.parameters[:data] ||= false
 
-            self.uri  = self.parameters.delete(:uri)
-            email     = self.parameters.delete(:email)
-            password  = self.parameters.delete(:password)
-
-            if uri.blank? || email.blank? || password.blank?
-              raise Locomotive::Mounter::WriterException.new("one or many API credentials (uri, email, password) are missing")
-            end
+            credentials = self.parameters.select { |k, _| %w(uri email password api_key).include?(k.to_s) }
+            self.uri    = credentials[:uri]
 
             begin
-              Locomotive::Mounter::EngineApi.set_token(uri, email, password)
+              Locomotive::Mounter::EngineApi.set_token(credentials)
             rescue Exception => e
               raise Locomotive::Mounter::WriterException.new("unable to get an API token: #{e.message}")
             end

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

@@ -5,12 +5,12 @@ module Locomotive
 
         class ContentAssetsWriter < Base
 
-          # It creates the theme assets folders
+          # It creates the content assets folder
           def prepare
             self.create_folder 'public'
           end
 
-          # It writes all the snippets into files
+          # It writes all the content assets into files
           def write
             self.mounting_point.content_assets.each do |_, asset|
               self.open_file(self.target_asset_path(asset), 'wb') do |file|

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

@@ -22,7 +22,6 @@ module Locomotive
           end
 
         end
-
       end
     end
   end

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

@@ -10,8 +10,8 @@ module Locomotive
           end
 
           def write
-            content = self.mounting_point.translations.each_with_object({}) do |translation, hash|
-              hash[translation.key] = translation.values
+            content = self.mounting_point.translations.each_with_object({}) do |(key,translation), hash|
+              hash[key] = translation.values
             end
 
             content = content.empty? ? '' : content.to_yaml

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

@@ -31,7 +31,7 @@ module Locomotive
           # @return [ Array ] List of the writer classes
           #
           def writers
-            [SiteWriter, SnippetsWriter, ContentTypesWriter, ContentEntriesWriter, PagesWriter, ThemeAssetsWriter, TranslationsWriter]
+            [SiteWriter, SnippetsWriter, ContentTypesWriter, ContentEntriesWriter, PagesWriter, ThemeAssetsWriter, ContentAssetsWriter, TranslationsWriter]
             # [SiteWriter, PagesWriter, SnippetsWriter, ContentTypesWriter, ContentEntriesWriter, ContentAssetsWriter, ThemeAssetsWriter, TranslationsWriter]
           end
 

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_mounter
 version: !ruby/object:Gem::Version
-  version: 1.0.4
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: less
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -158,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -166,7 +146,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -174,7 +153,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -182,7 +160,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -190,7 +167,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: httmultiparty
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -198,7 +174,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -206,23 +181,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.5
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.5
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -230,7 +202,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -238,7 +209,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: zip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -246,7 +216,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -254,7 +223,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -262,7 +230,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -270,7 +237,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -278,7 +244,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -286,7 +251,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -294,7 +258,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -302,7 +265,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -310,7 +272,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -318,7 +279,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -326,7 +286,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -334,7 +293,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -342,7 +300,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -350,7 +307,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-debug-wrapper
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -358,7 +314,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -366,7 +321,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -374,7 +328,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -382,23 +335,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.11.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.11.4
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -406,7 +356,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -491,29 +440,25 @@ files:
 - lib/locomotive/mounter.rb
 homepage: http://www.locomotivecms.com
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2290558764515626735
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: locomotivecms_mounter
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: LocomotiveCMS Mounter
 test_files: []