devise-active_node 0.0.1.alpha → 0.0.1.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74a1cabda42e11e0c77a6fbdf3a12856a07e6288
-  data.tar.gz: 51f194c4e6a4e0f06dff905968414fa40c11cbff
+  metadata.gz: 0a3cec0fb7ca42e3b70a219fc61e31ca60d18aaf
+  data.tar.gz: 619858cc6bcee732f5352c47fa1e8ad37e94647d
 SHA512:
-  metadata.gz: f74338d8b22b54c8824a5eb6ed6f673a65bb2d80de5b4f084aa0a45885c209fd77b169f8f0f5a11f8b9a9ff9f1c791d4b38f8afa0692acdb3899f9bdb5d4786c
-  data.tar.gz: accfa476762d9fcaeaa588066d4776dfff00d7330a213e7e953a79986528f7560ba6b7bedab982cf982072989e85fa18afcd250ddad87b93133ed72abb81b5f2
+  metadata.gz: e24adf41ffa8b23c4a9f277a6df6a7bcd6f2f22da2408e90f3f1ea85a1dbfd1b91ae2d778b8cc187d161122f1a6ef07dc466043a482d8af14048d10503c609eb
+  data.tar.gz: e87d70e6354e796105b474ce824bba6592ae28091913744443fcd9584df618a7f6203971792126cafa71e186facf4f470dad92590d2d5c94699c7081f014a776

data/devise-active_node.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "active_node", ">= 2.2.0"
+  spec.add_dependency "active_node", ">= 2.2.4"
   spec.add_dependency "devise"
 
   spec.add_development_dependency "bundler", "~> 1.6"

data/lib/devise/active_node/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module ActiveNode
-    VERSION = "0.0.1.alpha"
+    VERSION = "0.0.1.beta"
   end
 end

data/lib/orm_adapter/adapters/active_node.rb

@@ -24,12 +24,7 @@ module OrmAdapter
 
     # @see OrmAdapter::Base#find_all
     def find_all(options = {})
-      klass
-      .order(options.delete :order)
-      .where(options.delete :conditions)
-      .limit(options.delete :limit)
-      .offset(options.delete :offset)
-      .where(options)
+      construct_graph(klass, options)
     end
 
     # @see OrmAdapter::Base#create!
@@ -41,6 +36,22 @@ module OrmAdapter
     def destroy(object)
       object.destroy && true if valid_object?(object)
     end
+
+    protected
+    def construct_graph(graph, options)
+      conditions, order, limit, offset = extract_conditions!(options)
+
+      graph = graph.where(conditions || {})
+      graph = graph.order(order_clause(order)) if order.any?
+      graph = graph.limit(limit) if limit
+      graph = graph.offset(offset) if offset
+
+      graph
+    end
+
+    def order_clause(order)
+      order.map {|pair| "#{pair[0]} #{pair[1]}"}.join(",")
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise-active_node
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha
+  version: 0.0.1.beta
 platform: ruby
 authors:
 - Heinrich Klobuczek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2014-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_node
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -130,3 +130,4 @@ test_files:
 - spec/orm_adapter/adapters/active_node_spec.rb
 - spec/orm_adapter/example_app_shared.rb
 - spec/spec_helper.rb
+has_rdoc: