locomotivecms_mounter 1.0.0.alpha1 → 1.0.0.alpha2

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

@@ -32,8 +32,17 @@ module Locomotive
         # @return [ String ] The internal label
         #
         def _label
-          name = self.content_type.label_field_name
-          self.dynamic_getter(name)
+          field = self.content_type.label_field
+          value = self.dynamic_getter(field.name)
+
+          if field.type == :belongs_to
+            value.try(:_label)
+          else
+            value
+          end
+
+          # name = self.content_type.label_field_name
+          # self.dynamic_getter(name)
         end
 
         # Process a minimal validation by checking if the required fields
@@ -211,8 +220,12 @@ module Locomotive
         def set_slug
           self.translated_in.each do |locale|
             Locomotive::Mounter.with_locale(locale) do
-              self._slug = self._label.dup if self._label.present?
+              # first attempt from the label
+              if self._slug.blank?
+                self._slug = self._label.try(:dup)
+              end
 
+              # from the content type itself
               if self._slug.blank?
                 self._slug = self.content_type.send(:label_to_slug)
               end

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

@@ -14,7 +14,7 @@ module Locomotive
 
             {}.tap do |translations|
               if File.exists?(config_path)
-                self.read_yaml(config_path).each do |translation|
+                (self.read_yaml(config_path) || []).each do |translation|
                   key, values = translation
 
                   entry = Locomotive::Mounter::Models::Translation.new({

data/lib/locomotive/mounter/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_mounter
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha1
+  version: 1.0.0.alpha2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-25 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -471,7 +471,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2897689426871366681
+      hash: -91950627589408174
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: