datagrid 0.5.2 → 0.5.3

data/Gemfile

@@ -22,6 +22,7 @@ group :development do
   gem 'will_paginate', '2.3.15'
 
   gem "mongoid", "2.2.2"
+  gem "mongo_mapper", ">=0.11.0"
   gem "bson", "1.4.0"
   gem "bson_ext", "1.4.0"
 

data/Gemfile.lock

@@ -60,12 +60,18 @@ GEM
       metaclass (~> 0.0.1)
     mongo (1.4.0)
       bson (= 1.4.0)
+    mongo_mapper (0.11.0)
+      activemodel (~> 3.0)
+      activesupport (~> 3.0)
+      plucky (~> 0.4.0)
     mongoid (2.2.2)
       activemodel (~> 3.0)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
     multi_json (1.0.4)
     nokogiri (1.5.0)
+    plucky (0.4.3)
+      mongo (~> 1.3)
     polyglot (0.3.3)
     rack (1.3.5)
     rack-cache (1.1)
@@ -134,6 +140,7 @@ DEPENDENCIES
   fastercsv
   jeweler (~> 1.6.0)
   mocha
+  mongo_mapper (>= 0.11.0)
   mongoid (= 2.2.2)
   nokogiri
   rails (>= 3.0)

data/Readme.markdown

@@ -8,20 +8,11 @@ Ruby library that helps you to build and represent table-like data with:
 * Localization
 * Export to CSV
 
-
-### Grid DSL
-
-In order to create a report, you need to define:
-
-* scope of objects to look through
-* filters that will be used to filter data
-* columns that should be displayed and sortable (if possible)
-
-
 ### ORM Support
 
 * ActiveRecord
-* Mongoid (beta)
+* Mongoid
+* MongoMapper (beta)
 
 [Create an issue](https://github.com/bogdan/datagrid/issues/new) if you want more.
 
@@ -87,6 +78,15 @@ report.data   # => [ header, *rows]
 report.to_csv # => Yes, it is
 ```
 
+### Grid DSL
+
+In order to create a report, you need to define:
+
+* scope of objects to look through
+* filters that will be used to filter data
+* columns that should be displayed and sortable (if possible)
+
+
 ### Scope
 
 Default scope of objects to filter and display.
@@ -185,3 +185,10 @@ If you need a custom interface for your report you should probably build it your
 
 [More about frontend](https://github.com/bogdan/datagrid/wiki/Frontend)
 
+## Self-Promotion
+
+Like datagrid? 
+
+Follow the repository on [GitHub](https://github.com/bogdan/datagrid/toggle_watch). 
+
+Read [author blog](http://gusiev.com).

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.3

data/datagrid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "datagrid"
-  s.version = "0.5.2"
+  s.version = "0.5.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]
-  s.date = "2012-01-26"
+  s.date = "2012-02-13"
   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 = [
@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
     "lib/datagrid/drivers.rb",
     "lib/datagrid/drivers/abstract_driver.rb",
     "lib/datagrid/drivers/active_record.rb",
+    "lib/datagrid/drivers/mongo_mapper.rb",
     "lib/datagrid/drivers/mongoid.rb",
     "lib/datagrid/engine.rb",
     "lib/datagrid/filters.rb",
@@ -59,6 +60,7 @@ Gem::Specification.new do |s|
     "spec/datagrid/active_model_spec.rb",
     "spec/datagrid/columns_spec.rb",
     "spec/datagrid/drivers/active_record_spec.rb",
+    "spec/datagrid/drivers/mongo_mapper_spec.rb",
     "spec/datagrid/drivers/mongoid_spec.rb",
     "spec/datagrid/filters/boolean_enum_filter_spec.rb",
     "spec/datagrid/filters/composite_filters_spec.rb",
@@ -72,6 +74,7 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb",
     "spec/support/active_record.rb",
     "spec/support/matchers.rb",
+    "spec/support/mongo_mapper.rb",
     "spec/support/mongoid.rb",
     "spec/support/simple_report.rb",
     "spec/support/test_partials/_actions.html.erb"
@@ -98,6 +101,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
       s.add_development_dependency(%q<will_paginate>, ["= 2.3.15"])
       s.add_development_dependency(%q<mongoid>, ["= 2.2.2"])
+      s.add_development_dependency(%q<mongo_mapper>, [">= 0.11.0"])
       s.add_development_dependency(%q<bson>, ["= 1.4.0"])
       s.add_development_dependency(%q<bson_ext>, ["= 1.4.0"])
       s.add_development_dependency(%q<fastercsv>, [">= 0"])
@@ -114,6 +118,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
       s.add_dependency(%q<will_paginate>, ["= 2.3.15"])
       s.add_dependency(%q<mongoid>, ["= 2.2.2"])
+      s.add_dependency(%q<mongo_mapper>, [">= 0.11.0"])
       s.add_dependency(%q<bson>, ["= 1.4.0"])
       s.add_dependency(%q<bson_ext>, ["= 1.4.0"])
       s.add_dependency(%q<fastercsv>, [">= 0"])
@@ -131,6 +136,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
     s.add_dependency(%q<will_paginate>, ["= 2.3.15"])
     s.add_dependency(%q<mongoid>, ["= 2.2.2"])
+    s.add_dependency(%q<mongo_mapper>, [">= 0.11.0"])
     s.add_dependency(%q<bson>, ["= 1.4.0"])
     s.add_dependency(%q<bson_ext>, ["= 1.4.0"])
     s.add_dependency(%q<fastercsv>, [">= 0"])

data/lib/datagrid/drivers.rb

@@ -1,6 +1,7 @@
 require "datagrid/drivers/abstract_driver"
 require "datagrid/drivers/active_record"
 require "datagrid/drivers/mongoid"
+require "datagrid/drivers/mongo_mapper"
 
 
 module Datagrid

data/lib/datagrid/drivers/mongo_mapper.rb

@@ -0,0 +1,43 @@
+module Datagrid
+  module Drivers
+    class MongoMapper < AbstractDriver
+
+      def self.match?(scope)
+        return false unless defined?(::MongoMapper)
+        if scope.is_a?(Class) 
+          scope.ancestors.include?(::MongoMapper::Document)
+        else
+          scope.is_a?(::Plucky::Query)
+        end
+      end
+
+      def to_scope(scope)
+        scope.where
+      end
+
+      def where(scope, condition)
+        scope.where(condition)
+      end
+
+      def asc(scope, order)
+        scope.sort(order.asc)
+      end
+
+      def desc(scope, order)
+        scope.sort(order.desc)
+      end
+
+      def default_order(scope, column_name)
+        scope.key?(column_name) ? column_name : nil
+      end
+
+      def greater_equal(scope, field, value)
+        scope.where(field => {"$gte" => value})
+      end
+
+      def less_equal(scope, field, value)
+        scope.where(field => {"$lte" => value})
+      end
+    end
+  end
+end

data/lib/datagrid/drivers/mongoid.rb

@@ -28,7 +28,7 @@ module Datagrid
       end
 
       def default_order(scope, column_name)
-        column_name
+        scope.fields.keys.include?(column_name.to_s) ? column_name : nil
       end
 
       def greater_equal(scope, field, value)

data/spec/datagrid/drivers/mongo_mapper_spec.rb

@@ -0,0 +1,65 @@
+describe Datagrid::Drivers::MongoMapper do
+
+  describe ".match?" do
+    
+    subject { described_class }
+
+    it {should be_match(MongoMapperEntry)}
+    # MongoMapper doesn't have a scoped method, instead it has a query method which returns a Plucky::Query object
+    it {should be_match(MongoMapperEntry.query)}
+    it {should_not be_match(Entry.scoped)}
+
+  end
+  describe "api" do
+  
+    subject do
+      MongoMapperGrid.new(
+        defined?(_attributes) ? _attributes : {}
+      )
+    end
+  
+    let!(:first) do
+      MongoMapperEntry.create!(
+        :group_id => 2,
+        :name => "Main First",
+        :disabled => false
+      )
+    end
+    let!(:second) do
+      MongoMapperEntry.create!(
+        :group_id => 3,
+        :name => "Main Second",
+        :disabled => true
+      )
+    end
+  
+  
+    its(:assets) {should include(first, second)}
+      
+    its(:"assets.size") {should == 2}
+    its(:rows) {should == [["Main First", 2, false], ["Main Second", 3, true]]}
+    its(:header) {should ==[ "Name", "Group", "Disabled"]}
+      
+    its(:data) {should == [[ "Name", "Group", "Disabled"], ["Main First", 2, false], ["Main Second", 3, true]]}
+      
+      
+    describe "when some filters specified" do
+      let(:_attributes) { {:from_group_id => 3} }
+      its(:assets) {should_not include(first)}
+      its(:assets) {should include(second)}
+    end
+      
+    describe "when reverse ordering is specified" do
+      let(:_attributes) { {:order => :name, :descending => true} }
+      its(:rows) {should == [["Main Second", 3, true], ["Main First", 2, false]]}
+    end
+    it "should not provide default order for non declared fields" do
+      proc {
+        test_report(:order => :test) do
+          scope { MongoMapperEntry }
+          column(:test)
+        end
+      }.should raise_error(Datagrid::OrderUnsupported)
+    end
+  end
+end

data/spec/datagrid/drivers/mongoid_spec.rb

@@ -52,5 +52,14 @@ describe Datagrid::Drivers::Mongoid do
       let(:_attributes) { {:order => :name, :descending => true} }
       its(:rows) {should == [["Main Second", 3, true], ["Main First", 2, false]]}
     end
+
+    it "should not provide default order for non declared fields" do
+      proc {
+        test_report(:order => :test) do
+          scope { MongoidEntry }
+          column(:test)
+        end
+      }.should raise_error(Datagrid::OrderUnsupported)
+    end
   end
 end

data/spec/spec_helper.rb

@@ -15,6 +15,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require "active_record"
 require "will_paginate"
 require "mongoid"
+require "mongo_mapper"
 require 'datagrid'
 require "discover"
 begin
@@ -36,6 +37,7 @@ RSpec.configure do |config|
     Group.delete_all
     Entry.delete_all
     MongoidEntry.delete_all
+    MongoMapperEntry.delete_all
 
   end
 
@@ -48,4 +50,5 @@ end
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/schema.rb"].each {|f| require f}
 Dir["#{File.dirname(__FILE__)}/support/mongoid.rb"].each {|f| require f}
+Dir["#{File.dirname(__FILE__)}/support/mongo_mapper.rb"].each {|f| require f}
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}

data/spec/support/mongo_mapper.rb

@@ -0,0 +1,36 @@
+require "rubygems"
+require 'mongo_mapper'
+
+MongoMapper.connection = Mongo::Connection.new('localhost', 27017)
+MongoMapper.database = "datagrid_mongo_mapper"
+
+class MongoMapperEntry
+  include MongoMapper::Document
+
+  key :group_id, Integer
+  key :name, String
+  key :category, String
+  key :disabled, Boolean, :default => false
+  key :confirmed, Boolean, :default => false
+  key :shipping_date, DateTime
+  timestamps!
+
+end
+
+class MongoMapperGrid
+  include ::Datagrid
+
+  scope do
+    MongoMapperEntry
+  end
+
+  filter :name
+  integer_range_filters(:group_id, {:default => 0}, {:default => 100})
+  filter :disabled, :eboolean
+
+  column :name
+  column :group_id
+  column :disabled
+
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-26 00:00:00.000000000 Z
+date: 2012-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &78305030 !ruby/object:Gem::Requirement
+  requirement: &12512220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *78305030
+  version_requirements: *12512220
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &78304740 !ruby/object:Gem::Requirement
+  requirement: &12510700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78304740
+  version_requirements: *12510700
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &78304410 !ruby/object:Gem::Requirement
+  requirement: &12509940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *78304410
+  version_requirements: *12509940
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &78304050 !ruby/object:Gem::Requirement
+  requirement: &12509440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *78304050
+  version_requirements: *12509440
 - !ruby/object:Gem::Dependency
   name: ruby-debug
-  requirement: &78303520 !ruby/object:Gem::Requirement
+  requirement: &12508760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78303520
+  version_requirements: *12508760
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &78302760 !ruby/object:Gem::Requirement
+  requirement: &12508120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78302760
+  version_requirements: *12508120
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &78302520 !ruby/object:Gem::Requirement
+  requirement: &12507580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -87,10 +87,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *78302520
+  version_requirements: *12507580
 - !ruby/object:Gem::Dependency
   name: accept_values_for
-  requirement: &78302120 !ruby/object:Gem::Requirement
+  requirement: &12506900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78302120
+  version_requirements: *12506900
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &78301780 !ruby/object:Gem::Requirement
+  requirement: &12522440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78301780
+  version_requirements: *12522440
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &78301460 !ruby/object:Gem::Requirement
+  requirement: &12519640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78301460
+  version_requirements: *12519640
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &78301090 !ruby/object:Gem::Requirement
+  requirement: &12518180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -131,10 +131,10 @@ dependencies:
         version: 2.3.15
   type: :development
   prerelease: false
-  version_requirements: *78301090
+  version_requirements: *12518180
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &78300760 !ruby/object:Gem::Requirement
+  requirement: &12516820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -142,10 +142,21 @@ dependencies:
         version: 2.2.2
   type: :development
   prerelease: false
-  version_requirements: *78300760
+  version_requirements: *12516820
+- !ruby/object:Gem::Dependency
+  name: mongo_mapper
+  requirement: &12515720 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+  type: :development
+  prerelease: false
+  version_requirements: *12515720
 - !ruby/object:Gem::Dependency
   name: bson
-  requirement: &78300170 !ruby/object:Gem::Requirement
+  requirement: &12531000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -153,10 +164,10 @@ dependencies:
         version: 1.4.0
   type: :development
   prerelease: false
-  version_requirements: *78300170
+  version_requirements: *12531000
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &78299910 !ruby/object:Gem::Requirement
+  requirement: &12530120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -164,10 +175,10 @@ dependencies:
         version: 1.4.0
   type: :development
   prerelease: false
-  version_requirements: *78299910
+  version_requirements: *12530120
 - !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: &78299560 !ruby/object:Gem::Requirement
+  requirement: &12526640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,7 +186,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78299560
+  version_requirements: *12526640
 description: This allows you to easily build datagrid aka data tables with sortable
   columns and filters
 email: agresso@gmail.com
@@ -204,6 +215,7 @@ files:
 - lib/datagrid/drivers.rb
 - lib/datagrid/drivers/abstract_driver.rb
 - lib/datagrid/drivers/active_record.rb
+- lib/datagrid/drivers/mongo_mapper.rb
 - lib/datagrid/drivers/mongoid.rb
 - lib/datagrid/engine.rb
 - lib/datagrid/filters.rb
@@ -227,6 +239,7 @@ files:
 - spec/datagrid/active_model_spec.rb
 - spec/datagrid/columns_spec.rb
 - spec/datagrid/drivers/active_record_spec.rb
+- spec/datagrid/drivers/mongo_mapper_spec.rb
 - spec/datagrid/drivers/mongoid_spec.rb
 - spec/datagrid/filters/boolean_enum_filter_spec.rb
 - spec/datagrid/filters/composite_filters_spec.rb
@@ -240,6 +253,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/active_record.rb
 - spec/support/matchers.rb
+- spec/support/mongo_mapper.rb
 - spec/support/mongoid.rb
 - spec/support/simple_report.rb
 - spec/support/test_partials/_actions.html.erb
@@ -258,7 +272,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -972605005
+      hash: 1153933139173478709
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: