locomotive_cms 2.1.2 → 2.1.3

data/lib/locomotive/custom_fields.rb

@@ -38,7 +38,7 @@ module CustomFields
 
         # Set correct paths
         def store_dir
-          "sites/#{model.site_id}/#{model.class.model_name.demodulize.underscore}/#{model.id}/files"
+          "sites/#{model.site_id}/#{model._type.demodulize.underscore}/#{model.id}/files"
         end
 
         # In some situations, for instance, for the notification email when a content entry is created,

data/lib/locomotive/middlewares/fonts.rb

@@ -35,7 +35,7 @@ module Locomotive
           Site.match_domain(domain_name).only(:id).first._id.to_s rescue ''
         end
 
-        site_id.blank? ? nil : Site.new(id: site_id)
+        site_id.blank? ? nil : Site.new.tap { |site| site._id = site_id }
       end
     end
   end

data/lib/locomotive/version.rb

@@ -1,3 +1,3 @@
 module Locomotive #:nodoc
-  VERSION = '2.1.2'
+  VERSION = '2.1.3'
 end

data/spec/models/locomotive/content_entry_spec.rb

@@ -67,7 +67,7 @@ describe Locomotive::ContentEntry do
       build_content_entry(_slug: 'fish-1-hi').tap(&:save!)._slug.should == 'fish-1-hi'
       build_content_entry(_slug: 'fish-1-hi').tap(&:save!)._slug.should == 'fish-1-hi-1'
     end
-    
+
     it 'correctly handles more than 13 slugs with the same name' do
       (1..15).each do |i|
         build_content_entry(_slug: 'dogs').tap(&:save!)._slug.should == "dogs-#{i}"
@@ -118,7 +118,7 @@ describe Locomotive::ContentEntry do
 
           subject { build_content_entry(file: FixturedAsset.open('5k.png')).tap(&:save).to_values(host: 'example.com') }
 
-          its(:last) { should match(/^http:\/\/example.com\/sites\/[0-9a-f]+\/content_entry\/[0-9a-f]+\/files\/5k.png$/) }
+          its(:last) { should match(/^http:\/\/example.com\/sites\/[0-9a-f]+\/content_entry[0-9a-f]+\/[0-9a-f]+\/files\/5k.png$/) }
 
         end
 
@@ -139,7 +139,7 @@ describe Locomotive::ContentEntry do
 
       its(:first) { should eq("Title,Description,Visible ?,File") }
 
-      its(:last) { should match(/^Locomotive,Lorem ipsum....,false,http:\/\/example.com\/sites\/[0-9a-f]+\/content_entry\/[0-9a-f]+\/files\/5k.png$/) }
+      its(:last) { should match(/^Locomotive,Lorem ipsum....,false,http:\/\/example.com\/sites\/[0-9a-f]+\/content_entry[0-9a-f]+\/[0-9a-f]+\/files\/5k.png$/) }
 
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotive_cms
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -1373,7 +1373,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2534107307124546099
+      hash: 978956877074840268
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -1382,7 +1382,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2534107307124546099
+      hash: 978956877074840268
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23