active_nomad 0.2.2 → 0.2.3

data/CHANGELOG

@@ -1,3 +1,10 @@
+== 0.2.3 2010-10-12
+
+ * #inspect no longer requires a database connection.
+ * ActiveRecord::Base.default_timezone support.
+ * Dirty attribute tracking works.
+ * Undeclared attributes are preserved when roundtripped through ActiveNomad.
+
 == 0.2.2 2010-10-07
 
  * Support custom destruction strategies.

data/lib/active_nomad/version.rb

@@ -1,5 +1,5 @@
 module ActiveNomad
-  VERSION = [0, 2, 2]
+  VERSION = [0, 2, 3]
 
   class << VERSION
     include Comparable

data/lib/active_nomad.rb

@@ -26,25 +26,23 @@ module ActiveNomad
     def to_serialized_attributes
       attributes = ActiveSupport::OrderedHash.new
       columns = self.class.columns_hash
-      self.class.column_names.sort.each do |name|
-        column = columns[name] or
-          next
-        attributes[name] = serialize_value(send(name), column.type)
+      @attributes.sort.each do |name, value|
+        column = columns[name]
+        attributes[name] = serialize_value(send(name), column ? column.type : :string)
       end
       attributes
     end
 
     #
-    # Recreate an object from a serialized string.
+    # Recreate an object from the serialized attributes returned by
+    # #to_serialized_attributes.
     #
-    def self.from_serialized_attributes(deserialized_attributes)
-      instance = new
-      deserialized_attributes.each do |name, serialized_value|
-        column = columns_hash[name.to_s] or
-          next
-        instance.send "#{column.name}=", deserialize_value(serialized_value, column.type)
+    def self.from_serialized_attributes(serialized_attributes)
+      serialized_attributes = serialized_attributes.dup
+      columns_hash.each do |name, column|
+        serialized_attributes[name] ||= column.default
       end
-      instance
+      instantiate(serialized_attributes)
     end
 
     #
@@ -65,9 +63,10 @@ module ActiveNomad
     #
     def self.from_query_string(string)
       return new if string.blank?
-      serialized_attributes = string.strip.split(/&/).map do |pair|
+      serialized_attributes = {}
+      string.strip.split(/&/).map do |pair|
         name, value = pair.split(/=/, 2)
-        [CGI.unescape(name), CGI.unescape(value)]
+        serialized_attributes[CGI.unescape(name)] = CGI.unescape(value)
       end
       from_serialized_attributes(serialized_attributes)
     end
@@ -170,6 +169,10 @@ module ActiveNomad
       def transaction
         yield
       end
+
+      def inspect
+        (n = name).blank? ? '(anonymous)' : n
+      end
     end
 
     @columns = []
@@ -185,6 +188,7 @@ module ActiveNomad
       case type
       when :datetime, :timestamp, :time
         # The day in RFC 2822 is optional - chop it.
+        value = ActiveRecord::Base.default_timezone == :utc ? value.utc : value.in_time_zone(Time.zone)
         value.rfc2822.sub(/\A[A-Za-z]{3}, /, '')
       when :date
         value.to_date.strftime(DATE_FORMAT)
@@ -197,7 +201,8 @@ module ActiveNomad
       return nil if string.nil?
       case type
       when :datetime, :timestamp, :time
-        Time.parse(string)
+        value = Time.parse(string).in_time_zone
+        ActiveRecord::Base.default_timezone == :utc ? value.utc : value.in_time_zone(Time.zone)
       when :date
         Date.parse(string)
       else

data/spec/unit/active_nomad_spec.rb

@@ -1,6 +1,12 @@
 require 'spec_helper'
 
 describe ActiveNomad::Base do
+  before do
+    Time.zone = -5
+    ActiveRecord::Base.default_timezone = :utc
+    ActiveRecord::Base.time_zone_aware_attributes = true
+  end
+
   describe ".attribute" do
     it "should create a column with the given name and type" do
       klass = Class.new(ActiveNomad::Base) do
@@ -148,7 +154,7 @@ describe ActiveNomad::Base do
   end
 
   describe "#to_serialized_attributes" do
-    it "should return a list of attribute names with serialized attributes, sorted by name" do
+    it "should return an ordered hash of attribute names with serialized attributes, sorted by name" do
       klass = Class.new(ActiveNomad::Base) do
         attribute :integer_attribute, :integer
         attribute :string_attribute, :string
@@ -169,15 +175,15 @@ describe ActiveNomad::Base do
         :text_attribute => 'text',
         :float_attribute => 1.23,
         :decimal_attribute => BigDecimal.new('123.45'),
-        :datetime_attribute => Time.parse('03 Feb 2001 12:34:56 -0000'),
-        :timestamp_attribute => Time.parse('03 Feb 2001 12:34:56 -0000'),
-        :time_attribute => Time.parse('03 Feb 2001 12:34:56 -0000'),
+        :datetime_attribute => Time.parse('03 Feb 2001 7:34:56 -500'),
+        :timestamp_attribute => Time.parse('03 Feb 2001 7:34:56 -500'),
+        :time_attribute => Time.parse('03 Feb 2001 7:34:56 -500'),
         :date_attribute => Date.parse('03 Feb 2001'),
         :binary_attribute => "\0\1",
         :boolean_attribute => true,
         :nil_attribute => nil
       )
-      instance.to_serialized_attributes.to_a.should == [
+      instance.to_serialized_attributes.should == ActiveSupport::OrderedHash[[
         ['binary_attribute', "\0\1"],
         ['boolean_attribute', 'true'],
         ['date_attribute', '03 Feb 2001'],
@@ -190,7 +196,7 @@ describe ActiveNomad::Base do
         ['text_attribute', 'text'],
         ['time_attribute', '03 Feb 2001 12:34:56 -0000'],
         ['timestamp_attribute', '03 Feb 2001 12:34:56 -0000'],
-      ]
+      ]]
     end
   end
 
@@ -210,49 +216,34 @@ describe ActiveNomad::Base do
         attribute :boolean_attribute, :boolean
         attribute :nil_attribute, :boolean
       end
-      instance = klass.from_serialized_attributes([
-        [:integer_attribute, '5'],
-        [:string_attribute, 'string'],
-        [:text_attribute, 'text'],
-        [:float_attribute, '1.23'],
-        [:decimal_attribute, '123.45'],
-        [:datetime_attribute, '03 Feb 2001 12:34:56 -0000'],
-        [:timestamp_attribute, '03 Feb 2001 12:34:56 -0000'],
-        [:time_attribute, '03 Feb 2001 12:34:56 -0000'],
-        [:date_attribute, '03 Feb 2001'],
-        [:binary_attribute, "\0\1"],
-        [:boolean_attribute, 'true'],
-        [:nil_attribute, nil]
-      ])
+      instance = klass.from_serialized_attributes(ActiveSupport::OrderedHash[[
+        ['integer_attribute', '5'],
+        ['string_attribute', 'string'],
+        ['text_attribute', 'text'],
+        ['float_attribute', '1.23'],
+        ['decimal_attribute', '123.45'],
+        ['datetime_attribute', '03 Feb 2001 12:34:56 -0000'],
+        ['timestamp_attribute', '03 Feb 2001 12:34:56 -0000'],
+        ['time_attribute', '03 Feb 2001 12:34:56 -0000'],
+        ['date_attribute', '03 Feb 2001'],
+        ['binary_attribute', "\0\1"],
+        ['boolean_attribute', 'true'],
+        ['nil_attribute', nil],
+      ]])
       instance.integer_attribute.should == 5
       instance.string_attribute.should == 'string'
       instance.text_attribute.should == 'text'
       instance.float_attribute.should == 1.23
       instance.decimal_attribute.should == BigDecimal.new('123.45')
-      instance.datetime_attribute.should == Time.parse('03 Feb 2001 12:34:56 -0000')
-      instance.timestamp_attribute.should == Time.parse('03 Feb 2001 12:34:56 -0000')
-      instance.time_attribute.should == Time.parse('03 Feb 2001 12:34:56 -0000')
+      instance.datetime_attribute.should == Time.parse('03 Feb 2001 7:34:56 -500').in_time_zone
+      instance.timestamp_attribute.should == Time.parse('03 Feb 2001 7:34:56 -500').in_time_zone
+      instance.time_attribute.should == Time.parse('03 Feb 2001 12:34:56 -0000').in_time_zone
       instance.date_attribute.should == Date.parse('03 Feb 2001')
       instance.binary_attribute.should == "\0\1"
       instance.boolean_attribute.should be_true
       instance.nil_attribute.should be_nil
     end
 
-    it "should work with any enumerable" do
-      klass = Class.new(ActiveNomad::Base) do
-        attribute :name, :string
-      end
-      params = Object.new
-      class << params
-        def each
-          yield :name, 'joe'
-        end
-      end
-      params.extend Enumerable
-      instance = klass.from_serialized_attributes(params)
-      instance.name.should == 'joe'
-    end
-
     it "should leave defaults alone for attributes which are not set" do
       klass = Class.new(ActiveNomad::Base) do
         attribute :name, :string, :default => 'Joe'
@@ -317,6 +308,22 @@ describe ActiveNomad::Base do
     end
   end
 
+  it "should roundtrip undeclared attributes from the store through ActiveNomad" do
+    klass = Class.new(ActiveNomad::Base) do
+      attribute :declared, :string
+    end
+    stored_attributes = ActiveSupport::OrderedHash[[
+      ['declared', 'a'],
+      ['undeclared', 'b'],
+    ]]
+    instance = klass.from_serialized_attributes(stored_attributes)
+    roundtripped_attributes = instance.to_serialized_attributes
+    roundtripped_attributes.to_a.should == [
+      ['declared', 'a'],
+      ['undeclared', 'b'],
+    ]
+  end
+
   def self.it_should_roundtrip_through(serializer, deserializer, &block)
     describe "roundtripping through ##{serializer} and .#{deserializer}" do
       class_eval(&block) if block
@@ -356,15 +363,18 @@ describe ActiveNomad::Base do
       it_should_roundtrip :decimal, BigDecimal.new('123.45')
 
       it_should_roundtrip :datetime, nil
-      it_should_roundtrip :datetime, Time.now.in_time_zone
+      it_should_roundtrip :datetime, Time.parse('2000-01-01 01:23:34 UTC')
+      it_should_roundtrip :datetime, Time.parse('2000-01-01 01:23:34 EST')
       # TODO: Support DateTime here, which is used when the value is
       # outside the range of a Time.
 
       it_should_roundtrip :timestamp, nil
-      it_should_roundtrip :timestamp, Time.now.in_time_zone
+      it_should_roundtrip :timestamp, Time.parse('2000-01-01 01:23:34 UTC')
+      it_should_roundtrip :timestamp, Time.parse('2000-01-01 01:23:34 EST')
 
       it_should_roundtrip :time, nil
-      it_should_roundtrip :time, Time.parse('2000-01-01 01:23:34').in_time_zone
+      it_should_roundtrip :time, Time.parse('2000-01-01 01:23:34 UTC')
+      it_should_roundtrip :time, Time.parse('2000-01-01 01:23:34 EST')
 
       it_should_roundtrip :date, nil
       it_should_roundtrip :date, Date.today
@@ -449,4 +459,39 @@ describe ActiveNomad::Base do
       instance.transaction_called.should be_true
     end
   end
+
+  describe "#ATTRIBUTE_changed?" do
+    describe "on a new record with no attributes" do
+      before do
+        @klass = Class.new(ActiveNomad::Base) do
+          attribute :i, :integer
+        end
+        @instance = @klass.new
+      end
+
+      it "should be false" do
+        @instance.i_changed?.should be_false
+      end
+
+      describe "when the attribute has been assigned" do
+        before do
+          @instance.i = 2
+        end
+
+        it "should be true" do
+          @instance.i_changed?.should be_true
+        end
+
+        describe "when the record is roundtripped" do
+          before do
+            @instance = @klass.from_serialized_attributes(@instance.to_serialized_attributes)
+          end
+
+          it "should be false" do
+            @instance.i_changed?.should be_false
+          end
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_nomad
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - George Ogata
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-07 00:00:00 -04:00
+date: 2010-10-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency