active_node 0.0.7 → 0.0.8

data/lib/active_node/associations/builder/singular_association.rb

@@ -16,6 +16,16 @@ module ActiveNode::Associations::Builder
       CODE
     end
 
+    def define_readers
+      super
+
+      mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def #{name}_id
+          association(:#{name}).id_reader
+        end
+      CODE
+    end
+
     def define_writers
       super
 

data/lib/active_node/associations/singular_association.rb

@@ -10,7 +10,11 @@ module ActiveNode
       end
 
       def ids_reader
-        [target.try(:id)].compact
+        [id_reader].compact
+      end
+
+      def id_reader
+        target.try :id
       end
 
       def id_writer(id)

data/lib/active_node/persistence.rb

@@ -7,6 +7,11 @@ module ActiveNode
     end
 
     module ClassMethods
+      def timestamps
+        attribute :created_at, type: String
+        attribute :updated_at, type: String
+      end
+
       def find ids
         ids.is_a?(Enumerable) ? ids.map { |id| find(id) } : new_instance(Neography::Node.load(ids))
       end
@@ -32,27 +37,25 @@ module ActiveNode
       end
 
       def filterClass(nodes, klass)
-        wrap(nodes.select{|node| klass.nil? || node.type == klass.name.underscore}, klass)
+        wrap(nodes.select { |node| klass.nil? || node.type == klass.name.underscore }, klass)
       end
 
       private
       def new_instance node
-        node && new(node)
+        new(node) if node.try(:type) == type
       end
     end
 
     attr_reader :node
-    #protected :node
-
     delegate :neo_id, to: :node, allow_nil: true
+
     def id
       neo_id && neo_id.to_i
     end
+
     alias :to_param :id
     alias :persisted? :id
 
-    alias :[] :send
-
     def initialize object={}
       hash=object
       @node, hash = object, object.send(:table) if object.is_a? Neography::Node
@@ -100,7 +103,7 @@ module ActiveNode
     end
 
     def nullify_blanks! attrs
-      attrs.each { |k, v| attrs[k]=nil if attrs[k].blank? }
+      attrs.each { |k, v| attrs[k]=nil if v.blank? }
     end
 
     def create_or_update
@@ -109,10 +112,13 @@ module ActiveNode
     end
 
     def write
+      now = Time.now.utc.iso8601(3)
+      try :updated_at=, now
       if @node
-        nullify_blanks!(attributes).each { |k, v| @node[k]=v }
+        nullify_blanks!(self.attributes).each { |k, v| @node[k]=v }
       else
-        @node = Neography::Node.create nullify_blanks!(attributes).merge(type: self.class.type)
+        try :created_at=, now
+        @node = Neography::Node.create nullify_blanks!(self.attributes).merge!(type: self.class.type)
       end
     end
   end

data/lib/active_node/reflection.rb

@@ -133,7 +133,7 @@ module ActiveNode
 
       private
       def derive_class_name
-        name.to_s.camelize
+        (direction == :outgoing ? type : name).to_s.camelize
       end
 
       def derive_type

data/lib/active_node/version.rb

@@ -1,3 +1,3 @@
 module ActiveNode
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/functional/associations_spec.rb

@@ -100,6 +100,14 @@ describe ActiveNode::Associations do
       father.children.should == [child]
     end
 
+    it 'can read has_one relation by id' do
+      father = Person.create!
+      child = Person.create!
+      child.father = father
+      child.save
+      child.father_id.should == father.id
+    end
+
     it "can access new association without being saved" do
       father = Person.create!
       child = Person.new

data/spec/functional/persistence_spec.rb

@@ -25,6 +25,23 @@ describe ActiveNode::Persistence do
       person.destroy!.should be_true
       Person.all.count.should == 2
     end
+
+    it 'should record timestamp' do
+      now = Time.now
+      person = Person.create!
+      person.created_at.should_not be_nil
+      person = Person.find(person.id)
+      person.created_at.should_not be_nil
+      person.updated_at.should_not be_nil
+      allow(Time).to receive(:now) {now + 1.second}
+      person.name = 'abc'
+      person.save
+      (person.created_at < person.updated_at).should be_true
+    end
+
+    it 'should not record timestamp if not specified' do
+      Client.create!(name: 'abc').respond_to?(:created_at).should be_false
+    end
   end
 
   describe "#create!" do
@@ -36,6 +53,10 @@ describe ActiveNode::Persistence do
       person = Person.create!(multi: [1, 2, 3])
       Person.find(person.id).multi.should == [1, 2, 3]
     end
+
+    it 'should not find an object with id of a different model' do
+      Client.find(Person.create!.id).should be_nil
+    end
   end
 
   describe "#attributes" do

data/spec/models/person.rb

@@ -1,7 +1,10 @@
 class Person < ActiveNode::Base
   attribute :name, type: String
   attribute :multi
+  timestamps
+
   has_many :people
   has_many :children, class_name: "Person"
+  #has_many :sons, class_name: "Person"
   has_one :father, type: :child, direction: :incoming, class_name: "Person"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_node
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2013-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr