noodall-core 0.8.1 → 0.8.2

data/Gemfile

@@ -5,7 +5,7 @@ gemspec
 group :development do
   gem "rspec", "~> 2.0.0"
   gem "database_cleaner", "~> 0.5.2"
-  gem "factory_girl", "~> 1.3.2"
+  gem "factory_girl", "~> 2.0"
   gem "faker", "~> 0.3.1"
   gem "rake"
   gem 'bson_ext'

data/lib/noodall/core/version.rb

@@ -1,5 +1,5 @@
 module Noodall
   module Core
-    VERSION = "0.8.1"
+    VERSION = "0.8.2"
   end
 end

data/lib/noodall/tagging.rb

@@ -14,7 +14,11 @@ module Noodall
         ))
         tags_map = collection.map_reduce(tag_cloud_map, tag_cloud_reduce, {:query => query.criteria.to_hash, :out => "#{self.collection_name}_tags" })
         if tags_map.count > 0
-          tags = tags_map.find({}, query.options.to_hash ).to_a.collect{ |hash| Tag.new(hash['_id'], hash['value']) }
+          # Strange scoping issue means tags needs to be defined outside of the find block
+          tags = nil
+          tags_map.find({}, query.options.merge(:timeout => false).to_hash) do |cursor|
+            tags = cursor.map { |hash| Tag.new(hash['_id'], hash['value']) }
+          end
           tags
         else
           []

data/noodall-core.gemspec

@@ -14,7 +14,8 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = ">= 1.3.6"
 
-  s.add_dependency(%q<mongo_mapper>, ["~> 0.9.0"])
+  s.add_dependency(%q<mongo_mapper>, ["~> 0.11.0"])
+  s.add_dependency(%q<activemodel>, ["~> 3.1.0"]) # Because 3.3 breaks ramdiv-mongo_mapper_acts_as_tree
   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"])

data/spec/component_spec.rb

@@ -3,6 +3,8 @@ require 'spec_helper'
 describe Noodall::Component do
 
   it "should list components classes avaiable to a slot (deprecated)" do
+    Noodall::Node.slots :dwide, :dsmall, :dmain
+
     class DListedComponent < Noodall::Component
       allowed_positions :dsmall, :dwide
     end

data/spec/factories/node.rb

@@ -9,6 +9,13 @@ class LandingPage < Noodall::Node
   root_template!
 end
 
+# And a factory to build it
+Factory.define :home do |node|
+  node.title { Faker::Lorem.words(3).join(' ') }
+  node.body { Faker::Lorem.paragraph }
+  node.published_at { Time.now }
+end
+
 # And a factory to build it
 Factory.define :page do |node|
   node.title { Faker::Lorem.words(3).join(' ') }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: noodall-core
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,43 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-30 00:00:00.000000000Z
+date: 2012-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo_mapper
-  requirement: &18543540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.11.0
   type: :runtime
   prerelease: false
-  version_requirements: *18543540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: ramdiv-mongo_mapper_acts_as_tree
-  requirement: &18542540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +53,15 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *18542540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: mm-multi-parameter-attributes
-  requirement: &18541480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +69,15 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *18541480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: canable
-  requirement: &18540620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +85,15 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *18540620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: mm-versionable
-  requirement: &18539520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +101,15 @@ dependencies:
         version: 0.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *18539520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: ruby-stemmer
-  requirement: &18537220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +117,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18537220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Core data objects for Noodall
 email:
 - steve@wearebeef.co.uk
@@ -123,7 +169,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3597566339006113929
+      hash: -2543369303682078174
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -132,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Core data objects for Noodall