mongomodel 0.5.5 → 0.5.6

data/lib/mongomodel/support/scope/array_methods.rb

@@ -8,7 +8,7 @@ module MongoModel
           !empty?
         end
       end
-      
+
       def select(*args, &block)
         if block_given?
           to_a.select(&block)

data/lib/mongomodel/support/scope/batches.rb

@@ -3,7 +3,7 @@ module MongoModel
     module Batches
       def in_batches(batch_size=1000)
         offset = 0
-        
+
         begin
           documents = offset(offset).limit(batch_size).all
           yield documents if block_given? && !documents.empty?

data/lib/mongomodel/support/scope/dynamic_finders.rb

@@ -8,7 +8,7 @@ module MongoModel
           super
         end
       end
-      
+
       def method_missing(method_id, *args, &block)
         if finder = DynamicFinder.match(self, method_id)
           finder.execute(*args)

data/lib/mongomodel/support/scope/finder_methods.rb

@@ -21,7 +21,7 @@ module MongoModel
           end
         end
       end
-      
+
       def first(count=nil)
         if loaded?
           count ? to_a.first(count) : to_a.first
@@ -29,7 +29,7 @@ module MongoModel
           count ? limit(count).to_a : limit(1).to_a[0]
         end
       end
-      
+
       def last(count=nil)
         if loaded?
           count ? to_a.last(count) : to_a.last
@@ -37,24 +37,24 @@ module MongoModel
           count ? reverse_order.limit(count).to_a : reverse_order.limit(1).to_a[0]
         end
       end
-      
+
       def all
         to_a
       end
-      
+
       def exists?(id)
         where(:id => id).any?
       end
-      
+
       def apply_finder_options(options={})
         result = clone
-        
+
         result = result.where(options[:conditions]) if options[:conditions]
         result = result.order(options[:order])      if options[:order]
         result = result.select(options[:select])    if options[:select]
         result = result.limit(options[:limit])      if options[:limit]
         result = result.offset(options[:offset])    if options[:offset]
-        
+
         result
       end
     end

data/lib/mongomodel/support/scope/load_methods.rb

@@ -2,7 +2,7 @@ module MongoModel
   class Scope
     module LoadMethods
       attr_accessor :on_load_proc
-      
+
       def on_load(&block)
         new_scope = clone
         new_scope.on_load_proc = block

data/lib/mongomodel/support/scope/pagination.rb

@@ -4,7 +4,7 @@ module MongoModel
       def paginate(options={})
         page     = options[:page] || 1
         per_page = options[:per_page] || klass.per_page
-        
+
         Paginator.new(self, page, per_page)
       end
     end

data/lib/mongomodel/support/scope/query_methods.rb

@@ -5,10 +5,10 @@ module MongoModel
         SINGLE_VALUE_METHODS.each { |m| instance_variable_set("@#{m}_value", nil) }
         MULTI_VALUE_METHODS.each { |m| instance_variable_set("@#{m}_values", []) }
       end
-      
+
       MULTI_VALUE_METHODS.each do |query_method|
         attr_accessor :"#{query_method}_values"
-        
+
         class_eval <<-CEVAL, __FILE__
           def #{query_method}(*args, &block)
             new_scope = clone
@@ -16,7 +16,7 @@ module MongoModel
             new_scope.#{query_method}_values += value if value.present?
             new_scope
           end
-          
+
           def #{query_method}!(*args, &block)
             new_scope = clone
             value = Array.wrap(args.flatten).reject { |x| x.blank? }
@@ -25,7 +25,7 @@ module MongoModel
           end
         CEVAL
       end
-      
+
       SINGLE_VALUE_METHODS.each do |query_method|
         attr_accessor :"#{query_method}_value"
 
@@ -37,13 +37,13 @@ module MongoModel
           end
         CEVAL
       end
-      
+
       def from(value, &block)
         new_scope = clone
         new_scope.from_value = InstrumentedCollection.new(value.is_a?(String) ? klass.database.collection(value) : value)
         new_scope
       end
-      
+
       def reverse_order
         if order_values.empty?
           order(:id.desc)

data/lib/mongomodel/support/scope/spawn_methods.rb

@@ -3,33 +3,33 @@ module MongoModel
     module SpawnMethods
       def merge(scope)
         result = clone
-        
+
         MULTI_VALUE_METHODS.each do |method|
           values = send(:"#{method}_values") + scope.send(:"#{method}_values")
           result.send(:"#{method}_values=", values.uniq)
         end
-        
+
         SINGLE_VALUE_METHODS.each do |method|
           value = scope.send(:"#{method}_value")
           result.send(:"#{method}_value=", value) if value
         end
-        
+
         result.on_load_proc = scope.on_load_proc
-        
+
         result
       end
-      
+
       def except(*exceptions)
         result = self.class.new(klass)
-        
+
         MULTI_VALUE_METHODS.each do |method|
           result.send(:"#{method}_values=", send(:"#{method}_values")) unless exceptions.include?(method)
         end
-        
+
         SINGLE_VALUE_METHODS.each do |method|
           result.send(:"#{method}_value=", send(:"#{method}_value")) unless exceptions.include?(method)
         end
-        
+
         result
       end
     end

data/lib/mongomodel/support/types.rb

@@ -4,11 +4,11 @@ require 'mongomodel/support/types/custom'
 module MongoModel
   module Types
     CONVERTERS = Hash.new { |h, k| h[k] = Types::Custom.new(k) }
-    
+
     def self.register_converter(type, converter)
       CONVERTERS[type] = converter
     end
-    
+
     def self.converter_for(type)
       CONVERTERS[type]
     end

data/lib/mongomodel/support/types/array.rb

@@ -4,7 +4,7 @@ module MongoModel
       def to_mongo(array)
         array.map { |i| convert(i) } if array
       end
-      
+
       def to_query(value)
         convert(value)
       end

data/lib/mongomodel/support/types/boolean.rb

@@ -3,7 +3,7 @@ module MongoModel
     class Boolean < Object
       TRUE_VALUES = [ true, 'true', 't', 'TRUE', 'T', 'yes', 'YES', 'Y', 'y', '1', 1 ]
       FALSE_VALUES = [ false, 'false', 'f', 'FALSE', 'F', 'no', 'NO', 'N', 'n', '0', 0 ]
-      
+
       def cast(value)
         if true?(value)
           true
@@ -11,12 +11,12 @@ module MongoModel
           false
         end
       end
-    
+
     private
       def true?(value)
         TRUE_VALUES.include?(value)
       end
-      
+
       def false?(value)
         FALSE_VALUES.include?(value)
       end

data/lib/mongomodel/support/types/custom.rb

@@ -6,7 +6,7 @@ module MongoModel
       def initialize(type)
         @type = type
       end
-      
+
       def cast(value)
         if value.is_a?(@type)
           value
@@ -16,7 +16,7 @@ module MongoModel
           @type.new(value)
         end
       end
-      
+
       def to_mongo(value)
         if value.respond_to?(:to_mongo)
           value.to_mongo
@@ -24,7 +24,7 @@ module MongoModel
           value
         end
       end
-      
+
       def from_mongo(value)
         if @type.respond_to?(:from_mongo)
           value = value.with_indifferent_access if value.respond_to?(:with_indifferent_access)

data/lib/mongomodel/support/types/date.rb

@@ -14,11 +14,11 @@ module MongoModel
       rescue
         nil
       end
-      
+
       def to_mongo(value)
         value.strftime("%Y/%m/%d") if value
       end
-      
+
       def from_mongo(value)
         value.to_date if value
       end

data/lib/mongomodel/support/types/date_time.rb

@@ -18,34 +18,24 @@ module MongoModel
       rescue
         nil
       end
-      
+
       def to_mongo(value)
         to_time(value.utc) if value
       end
-      
+
       def from_mongo(t)
         ::DateTime.civil(t.year, t.month, t.day, t.hour, t.min, t.sec + Rational(t.usec, 1000000)) if t
       end
-    
+
     private
       # Define our own to_time method as DateTime.to_time in ActiveSupport may return
       # the DateTime object unchanged, whereas BSON expects an actual Time object.
       def to_time(dt)
-        ::Time.utc(dt.year, dt.month, dt.day, dt.hour, dt.min, dt.sec, sec_fraction(dt).to_f * 1000000)
+        ::Time.utc(dt.year, dt.month, dt.day, dt.hour, dt.min, dt.sec, dt.sec_fraction.to_f * 1000000)
       end
-      
-      def sec_fraction(dt)
-        if RUBY_VERSION <= "1.8.7"
-          # Ruby 1.8.7 DateTime#sec_fraction unit is in days
-          dt.sec_fraction * 86400
-        else
-          dt.sec_fraction
-        end
-      end
-      
+
       def round_microseconds(dt)
-        seconds = dt.sec + sec_fraction(dt)
-        dt.change(:sec => Rational((seconds * 1000).round, 1000))
+        ::DateTime.civil(dt.year, dt.month, dt.day, dt.hour, dt.min, dt.sec + Rational(dt.sec_fraction).truncate(3))
       end
     end
   end

data/lib/mongomodel/support/types/float.rb

@@ -8,7 +8,7 @@ module MongoModel
           Kernel::Float(value) rescue nil
         end
       end
-      
+
       def boolean(value)
         !value.zero?
       end

data/lib/mongomodel/support/types/hash.rb

@@ -9,7 +9,7 @@ module MongoModel
           result
         } if hash
       end
-      
+
       def from_mongo(hash)
         hash.with_indifferent_access if hash
       end

data/lib/mongomodel/support/types/integer.rb

@@ -2,20 +2,23 @@ module MongoModel
   module Types
     class Integer < Object
       def cast(value)
-        if value.nil?
-          nil
-        else
-          begin
-            Kernel::Integer(value)
-          rescue ArgumentError
-            Kernel::Float(value).to_i rescue nil
-          end
-        end
+        to_integer(value) if value
       end
-      
+
       def boolean(value)
         !value.zero?
       end
+
+      def from_mongo(value)
+        to_integer(value)
+      end
+
+    private
+      def to_integer(value)
+        Kernel::Integer(value)
+      rescue ArgumentError, TypeError
+        Kernel::Float(value).to_i rescue nil
+      end
     end
   end
 end

data/lib/mongomodel/support/types/object.rb

@@ -4,23 +4,23 @@ module MongoModel
       def cast(value)
         value
       end
-      
+
       def boolean(value)
         !value.blank?
       end
-      
+
       def to_mongo(value)
         value
       end
-      
+
       def from_mongo(value)
         value
       end
-      
+
       def to_query(value)
         to_mongo(cast(value))
       end
-    
+
     protected
       def convert(value)
         Types.converter_for(value.class).to_mongo(value)

data/lib/mongomodel/support/types/rational.rb

@@ -19,15 +19,15 @@ module MongoModel
           end
         end
       end
-      
+
       def from_mongo(value)
         rational_from_string(value)
       end
-      
+
       def to_mongo(value)
         value.to_s
       end
-    
+
     private
       if RUBY_VERSION >= '1.9.2'
         def rational_from_string(str)

data/lib/mongomodel/support/types/time.rb

@@ -22,11 +22,11 @@ module MongoModel
       rescue
         nil
       end
-      
+
       def to_mongo(value)
         value.utc if value
       end
-      
+
       def from_mongo(value)
         value.in_time_zone if value
       end

data/lib/mongomodel/version.rb

@@ -1,3 +1,3 @@
 module MongoModel
-  VERSION = "0.5.5"
+  VERSION = "0.5.6"
 end

data/lib/rails/generators/mongo_model/config/templates/mongomodel.yml

@@ -14,8 +14,7 @@ production:
   <<: *defaults
   database: <%= database %>_production
   # host:
-  # username: 
-  # password: 
-  # pool_size: 
+  # username:
+  # password:
+  # pool_size:
   # timeout:
-