greenwich 2.0.1 → 2.0.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    greenwich (2.0.1)
+    greenwich (2.0.2)
       activerecord (~> 3.0)
       activesupport (~> 3.0)
       tzinfo (~> 0.3)

data/lib/greenwich/conversion.rb

@@ -20,7 +20,7 @@ module Greenwich
 
         define_method time_field do
           time_zone = Greenwich::Utilities.get_time_zone(self, time_zone_field)
-          time      = read_attribute(utc_time_field)
+          time      = send(utc_time_field)
           time      = time.in_time_zone(time_zone) if time && time_zone
 
           time
@@ -60,7 +60,7 @@ module Greenwich
 
           associated_time_fields.each do |time_field|
             if greenwich_time_field_needs_conversion?(time_field, name)
-              send("#{time_field}=".to_sym, read_attribute("#{time_field}_utc"))
+              send("#{time_field}=".to_sym, send("#{time_field}_utc"))
 
               greenwich_time_fields_converted["#{time_field}_utc"] = true
             end
@@ -80,7 +80,7 @@ module Greenwich
   private
     def greenwich_time_field_needs_conversion?(time_field, time_zone_field)
       (send("#{time_zone_field}_was".to_sym).nil? || send("#{time_field}_utc_was").nil?) &&
-        read_attribute("#{time_field}_utc").present? &&
+        send("#{time_field}_utc").present? &&
         self.greenwich_time_fields_converted["#{time_field}_utc"].nil?
     end
   end

data/lib/greenwich/version.rb

@@ -1,3 +1,3 @@
 module Greenwich
-  VERSION = "2.0.1"
+  VERSION = '2.0.2'
 end

data/spec/conversion_spec.rb

@@ -1,26 +1,8 @@
 require 'spec_helper'
 
-root = File.expand_path(File.join(File.dirname(__FILE__), '../..'))
-db_root = File.join(root, 'db')
-
-Dir.mkdir(db_root) unless File.exists?(db_root)
-ActiveRecord::Base.establish_connection(:adapter => 'sqlite3',
-                                        :database => "#{db_root}/conversion.sqlite")
-
-ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS 'model_with_time_zones'")
-ActiveRecord::Base.connection.create_table(:model_with_time_zones) do |t|
-  t.datetime :started_at_utc
-  t.datetime :ended_at_utc
-  t.string   :time_zone
-end
-
 class ModelWithTimeZone < ActiveRecord::Base
   include Greenwich::Conversion
 
-  attr_accessible :started_at_utc,
-                  :ended_at_utc,
-                  :time_zone
-
   time_with_time_zone :started_at_utc, :time_zone => :time_zone
   time_with_time_zone :ended_at_utc,   :time_zone => :time_zone
 

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
-Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
-
+require 'sqlite3'
+require 'active_record'
 require 'greenwich'
+
+Dir[File.dirname(__FILE__) + '/support/**/*.rb'].each {|f| require f}

data/spec/support/active_record.rb

@@ -0,0 +1,25 @@
+test_db_root = File.expand_path('../../../tmp/', __FILE__)
+Dir.mkdir test_db_root unless Dir.exists? test_db_root
+
+SQLite3::Database.new "#{test_db_root}/test.db"
+
+ActiveRecord::Base.establish_connection(
+  :adapter  => 'sqlite3',
+  :database => 'tmp/test.db'
+)
+
+ActiveRecord::Base.connection.create_table(:model_with_time_zones) do |t|
+  t.datetime :started_at_utc
+  t.datetime :ended_at_utc
+  t.string   :time_zone
+end
+
+RSpec.configure do |config|
+  config.before(:each) do
+    ActiveRecord::Base.connection.execute 'DELETE FROM model_with_time_zones'
+  end
+
+  config.after(:suite) do
+    `rm -f ./tmp/test.db`
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: greenwich
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-18 00:00:00.000000000 Z
+date: 2012-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -200,6 +200,7 @@ files:
 - lib/greenwich/version.rb
 - spec/conversion_spec.rb
 - spec/spec_helper.rb
+- spec/support/active_record.rb
 - spec/support/focused.rb
 - spec/support/pending.rb
 - spec/utilities_spec.rb
@@ -231,6 +232,7 @@ summary: Allowing users to select dates with custom time zones since 2011.
 test_files:
 - spec/conversion_spec.rb
 - spec/spec_helper.rb
+- spec/support/active_record.rb
 - spec/support/focused.rb
 - spec/support/pending.rb
 - spec/utilities_spec.rb