active_node 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19347532b691863f735cdb799989cf68a1bc624b
-  data.tar.gz: 71833a5ff1029940a6965c90c9f86504747f5c6a
+  metadata.gz: b3c0d2fe8c063ac29c20b91a568919d9723d5b3e
+  data.tar.gz: 11522535a767b8709c00420e83e9e2f2340f9a65
 SHA512:
-  metadata.gz: 9017661492388db4212a1674c9364ff182ea756f48252a8de0221e1194e0697ab2faf2964182d6f5ac310ea9deee3e4045556389ab50ecac4898747009ef301a
-  data.tar.gz: 63610493b0a11263928de9fab5bbe3f79741a82e54dd8869f87d9d733444046da275816d803d78946e6f42f7f0cafb213fcd57bc1fc6d88834cb69a75eb1e453
+  metadata.gz: 81912f84e1e63e9fa220b0b67c07b15e58a30af7f8780e34cf72d68552e0a3347e7f6d6a2bcf59cd34d244f43afdd4b43ef2b2339b7fcefccdb1603bc77ebe33
+  data.tar.gz: d38f3caad3486c0504d1aa51b40ec1433dd11a5b135ad0c3fca5c7c787b8219e06e3aa0585d345bbaa42bfe192d5d742f3e728c995cb4154e9b328ca0ff73eee

data/lib/active_node/graph/delegation.rb

@@ -0,0 +1,35 @@
+require 'set'
+require 'active_support/concern'
+
+module ActiveNode
+  module Delegation # :nodoc:
+    extend ActiveSupport::Concern
+
+    # This module creates compiled delegation methods dynamically at runtime, which makes
+    # subsequent calls to that method faster by avoiding method_missing. The delegations
+    # may vary depending on the klass of a relation, so we create a subclass of Relation
+    # for each different klass, and the delegations are compiled into that subclass only.
+
+    BLACKLISTED_ARRAY_METHODS = [
+        :compact!, :flatten!, :reject!, :reverse!, :rotate!, :map!,
+        :shuffle!, :slice!, :sort!, :sort_by!, :delete_if,
+        :keep_if, :pop, :shift, :delete_at, :compact
+    ].to_set # :nodoc:
+
+    delegate :to_xml, :to_yaml, :length, :collect, :map, :each, :all?, :include?, :to_ary, to: :to_a
+
+    protected
+
+    def array_delegable?(method)
+      Array.method_defined?(method) && BLACKLISTED_ARRAY_METHODS.exclude?(method)
+    end
+
+    def method_missing(method, *args, &block)
+      if array_delegable?(method)
+        to_a.public_send(method, *args, &block)
+      else
+        super
+      end
+    end
+  end
+end

data/lib/active_node/graph.rb

@@ -1,13 +1,11 @@
 module ActiveNode
   class Graph
     include Neography::Rest::Helpers
-    include FinderMethods, QueryMethods
+    include FinderMethods, QueryMethods, Delegation
 
     attr_reader :reflections, :matches, :klass, :loaded
     alias :loaded? :loaded
 
-    delegate :to_xml, :to_yaml, :length, :collect, :map, :each, :all?, :include?, :to_ary, to: :to_a
-
     def initialize klass, *includes
       @klass = klass if klass < ActiveNode::Base
       @matches = []
@@ -57,6 +55,46 @@ module ActiveNode
       @records
     end
 
+    def as_json(options = nil) #:nodoc:
+      to_a.as_json(options)
+    end
+
+    # Returns size of the records.
+    def size
+      loaded? ? @records.length : count
+    end
+
+    # Returns true if there are no records.
+    def empty?
+      return @records.empty? if loaded?
+
+      if limit_value == 0
+        true
+      else
+        # FIXME: This count is not compatible with #select('authors.*') or other select narrows
+        c = count
+        c.respond_to?(:zero?) ? c.zero? : c.empty?
+      end
+    end
+
+    # Returns true if there are any records.
+    def any?
+      if block_given?
+        to_a.any? { |*block_args| yield(*block_args) }
+      else
+        !empty?
+      end
+    end
+
+    # Returns true if there is more than one record.
+    def many?
+      if block_given?
+        to_a.many? { |*block_args| yield(*block_args) }
+      else
+        limit_value ? to_a.many? : size > 1
+      end
+    end
+
     # Compares two relations for equality.
     def ==(other)
       case other

data/lib/active_node/persistence.rb

@@ -177,7 +177,7 @@ module ActiveNode
 
     def create_or_update
       fresh = new_record?
-      write; true
+      write
       association_cache.values.each { |assoc| assoc.save(fresh) }
     end
 

data/lib/active_node/reflection.rb

@@ -222,13 +222,9 @@ module ActiveNode
 
       private
       def derive_class_name
-        if direction == :outgoing
-          class_name = type.to_s
-        else
-          class_name = name.to_s
-          class_name = class_name.singularize if collection?
-        end
-        model.name.sub(/[^:]*$/, class_name.camelize)
+        class_name = name.to_s.camelize
+        class_name = class_name.singularize if collection?
+        model.name.sub(/[^:]*$/, class_name)
       end
     end
 

data/lib/active_node/version.rb

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

data/lib/active_node.rb

@@ -17,6 +17,7 @@ module ActiveNode
   autoload_under 'graph' do
     autoload :QueryMethods
     autoload :FinderMethods
+    autoload :Delegation
   end
 
   eager_autoload do

data/spec/functional/graph_spec.rb

@@ -32,4 +32,16 @@ describe ActiveNode::Graph do
       person.children
     end
   end
+
+  describe '#empty?' do
+    it 'should return true' do
+      Person.all.should be_empty
+    end
+  end
+
+  describe '#detect' do
+    it 'should return nil' do
+      Person.all.detect{|p| true}.should be_nil
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_node
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Heinrich Klobuczek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2014-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr
@@ -168,6 +168,7 @@ files:
 - lib/active_node/dirty.rb
 - lib/active_node/errors.rb
 - lib/active_node/graph.rb
+- lib/active_node/graph/delegation.rb
 - lib/active_node/graph/finder_methods.rb
 - lib/active_node/graph/query_methods.rb
 - lib/active_node/neo.rb