noodall-core 0.7.3 → 0.7.5

data/.rvmrc

@@ -4,7 +4,7 @@
 # development environment upon cd'ing into the directory
 
 # First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
-environment_id="ruby-1.8.7-p334@g-noodall-core"
+environment_id="ruby-1.9.2@noodall-core"
 
 #
 # First we attempt to load the desired environment directly from the environment

data/Gemfile

@@ -8,7 +8,6 @@ group :development do
   gem "factory_girl", "~> 1.3.2"
   gem "faker", "~> 0.3.1"
   gem "rake"
-  gem 'bson_ext', '~> 1.3.0'
-  gem 'SystemTimer', '~> 1.2.0'
+  gem 'bson_ext'
 end
 

data/lib/noodall/core/version.rb

@@ -1,5 +1,5 @@
 module Noodall
   module Core
-    VERSION = "0.7.3"
+    VERSION = "0.7.5"
   end
 end

data/lib/noodall/node.rb

@@ -14,7 +14,7 @@ module Noodall
     key :browser_title, String
     key :name, String
     key :description, String
-    key :body, String
+    key :body, String, :default => ""
     key :position, Integer, :default => nil, :index => true
     key :_type, String
     key :published_at, Time, :index => true
@@ -163,7 +163,7 @@ module Noodall
     end
 
     def admin_title
-      title
+      name
     end
 
   private

data/noodall-core.gemspec

@@ -5,22 +5,22 @@ Gem::Specification.new do |s|
   s.name = "noodall-core"
   s.version = Noodall::Core::VERSION
   s.platform    = Gem::Platform::RUBY
-  
+
   s.authors = ["Steve England"]
   s.email = ['steve@wearebeef.co.uk']
   s.homepage = "http://github.com/beef/noodall-core"
   s.summary = "Core data objects for Noodall"
   s.description = "Core data objects for Noodall"
-  
+
   s.required_rubygems_version = ">= 1.3.6"
-  
+
   s.add_dependency(%q<mongo_mapper>, ["~> 0.9.0"])
   s.add_dependency(%q<ramdiv-mongo_mapper_acts_as_tree>, ["~> 0.1.1"])
   s.add_dependency(%q<mm-multi-parameter-attributes>, ["~> 0.2.1"])
-  s.add_dependency(%q<canable>, ["= 0.1.1"])
-  s.add_dependency(%q<mm-versionable>, ["= 0.2.4"])
+  s.add_dependency(%q<canable>, ["~> 0.1.1"])
+  s.add_dependency(%q<mm-versionable>, ["~> 0.2.5"])
   s.add_dependency(%q<ruby-stemmer>, [">= 0"])
-  
+
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
   s.require_path = 'lib'

data/spec/node_spec.rb

@@ -415,14 +415,23 @@ describe Noodall::Node do
   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")
+    title = "My Long Title that is long"
+    name = "Shorty"
+    page = Factory(:page, :title => title)
 
-    page.name.should == "My Long Title that is long"
+    page.name.should == title
 
-    page.name = "Shorty"
+    page.name = name
     page.save
 
-    page.name.should == "Shorty"
+    page.name.should == name
+  end
+
+  it "Should have an admin_title that matches the name" do
+    title = "My title"
+    name = "Somthing else"
+    page = Factory(:page, :title => title, :name => name)
+    page.admin_title.should == name
   end
 
   it "should be indexed only when explicitly called" do

metadata

@@ -1,127 +1,89 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: noodall-core
-version: !ruby/object:Gem::Version 
-  hash: 5
+version: !ruby/object:Gem::Version
+  version: 0.7.5
   prerelease: 
-  segments: 
-  - 0
-  - 7
-  - 3
-  version: 0.7.3
 platform: ruby
-authors: 
+authors:
 - Steve England
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-23 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2011-09-26 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: mongo_mapper
+  requirement: &14024980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 9
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.9.0
-  prerelease: false
-  requirement: *id001
-  name: mongo_mapper
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *14024980
+- !ruby/object:Gem::Dependency
+  name: ramdiv-mongo_mapper_acts_as_tree
+  requirement: &14023780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 1
-        - 1
+      - !ruby/object:Gem::Version
         version: 0.1.1
-  prerelease: false
-  requirement: *id002
-  name: ramdiv-mongo_mapper_acts_as_tree
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *14023780
+- !ruby/object:Gem::Dependency
+  name: mm-multi-parameter-attributes
+  requirement: &14022840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 2
-        - 1
+      - !ruby/object:Gem::Version
         version: 0.2.1
-  prerelease: false
-  requirement: *id003
-  name: mm-multi-parameter-attributes
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 1
-        - 1
-        version: 0.1.1
   prerelease: false
-  requirement: *id004
+  version_requirements: *14022840
+- !ruby/object:Gem::Dependency
   name: canable
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &14022000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 2
-        - 4
-        version: 0.2.4
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
   prerelease: false
-  requirement: *id005
+  version_requirements: *14022000
+- !ruby/object:Gem::Dependency
   name: mm-versionable
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &14021120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.5
+  type: :runtime
   prerelease: false
-  requirement: *id006
+  version_requirements: *14021120
+- !ruby/object:Gem::Dependency
   name: ruby-stemmer
+  requirement: &14020320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
+  prerelease: false
+  version_requirements: *14020320
 description: Core data objects for Noodall
-email: 
+email:
 - steve@wearebeef.co.uk
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .document
 - .gitignore
 - .rvmrc
@@ -139,50 +101,38 @@ files:
 - lib/noodall/search.rb
 - lib/noodall/site.rb
 - lib/noodall/tagging.rb
-- lib/versionable/models/version.rb
 - noodall-core.gemspec
-- noodall-core.gemspec.orig
 - spec/component_spec.rb
 - spec/factories/component.rb
 - spec/factories/node.rb
 - spec/node_spec.rb
 - spec/site_map_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/beef/noodall-core
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -1321159501201934569
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.1
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Core data objects for Noodall
 test_files: []
-

data/lib/versionable/models/version.rb

@@ -1,22 +0,0 @@
-# This is a duplicate of mm-versionable lib/versionable/models/version.rb
-# with indexing turned off so it doesn't complian when included that there
-# is no db connection
-class Version
-  include MongoMapper::Document
-
-  key :data, Hash
-  key :date, Time
-  key :pos, Integer#, :index => true
-  key :doc_id, String#, :index => true
-  key :message, String
-  key :updater_id, String
-
-  def content(key)
-    cdata = self.data[key]
-    if cdata.respond_to?(:join)
-      cdata.join(" ")
-    else
-      cdata
-    end
-  end
-end

data/noodall-core.gemspec.orig

@@ -1,106 +0,0 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path("../lib/noodall/core/version", __FILE__)
-
-Gem::Specification.new do |s|
-<<<<<<< HEAD
-  s.name = %q{noodall-core}
-  s.version = "0.6.3"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Steve England"]
-  s.date = %q{2011-06-03}
-  s.description = %q{Core data objects for Noodall}
-  s.email = %q{steve@wearebeef.co.uk}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     ".rvmrc",
-     "Gemfile",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/noodall-core.rb",
-     "lib/noodall/component.rb",
-     "lib/noodall/global_update_time.rb",
-     "lib/noodall/indexer.rb",
-     "lib/noodall/node.rb",
-     "lib/noodall/permalink.rb",
-     "lib/noodall/search.rb",
-     "lib/noodall/site.rb",
-     "lib/noodall/tagging.rb",
-     "noodall-core.gemspec",
-     "spec/component_spec.rb",
-     "spec/factories/component.rb",
-     "spec/factories/node.rb",
-     "spec/node_spec.rb",
-     "spec/site_map_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/beef/noodall-core}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Core data objects for Noodall}
-  s.test_files = [
-    "spec/component_spec.rb",
-     "spec/factories/component.rb",
-     "spec/factories/node.rb",
-     "spec/node_spec.rb",
-     "spec/site_map_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    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<mm-multi-parameter-attributes>, ["~> 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<mm-multi-parameter-attributes>, ["~> 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<mm-multi-parameter-attributes>, ["~> 0.1.1"])
-    s.add_dependency(%q<canable>, ["= 0.1.1"])
-    s.add_dependency(%q<ruby-stemmer>, [">= 0"])
-  end
-=======
-  s.name = "noodall-core"
-  s.version = Noodall::Core::VERSION
-  s.platform    = Gem::Platform::RUBY
-  
-  s.authors = ["Steve England"]
-  s.email = ['steve@wearebeef.co.uk']
-  s.homepage = "http://github.com/beef/noodall-core"
-  s.summary = "Core data objects for Noodall"
-  s.description = "Core data objects for Noodall"
-  
-  s.required_rubygems_version = ">= 1.3.6"
-  
-  s.add_dependency(%q<mongo_mapper>, ["~> 0.9.0"])
-  s.add_dependency(%q<ramdiv-mongo_mapper_acts_as_tree>, ["~> 0.1.1"])
-  s.add_dependency(%q<mm-multi-parameter-attributes>, ["~> 0.2.1"])
-  s.add_dependency(%q<canable>, ["= 0.1.1"])
-  s.add_dependency(%q<mm-versionable>, ["= 0.2.4"])
-  s.add_dependency(%q<ruby-stemmer>, [">= 0"])
-  
-  s.files        = `git ls-files`.split("\n")
-  s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
-  s.require_path = 'lib'
->>>>>>> mm9
-end
-