locomotive_cms 2.1.3 → 2.1.4

data/app/assets/stylesheets/locomotive/backoffice/pagination.css.scss

@@ -8,6 +8,8 @@
 nav.pagination {
   text-align: center;
 
+  margin-bottom: 15px;
+
   a {
     @include gray-button;
     margin: 0px 1px;

data/app/models/locomotive/extensions/content_entry/csv.rb

@@ -62,10 +62,10 @@ module Locomotive
 
             CSV.generate(csv_options) do |csv|
               # header
-              csv << fields.map(&:label)
+              csv << (fields.map(&:label) + [I18n.t('mongoid.attributes.locomotive/content_entry.created_at')])
               # body
               all.each do |entry|
-                csv << entry.to_values(options)
+                csv << (entry.to_values(options) + [I18n.l(entry.created_at, format: :long)])
               end
             end
           end

data/app/models/locomotive/page.rb

@@ -50,8 +50,8 @@ module Locomotive
 
     ## named scopes ##
     scope :latest_updated,      order_by(updated_at: :desc).limit(Locomotive.config.ui[:latest_entries_nb])
-    scope :root,                where(slug: 'index', depth: 0)
-    scope :not_found,           where(slug: '404', depth: 0)
+    scope :root,                -> { where(slug: 'index', depth: 0) }
+    scope :not_found,           -> { where(slug: '404', depth: 0) }
     scope :published,           where(published: true)
     scope :fullpath,            ->(fullpath){ where(fullpath: fullpath) }
     scope :handle,              ->(handle){ where(handle: handle) }

data/app/models/locomotive/theme_asset.rb

@@ -146,7 +146,7 @@ module Locomotive
 
       text.gsub(/[("'](\/(stylesheets|javascripts|images|media|others)\/(([^;.]+)\/)*([a-zA-Z_\-0-9]+)\.[a-z]{2,3})(\?[0-9]+)?[)"']/) do |path|
 
-        sanitized_path = path.gsub(/[("')]/, '').gsub(/^\//, '')
+        sanitized_path = path.gsub(/[("')]/, '').gsub(/^\//, '').gsub(/\?[0-9]+$/, '')
 
         if asset = self.site.theme_assets.where(local_path: sanitized_path).first
           "#{path.first}#{asset.source.url}#{path.last}"

data/app/views/locomotive/kaminari/_first_page.html.haml

@@ -1,2 +1,2 @@
-%span.first
+%span.first>
   = link_to_unless current_page.first?, raw(t 'locomotive.pagination.first'), url, remote: remote

data/app/views/locomotive/kaminari/_last_page.html.haml

@@ -1,2 +1,2 @@
-%span.last
+%span.last>
   = link_to_unless current_page.last?, raw(t 'locomotive.pagination.last'), url, { remote: remote }

data/app/views/locomotive/kaminari/_next_page.html.haml

@@ -1,2 +1,2 @@
-%span.next
+%span.next>
   = link_to_unless current_page.last?, raw(t 'locomotive.pagination.next'), url, rel: 'next', remote: remote

data/app/views/locomotive/kaminari/_page.html.haml

@@ -1,2 +1 @@
-%span{class: "page#{' current' if page.current?}"}
-  = link_to_unless page.current?, page, url, { remote: remote, rel: page.next? ? 'next' : page.prev? ? 'prev' : nil }
+%span{class: "page#{' current' if page.current?}"}= link_to_unless page.current?, page, url, { remote: remote, rel: page.next? ? 'next' : page.prev? ? 'prev' : nil }

data/app/views/locomotive/kaminari/_prev_page.html.haml

@@ -1,2 +1,2 @@
-%span.prev
+%span.prev>
   = link_to_unless current_page.first?, raw(t 'locomotive.pagination.previous'), url, rel: 'prev', remote: remote

data/config/locales/default.en.yml

@@ -7,6 +7,9 @@ en:
     errors:
       messages:
         blank_in_locale: "can't be blank"
+    attributes:
+      locomotive/content_entry:
+        created_at: Created at
 
   errors:
       messages:

data/config/locales/default.fr.yml

@@ -83,6 +83,8 @@ fr:
         group_by_field_id: Champ pour grouper
         public_submission_enabled: Activation API
         public_submission_accounts: Comptes à notifier
+      locomotive/content_entry:
+        created_at: Date de création
       locomotive/asset:
         source: Fichier
       locomotive/account:

data/lib/locomotive/liquid/drops/site.rb

@@ -12,7 +12,7 @@ module Locomotive
         def pages
           @pages ||= liquify(*self.scoped_pages)
         end
-        
+
         protected
         def scoped_pages
           if @context["with_scope"]

data/lib/locomotive/version.rb

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

data/spec/models/locomotive/content_entry_spec.rb

@@ -137,9 +137,9 @@ describe Locomotive::ContentEntry do
 
       its(:size) { should eq(4) }
 
-      its(:first) { should eq("Title,Description,Visible ?,File") }
+      its(:first) { should eq("Title,Description,Visible ?,File,Created at") }
 
-      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$/) }
+      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,\"July 05, 2013 00:00\"$/) }
 
     end
 
@@ -328,7 +328,7 @@ describe Locomotive::ContentEntry do
   end
 
   def build_content_entry(options = {})
-    @content_type.entries.build({ title: 'Locomotive', description: 'Lorem ipsum....', _label_field_name: 'title' }.merge(options))
+    @content_type.entries.build({ title: 'Locomotive', description: 'Lorem ipsum....', _label_field_name: 'title', created_at: DateTime.parse('2013-07-05 00:00:00') }.merge(options))
   end
 
   def fake_bson_id(id)

data/spec/models/locomotive/theme_asset_spec.rb

@@ -129,7 +129,7 @@ describe Locomotive::ThemeAsset do
   describe '.escape_shortcut_urls' do
 
     before(:each) do
-      site.theme_assets.stubs(:where).returns([image])
+      site.theme_assets.expects(:where).with(local_path: 'images/banner.png').returns([image])
     end
 
     let(:image) { stub(source: OpenStruct.new(url: 'http://engine.dev/images/banner.png')) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotive_cms
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-09 00:00:00.000000000 Z
+date: 2013-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -368,7 +368,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: 2.0.3
   type: :runtime
@@ -376,7 +376,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: 2.0.3
 - !ruby/object:Gem::Dependency
@@ -1373,7 +1373,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 978956877074840268
+      hash: 1655850861227393750
 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: 978956877074840268
+      hash: 1655850861227393750
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23