locomotive_cms 2.5.0.rc1 → 2.5.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6b5fd84b77a2c1027f2f3a0ef2ff655bc31f775
-  data.tar.gz: 884301132a77dc7822611d9291582d7688f3afc2
+  metadata.gz: 445a239a0a0d6b9f30fec36b880d297f837a81cc
+  data.tar.gz: 383dc6883e250d582c10ec52e8fe251f0db76717
 SHA512:
-  metadata.gz: cd423925ab81601ff850d0d784d7b34ac48cf70509c8a9b2b2fbb19ef45721c0ba35b30673d37c914586c73fa8d7b66877067f5034aac529370e7c91e11634fa
-  data.tar.gz: 3bdfce2c8125d5e1690ebe4f266bc50a0a1603de461692c61299f920ee2ecdd82c44a86b1ac602283ee670569a3b7a62b34161ec8cefdbf591d3670dd2e83df5
+  metadata.gz: 77446b33a479d73220ec27e8925377074bad411ac2d10865dbd94ccedb2eb81aad5e3559aab2695390a1ec6fb2cb76b7a1e2e3c01a3ac735862e8466dfb4d085
+  data.tar.gz: c2885bd30892cf699bc6c75983232594e0289f0062f567c1322fce86f5cebffab10f8029e5742c7cab88efd16ad75163c161da30f389b7c1dacfd88809624139

data/app/helpers/locomotive/base_helper.rb

@@ -136,7 +136,7 @@ module Locomotive
     # @return [ String ] The HTML image tag with the path to the matching flag.
     #
     def flag_tag(locale, size = '24x24')
-      image_tag("locomotive/icons/flags/#{locale}.png", class: 'flag', size: size)
+      image_tag("locomotive/icons/flags/#{locale}.png", class: "flag flag-#{locale}", size: size)
     end
 
     def nocoffee_tag

data/config/initializers/locomotive_loaded_first.rb

@@ -6,7 +6,7 @@ module ActiveSupport::Dependencies
 
   def require_or_load(file_name, const_path = nil)
     if file_name.starts_with?(Rails.root.to_s + '/app')
-      relative_name = file_name.gsub(Rails.root.to_s, '')
+      relative_name = file_name.gsub(/^#{Rails.root.to_s}/, '')
       @engine_paths ||= Rails::Application::Railties.engines.collect{|engine| engine.config.root.to_s }
       @engine_paths.each do |path|
         engine_file = File.join(path, relative_name)

data/lib/locomotive/version.rb

@@ -1,3 +1,3 @@
 module Locomotive #:nodoc
-  VERSION = '2.5.0.rc1'
+  VERSION = '2.5.0.rc2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locomotive_cms
 version: !ruby/object:Gem::Version
-  version: 2.5.0.rc1
+  version: 2.5.0.rc2
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-18 00:00:00.000000000 Z
+date: 2014-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake