lalala 4.0.0.dev.118 → 4.0.0.dev.123

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e231da30094b763a1b6209648741a9ce7365f7be
4
- data.tar.gz: 13ab4e1be74b3092e2358dde5aa401cc101ebb27
3
+ metadata.gz: 64613fac22d5f47a8c4a5e6d9cbfd7d5d97cacb8
4
+ data.tar.gz: 00976d68afda3096396aac70073be35c0f55f9c4
5
5
  SHA512:
6
- metadata.gz: bcb0a0745f737a7ef94ec46b2b2a33cb9afccc993cce5b844660607da1b76b669d7eebf4e3b2c61d66ee9e13c0d67322473b85efd676059f6ebb04b71af6b98c
7
- data.tar.gz: e1bf3666978d93e6a1652f084b0de1435843a45b3fd3c02db8d25da3cc3a9e25f3a1e78d821c6a90f916540385f52b177b57c2ffc4b848fcf6921104ba5fbdab
6
+ metadata.gz: 1af3d5371b8733a7f8047791b5c177f42308a39a00f3923358397fbff247dc9be1b7b8b55658096c1f3ec6c86e6f267dc227ecf9cbf0260b5890f4fa0352efc7
7
+ data.tar.gz: 4c0a69e208b3c3009bd67e358a17f9b650964829965797d720e702211d9979d918418f7c0b2c82f8a47d15d7a59488787b1349e1d769a8b83c838387fb71011c
data/Gemfile CHANGED
@@ -1,6 +1,8 @@
1
1
  source 'https://rubygems.org'
2
2
 
3
+ ruby "2.0.0"
4
+
3
5
  gemspec name: 'lalala'
4
6
  gemspec name: 'lalala-development', groups: [:development]
5
7
  gemspec name: 'lalala-assets', groups: [:development, :assets]
6
- gemspec name: 'lalala-test', groups: [:test]
8
+ gemspec name: 'lalala-test', groups: [:test]
@@ -39,9 +39,6 @@ class Lalala::Page < ActiveRecord::Base
39
39
  maximum: ->(r){ r.maximum_children }
40
40
 
41
41
 
42
- default_scope order(:position)
43
-
44
-
45
42
  # Before filters
46
43
  before_validation :set_default_title, :on => :create
47
44
  before_validation :set_default_position, :on => :create
@@ -64,6 +61,14 @@ class Lalala::Page < ActiveRecord::Base
64
61
 
65
62
  self.route = self.default_route
66
63
 
64
+ def path
65
+ path_components = self.ancestry_path || []
66
+ unless path_components.first == ''
67
+ path_components.unshift('')
68
+ end
69
+ File.join(path_components)
70
+ end
71
+
67
72
 
68
73
  # The form
69
74
  def self.form(&block)
@@ -32,7 +32,7 @@ Gem::Specification.new do |gem|
32
32
  gem.add_runtime_dependency 'coffee-script-source', '= 1.4.0'
33
33
  gem.add_runtime_dependency 'compass', '= 0.13.alpha.0'
34
34
  gem.add_runtime_dependency 'compass-rails', '= 1.0.3'
35
- gem.add_runtime_dependency 'sass', '= 3.2.8'
35
+ gem.add_runtime_dependency 'sass', '= 3.2.9'
36
36
  gem.add_runtime_dependency 'sass-rails', '= 3.2.6'
37
37
  gem.add_runtime_dependency 'sprockets-commonjs', '= 0.0.5'
38
38
  gem.add_runtime_dependency 'uglifier', '= 1.3.0'
@@ -1,6 +1,6 @@
1
1
  module Lalala
2
2
  VERSION = "4.0.0"
3
- BUILD = "118"
3
+ BUILD = "123"
4
4
 
5
5
  if BUILD != ("{{BUILD_NUMBER" + "}}") # prevent sed replacement (see script/ci)
6
6
  BUILD_VERSION = "#{VERSION}.dev.#{BUILD}"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: lalala
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.0.0.dev.118
4
+ version: 4.0.0.dev.123
5
5
  platform: ruby
6
6
  authors:
7
7
  - Simon Menke
@@ -13,7 +13,7 @@ authors:
13
13
  autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
- date: 2013-05-08 00:00:00.000000000 Z
16
+ date: 2013-05-13 00:00:00.000000000 Z
17
17
  dependencies:
18
18
  - !ruby/object:Gem::Dependency
19
19
  name: carrierwave