noodall-core 0.2.1 → 0.3.0

data/Gemfile

@@ -2,6 +2,7 @@ source "http://rubygems.org"
 
 gem 'mongo_mapper', '~> 0.8.6'
 gem 'ramdiv-mongo_mapper_acts_as_tree', '~> 0.1.1'
+gem 'mm-multi-parameter-attributes', '~> 0.1.1'
 gem 'canable', '~> 0.1.1'
 gem 'ruby-stemmer'
 gem 'i18n'

data/Gemfile.lock

@@ -19,6 +19,8 @@ GEM
     jnunemaker-validatable (1.8.4)
       activesupport (>= 2.3.4)
     json_pure (1.4.6)
+    mm-multi-parameter-attributes (0.1.1)
+      mongo_mapper
     mongo (1.1.1)
       bson (>= 1.1.1)
     mongo_mapper (0.8.6)
@@ -55,6 +57,7 @@ DEPENDENCIES
   faker (~> 0.3.1)
   i18n
   jeweler (~> 1.4.0)
+  mm-multi-parameter-attributes (~> 0.1.1)
   mongo_mapper (~> 0.8.6)
   rake
   ramdiv-mongo_mapper_acts_as_tree (~> 0.1.1)

data/Rakefile

@@ -13,6 +13,7 @@ begin
     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('mm-multi-parameter-attributes', '~> 0.1.1')
     gem.add_dependency('canable', '0.1.1')
     gem.add_dependency('ruby-stemmer')
 

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/lib/noodall/node.rb

@@ -4,7 +4,7 @@ module Noodall
     include MongoMapper::Acts::Tree
     include Canable::Ables
 
-    plugin MultiParameterAttributes
+    plugin MongoMapper::Plugins::MultiParameterAttributes
     plugin Indexer
     plugin Search
     plugin Tagging
@@ -332,10 +332,6 @@ module Noodall
         @root_template
       end
 
-      def single_collection_inherited?
-        false
-      end
-
       # Returns a list of classes that can have this model as a child
       def parent_classes
         classes = []

data/lib/noodall-core.rb

@@ -1,8 +1,8 @@
 require 'mongo_mapper'
 require 'mongo_mapper_acts_as_tree'
 require 'canable'
+require 'mm-multi-parameter-attributes'
 require 'noodall/global_update_time'
-require 'noodall/multi_parameter_attributes'
 require 'noodall/search'
 require 'noodall/tagging'
 require 'noodall/permalink'

data/noodall-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{noodall-core}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve England"]
-  s.date = %q{2010-11-02}
+  s.date = %q{2010-11-03}
   s.description = %q{Core data objects for Noodall}
   s.email = %q{steve@wearebeef.co.uk}
   s.extra_rdoc_files = [
@@ -29,7 +29,6 @@ Gem::Specification.new do |s|
      "lib/noodall/component.rb",
      "lib/noodall/global_update_time.rb",
      "lib/noodall/indexer.rb",
-     "lib/noodall/multi_parameter_attributes.rb",
      "lib/noodall/node.rb",
      "lib/noodall/permalink.rb",
      "lib/noodall/search.rb",
@@ -61,17 +60,20 @@ 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<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

data/spec/node_spec.rb

@@ -33,6 +33,15 @@ describe Noodall::Node do
     node = Noodall::Node.find(page.id)
 
     node.class.should == Page
+
+    class LandingPage < Noodall::Node
+      root_template!
+    end
+
+    LandingPage.create!(@valid_attributes)
+
+    Page.last.class.should == Page
+    LandingPage.last.class.should == LandingPage
   end
 
   it "should be found by permalink" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: noodall-core
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Steve England
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-02 00:00:00 +00:00
+date: 2010-11-03 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,11 +53,11 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
-  name: canable
+  name: mm-multi-parameter-attributes
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 25
         segments: 
@@ -69,8 +69,24 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
-  name: ruby-stemmer
+  name: canable
   version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 1
+        - 1
+        version: 0.1.1
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: ruby-stemmer
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -79,7 +95,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
+  requirement: *id005
 description: Core data objects for Noodall
 email: steve@wearebeef.co.uk
 executables: []
@@ -102,7 +118,6 @@ files:
 - lib/noodall/component.rb
 - lib/noodall/global_update_time.rb
 - lib/noodall/indexer.rb
-- lib/noodall/multi_parameter_attributes.rb
 - lib/noodall/node.rb
 - lib/noodall/permalink.rb
 - lib/noodall/search.rb

data/lib/noodall/multi_parameter_attributes.rb

@@ -1,83 +0,0 @@
-module Noodall
-  module MultiParameterAttributes
-    module InstanceMethods
-      def attributes=(attrs)
-        multi_parameter_attributes = []
-        attrs.each do |name, value|
-          return if attrs.blank?
-          if name.to_s.include?("(")
-            multi_parameter_attributes << [ name, value ]
-          else
-            writer_method = "#{name}="
-            if respond_to?(writer_method)
-              self.send(writer_method, value)
-            else
-              self[name.to_s] = value
-            end
-          end
-        end
-  
-        assign_multiparameter_attributes(multi_parameter_attributes)
-      end
-  
-      def assign_multiparameter_attributes(pairs)
-        execute_callstack_for_multiparameter_attributes(
-          extract_callstack_for_multiparameter_attributes(pairs)
-        )
-      end
-  
-      def execute_callstack_for_multiparameter_attributes(callstack)
-        callstack.each do |name, values_with_empty_parameters|
-          # in order to allow a date to be set without a year, we must keep the empty values.
-          # Otherwise, we wouldn't be able to distinguish it from a date with an empty day.
-          values = values_with_empty_parameters.reject(&:blank?)
-  
-          if values.any?
-            key = self.class.keys[name]
-            raise ArgumentError, "Unknown key #{name}" if key.nil?
-            klass = key.type
-  
-            value = if Time == klass
-              Time.zone.local(*values.map(&:to_i))
-            elsif Date == klass
-              begin
-                values = values_with_empty_parameters.collect do |v| v.nil? ? 1 : v end
-                Date.new(*values)
-              rescue ArgumentError => ex # if Date.new raises an exception on an invalid date
-                Time.zone.local(*values).to_date # we instantiate Time object and convert it back to a date thus using Time's logic in handling invalid dates
-              end
-            else
-              klass.new(*values)
-            end
-          else
-            value = nil
-          end
-          writer_method = "#{name}="
-          if respond_to?(writer_method)
-            self.send(writer_method, value)
-          else
-            self[name.to_s] = value
-          end
-        end
-      end
-  
-      def extract_callstack_for_multiparameter_attributes(pairs)
-        attributes = { }
-  
-        for pair in pairs
-          multiparameter_name, value = pair
-          attribute_name = multiparameter_name.split("(").first
-          attributes[attribute_name] = [] unless attributes.include?(attribute_name)
-  
-          attributes[attribute_name] << [ find_parameter_position(multiparameter_name), value ]
-        end
-  
-        attributes.each { |name, values| attributes[name] = values.sort_by{ |v| v.first }.collect { |v| v.last } }
-      end
-  
-      def find_parameter_position(multiparameter_name)
-        multiparameter_name.scan(/\(([0-9]*).*\)/).first.first
-      end
-    end
-  end
-end