mm-multi-parameter-attributes 0.2.1 → 0.2.2

data/README.rdoc

@@ -10,7 +10,7 @@ https://gist.github.com/268948/c5ca7d8fb02470c5c8a0a8225390a4186349a8d4
 Either load it into all models, or individual models:
   
   # add to all models
-  MongoMapper::Document.append_inclusions(MongoMapper::Plugins::MultiParameterAttributes)
+  MongoMapper::Document.plugin(MongoMapper::Plugins::MultiParameterAttributes)
 
   # add to a specific model
   plugin MongoMapper::Plugins::MultiParameterAttributes

data/Rakefile

@@ -15,7 +15,7 @@ spec = Gem::Specification.new do |s|
 
   # Change these as appropriate
   s.name              = "mm-multi-parameter-attributes"
-  s.version           = "0.2.1"
+  s.version           = "0.2.2"
   s.summary           = "Tiny plugin for MongoMapper to add multi-parameter attributes"
   s.author            = "Richard Livsey"
   s.email             = "richard@livsey.org"
@@ -32,6 +32,7 @@ spec = Gem::Specification.new do |s|
   # If you want to depend on other gems, add them here, along with any
   # relevant versions
   s.add_dependency("mongo_mapper", ">= 0.9.0")
+  s.add_dependency("tzinfo")
 
   # If your tests use any gems, include them here
   s.add_development_dependency("rspec")
@@ -42,7 +43,7 @@ end
 # be automatically building a gem for this project. If you're not
 # using GitHub, edit as appropriate.
 #
-# To publish your gem online, install the 'gemcutter' gem; Read more 
+# To publish your gem online, install the 'gemcutter' gem; Read more
 # about that here: http://gemcutter.org/pages/gem_docs
 Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec

data/lib/mm-multi-parameter-attributes.rb

@@ -1,95 +1,104 @@
 require 'mongo_mapper'
+require 'tzinfo'
 
 module MongoMapper
   module Plugins
     module MultiParameterAttributes
       extend ActiveSupport::Concern
 
-      module InstanceMethods
-        def attributes=(new_attributes)
-          return if new_attributes.nil?
+      def attributes=(new_attributes)
+        return if new_attributes.nil?
 
-          multi_parameter_attributes = []
-          normal_attributes = {}
+        multi_parameter_attributes = []
+        normal_attributes = {}
 
-          new_attributes.each do |k, v|
-            if k.to_s.include?("(")
-              multi_parameter_attributes << [ k.to_s, v ]
-            else
-              normal_attributes[k] = v
-            end
+        new_attributes.each do |k, v|
+          if k.to_s.include?("(")
+            multi_parameter_attributes << [ k.to_s, v ]
+          else
+            normal_attributes[k] = v
           end
+        end
 
-          assign_multiparameter_attributes(multi_parameter_attributes)
+        assign_multiparameter_attributes(multi_parameter_attributes)
 
-          super(normal_attributes)
-        end
+        super(normal_attributes)
+      end
 
-        # Instantiates objects for all attribute classes that needs more than one constructor parameter. This is done
-        # by calling new on the column type or aggregation type (through composed_of) object with these parameters.
-        # So having the pairs written_on(1) = "2004", written_on(2) = "6", written_on(3) = "24", will instantiate
-        # written_on (a date type) with Date.new("2004", "6", "24"). You can also specify a typecast character in the
-        # parentheses to have the parameters typecasted before they're used in the constructor. Use i for Fixnum, f for Float,
-        # s for String, and a for Array. If all the values for a given attribute are empty, the attribute will be set to nil.
-        def assign_multiparameter_attributes(pairs)
-          execute_callstack_for_multiparameter_attributes(
-            extract_callstack_for_multiparameter_attributes(pairs)
-          )
-        end
+      # Instantiates objects for all attribute classes that needs more than one constructor parameter. This is done
+      # by calling new on the column type or aggregation type (through composed_of) object with these parameters.
+      # So having the pairs written_on(1) = "2004", written_on(2) = "6", written_on(3) = "24", will instantiate
+      # written_on (a date type) with Date.new("2004", "6", "24"). You can also specify a typecast character in the
+      # parentheses to have the parameters typecasted before they're used in the constructor. Use i for Fixnum, f for Float,
+      # s for String, and a for Array. If all the values for a given attribute are empty, the attribute will be set to nil.
+      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(&:nil?)
-
-            if !values.reject{|x| x.blank? }.empty?
-              values = values.map(&:to_i)
-
-              key = self.class.keys[name]
-              raise ArgumentError, "Unknown key #{name}" if key.nil?
-              klass = key.type
-
-              value = if Time == klass
-                Time.zone.local(*values)
-              elsif Date == klass
-                begin
-                  values = values_with_empty_parameters.map{|v| v.blank? ? 1 : v.to_i}
-                  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
-              writer_method = "#{name}="
-              if respond_to?(writer_method)
-                self.send(writer_method, value)
-              else
-                self[name.to_s] = value
-              end
-            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(*valid_datetime_values(values_with_empty_parameters))
+                    elsif Date == klass
+                      values = valid_datetime_values(values_with_empty_parameters)
+                      begin
+                        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_with_empty_parameters)
+                    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 = { }
+      # Ensures that values for date are set to now if blank (as month and say cannot be 0) and that all values are converted to integers
+      def valid_datetime_values(values)
+        now = Time.zone.now
+        values[0] = now.year if values[0].blank?
+        values[1] = now.month if values[1].blank?
+        values[2] = now.day if values[2].blank?
+        values.map(&:to_i)
+      end
 
-          for pair in pairs
-            multiparameter_name, value = pair
-            attribute_name = multiparameter_name.split("(").first
-            attributes[attribute_name] = [] unless attributes.include?(attribute_name)
+      def extract_callstack_for_multiparameter_attributes(pairs)
+        attributes = { }
 
-            attributes[attribute_name] << [ find_parameter_position(multiparameter_name), value ]
-          end
+        for pair in pairs
+          multiparameter_name, value = pair
+          attribute_name = multiparameter_name.split("(").first
+          attributes[attribute_name] = [] unless attributes.include?(attribute_name)
 
-          attributes.each { |name, values| attributes[name] = values.sort_by{ |v| v.first }.collect { |v| v.last } }
+          attributes[attribute_name] << [ find_parameter_position(multiparameter_name), value ]
         end
 
-        def find_parameter_position(multiparameter_name)
-          multiparameter_name.scan(/\(([0-9]*).*\)/).first.first
-        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
+end

metadata

@@ -1,100 +1,87 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mm-multi-parameter-attributes
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 0.2.2
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 1
-  version: 0.2.1
 platform: ruby
-authors: 
+authors:
 - Richard Livsey
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-09 00:00:00 +00:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mongo_mapper
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70196703635800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 9
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70196703635800
+- !ruby/object:Gem::Dependency
+  name: tzinfo
+  requirement: &70196703635420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70196703635420
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70196703634980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *70196703634980
 description: 
 email: richard@livsey.org
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - LICENSE
 - Rakefile
 - README.rdoc
 - lib/mm-multi-parameter-attributes.rb
-has_rdoc: true
 homepage: http://github.com/rlivsey/mm-multi-parameter-attributes
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
-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: -305387027764767057
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Tiny plugin for MongoMapper to add multi-parameter attributes
 test_files: []
-