active_type 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f6709aa6a9fb26d216bd6824523b35af47d6e53
-  data.tar.gz: c4699de79bcfca007fd56d7f513916fccb424fbb
+  metadata.gz: 246d6b642fc001e5a1df57b9c4cd42e20a6fe68c
+  data.tar.gz: dbce1038dc7d9d74d6258927e0e3a1bfb995af70
 SHA512:
-  metadata.gz: 4285b28839f7e1ba7a10c807cdc0cb497d46bdedfa5f621e4ec699787e564145d3e2819134dc8250739d18e7de6aa3eea33e9e83989446b0f031d46611754e04
-  data.tar.gz: 139b82919f9a75396ac3c15174d946aa5e12e9a14dea25fe8a24a6b14bb334bbec090ab5a5903c538ff34004cf7ca878cb7e6ceab6648af5390d725e0503b8cd
+  metadata.gz: 68925ab89dbead458c046fcdea66fc7493e16e616af15aec2647c5800851f7bc6db00fc1f61077aadabebf310b1a52dec2c84e8f64c37aa012c0886173c5e5d4
+  data.tar.gz: e7dd74a94787288cc37b6dadfbae1f4e3451cb6707c4733cd6e1dd357bc906b8bc323fe08102b7824d9661fee7d0fb57b6dc6a9e642618233f1f5514920233ac

data/gemfiles/Gemfile.3.2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    active_type (0.1.0)
+    active_type (0.1.2)
       activerecord (>= 3.2)
 
 GEM

data/gemfiles/Gemfile.4.0.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    active_type (0.1.0)
+    active_type (0.1.2)
       activerecord (>= 3.2)
 
 GEM

data/gemfiles/Gemfile.4.1.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    active_type (0.1.0)
+    active_type (0.1.2)
       activerecord (>= 3.2)
 
 GEM

data/lib/active_type/extended_record.rb

@@ -11,7 +11,6 @@ module ActiveType
 
       def [](base)
         Class.new(base) do
-          @abstract_class = true
 
           include VirtualAttributes
           include Inheritance

data/lib/active_type/no_table.rb

@@ -30,6 +30,10 @@ module ActiveType
       nil
     end
 
+    def attribute_names
+      []
+    end
+
     def transaction(&block)
       @_current_transaction_records ||= []
       yield

data/lib/active_type/version.rb

@@ -1,3 +1,3 @@
 module ActiveType
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/active_type/virtual_attributes.rb

@@ -64,6 +64,10 @@ module ActiveType
           def #{name}
             read_virtual_attribute('#{name}')
           end
+
+          def #{name}?
+            read_virtual_attribute('#{name}').present?
+          end
         BODY
       end
 
@@ -113,6 +117,12 @@ module ActiveType
       end
     end
 
+    def attributes
+      self.class._virtual_column_names.each_with_object(super) do |name, attrs|
+        attrs[name] = read_virtual_attribute(name)
+      end
+    end
+
     def read_virtual_attribute(name)
       name = name.to_s
       @virtual_attributes_cache[name] ||= begin
@@ -138,6 +148,16 @@ module ActiveType
         end
       end
 
+      def _virtual_column_names
+        @virtual_column_names ||= begin
+          names = virtual_columns_hash.keys
+          if defined?(super)
+            names += super
+          end
+          names
+        end
+      end
+
       def _has_virtual_column?(name)
         virtual_columns_hash.has_key?(name.to_s) || begin
           if defined?(super)

data/spec/active_type/extended_record_spec.rb

@@ -44,6 +44,25 @@ describe "ActiveType::Record[ActiveRecord::Base]" do
     it_should_behave_like 'ActiveRecord-like constructors', { :persisted_string => "persisted string", :another_virtual_string => "another virtual string" }
   end
 
+  describe '#attributes' do
+
+    it 'returns a hash of virtual and persisted attributes' do
+      subject.persisted_string = "string"
+      subject.another_virtual_string = "string"
+
+      subject.attributes.should == {
+        "another_virtual_string" => "string",
+        "id" => nil,
+        "persisted_string" => "string",
+        "persisted_integer" => nil,
+        "persisted_time" => nil,
+        "persisted_date" => nil,
+        "persisted_boolean" => nil
+      }
+    end
+
+  end
+
   describe 'accessors' do
     it_should_behave_like 'ActiveRecord-like accessors', { :persisted_string => "persisted string", :another_virtual_string => "another virtual string" }
   end
@@ -65,6 +84,12 @@ describe "ActiveType::Record[ActiveRecord::Base]" do
     end
   end
 
+  describe '.base_class' do
+    it 'is the base class inherited from' do
+      subject.class.base_class.should == ExtendedRecordSpec::BaseRecord
+    end
+  end
+
 end
 
 
@@ -86,6 +111,26 @@ describe "ActiveType::Record[ActiveType::Record]" do
     it_should_behave_like 'ActiveRecord-like constructors', { :persisted_string => "persisted string", :virtual_string => "virtual string", :another_virtual_string => "another virtual string" }
   end
 
+  describe '#attributes' do
+
+    it 'returns a hash of virtual and persisted attributes' do
+      subject.persisted_string = "string"
+      subject.virtual_string = "string"
+
+      subject.attributes.should == {
+        "virtual_string" => "string",
+        "another_virtual_string" => nil,
+        "id" => nil,
+        "persisted_string" => "string",
+        "persisted_integer" => nil,
+        "persisted_time" => nil,
+        "persisted_date" => nil,
+        "persisted_boolean" => nil
+      }
+    end
+
+  end
+
   describe 'accessors' do
     it_should_behave_like 'ActiveRecord-like accessors', { :persisted_string => "persisted string", :virtual_string => "virtual string", :another_virtual_string => "another virtual string" }
   end
@@ -115,4 +160,10 @@ describe "ActiveType::Record[ActiveType::Record]" do
     end
   end
 
+  describe '.base_class' do
+    it 'is the base class inherited from' do
+      subject.class.base_class.should == ExtendedRecordSpec::BaseActiveTypeRecord
+    end
+  end
+
 end

data/spec/active_type/object_spec.rb

@@ -149,6 +149,90 @@ describe ActiveType::Object do
     end
   end
 
+  describe 'query methods' do
+
+    it 'returns true for true' do
+      subject.virtual_attribute = true
+
+      subject.virtual_attribute?.should == true
+    end
+
+    it 'returns false for false' do
+      subject.virtual_attribute = false
+
+      subject.virtual_attribute?.should == false
+    end
+
+    it 'returns false for nil' do
+      subject.virtual_attribute = nil
+
+      subject.virtual_attribute?.should == false
+    end
+
+    it 'returns true for 1' do
+      subject.virtual_attribute = 1
+
+      subject.virtual_attribute?.should == true
+    end
+
+    it 'returns true for an object' do
+      subject.virtual_attribute = Object.new
+
+      subject.virtual_attribute?.should == true
+    end
+
+  end
+
+  describe '#attributes' do
+
+    it 'returns a hash of virtual attributes' do
+      subject.virtual_string = "string"
+      subject.virtual_integer = "17"
+
+      subject.attributes.should == {
+        "virtual_string" => "string",
+        "virtual_integer" => 17,
+        "virtual_time" => nil,
+        "virtual_date" => nil,
+        "virtual_boolean" => nil,
+        "virtual_attribute" => nil,
+      }
+    end
+
+    it 'also includes inherited attributes' do
+      object = ObjectSpec::InheritingObject.new
+      object.virtual_string = "string"
+      object.virtual_integer = "17"
+
+      object.attributes.should == {
+        "virtual_string" => "string",
+        "virtual_integer" => 17,
+        "virtual_time" => nil,
+        "virtual_date" => nil,
+        "virtual_boolean" => nil,
+        "virtual_attribute" => nil,
+        "another_virtual_string" => nil,
+      }
+    end
+
+    it 'also includes included attributes' do
+      object = ObjectSpec::IncludingObject.new
+      object.virtual_string = "string"
+      object.virtual_integer = "17"
+
+      object.attributes.should == {
+        "virtual_string" => "string",
+        "virtual_integer" => 17,
+        "virtual_time" => nil,
+        "virtual_date" => nil,
+        "virtual_boolean" => nil,
+        "virtual_attribute" => nil,
+        "another_virtual_string" => nil,
+      }
+    end
+
+  end
+
   describe 'inherited classes' do
 
     it 'sees attributes of both classes' do

data/spec/active_type/record_spec.rb

@@ -140,6 +140,31 @@ describe ActiveType::Record do
     end
   end
 
+  describe '#attributes' do
+
+    it 'returns a hash of virtual and persisted attributes' do
+      subject.persisted_string = "string"
+      subject.virtual_string = "string"
+      subject.virtual_integer = "17"
+
+      subject.attributes.should == {
+        "virtual_string" => "string",
+        "virtual_integer" => 17,
+        "virtual_time" => nil,
+        "virtual_date" => nil,
+        "virtual_boolean" => nil,
+        "virtual_attribute" => nil,
+        "id" => nil,
+        "persisted_string" => "string",
+        "persisted_integer" => nil,
+        "persisted_time" => nil,
+        "persisted_date" => nil,
+        "persisted_boolean" => nil
+      }
+    end
+
+  end
+
   describe 'validations' do
     subject { RecordSpec::RecordWithValidations.new }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_type
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Tobias Kraze