mongoid_time_field 0.2.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 537b202c74ae99d9c2fe7564506bfc3acfced49d
-  data.tar.gz: ef56ebe5b5854312e4c4b663a49e5332c53bbe8d
+  metadata.gz: 6b650d7bcdd423e0ebffe2899b18dbd171d4cc80
+  data.tar.gz: 97248e826c2dff4f57d3f8da3ecf053d3e425ead
 SHA512:
-  metadata.gz: 0f88679289a058e07f67ac5c1afc54c4590f7772916584372337ff55688827bd19d9f10bd01b204203e71498a1899e6ef6e57610658391070b8781b3d6bb52a3
-  data.tar.gz: 53f5e2d89037f2d43b7785975da46acaa7989238d245f166f5b9af130f6321cbc59b57401e4aca7eab3e709379282e2277ef3f009088ede5de30ccf7dbd07645
+  metadata.gz: ce9ca402375d3a586947fe46ffcb94761270efe95bf622f1cb539f446c727f20c07a92fd345f3c86546b55133bd2f56a7da7533019654b28a9626c543dd747c3
+  data.tar.gz: 1ce4f7fd8a957637379c9160ccdd0c03e32c0ffc9af7eddd6095ce805ab69f40033f2347b5c522b2d45b1750bf8db3274480cbff4ead98689c0c66a732a5ee96

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p195
+2.0.0-p353

data/lib/mongoid_time_field.rb

@@ -9,6 +9,12 @@ module Mongoid
   end
 end
 
+if Object.const_defined?("TimeValidator")
+  puts "[WARN] Mongoid Time Field: TimeValidator is already defined, not loading ours"
+else
+  require "mongoid_time_field/validator"
+end
+
 if Object.const_defined?("RailsAdmin")
   require 'rails_admin/adapters/mongoid'
   require 'rails_admin/config/fields/types/text'

data/lib/mongoid_time_field/validator.rb

@@ -0,0 +1,14 @@
+class TimeValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    unless options[:less_than].blank?
+      unless value < Mongoid::TimeField::Value.new(options[:less_than], value.format)
+        record.errors.add attribute, (options[:message] || "должно быть меньше #{options[:less_than]}") 
+      end
+    end
+    unless options[:greater_than].blank?
+      unless value > Mongoid::TimeField::Value.new(options[:greater_than], value.format)
+        record.errors.add attribute, (options[:message] || "должно быть больше #{options[:greater_than]}") 
+      end
+    end
+  end
+end

data/lib/mongoid_time_field/value.rb

@@ -18,6 +18,10 @@ module Mongoid::TimeField
       seconds.__bson_dump__(io, key)
     end
 
+    def format
+      @options[:format].dup
+    end
+
     def to_s
       if @seconds.nil?
         nil
@@ -73,6 +77,16 @@ module Mongoid::TimeField
       '"' + to_s + '"'
     end
 
+    def >(x)
+      raise ArgumentError, 'Argument is not Mongoid::TimeField::Value' unless x.is_a? Mongoid::TimeField::Value
+      @seconds > x.seconds
+    end
+
+    def <(x)
+      raise ArgumentError, 'Argument is not Mongoid::TimeField::Value' unless x.is_a? Mongoid::TimeField::Value
+      @seconds < x.seconds
+    end
+
     def coerce(something)
       [self, something]
     end

data/lib/mongoid_time_field/version.rb

@@ -1,3 +1,3 @@
 module MongoidTimeField
-  VERSION = "0.2.9"
+  VERSION = "0.3.0"
 end

data/spec/support/dummy_hhmm.rb

@@ -0,0 +1,6 @@
+class DummyHhmm
+  include Mongoid::Document
+
+  field :t, type: TimeField.new(format: 'HH:MM')
+  validates :t, time: { less_than: 24*60*60, greater_than: 0 }
+end

data/spec/v2_spec.rb

@@ -260,4 +260,31 @@ describe Mongoid::TimeField do
       dummy.save.should eq true
     end
   end
+
+  describe 'HH:MM' do
+    it 'stores properly' do
+      h = DummyHhmm.create!(t: '12:30')
+      h.t.should eq '12:30'
+      h.t.to_i.should eq ( (12 * 60) + 30) * 60
+      h.reload
+      h.t.should eq '12:30'
+      h.t.to_i.should eq ( (12 * 60) + 30) * 60
+    end
+
+    it 'validates' do
+      h = DummyHhmm.new(t: '24:30')
+      h.valid?.should be_false
+      h = DummyHhmm.new(t: '23:30')
+      h.valid?.should be_true
+    end
+  end
+
+  describe 'Value' do
+    it 'does compare' do
+      opt = {format: 'mm:SS'}
+      Mongoid::TimeField::Value.new(120, opt).to_s.should eq '2:00'
+      (Mongoid::TimeField::Value.new(120, opt) > Mongoid::TimeField::Value.new(119, opt)).should be_true
+    end
+
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_time_field
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-16 00:00:00.000000000 Z
+date: 2013-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -113,11 +113,13 @@ files:
 - lib/mongoid_time_field.rb
 - lib/mongoid_time_field/class_methods.rb
 - lib/mongoid_time_field/time_field.rb
+- lib/mongoid_time_field/validator.rb
 - lib/mongoid_time_field/value.rb
 - lib/mongoid_time_field/version.rb
 - mongoid_time_field.gemspec
 - spec/spec_helper.rb
 - spec/support/dummy_duration.rb
+- spec/support/dummy_hhmm.rb
 - spec/support/dummy_time.rb
 - spec/support/dummy_v2.rb
 - spec/support/dummy_validate.rb
@@ -144,13 +146,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Time field for Mongoid
 test_files:
 - spec/spec_helper.rb
 - spec/support/dummy_duration.rb
+- spec/support/dummy_hhmm.rb
 - spec/support/dummy_time.rb
 - spec/support/dummy_v2.rb
 - spec/support/dummy_validate.rb