date_time_attribute 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2Q3NWU3ZjQ5MTFmZGM1MzU3MTczMmUwNzViYTYxYzc1NThhNWMyOQ==
+    MDJjOGJhZWE1ODQ2ODZiNGU3NjNjODAzYzE0YzllNjU5Zjc5Y2U5Mw==
   data.tar.gz: !binary |-
-    MWFiYWRjMDhmNTkyMTcwNDVhMjRlNjIxM2E0NGRkMGMwMDgyMWU1OA==
+    MTBkZTY3NDE2NDkzNzBiMDc3YWExNGU0ZjQ4NDRjMDA2YmY5NWYxMg==
 SHA512:
   metadata.gz: !binary |-
-    ZTdkN2Y1MDg3OWU4NjJhN2FmOGI5Y2ExZDZkMGZmNmYwZjIzMTU0NDM1MTdl
-    NGU1YzUyYTViYzlkYjdmNDAwMWQ2NDA3YzA2ODFlNzBlM2Y5YTZmYmMzZjE5
-    NDJkZDZkNjRkZDA0ZTgxNTE1ZGQwMjI5OWQ3ZWJlMWMzNDI0OWM=
+    YzMwMWM5NWI3MmY4YzA3NmM3Y2EwNTRkMGZiZDc1ZjY1OTVlZDUzODE3ZGIx
+    ZjdiZmNjOWQ4MzBhYWNjNGFmMTgyZjk3NDkxY2YyMzU2ODE5OTc3ZjBiZDRm
+    NjE0ZjdhOTdiMGNhODc5NzcwYWI3M2MxODFjOGEzOWFiNGI2MWM=
   data.tar.gz: !binary |-
-    MDc5ZTRmOTk0Y2E3Zjg1YTcwZDc1NjBhNzFlMWEwMjY5MzlmY2IwM2ZhNGNi
-    NWU4MDcyMDNjYTBmMTQ5MmMwNjc1MjI0ZWU4NDMzYjVkNWI0YTJhMzNiMGJm
-    Nzc1MTJiYzQ2ZjViNjA4NDkwOWVjYzBlNjQ0N2Q3YmZkMjhmMmQ=
+    M2Q1NDNmZGE5Y2RjNzc2NmQ3YjI4Nzg4ODc2MDg5MzIwZjcyNGU5YTExYmI4
+    MDg5MjNjYzIwYmJjZDk1NWMwNThjYjQwODQwZGM1M2I5OTgyZjZmNmUyYzdm
+    NjFlMTIxOGJiNmE2YzliMDU1NjNkNzg3YTVlYWYxZDYzZGUxZDY=

data/.gitignore

@@ -18,3 +18,4 @@ doc
 .rvmrc
 Gemfile.lock
 .idea
+.ruby-version

data/Gemfile

@@ -1,9 +1,10 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 gemspec
 
 group :test do
-  gem "rspec"
+  gem 'rspec'
   gem 'coveralls', require: false
+  gem 'rake'
+  gem 'sqlite3'
 end
-

data/README.md

@@ -114,7 +114,7 @@ my_date_time = DateTimeAttribute::Container.new
 my_date_time.date_time           # => nil
 my_date_time.date = '2001-02-03'
 my_date_time.date_time           # => 2001-02-03 00:00:00 +0700
-my_date_time.dime = '10:00pm'
+my_date_time.time = '10:00pm'
 my_date_time.date_time           # => 2001-02-03 22:00:00 +0700
 
 # ...same as described above

data/date_time_attribute.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{date_time_attribute}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.date = %q{2013-11-22}
   s.authors = ["Sergei Zinin"]
@@ -20,4 +20,5 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'activesupport', ">= 3.0.0"
   s.add_development_dependency 'bundler'
+  s.add_development_dependency 'activerecord', ">= 4.0.2"
 end

data/lib/date_time_attribute.rb

@@ -4,7 +4,7 @@ require 'active_support/duration'
 require 'date_time_attribute/container'
 
 module DateTimeAttribute
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 
   extend ActiveSupport::Concern
 
@@ -53,12 +53,15 @@ module DateTimeAttribute
 
       attributes.each do |attribute|
         attribute = attribute.to_sym
+        is_active_record_attribute = respond_to?(:attribute_method?) && attribute_method?(attribute)
 
-        # ActiveRecord issue: https://rails.lighthouseapp.com/projects/8994/tickets/4317-inconsistent-method_defined-bevahiour
-        if !(method_defined?(attribute) || (respond_to?(:attribute_method?) && attribute_method?(attribute)))
-          attr_accessor attribute
+        # ActiveRecord lazy initialization issue: https://github.com/einzige/date_time_attribute/issues/2
+        if is_active_record_attribute && !attribute_methods_generated?
+          define_attribute_methods
         end
 
+        attr_accessor attribute unless method_defined?(attribute)
+
         define_method("#{attribute}_date") do
           in_time_zone(time_zone) do |time_zone|
             date_time_container(attribute).in_time_zone(time_zone).date

data/spec/active_record_spec.rb

@@ -0,0 +1,103 @@
+require 'spec_helper'
+
+describe DateTimeAttribute, ActiveRecord::Base, use_active_record: true do
+  before do
+    Time.zone = 'Pacific Time (US & Canada)'
+  end
+
+  context 'persisted record' do
+    subject(:target) { Model.create! }
+
+    it { should respond_to :created_at }
+    it { should respond_to :created_at_time }
+    it { should respond_to :created_at_date }
+
+    describe 'values' do
+      let(:created_at) { nil }
+      let(:date) { nil }
+      let(:time) { nil }
+      let(:time_zone) { nil }
+      subject(:date_time) { target.created_at }
+
+      before do
+        target.created_at = created_at
+        target.created_at_date = date
+        target.created_at_time = time
+        target.created_at_time_zone = time_zone
+      end
+
+      context 'nothing set' do
+        let(:created_at) { nil }
+        let(:date) { nil }
+        let(:time) { nil }
+
+        it { should be_nil }
+      end
+
+      context 'date_time set' do
+        let(:created_at) { Time.zone.now }
+        it { should_not be_nil }
+      end
+
+      context 'date_time reset to nil' do
+        let(:created_at) { nil }
+        let(:date) { '2001-02-03' }
+        let(:time) { '10:00pm' }
+
+        it { should_not be_nil }
+
+        context 'returning back to nil' do
+          before do
+            target.created_at = nil
+            target.created_at_date = nil
+          end
+
+          it { should be_nil }
+        end
+      end
+
+      context 'time set' do
+        let(:date) { nil }
+        let(:time) { '23:00' }
+
+        its(:year) { should == Time.zone.now.year }
+        its(:month) { should == Time.zone.now.month }
+        its(:day) { should == Time.zone.now.day }
+        its(:hour) { should == 23 }
+      end
+
+      context 'date set' do
+        let(:date) { '2001-02-03' }
+        let(:time) { nil }
+
+        its(:year) { should == 2001 }
+        its(:month) { should == 2 }
+        its(:day) { should == 3 }
+        its(:hour) { should == 0 }
+
+        context 'time set' do
+          let(:date) { '2001-02-03' }
+          let(:time) { '10:00pm' }
+
+          its(:year) { should == 2001 }
+          its(:month) { should == 2 }
+          its(:day) { should == 3 }
+          its(:hour) { should == 22 }
+
+          context 'timezone set explicitly' do
+            let(:time_zone) { 'Krasnoyarsk' }
+
+            its(:year) { should == 2001 }
+            its(:month) { should == 2 }
+            its(:day) { should == 3 }
+            its(:hour) { should == 22 }
+
+            specify do
+              subject.time_zone.name.should == 'Krasnoyarsk'
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/date_time_attribute/container_spec.rb

@@ -23,7 +23,7 @@ describe DateTimeAttribute::Container do
       target.time = time
     end
 
-    context "nothing set" do
+    context 'nothing set' do
       let(:date_time) { nil }
       let(:date) { nil }
       let(:time) { nil }
@@ -31,7 +31,7 @@ describe DateTimeAttribute::Container do
       its(:date_time) { should be_nil }
     end
 
-    context "time set" do
+    context 'time set' do
       let(:date) { nil }
       let(:time) { '23:00' }
 
@@ -41,7 +41,7 @@ describe DateTimeAttribute::Container do
       its(:hour) { should == 23 }
     end
 
-    context "date set" do
+    context 'date set' do
       let(:date) { '2001-02-03' }
       let(:time) { nil }
 
@@ -53,7 +53,7 @@ describe DateTimeAttribute::Container do
         subject.hour.should == 0
       end
 
-      context "time set" do
+      context 'time set' do
         let(:date) { '2001-02-03' }
         let(:time) { '10:00pm' }
 
@@ -62,7 +62,7 @@ describe DateTimeAttribute::Container do
         its(:day) { should == 3 }
         its(:hour) { should == 22 }
 
-        context "non string values" do
+        context 'non string values' do
           let(:date) { Date.new(2001, 02, 03) }
           let(:time) { Time.new(2001, 02, 03, 04, 05) }
 
@@ -72,7 +72,7 @@ describe DateTimeAttribute::Container do
           its(:hour) { should == 4 }
         end
 
-        context "time zone set" do
+        context 'time zone set' do
           its(:year) { should == 2001 }
           its(:month) { should == 2 }
 
@@ -88,7 +88,7 @@ describe DateTimeAttribute::Container do
             expect { subject.time_zone = 'Moscow' }.to change { subject.hour }.from(22).to(9)
           end
 
-          context "different environment timezone set" do
+          context 'different environment timezone set' do
             before do
               Time.zone = 'Krasnoyarsk'
             end

data/spec/date_time_attribute_spec.rb

@@ -5,7 +5,7 @@ describe DateTimeAttribute do
     Time.zone = 'Pacific Time (US & Canada)'
   end
 
-  describe ".parser" do
+  describe '.parser' do
     its(:parser) { should == Time.zone }
   end
 
@@ -26,7 +26,7 @@ describe DateTimeAttribute do
     it { should respond_to :created_at_time }
     it { should respond_to :created_at_date }
 
-    describe "values" do
+    describe 'values' do
       let(:due_at) { nil }
       let(:date) { nil }
       let(:time) { nil }
@@ -40,7 +40,7 @@ describe DateTimeAttribute do
         target.due_at_time_zone = time_zone
       end
 
-      context "nothing set" do
+      context 'nothing set' do
         let(:due_at) { nil }
         let(:date) { nil }
         let(:time) { nil }
@@ -48,19 +48,19 @@ describe DateTimeAttribute do
         it { should be_nil }
       end
 
-      context "date_time set" do
+      context 'date_time set' do
         let(:due_at) { Time.zone.now }
         it { should_not be_nil }
       end
 
-      context "date_time reset to nil" do
+      context 'date_time reset to nil' do
         let(:due_at) { nil }
         let(:date) { '2001-02-03' }
         let(:time) { '10:00pm' }
 
         it { should_not be_nil }
 
-        context "returning back to nil" do
+        context 'returning back to nil' do
           before do
             target.due_at = nil
             target.due_at_date = nil
@@ -70,7 +70,7 @@ describe DateTimeAttribute do
         end
       end
 
-      context "time set" do
+      context 'time set' do
         let(:date) { nil }
         let(:time) { '23:00' }
 
@@ -80,7 +80,7 @@ describe DateTimeAttribute do
         its(:hour) { should == 23 }
       end
 
-      context "date set" do
+      context 'date set' do
         let(:date) { '2001-02-03' }
         let(:time) { nil }
 
@@ -89,7 +89,7 @@ describe DateTimeAttribute do
         its(:day) { should == 3 }
         its(:hour) { should == 0 }
 
-        context "time set" do
+        context 'time set' do
           let(:date) { '2001-02-03' }
           let(:time) { '10:00pm' }
 
@@ -98,7 +98,7 @@ describe DateTimeAttribute do
           its(:day) { should == 3 }
           its(:hour) { should == 22 }
 
-          context "timezone set explicitly" do
+          context 'timezone set explicitly' do
             let(:time_zone) { 'Krasnoyarsk' }
 
             its(:year) { should == 2001 }
@@ -111,7 +111,7 @@ describe DateTimeAttribute do
             end
           end
 
-          context "time zone set on attribute" do
+          context 'time zone set on attribute' do
             let(:dummy_class) do
               Class.new do
                 include DateTimeAttribute
@@ -128,7 +128,7 @@ describe DateTimeAttribute do
               subject.time_zone.name.should == 'Moscow'
             end
 
-            context "timezone set explicitly" do
+            context 'timezone set explicitly' do
               let(:time_zone) { 'Krasnoyarsk' }
 
               its(:year) { should == 2001 }
@@ -141,7 +141,7 @@ describe DateTimeAttribute do
               end
             end
 
-            context "different timezone set" do
+            context 'different timezone set' do
               before do
                 Time.zone = 'Krasnoyarsk'
               end
@@ -156,7 +156,7 @@ describe DateTimeAttribute do
               end
             end
 
-            context "timezone proc given" do
+            context 'timezone proc given' do
               let(:dummy_class) do
                 Class.new do
                   include DateTimeAttribute
@@ -174,7 +174,7 @@ describe DateTimeAttribute do
               end
             end
 
-            context "timezone method given" do
+            context 'timezone method given' do
               let(:dummy_class) do
                 Class.new do
                   include DateTimeAttribute
@@ -196,7 +196,7 @@ describe DateTimeAttribute do
               end
             end
 
-            context "nil timezone" do
+            context 'nil timezone' do
               let(:dummy_class) do
                 Class.new do
                   include DateTimeAttribute

data/spec/spec_helper.rb

@@ -1,9 +1,20 @@
-if ENV['COVERALLS_CONFIG'] != 'nocoveralls'
-  require 'coveralls'
-  Coveralls.wear!
-end
-
 require 'date_time_attribute'
+require 'active_record'
+
+shared_context 'use active record', use_active_record: true do
+  ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
+
+  ActiveRecord::Schema.define do
+    create_table 'models' do |table|
+      table.column :created_at, :datetime
+    end
+  end
+
+  class Model < ActiveRecord::Base
+    include DateTimeAttribute
+    date_time_attribute :created_at
+  end
+end
 
 RSpec.configure do |config|
   config.mock_with :rspec

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: date_time_attribute
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Sergei Zinin
@@ -38,6 +38,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.2
 description: Allows to assign date and time attributes separately for a DateTime attribute
   in your model instance. Plays with time zones as well.
 email: szinin@gmail.com
@@ -55,6 +69,7 @@ files:
 - date_time_attribute.gemspec
 - lib/date_time_attribute.rb
 - lib/date_time_attribute/container.rb
+- spec/active_record_spec.rb
 - spec/date_time_attribute/container_spec.rb
 - spec/date_time_attribute_spec.rb
 - spec/spec_helper.rb