noodall-core 0.1.2 → 0.1.3

data/Gemfile

@@ -1,7 +1,6 @@
 source "http://rubygems.org"
 
-gem 'mongo_mapper', '~> 0.8.4'
-gem 'bson_ext', '~> 1.0.9'
+gem 'mongo_mapper', '~> 0.8.6'
 gem 'ramdiv-mongo_mapper_acts_as_tree', '~> 0.1.1'
 gem 'canable', '~> 0.1.1'
 gem 'ruby-stemmer'
@@ -14,5 +13,6 @@ group :development do
   gem "factory_girl", "~> 1.3.2"
   gem "faker", "~> 0.3.1"
   gem "rake"
+  gem 'bson_ext', '~> 1.1.0'
 end
 

data/Gemfile.lock

@@ -1,9 +1,9 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.0)
-    bson (1.0.9)
-    bson_ext (1.0.9)
+    activesupport (3.0.1)
+    bson (1.1.1)
+    bson_ext (1.1.1)
     canable (0.1.1)
     database_cleaner (0.5.2)
     diff-lcs (1.1.2)
@@ -11,7 +11,7 @@ GEM
     faker (0.3.1)
     gemcutter (0.6.1)
     git (1.2.5)
-    i18n (0.4.1)
+    i18n (0.4.2)
     jeweler (1.4.0)
       gemcutter (>= 0.1.0)
       git (>= 1.2.5)
@@ -19,27 +19,27 @@ GEM
     jnunemaker-validatable (1.8.4)
       activesupport (>= 2.3.4)
     json_pure (1.4.6)
-    mongo (1.0.9)
-      bson (>= 1.0.5)
-    mongo_mapper (0.8.4)
+    mongo (1.1.1)
+      bson (>= 1.1.1)
+    mongo_mapper (0.8.6)
       activesupport (>= 2.3.4)
       jnunemaker-validatable (~> 1.8.4)
-      plucky (~> 0.3.5)
-    plucky (0.3.5)
-      mongo (~> 1.0.8)
+      plucky (~> 0.3.6)
+    plucky (0.3.6)
+      mongo (~> 1.1)
     rake (0.8.7)
-    ramdiv-mongo_mapper_acts_as_tree (0.1.1)
+    ramdiv-mongo_mapper_acts_as_tree (0.1.2)
       mongo_mapper (>= 0.6.8)
-    rspec (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
-      rspec-mocks (= 2.0.0.beta.22)
-    rspec-core (2.0.0.beta.22)
-    rspec-expectations (2.0.0.beta.22)
+    rspec (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
+      rspec-mocks (~> 2.0.1)
+    rspec-core (2.0.1)
+    rspec-expectations (2.0.1)
       diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
+    rspec-mocks (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
     ruby-stemmer (0.8.2)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
@@ -48,14 +48,14 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bson_ext (~> 1.0.9)
+  bson_ext (~> 1.1.0)
   canable (~> 0.1.1)
   database_cleaner (~> 0.5.2)
   factory_girl (~> 1.3.2)
   faker (~> 0.3.1)
   i18n
   jeweler (~> 1.4.0)
-  mongo_mapper (~> 0.8.4)
+  mongo_mapper (~> 0.8.6)
   rake
   ramdiv-mongo_mapper_acts_as_tree (~> 0.1.1)
   rspec (~> 2.0.0.beta.22)

data/Rakefile

@@ -12,7 +12,7 @@ begin
     gem.homepage = "http://github.com/beef/noodall-core"
     gem.authors = ["Steve England"]
     gem.add_dependency('mongo_mapper', '~> 0.8.6')
-    gem.add_dependency('ramdiv-mongo_mapper_acts_as_tree', '0.1.1')
+    gem.add_dependency('ramdiv-mongo_mapper_acts_as_tree', '~> 0.1.1')
     gem.add_dependency('canable', '0.1.1')
     gem.add_dependency('ruby-stemmer')
 

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/noodall/node.rb

@@ -3,15 +3,15 @@ module Noodall
     include MongoMapper::Document
     include MongoMapper::Acts::Tree
     include Canable::Ables
-  
+
     plugin MultiParameterAttributes
     plugin Indexer
     plugin Search
     plugin Tagging
     plugin GlobalUpdateTime
-  
+
     key :title, String, :required => true
-    key :link_name, String
+    key :name, String
     key :description, String
     key :body, String
     key :position, Integer, :default => nil
@@ -22,83 +22,83 @@ module Noodall
     key :destroyable_groups, Array
     key :publishable_groups, Array
     key :permalink, Permalink, :required => true, :index => true
-    
+
     timestamps!
     userstamps!
-  
+
     alias_method :keywords, :tag_list
     alias_method :keywords=, :tag_list=
-  
+
     attr_accessor :publish, :hide #for publishing
-  
+
     acts_as_tree :order => "position"
-  
+
     searchable_keys :title, :description, :keywords, :body
-  
+
     validates_true_for :template, :message => "cannot be changed as sub content is not allowed in this template", :logic => lambda { children.reject{|c| self._type.constantize.template_classes.include?(c.class)}.empty? }
-  
+
     def published_children
       self.children.select{|c| c.published? }
     end
-  
+
     # Allow parent to be set to none using a string. Allows us to set the parent to nil easily via forms
     def parent=(var)
       self[parent_id_field] = nil
       var == "none" ? super(nil) : super
     end
-  
+
     def template
       self.class.name.titleize
     end
-  
+
     def template=(template_name)
       self._type = template_name.gsub(' ','') unless template_name.blank?
     end
-  
+
     def published?
       !published_at.nil? and published_at <= current_time and (published_to.nil? or published_to >= current_time)
     end
-  
+
     def pending?
       published_at.nil? or published_at >= current_time
     end
-  
+
     def expired?
       !published_to.nil? and published_to <= current_time
     end
-  
+
     def first?
       position == 0
     end
-  
+
     def last?
       position == self.class.count(:_id => {"$ne" => self._id}, parent_id_field => self[parent_id_field])
     end
     def move_lower
       sibling = self.class.first(:position => {"$gt" => self.position}, parent_id_field => self[parent_id_field], :order => 'position ASC')
-  
+
       tmp = sibling.position
       sibling.position = self.position
       self.position = tmp
-  
+
       self.class.collection.update({:_id => self._id}, self.to_mongo)
       self.class.collection.update({:_id => sibling._id}, sibling.to_mongo)
-      
+
       global_updated!
     end
     def move_higher
       sibling = self.class.first(:position => {"$lt" => self.position}, parent_id_field => self[parent_id_field], :order => 'position DESC')
-  
+
       tmp = sibling.position
       sibling.position = self.position
       self.position = tmp
-  
+
       self.class.collection.update({:_id => self._id}, self.to_mongo)
       self.class.collection.update({:_id => sibling._id}, sibling.to_mongo)
-      
+
       global_updated!
     end
-  
+
     def run_callbacks(kind, options = {}, &block)
       self.class.send("#{kind}_callback_chain").run(self, options, &block)
       self.embedded_associations.each do |association|
@@ -110,7 +110,7 @@ module Noodall
         self.send(key.name).run_callbacks(kind, options, &block) unless self.send(key.name).nil?
       end
     end
-  
+
     def slots
       slots = []
       for slot_type in self.class.possible_slots.map(&:to_s)
@@ -120,95 +120,95 @@ module Noodall
       end
       slots.compact
     end
-  
+
     ## CANS
     def all_groups
       updatable_groups | destroyable_groups | publishable_groups
     end
-  
+
     %w( updatable destroyable publishable ).each do |permission|
       define_method("#{permission}_by?") do |user|
         user.admin? or send("#{permission}_groups").empty? or user.groups.any?{ |g| send("#{permission}_groups").include?(g) }
       end
-  
+
       define_method("#{permission}_groups_list") do
         send("#{permission}_groups").join(', ')
       end
-  
+
       define_method("#{permission}_groups_list=") do |groups_string|
         send("#{permission}_groups=", groups_string.split(',').map{|g| g.blank? ? nil : g.strip }.compact.uniq)
       end
     end
-  
+
     def creatable_by?(user)
       parent.nil? or parent.updatable_by?(user)
     end
-  
+
     # tree method that allow oprions to be passed
     def siblings(options = {})
       self.class.all(options.merge(:_id => {"$ne" => self._id}, parent_id_field => self[parent_id_field], :order => tree_order))
     end
-  
+
     def self_and_siblings(options = {})
       self.class.all(options.merge(parent_id_field => self[parent_id_field], :order => tree_order))
     end
-  
+
     def children(options = {})
       self.class.all(options.merge(parent_id_field => self._id, :order => tree_order))
     end
-  
+
   private
 
     def current_time
       self.class.current_time
     end
-  
+
     before_validation :set_permalink
     def set_permalink
       self.permalink = Permalink.new(*(ancestors << self).map{ |a| a.title.parameterize }) if permalink.blank? and not title.blank?
     end
-  
+
     before_save :set_position
     def set_position
       write_attribute :position, siblings.size if position.nil?
     end
-  
+
     before_save :clean_slots
-  
+
     # This method removes any uneeded modules from the object
     # modules that would otherwise remain hidden
     # if the objects class was changed
     def clean_slots
-  
+
       # TODO: spec this
-  
+
       slot_types = self.class.possible_slots.map(&:to_s)
       # collect all of the slot attributes
       #    (so we don't have to loop through the whole object each time)
       slots = self.attributes.select{|k,v| k =~ /^(#{slot_types.join('|')})_slot_\d+$/ }
-  
+
       # for each type of slot
       for slot_type in slot_types
         # get the number of slots of this type in the (possibly new) class
         slot_count = self._type.constantize.send("#{slot_type}_slots_count").to_i
-  
+
         # loop through all of the slot attributes for this type
         slots.select{|k,v| k =~ /^#{slot_type}_slot_\d+$/ }.each do |key, slot|
-  
+
           index = key[/#{slot_type}_slot_(\d+)$/, 1].to_i
-  
+
           logger.debug "Deleting #{key} #{self.send(key).inspect}" if index >= slot_count
           # set the slot to nil
           write_attribute(key.to_sym, nil) if index >= slot_count
         end
       end
     end
-  
+
     before_save :set_path
     def set_path
       write_attribute :path, parent.path + [parent._id] unless parent.nil?
     end
-  
+
     before_create :inherit_permisions
     def inherit_permisions
       unless parent.nil?
@@ -217,7 +217,7 @@ module Noodall
         self.publishable_groups = parent.publishable_groups
       end
     end
-  
+
     after_save :order_siblings
     def order_siblings
       if position_changed?
@@ -230,7 +230,7 @@ module Noodall
         end
       end
     end
-  
+
     before_save :set_published
     def set_published
       if publish
@@ -242,17 +242,22 @@ module Noodall
         write_attribute :published_to, 10.years.from_now
       end
     end
-  
+
+    before_save :set_name
+    def set_name
+      self.name = self.title if self.name.blank?
+    end
+
     module ClassMethods
       @@slots = []
-  
+
       # Set the names of the slots that will be avaiable to fill with components
       # For each name new methods will be created;
-      #   
+      #
       #   <name>_slots(count)
       #   This allow you to set the number of slots available in a template
       #   <name>_slots_count(count)
-      #   Reads back the count you set 
+      #   Reads back the count you set
       def slots(*args)
         @@slots = args.map(&:to_sym).uniq
 
@@ -281,13 +286,13 @@ module Noodall
       def roots(options = {})
         self.all(options.merge(parent_id_field => nil, :order => tree_order))
       end
-  
+
       def find_by_permalink(permalink)
         node = find_one(:permalink => permalink.to_s, :published_at => { :$lte => current_time })
         raise MongoMapper::DocumentNotFound if node.nil? or node.expired?
         node
       end
-  
+
       def template_classes
         return @template_classes if @template_classes
         classes = []
@@ -297,11 +302,11 @@ module Noodall
         end
         @template_classes = classes
       end
-  
+
       def template_names
         template_classes.collect{|c| c.name.titleize}.sort
       end
- 
+
       def all_template_classes
         templates = []
         template_classes.each do |template|
@@ -310,15 +315,15 @@ module Noodall
         end
         templates.uniq.collect{ |c| c.name.titleize }.sort
       end
-  
+
       def sub_templates(*arr)
         @template_classes = arr
       end
-  
+
       def root_template!
         @root_template = true
       end
-  
+
       def root_template?
         @root_template
       end
@@ -326,7 +331,7 @@ module Noodall
       def single_collection_inherited?
         false
       end
-  
+
       # Returns a list of classes that can have this model as a child
       def parent_classes
         classes = []
@@ -336,15 +341,15 @@ module Noodall
         end
         classes
       end
-    
-      # If rails style time zones are unavaiable fallback to standard now 
+
+      # If rails style time zones are unavaiable fallback to standard now
       def current_time
-        Time.zone ? Time.zone.now : Time.now 
+        Time.zone ? Time.zone.now : Time.now
       end
     end
     extend ClassMethods
-  
-  
+
+
   end
 
 end

data/noodall-core.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{noodall-core}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve England"]
@@ -60,18 +60,18 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<mongo_mapper>, ["~> 0.8.6"])
-      s.add_runtime_dependency(%q<ramdiv-mongo_mapper_acts_as_tree>, ["= 0.1.1"])
+      s.add_runtime_dependency(%q<ramdiv-mongo_mapper_acts_as_tree>, ["~> 0.1.1"])
       s.add_runtime_dependency(%q<canable>, ["= 0.1.1"])
       s.add_runtime_dependency(%q<ruby-stemmer>, [">= 0"])
     else
       s.add_dependency(%q<mongo_mapper>, ["~> 0.8.6"])
-      s.add_dependency(%q<ramdiv-mongo_mapper_acts_as_tree>, ["= 0.1.1"])
+      s.add_dependency(%q<ramdiv-mongo_mapper_acts_as_tree>, ["~> 0.1.1"])
       s.add_dependency(%q<canable>, ["= 0.1.1"])
       s.add_dependency(%q<ruby-stemmer>, [">= 0"])
     end
   else
     s.add_dependency(%q<mongo_mapper>, ["~> 0.8.6"])
-    s.add_dependency(%q<ramdiv-mongo_mapper_acts_as_tree>, ["= 0.1.1"])
+    s.add_dependency(%q<ramdiv-mongo_mapper_acts_as_tree>, ["~> 0.1.1"])
     s.add_dependency(%q<canable>, ["= 0.1.1"])
     s.add_dependency(%q<ruby-stemmer>, [">= 0"])
   end

data/spec/node_spec.rb

@@ -55,7 +55,7 @@ describe Noodall::Node do
 
       @child = Page.create!(:title => "Ickle Kid", :parent => @root)
 
-      @grandchild = Page.create!(:title => "Very Ickle Kid", :parent => @child) 
+      @grandchild = Page.create!(:title => "Very Ickle Kid", :parent => @child)
     end
 
     it "should create permlink based on tree" do
@@ -63,11 +63,11 @@ describe Noodall::Node do
       @grandchild.reload
       @grandchild.permalink.to_s.should == "root/ickle-kid/very-ickle-kid"
     end
-    
+
     it "should be under the correct path once moved" do
       grand_child_2 = Page.create!(:title => "Ickle Kid", :parent => @child)
       root_2 = Page.create!(:title => "Root 2")
-      
+
       grand_child_2.parent = root_2
       grand_child_2.save!
 
@@ -82,7 +82,7 @@ describe Noodall::Node do
       @child.save(:validate => false)
 
       grand_child_2.reload
-      
+
       grand_child_2.path.should_not include(@root.id)
       grand_child_2.path.should include(root_2.id)
     end
@@ -327,4 +327,15 @@ describe Noodall::Node do
     Page.parent_classes.should_not include(ArticlesList)
   end
 
+  it "should fall back to title for link name if it is blank" do
+    page = Factory(:page, :title => "My Long Title that is long")
+
+    page.name.should == "My Long Title that is long"
+
+    page.name = "Shorty"
+    page.save
+
+    page.name.should == "Shorty"
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: noodall-core
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Steve England
@@ -41,7 +41,7 @@ dependencies:
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 25
         segments: