active_node 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3c0d2fe8c063ac29c20b91a568919d9723d5b3e
-  data.tar.gz: 11522535a767b8709c00420e83e9e2f2340f9a65
+  metadata.gz: cda1ec188ea5746ae414a8192aafe9cfbfbc0d19
+  data.tar.gz: 5c6e6984bfc33b7bc102fa1b88005cc36d4b6f62
 SHA512:
-  metadata.gz: 81912f84e1e63e9fa220b0b67c07b15e58a30af7f8780e34cf72d68552e0a3347e7f6d6a2bcf59cd34d244f43afdd4b43ef2b2339b7fcefccdb1603bc77ebe33
-  data.tar.gz: d38f3caad3486c0504d1aa51b40ec1433dd11a5b135ad0c3fca5c7c787b8219e06e3aa0585d345bbaa42bfe192d5d742f3e728c995cb4154e9b328ca0ff73eee
+  metadata.gz: 7dfec1170324f4d06ef8e8eb7e09fb0224ce5a7e72683298bdbe625b7d574f5e6d6f8a649b43cabd39f5be947584a215b3c123d63426ffbe57cf9bb0ed867466
+  data.tar.gz: e29c1ca9dfa3113f45cb129dc6e89aa9b03336b0ff161e1ec1a19193debaee1de48a5e39c6447a938933b8455b64d3b466fd1bc22144f0854159426c97fac1ab

data/lib/active_node.rb

@@ -13,6 +13,7 @@ module ActiveNode
   autoload :Neo
   autoload :Relationship
   autoload :Graph
+  autoload :Typecasting
 
   autoload_under 'graph' do
     autoload :QueryMethods

data/lib/active_node/base.rb

@@ -7,6 +7,7 @@ module ActiveNode
     include ActiveAttr::Attributes
     include ActiveAttr::MassAssignment
     include ActiveAttr::TypecastedAttributes
+    include Typecasting
     include Dirty
     include Persistence
     include Validations

data/lib/active_node/persistence.rb

@@ -15,8 +15,8 @@ module ActiveNode
       delegate :all, :first, :where, :limit, :includes, :delete_all, :build, :find, :offset, :count, :order, to: :graph
 
       def timestamps
-        attribute :created_at, type: String
-        attribute :updated_at, type: String
+        attribute :created_at, type: Time
+        attribute :updated_at, type: Time
       end
 
       def find_by_cypher query, params={}, klass=nil
@@ -86,10 +86,6 @@ module ActiveNode
       id.to_s if persisted?
     end
 
-    def to_key
-      id
-    end
-
     def persisted?
       id.present? && !destroyed?
     end
@@ -137,11 +133,15 @@ module ActiveNode
     end
 
     def update_attributes attributes
-      attributes.each { |key, value| respond_to_writer?(attr) ? write_attr(key, value) : self[key]=value }
+      attributes.each { |key, value| respond_to_non_id_writer?(key) ? write_attr(key, value) : self[key]=value }
       save
     end
 
     private
+    def respond_to_non_id_writer? attr
+      respond_to_writer?(attr) && attr.to_s != 'id'
+    end
+
     def split_hash hash, method, split_by
       hash.try(method) { |k, _| send split_by, k }
     end
@@ -182,7 +182,7 @@ module ActiveNode
     end
 
     def write
-      now = Time.now.utc.iso8601(3)
+      now = Time.now
       try :updated_at=, now
       if persisted?
         write_properties
@@ -202,7 +202,22 @@ module ActiveNode
     end
 
     def all_attributes
-      attributes.except('id').merge(@hash)
+      to_neo! attributes.except('id').merge(@hash)
+    end
+
+    def to_neo! attrs
+      attrs.each { |k, v| attrs[k] = to_neo v }
+    end
+
+    def to_neo value
+      case value
+        when Time, DateTime
+          value.utc.iso8601(6)
+        when Date
+          value.to_s
+        else
+          value
+      end
     end
   end
 end

data/lib/active_node/typecasting.rb

@@ -0,0 +1,14 @@
+require "active_node/typecasting/time_typecaster"
+
+module ActiveNode
+  module Typecasting
+    # @private
+    EXTENDED_TYPECASTER_MAP = {
+        Time => TimeTypecaster
+    }.freeze
+
+    def typecaster_for(type)
+      EXTENDED_TYPECASTER_MAP[type].try(:new) or super
+    end
+  end
+end

data/lib/active_node/typecasting/time_typecaster.rb

@@ -0,0 +1,12 @@
+require "active_support/core_ext/string/conversions"
+require "active_support/time"
+
+module ActiveNode
+  module Typecasting
+    class TimeTypecaster
+      def call(value)
+        value.to_time if value.respond_to? :to_time
+      end
+    end
+  end
+end

data/lib/active_node/version.rb

@@ -1,3 +1,3 @@
 module ActiveNode
-  VERSION = "2.2.1"
+  VERSION = "2.2.2"
 end

data/spec/functional/graph_spec.rb

@@ -41,7 +41,14 @@ describe ActiveNode::Graph do
 
   describe '#detect' do
     it 'should return nil' do
-      Person.all.detect{|p| true}.should be_nil
+      Person.all.detect { |p| true }.should be_nil
+    end
+  end
+
+  describe '#includes' do
+    it 'should not throw an error' do
+      p = Person.create! father: Person.create!
+      Person.where(id: p.id).includes(:father).first.should == p
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_node
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Heinrich Klobuczek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-06 00:00:00.000000000 Z
+date: 2014-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr
@@ -175,6 +175,8 @@ files:
 - lib/active_node/persistence.rb
 - lib/active_node/reflection.rb
 - lib/active_node/relationship.rb
+- lib/active_node/typecasting.rb
+- lib/active_node/typecasting/time_typecaster.rb
 - lib/active_node/validations.rb
 - lib/active_node/validations/uniqueness.rb
 - lib/active_node/version.rb