noodall-core 0.6.0 → 0.6.1

Sign up to get free protection for your applications and to get access to all the features.
data/Gemfile CHANGED
@@ -14,6 +14,6 @@ group :development do
14
14
  gem "factory_girl", "~> 1.3.2"
15
15
  gem "faker", "~> 0.3.1"
16
16
  gem "rake"
17
- gem 'bson_ext', '~> 1.1.0'
17
+ gem 'bson_ext', '~> 1.3.0'
18
18
  end
19
19
 
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.6.0
1
+ 0.6.1
data/lib/noodall/node.rb CHANGED
@@ -39,7 +39,7 @@ module Noodall
39
39
  # if there are any children that are not of an allowed template, error
40
40
  validates_true_for :template,
41
41
  :message => "cannot be changed as sub content is not allowed in this template",
42
- :logic => lambda { !_type_changed? or children.empty? or children.select{|c| !self._type.constantize.template_classes.include?(c.class)}.empty? }
42
+ :logic => lambda { |args| !_type_changed? or children.empty? or children.select{|c| !self._type.constantize.template_classes.include?(c.class)}.empty? }
43
43
 
44
44
  scope :published, lambda { where(:published_at => { :$lte => current_time }, :published_to => { :$gte => current_time }) }
45
45
 
@@ -156,7 +156,7 @@ module Noodall
156
156
  def slug
157
157
  (self.name.blank? ? self.title : self.name).to_s.parameterize
158
158
  end
159
-
159
+
160
160
  def admin_title
161
161
  title
162
162
  end
@@ -321,7 +321,7 @@ module Noodall
321
321
  instance_variable_set("@#{slot}_slots_count", count)
322
322
  count.times do |i|
323
323
  key "#{slot}_slot_#{i}", Noodall::Component
324
- validates_each "#{slot}_slot_#{i}", :logic => lambda { errors.add("#{slot}_slot_#{i}", "is not allowed in a #{slot} slot") unless send("#{slot}_slot_#{i}").nil? or Noodall::Component.positions_classes(slot).include?(send("#{slot}_slot_#{i}").class) } # TODO: Nicer message please
324
+ validates_each "#{slot}_slot_#{i}", :logic => lambda { |args| errors.add("#{slot}_slot_#{i}", "is not allowed in a #{slot} slot") unless send("#{slot}_slot_#{i}").nil? or Noodall::Component.positions_classes(slot).include?(send("#{slot}_slot_#{i}").class) } # TODO: Nicer message please
325
325
  validates_associated "#{slot}_slot_#{i}"
326
326
  end
327
327
  end
data/noodall-core.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{noodall-core}
8
- s.version = "0.6.0"
8
+ s.version = "0.6.1"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Steve England"]
12
- s.date = %q{2011-03-02}
12
+ s.date = %q{2011-04-07}
13
13
  s.description = %q{Core data objects for Noodall}
14
14
  s.email = %q{steve@wearebeef.co.uk}
15
15
  s.extra_rdoc_files = [
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: noodall-core
3
3
  version: !ruby/object:Gem::Version
4
- hash: 7
4
+ hash: 5
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 6
9
- - 0
10
- version: 0.6.0
9
+ - 1
10
+ version: 0.6.1
11
11
  platform: ruby
12
12
  authors:
13
13
  - Steve England
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2011-03-02 00:00:00 +00:00
18
+ date: 2011-04-07 00:00:00 +01:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency