locomotivecms_mounter 1.1.0 → 1.2.0

data/lib/locomotive/mounter/engine_api.rb

@@ -1,3 +1,5 @@
+require 'uri'
+
 module Locomotive
   module Mounter
 
@@ -18,7 +20,9 @@ module Locomotive
       def self.set_token(*args)
         _credentials = self.credentials(args)
 
-        self.base_uri _credentials.delete(:uri)
+        uri = URI _credentials.delete(:uri)
+        self.base_uri uri.to_s
+        self.basic_auth uri.user, uri.password if uri.userinfo
 
         response = post('/tokens.json', body: _credentials) #{ email: email, password: password })
 
@@ -32,6 +36,7 @@ module Locomotive
 
       def self.teardown
         Locomotive::Mounter::EngineApi.default_options[:base_uri] = nil
+        Locomotive::Mounter::EngineApi.default_options[:base_auth] = nil
         Locomotive::Mounter::EngineApi.default_options[:default_params] = {}
       end
 

data/lib/locomotive/mounter/extensions/compass.rb

@@ -14,6 +14,7 @@ module Locomotive
             config.http_path        = '/'
             config.css_dir          = '../tmp/stylesheets'
             config.sass_dir         = 'stylesheets'
+            config.fonts_dir        = 'fonts'
             config.images_dir       = 'images'
             config.javascripts_dir  = 'javascripts'
             config.project_type     = :stand_alone

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

@@ -120,7 +120,7 @@ module Locomotive
           when :date
             value.is_a?(String) ? Date.parse(value) : value
           when :file
-            { 'url' => value }
+            value.present? ? { 'url' => value } : nil
           when :belongs_to
             field.klass.find_entry(value)
           when :has_many

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

@@ -12,7 +12,6 @@ module Locomotive
         field :position,  default: 0
         field :required,  default: false
         field :localized, default: false
-        field :class_slug
 
         # text
         field :text_formatting
@@ -21,7 +20,8 @@ module Locomotive
         field :select_options, type: :array, class_name: 'Locomotive::Mounter::Models::ContentSelectOption'
 
         # relationships: belongs_to, has_many, many_to_many
-        field :class_name
+        field :class_slug # out
+        field :class_name # in
         field :inverse_of
         field :order_by
         field :ui_enabled
@@ -64,6 +64,16 @@ module Locomotive
           end
         end
 
+        # Set directly the content type matching the class_name.
+        #
+        # @param [ Object ] The matching Content Type
+        #
+        def klass=(content_type)
+          if self.class_name == content_type.slug
+            @klass = content_type
+          end
+        end
+
         # Find a select option by its name IN the current locale.
         #
         # @param [ String / Symbol] name_or_id Name or Id of the option

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

@@ -29,7 +29,7 @@ module Locomotive
         field :editable_elements, type: :array, class_name: 'Locomotive::Mounter::Models::EditableElement'
 
         ## other accessors ##
-        attr_accessor :content_type_id, :parent_id, :children
+        attr_accessor :content_type_id, :content_entry, :parent_id, :children
 
         ## aliases ##
         alias :listed?      :listed

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

@@ -53,6 +53,8 @@ module Locomotive
 
             if (url =~ /^https?:\/\//).nil?
               url = URI.join(self.uri_with_scheme, url)
+            else
+              url = URI(url)
             end
 
             asset = Locomotive::Mounter::Models::ContentAsset.new(uri: url, folder: folder)

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

@@ -19,8 +19,6 @@ module Locomotive
           def read
             self.fetch
 
-            self.resolve_relationships
-
             self.items
           end
 
@@ -59,8 +57,6 @@ module Locomotive
           def add(content_type, attributes)
             _attributes = self.filter_attributes(content_type, attributes)
 
-            # puts "_attributes = #{_attributes.inspect}" # DEBUG
-
             entry = content_type.build_entry(_attributes)
 
             key = File.join(content_type.slug, entry._slug)
@@ -90,10 +86,7 @@ module Locomotive
                 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] }
+              when :has_many
                 nil
               else
                 # :string, :boolean, :email, :integer, :float, :tags
@@ -106,22 +99,6 @@ module Locomotive
             attributes
           end
 
-          # Some entries have what it is called "relationships" field
-          # which can be only resolved once all the entries have been fetched
-          #
-          def resolve_relationships
-            self.relationships.each do |relationship|
-              source_entry, target_ids = self.ids[relationship[:id]], relationship[:target_ids]
-
-              target_entries = self.ids.select { |k, _| [*target_ids].include?(k) }.values
-
-              # single entry (belongs_to) or an array (many_to_many) ?
-              target_entries = target_entries.first unless target_ids.is_a?(Array)
-
-              source_entry.send(:"#{relationship[:field]}=", target_entries)
-            end
-          end
-
           # For a given content, parse it and replace all the urls from content assets
           # by their corresponding locale ones.
           #

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

@@ -56,8 +56,8 @@ module Locomotive
             self.items.each do |_, content_type|
               content_type.fields.find_all(&:is_relationship?).each do |field|
                 # look for the target content type from its slug
-                target = self.items.keys.find { |k| k == field.class_slug }
-                field.class_name = target
+                field.class_name  = field.class_slug
+                field.klass       = self.items[field.class_slug]
               end
             end
           end

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

@@ -146,11 +146,13 @@ module Locomotive
             list.map do |attributes|
               type = attributes['type']
               attributes.keep_if { |k, _| %w(_id block slug content).include?(k) }.tap do |hash|
-                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)
+                unless hash['content'].blank?
+                  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/file_system/content_assets_reader.rb

@@ -43,11 +43,13 @@ module Locomotive
                 Locomotive::Mounter.with_locale(locale) do
                   # get the string, text, file fields...
                   content_entry.content_type.fields.each do |field|
+                    value = content_entry.dynamic_getter(field.name)
+
                     case field.type.to_sym
                     when :string, :text
-                      self.add_assets_from_string(content_entry.dynamic_getter(field.name))
+                      self.add_assets_from_string(value)
                     when :file
-                      self.add_assets_from_string(content_entry.dynamic_getter(field.name)['url'])
+                      self.add_assets_from_string(value['url']) if value
                     end
                   end
                 end

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

@@ -91,7 +91,7 @@ module Locomotive
           # @return [ String ] The slug
           #
           def filepath_to_slug(filepath)
-            File.basename(filepath).split('.').first
+            File.basename(filepath).split('.').first.permalink(true)
           end
 
           # From a filepath, parse the template inside.

data/lib/locomotive/mounter/utils/string.rb

@@ -4,12 +4,13 @@
 
 class String #:nodoc
 
-  def permalink
-    self.to_ascii.parameterize('-')
+  def permalink(underscore = false)
+    permalink = self.to_ascii.parameterize
+    underscore ? permalink.underscore : permalink
   end
 
-  def permalink!
-    replace(self.permalink)
+  def permalink!(underscore = false)
+    replace(self.permalink(underscore))
   end
 
   alias :parameterize! :permalink!

data/lib/locomotive/mounter/version.rb

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

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

@@ -161,7 +161,7 @@ module Locomotive
             self.mounting_point.content_types
           end
 
-          # Take a content entry and get the params related to that content
+          # Take a content entry and get the params related to that content entry.
           #
           # @param [ Object ] entry The content entry
           #
@@ -171,17 +171,19 @@ module Locomotive
             params = entry.to_params
 
             entry.each_dynamic_field do |field, value|
-              case field.type.to_sym
-              when :string, :text
-                params[field.name] = self.replace_content_assets!(value)
-              when :date, :select, :boolean
-                params[field.name] = value
-              when :file
-                if value =~ %r($http://)
+              unless field.is_relationship?
+                case field.type.to_sym
+                when :string, :text
+                  params[field.name] = self.replace_content_assets!(value)
+                when :file
+                  if value =~ %r($http://)
+                    params[field.name] = value
+                  elsif value && self.mounting_point.path
+                    path = File.join(self.mounting_point.path, 'public', value)
+                    params[field.name] = File.new(path)
+                  end
+                else
                   params[field.name] = value
-                elsif value && self.mounting_point.path
-                  path = File.join(self.mounting_point.path, 'public', value)
-                  params[field.name] = File.new(path)
                 end
               end
             end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_mounter
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: less
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -125,6 +142,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -132,6 +150,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -139,6 +158,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -146,6 +166,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -153,6 +174,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -160,6 +182,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -167,6 +190,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: httmultiparty
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -174,6 +198,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -181,6 +206,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -188,6 +214,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -195,6 +222,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -202,6 +230,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -209,6 +238,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: zip
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -216,6 +246,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -223,6 +254,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -230,6 +262,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -237,6 +270,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -244,6 +278,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -251,6 +286,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -258,6 +294,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -265,6 +302,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -272,6 +310,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -279,6 +318,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -286,6 +326,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -293,6 +334,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -300,6 +342,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -307,6 +350,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-debug-wrapper
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -314,6 +358,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -321,6 +366,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -328,6 +374,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -335,6 +382,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -342,6 +390,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -349,6 +398,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -356,6 +406,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -440,25 +491,29 @@ 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: 2524146150368987271
 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: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: LocomotiveCMS Mounter
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!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=