datagrid 0.7.0 → 0.7.1

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/datagrid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "datagrid"
-  s.version = "0.7.0"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]
-  s.date = "2012-12-15"
+  s.date = "2013-01-15"
   s.description = "This allows you to easily build datagrid aka data tables with sortable columns and filters"
   s.email = "agresso@gmail.com"
   s.extra_rdoc_files = [

data/lib/datagrid/drivers/active_record.rb

@@ -12,7 +12,17 @@ module Datagrid
       end
 
       def to_scope(scope)
-        scope.scoped({})
+        # Model class or Active record association
+        # ActiveRecord association class hides itself under an Array 
+        # We can only reveal it by checking if it respond to some specific
+        # to ActiveRecord method like #scoped
+        if scope.is_a?(Class) 
+          scope.scoped({})
+        elsif (scope.is_a?(Array) && scope.respond_to?(:scoped))
+          scope.scoped
+        else
+          scope
+        end
       end
 
       def where(scope, condition)

data/spec/datagrid/drivers/active_record_spec.rb

@@ -9,5 +9,11 @@ describe Datagrid::Drivers::ActiveRecord do
     it {should be_match(Entry.scoped)}
     it {should_not be_match(MongoidEntry)}
   end
+
+  it "should convert any scope to AR::Relation" do
+    subject.to_scope(Entry).should be_a(ActiveRecord::Relation)
+    subject.to_scope(Entry.limit(5)).should be_a(ActiveRecord::Relation)
+    subject.to_scope(Group.create!.entries).should be_a(ActiveRecord::Relation)
+  end
   
 end

data/spec/support/active_record.rb

@@ -32,5 +32,6 @@ ActiveRecord::Schema.define(:version => 1) do
     belongs_to :group
   end
   class ::Group < ActiveRecord::Base
+    has_many :entries
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-15 00:00:00.000000000 Z
+date: 2013-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -308,7 +308,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 813907041614063922
+      hash: -1867326624462415975
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: