mongoid_time_field 0.1.0 → 0.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 675c1a0fb1ddddd399518a3984b3575f5203186e
+  data.tar.gz: 254095769b5f2c6cb8b67889d2e9e7aea3211c05
+SHA512:
+  metadata.gz: 54b63521baaccff3b95eb6d7075d6ae58e0e342ea95c87d710a380a439c8adfa7af5983e1ce7fd15279bbb9692afc1a6b0fa0b2eef05f001984251541d0c4182
+  data.tar.gz: 93944c906019a1a619b3cc77fd35f592112f7b9645d0b46da9c1402d563e84c5c72da52b84eb41e865db67335f5d6277a9cf43962c018c8d12149e1bbf6205c0

data/.gitignore

@@ -0,0 +1,17 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/.ruby-gemset

@@ -0,0 +1 @@
+time_field

data/.ruby-version

@@ -0,0 +1 @@
+2.0.0-p195

data/Gemfile

@@ -1,12 +1,4 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
-gem 'mongoid'
-
-group :development do
-  gem "rspec", "~> 2.8.0"
-  gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.8.3"
-  gem "simplecov", '>= 0.4.0', :require => false
-  gem "database_cleaner"
-end
+# Specify your gem's dependencies in mongoid_time_field.gemspec
+gemspec

data/Gemfile.lock

@@ -1,56 +1,52 @@
+PATH
+  remote: .
+  specs:
+    mongoid_time_field (0.2.1)
+      mongoid (>= 3.0.0)
+
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    activemodel (3.2.2)
-      activesupport (= 3.2.2)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activesupport (3.2.2)
-      i18n (~> 0.6)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
-    bson (1.6.1)
-    builder (3.0.0)
-    database_cleaner (0.7.1)
-    diff-lcs (1.1.3)
-    git (1.2.5)
-    i18n (0.6.0)
-    jeweler (1.8.3)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-      rdoc
-    json (1.6.5)
-    mongo (1.6.1)
-      bson (~> 1.6.1)
-    mongoid (2.4.6)
-      activemodel (~> 3.1)
-      mongo (~> 1.3)
+    builder (3.0.4)
+    database_cleaner (1.0.1)
+    diff-lcs (1.2.4)
+    i18n (0.6.1)
+    mongoid (3.1.4)
+      activemodel (~> 3.2)
+      moped (~> 1.4)
+      origin (~> 1.0)
       tzinfo (~> 0.3.22)
-    multi_json (1.1.0)
-    rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    simplecov (0.6.1)
+    moped (1.5.0)
+    multi_json (1.7.6)
+    origin (1.1.0)
+    rake (10.0.4)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    simplecov (0.7.1)
       multi_json (~> 1.0)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
-    tzinfo (0.3.32)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
+  bundler
   database_cleaner
-  jeweler (~> 1.8.3)
-  mongoid
-  rdoc (~> 3.12)
-  rspec (~> 2.8.0)
-  simplecov (>= 0.4.0)
+  mongoid_time_field!
+  rake
+  rspec
+  simplecov

data/LICENSE.txt

@@ -1,4 +1,6 @@
-Copyright (c) 2012 glebtv
+Copyright (c) 2013 glebtv
+
+MIT License
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -7,21 +7,18 @@ Simple gem to store minutes+seconds or hours+minutes in one integer field in mon
 Include the gem in your Gemfile
 
     gem 'mongoid_time_field'
-    
+
 == Usage
 
     class DummyTime
       include Mongoid::Document
-      include Mongoid::TimeField
-      
-      field :description
-      
-      time_field :open, :close
 
+      field :worktime, type: TimeField.new(format: 'HH:MM')
+      field :time_of_day, type: TimeField.new(format: 'HH:MM:SS')
+      field :duration, type: TimeField.new(format: 'mm:SS')
     end
-    
-All time values are converted and stored in mongodb as seconds.
 
+All time values are converted and stored in mongodb as seconds.
 
 == Contributing to mongoid_time_field
  
@@ -35,6 +32,5 @@ All time values are converted and stored in mongodb as seconds.
 
 == Copyright
 
-Copyright (c) 2012 glebtv. See LICENSE.txt for
-further details.
+Copyright (c) 2012-2013 glebtv. See LICENSE.txt for further details.
 

data/Rakefile

@@ -1,49 +1 @@
-# encoding: utf-8
-
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "mongoid_time_field"
-  gem.homepage = "http://github.com/glebtv/mongoid_time_field"
-  gem.license = "MIT"
-  gem.summary = %Q{hh:mm or mm:ss time field for mongoid}
-  gem.description = %Q{hh:mm or mm:ss time field for mongoid}
-  gem.email = "glebtv@gmail.com"
-  gem.authors = ["glebtv"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-end
-
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :default => :spec
-
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "mongoid_time_field #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require "bundler/gem_tasks"

data/lib/mongoid_time_field.rb

@@ -1,57 +1,10 @@
+require "mongoid_time_field/version"
+require "mongoid_time_field/time_field"
+
 module Mongoid
   module TimeField
     extend ActiveSupport::Concern
-    module ClassMethods
-      def time_field(*columns)
-        [columns].flatten.each do |name|
-          attr = name.to_sym
-          name_minutes = (name.to_s + '_minutes').to_sym
-
-          field attr, type: Integer
-
-          define_method(name) do
-            minutes = read_attribute(attr)
-            if minutes.nil?
-              nil
-            else
-              hours = (minutes / 60).to_i
-              sprintf("%d:%02d", hours, (minutes - 60 * hours))
-            end
-          end
-
-          define_method("#{name}=") do |value|
-            if value.blank?
-              write_attribute(attr, nil)
-              nil
-            else
-              hours, minutes = value.split(/:/)
-              val = minutes.to_i + (hours.to_i * 60)
-              write_attribute(attr, val)
-              value
-            end
-          end
-
-          define_method(name_minutes) do
-            minutes = read_attribute(attr)
-            if minutes.nil?
-              nil
-            else
-              minutes
-            end
-          end
-
-          define_method("#{name_minutes}=") do |value|
-            if value.blank?
-              write_attribute(attr, nil)
-              nil
-            else
-              write_attribute(attr, value.to_i)
-              value.to_i
-            end
-          end
-
-        end
-      end
-    end
+    autoload :ClassMethods, 'mongoid_time_field/class_methods'
+    autoload :Value,        'mongoid_time_field/value'
   end
 end

data/lib/mongoid_time_field/class_methods.rb

@@ -0,0 +1,24 @@
+module Mongoid::TimeField
+  module ClassMethods
+    # @deprecated
+    def time_field(*columns)
+      [columns].flatten.each do |name|
+        attr = name.to_sym
+        name_minutes = (name.to_s + '_minutes').to_sym
+
+        field attr, type: TimeField.new(format: 'mm:SS')
+
+        # we treat minutes as seconds for compatibility with v0.1.0
+        # TODO: Remove this later
+        define_method(name_minutes) do
+          v = send(attr)
+          v.nil? ? nil : v.seconds
+        end
+
+        define_method("#{name_minutes}=") do |value|
+          send(name.to_s + '=', Mongoid::TimeField::Value.new(value))
+        end
+      end
+    end
+  end
+end

data/lib/mongoid_time_field/time_field.rb

@@ -0,0 +1,68 @@
+class TimeField
+  def initialize(options = {})
+    @options = options
+
+    @options[:format] = 'mm:SS' unless options[:format]
+    @options[:regexp] = build_regexp(options[:format]) unless options[:regexp]
+  end
+
+  def build_regexp(format)
+    s = '^' + Regexp.escape(format) + '$'
+    s.gsub!(':', ':?')
+    s.gsub!('-', '-?')
+    s.gsub!('_', '_?')
+
+    s.gsub!('HH', '(?<h>\d*?)')
+    s.gsub!('hh', '(?<h>\d*?)')
+    s.gsub!('MM', '(?<m>\d*)')
+    s.gsub!('mm', '(?<m>\d*)')
+    s.gsub!('SS', '(?<s>\d*)')
+    Regexp.new(s)
+  end
+
+  def parse(value)
+    if value.blank?
+      nil
+    else
+      match = @options[:regexp].match(value)
+      seconds = 0
+      names = match.names
+
+      seconds += match['s'].to_i        if names.include?('s')
+      seconds += match['m'].to_i * 60   if names.include?('m')
+      seconds += match['h'].to_i * 3600 if names.include?('h')
+
+      Mongoid::TimeField::Value.new(seconds, @options)
+    end
+  end
+
+  # Get the object as it was stored in the database, and instantiate
+  # this custom class from it.
+  def demongoize(object)
+    if object.nil?
+      nil
+    else
+      Mongoid::TimeField::Value.new(object, @options)
+    end
+  end
+
+  # Takes any possible object and converts it to how it would be
+  # stored in the database.
+  def mongoize(object)
+    case object
+    when Mongoid::TimeField::Value then object.mongoize
+    when String then parse(object).mongoize
+    else object
+    end
+  end
+
+  # Converts the object that was supplied to a criteria and converts it
+  # into a database friendly form.
+  def evolve(object)
+    case object
+    when String then parse(object).mongoize
+    when Mongoid::TimeField::Value then object.mongoize
+    else object
+    end
+  end
+end

data/lib/mongoid_time_field/value.rb

@@ -0,0 +1,77 @@
+module Mongoid::TimeField
+  class Value
+    attr_accessor :seconds
+
+    def initialize(seconds, options = {})
+      if seconds.blank?
+        @seconds = nil
+      else
+        @seconds = seconds
+      end
+
+      @options = options
+    end
+
+    def to_s
+      # @seconds.nil? ? nil : Time.at(@seconds).utc.strftime(@options[:strftime])
+
+      if @seconds.nil?
+        nil
+      else
+        format = @options[:format]
+
+        fm, ss = @seconds.divmod(60)
+        hh, mm = fm.divmod(60)
+
+        if format.match(/hh/i).nil?
+          replaces = {
+            'mm' => fm,
+            'MM' => fm.to_s.rjust(2, '0'),
+            'SS' => ss.to_s.rjust(2, '0'),
+          }
+          format.gsub(/(mm|MM|SS)/) do |match|
+            replaces[match]
+          end
+        else
+          replaces = {
+            'hh' => hh,
+            'HH' => hh.to_s.rjust(2, '0'),
+            'mm' => mm,
+            'MM' => mm.to_s.rjust(2, '0'),
+            'SS' => ss.to_s.rjust(2, '0'),
+          }
+          format.gsub(/(hh|HH|mm|MM|SS)/) do |match|
+            replaces[match]
+          end
+        end
+      end
+    end
+    alias_method :to_str, :to_s
+
+    def minutes
+      @seconds / 60
+    end
+
+    def mongoize
+      @seconds
+    end
+
+    def inspect
+      '"' + to_s + '"'
+    end
+
+    def coerce(something)
+      [self, something]
+    end
+
+    def ==(something)
+      if seconds === something
+        true
+      elsif to_s === something
+        true
+      else
+        false
+      end
+    end
+  end
+end

data/lib/mongoid_time_field/version.rb

@@ -0,0 +1,3 @@
+module MongoidTimeField
+  VERSION = "0.2.1"
+end

data/mongoid_time_field.gemspec

@@ -1,71 +1,28 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'mongoid_time_field/version'
 
-Gem::Specification.new do |s|
-  s.name = "mongoid_time_field"
-  s.version = "0.1.0"
+Gem::Specification.new do |spec|
+  spec.name          = "mongoid_time_field"
+  spec.version       = MongoidTimeField::VERSION
+  spec.authors       = ["glebtv"]
+  spec.email         = ["glebtv@gmail.com"]
+  spec.description   = %q{Time field (stored as integer with no date) for Mongoid}
+  spec.summary       = %q{Time field for Mongoid}
+  spec.homepage      = "http://github.com/glebtv/mongoid_time_field"
+  spec.license       = "MIT"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["glebtv"]
-  s.date = "2012-03-18"
-  s.description = "hh:mm or mm:ss time field for mongoid"
-  s.email = "glebtv@gmail.com"
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    ".rvmrc",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "lib/mongoid_time_field.rb",
-    "mongoid_time_field.gemspec",
-    "spec/spec_helper.rb",
-    "spec/support/dummy_time.rb",
-    "spec/time_spec.rb"
-  ]
-  s.homepage = "http://github.com/glebtv/mongoid_time_field"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.15"
-  s.summary = "hh:mm or mm:ss time field for mongoid"
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  spec.add_runtime_dependency 'mongoid', [">= 3.0.0"]
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongoid>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_development_dependency(%q<simplecov>, [">= 0.4.0"])
-      s.add_development_dependency(%q<database_cleaner>, [">= 0"])
-    else
-      s.add_dependency(%q<mongoid>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_dependency(%q<simplecov>, [">= 0.4.0"])
-      s.add_dependency(%q<database_cleaner>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<mongoid>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-    s.add_dependency(%q<simplecov>, [">= 0.4.0"])
-    s.add_dependency(%q<database_cleaner>, [">= 0"])
-  end
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'database_cleaner'
 end
-

data/spec/spec_helper.rb

@@ -14,10 +14,10 @@ require 'mongoid_time_field'
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
-
-
-Mongoid.config.master = Mongo::Connection.new.db("mongoid_time_field_test")
-Mongoid.logger = Logger.new($stdout)
+Mongoid.configure do |config|
+  ENV["MONGOID_ENV"] = "test"
+  Mongoid.load!("spec/support/mongoid.yml")
+end
 
 DatabaseCleaner.orm = "mongoid"
 

data/spec/support/dummy_duration.rb

@@ -0,0 +1,7 @@
+class DummyDuration
+  include Mongoid::Document
+
+  field :description
+
+  field :duration, type: TimeField.new(format: 'MM:SS')
+end

data/spec/support/dummy_time.rb

@@ -1,9 +1,8 @@
 class DummyTime
   include Mongoid::Document
   include Mongoid::TimeField
-  
+
   field :description
-  
-  time_field :open, :close
 
+  time_field :open, :close
 end

data/spec/support/dummy_v2.rb

@@ -0,0 +1,12 @@
+class DummyV2
+  include Mongoid::Document
+
+  field :description
+
+  field :open, type: TimeField.new(format: "hh:MM")
+  field :close, type: TimeField.new(format: 'hh:MM')
+
+  field :worktime, type: TimeField.new(format: 'HH:MM')
+  field :time_of_day, type: TimeField.new(format: 'HH:MM:SS')
+  field :duration, type: TimeField.new(format: 'mm:SS')
+end

data/spec/support/mongoid.yml

@@ -0,0 +1,8 @@
+test:
+  sessions:
+    default:
+      database: mongoid_time_field
+      hosts:
+        - localhost:27017
+      options:
+        consistency: :strong

data/spec/{time_spec.rb → v1_spec.rb}

@@ -1,22 +1,24 @@
 require 'spec_helper'
 
 describe Mongoid::TimeField do
-  
+
   describe 'when persisting a document with a TimeField datatype' do
-  
+
     it 'should be persisted normally' do
       dummy = DummyTime.new
       dummy.open = '10:00'
       dummy.save.should eq true
     end
-    
+
     it 'should fix bad time values' do
       dummy = DummyTime.new
       dummy.open = '10:61'
       dummy.save.should eq true
+
+      dummy = DummyTime.first
       dummy.open.should eq '11:01'
     end
-    
+
     it 'should handle blank values set as time' do
       dummy = DummyTime.new
       dummy.open = ''
@@ -32,19 +34,19 @@ describe Mongoid::TimeField do
       dummy.open.should be_nil
       dummy.open_minutes.should be_nil
     end
-    
+
   end
-  
+
   describe 'when accessing a document from the datastore with a TimeField datatype' do
     before(:each) do
       DummyTime.create(:description => "Test", :open => '12:34')
     end
-    
+
     it 'should have a time field value that matches the TimeField value that was initially persisted' do
       dummy = DummyTime.first
       dummy.open.should eq '12:34'
     end
-    
+
     it 'should have a minutes field value equal to what was initially persisted as time' do
       dummy = DummyTime.first
       dummy.open_minutes.should eq 754
@@ -55,24 +57,24 @@ describe Mongoid::TimeField do
     before(:each) do
       DummyTime.create(:description => "Test", :open_minutes => 754)
     end
-    
+
     it 'should have a time field value that matches the TimeField value that was initially persisted' do
       dummy = DummyTime.first
       dummy.open.should eq '12:34'
     end
-    
+
     it 'should have a minutes field value equal to what was initially persisted as time' do
       dummy = DummyTime.first
       dummy.open_minutes.should eq 754
     end
   end
 
-  
+
   describe 'when accessing a document from the datastore with a TimeField datatype and empty value' do
     before(:each) do
       DummyTime.create(:description => "Test")
     end
-    
+
     it 'should have a TimeField value of 0' do
       dummy = DummyTime.first
       dummy.open.should be_nil
@@ -83,7 +85,7 @@ describe Mongoid::TimeField do
     before(:each) do
       DummyTime.create(description: "Test", open: '1:23', close: '2:33')
     end
-    
+
     it 'should have correct TimeField value for field 1' do
       dummy = DummyTime.first
       dummy.open.should eq '1:23'

data/spec/v2_spec.rb

@@ -0,0 +1,175 @@
+require 'spec_helper'
+
+describe Mongoid::TimeField do
+  describe 'compatibility with v0.1.0' do
+    it 'should store minutes as seconds' do
+      dummy = DummyTime.new
+      dummy.open = '10:00'
+      dummy.save.should eq true
+      dummy.open_minutes.should eq 600
+
+      dummy = DummyTime.first
+      dummy.read_attribute(:open).should eq 600
+      dummy.open_minutes.should eq 600
+    end
+  end
+
+  describe 'datatype' do
+
+    it 'is persisted normally' do
+      dummy = DummyV2.new
+      dummy.open = '10:00'
+      dummy.save.should eq true
+    end
+
+    it 'allows querying' do
+      DummyV2.create!(open: '10:00')
+      second = DummyV2.create!(open: '10:05')
+      last = DummyV2.create!(open: '11:00')
+      DummyV2.where(open: {'$gt' => 10 * 3600 + 5 * 60 }).count.should eq 1
+      DummyV2.where(open: {'$gt' => '10:05'}).count.should eq 1
+      DummyV2.where(open: '10:05').first.id.should eq second.id
+      DummyV2.where(open: '11:00').first.id.should eq last.id
+      DummyV2.where(open: last.open).first.id.should eq last.id
+    end
+
+    it 'has proper inspect' do
+      dummy = DummyV2.new
+      dummy.open = '10:00'
+      dummy.open.inspect.should eq '"10:00"'
+    end
+
+    it 'allows setting seconds' do
+      dummy = DummyV2.new
+      dummy.open = 20 * 60
+      dummy.open.should eq '0:20'
+    end
+
+    it 'has proper comparsion and coercion for strings and integers' do
+      dummy = DummyV2.new
+      dummy.open = '10:00'
+      (dummy.open == '10:00').should be_true
+      (dummy.open == (10*60*60)).should be_true
+      (dummy.open == (10*60*60 + 1)).should be_false
+      ('10:00' == dummy.open).should be_true
+      ((10*60*60) == dummy.open).should be_true
+      ((10*60*60 + 1) == dummy.open).should be_false
+    end
+
+    it 'fixes bad time values' do
+      dummy = DummyV2.new
+      dummy.open = '10:61'
+      dummy.save.should eq true
+      dummy.open.should eq '11:01'
+    end
+
+    it 'handles blank values set as time' do
+      dummy = DummyV2.new
+      dummy.open = ''
+      dummy.save.should eq true
+      dummy.open.should be_nil
+    end
+  end
+
+  describe 'loading from DB' do
+    before(:each) do
+      DummyV2.create(:description => "Test", :open => '12:34')
+    end
+
+    it 'has same value' do
+      dummy = DummyV2.first
+      dummy.open.should eq '12:34'
+    end
+
+    it 'has proper minutes and seconds' do
+      dummy = DummyV2.first
+      dummy.open.minutes.should eq 754
+      dummy.open.seconds.should eq (754*60)
+    end
+  end
+
+  describe 'empty value' do
+    before(:each) do
+      DummyV2.create(:description => "Test")
+    end
+
+    it 'should have a TimeField value of 0' do
+      dummy = DummyV2.first
+      dummy.open.should be_nil
+    end
+  end
+
+  describe 'multiple' do
+    before(:each) do
+      DummyV2.create(description: "Test", open: '1:23', close: '2:33')
+    end
+
+    it 'should have correct TimeField value for field 1' do
+      dummy = DummyV2.first
+      dummy.open.should eq '1:23'
+    end
+    it 'should have correct TimeField value for field 2' do
+      dummy = DummyV2.first
+      dummy.close.should eq '2:33'
+    end
+  end
+
+  describe 'formats' do
+    it 'works with HH:MM' do
+      dummy = DummyV2.new
+      dummy.worktime = '1:00'
+      dummy.save.should eq true
+      dummy.worktime.should eq '01:00'
+    end
+
+    it 'works with HH:MM:SS' do
+      dummy = DummyV2.new
+      dummy.time_of_day = '1:00'
+      dummy.save.should eq true
+      dummy.time_of_day.should eq '00:01:00'
+      dummy.time_of_day.seconds.should eq 60
+      dummy.time_of_day.minutes.should eq 1
+    end
+
+    it 'works with mm:SS' do
+      dummy = DummyV2.new
+      dummy.duration = '1:00'
+      dummy.save.should eq true
+      dummy.duration.should eq '1:00'
+      dummy.duration.seconds.should eq 60
+      dummy.duration.minutes.should eq 1
+    end
+
+    it 'mm:SS handles more minutes' do
+      dummy = DummyV2.new
+      dummy.duration = '120:00'
+      dummy.save.should eq true
+      dummy.duration.should eq '120:00'
+      dummy.duration.seconds.should eq (120 * 60)
+      dummy.duration.minutes.should eq 120
+    end
+
+    it 'HH:MM handles more hours' do
+      dummy = DummyV2.new
+      dummy.worktime = '121:00'
+      dummy.save.should eq true
+      dummy.worktime.should eq '121:00'
+    end
+
+    it 'HH:MM:SS handles more hours' do
+      dummy = DummyV2.new
+      dummy.time_of_day = '120:00:00'
+      dummy.save.should eq true
+      dummy.time_of_day.should eq '120:00:00'
+      dummy.time_of_day.minutes.should eq (120 * 60)
+    end
+
+    it 'HH:MM:SS normalizes' do
+      dummy = DummyV2.new
+      dummy.time_of_day = '1:70:00'
+      dummy.save.should eq true
+      dummy.time_of_day.should eq '02:10:00'
+      dummy.time_of_day.minutes.should eq (130)
+    end
+  end
+end

metadata

@@ -1,141 +1,157 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_time_field
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.2.1
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-18 00:00:00.000000000 Z
+date: 2013-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &75414110 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *75414110
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &75429980 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.8.0
-  type: :development
-  prerelease: false
-  version_requirements: *75429980
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &75429360 !ruby/object:Gem::Requirement
-    none: false
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75429360
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &75428920 !ruby/object:Gem::Requirement
-    none: false
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75428920
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &75428470 !ruby/object:Gem::Requirement
-    none: false
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75428470
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &75427890 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75427890
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &75427470 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75427470
-description: hh:mm or mm:ss time field for mongoid
-email: glebtv@gmail.com
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Time field (stored as integer with no date) for Mongoid
+email:
+- glebtv@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE.txt
-- README.rdoc
+extra_rdoc_files: []
 files:
-- .document
+- .gitignore
 - .rspec
-- .rvmrc
+- .ruby-gemset
+- .ruby-version
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.rdoc
 - Rakefile
-- VERSION
 - lib/mongoid_time_field.rb
+- lib/mongoid_time_field/class_methods.rb
+- lib/mongoid_time_field/time_field.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_time.rb
-- spec/time_spec.rb
+- spec/support/dummy_v2.rb
+- spec/support/mongoid.yml
+- spec/v1_spec.rb
+- spec/v2_spec.rb
 homepage: http://github.com/glebtv/mongoid_time_field
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -523699249
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
-summary: hh:mm or mm:ss time field for mongoid
-test_files: []
+specification_version: 4
+summary: Time field for Mongoid
+test_files:
+- spec/spec_helper.rb
+- spec/support/dummy_duration.rb
+- spec/support/dummy_time.rb
+- spec/support/dummy_v2.rb
+- spec/support/mongoid.yml
+- spec/v1_spec.rb
+- spec/v2_spec.rb

data/.document

@@ -1,5 +0,0 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt

data/.rvmrc

@@ -1 +0,0 @@
-rvm use ruby-1.9.3-p125@timefield --create

data/VERSION

@@ -1 +0,0 @@
-0.1.0