datagrid 1.5.1 → 1.5.2

data/spec/datagrid/helper_spec.rb

@@ -77,7 +77,7 @@ describe Datagrid::Helper do
     end
 
     it "should support giving assets explicitly" do
-      Entry.create!(entry.attributes)
+      Entry.create!(entry.attributes.except("id"))
       datagrid_table = subject.datagrid_table(grid, [entry])
 
       expect(datagrid_table).to match_css_pattern({
@@ -415,8 +415,8 @@ describe Datagrid::Helper do
       object = OrderedGrid.new(:descending => true, :order => :category)
       expect(subject.datagrid_order_for(object, object.column_by_name(:category))).to equal_to_dom(<<-HTML)
 <div class="order">
-<a href="/location?ordered_grid%5Bdescending%5D=false&amp;ordered_grid%5Border%5D=category" class="asc">&uarr;</a>
-<a href="/location?ordered_grid%5Bdescending%5D=true&amp;ordered_grid%5Border%5D=category" class="desc">&darr;</a>
+<a class="asc" href="/location?ordered_grid%5Bdescending%5D=false&amp;ordered_grid%5Border%5D=category">&uarr;</a>
+<a class="desc" href="/location?ordered_grid%5Bdescending%5D=true&amp;ordered_grid%5Border%5D=category">&darr;</a>
 </div>
       HTML
     end
@@ -611,7 +611,7 @@ describe Datagrid::Helper do
       end
       expect(subject.datagrid_header(grid)).to equal_to_dom(<<HTML)
 <tr><th class="category ordered asc">Category<div class="order">
-<a href="/location?grid%5Bdescending%5D=false&amp;grid%5Border%5D=category" class="asc">&uarr;</a><a href="/location?grid%5Bdescending%5D=true&amp;grid%5Border%5D=category" class="desc">&darr;</a>
+<a class="asc" href="/location?grid%5Bdescending%5D=false&amp;grid%5Border%5D=category">&uarr;</a><a class="desc" href="/location?grid%5Bdescending%5D=true&amp;grid%5Border%5D=category">&darr;</a>
 </div>
 </th></tr>
 HTML

data/spec/spec_helper.rb

@@ -1,9 +1,5 @@
 require 'rubygems'
 require 'bundler'
-require 'mongoid'
-require 'mongo_mapper'
-
-
 
 begin
   Bundler.setup(:default, :development)
@@ -20,7 +16,13 @@ require "active_record"
 require 'action_view'
 require "rails"
 require "mongoid"
-require "mongo_mapper"
+begin
+require 'mongo_mapper'
+rescue LoadError
+end
+
+
+
 require 'datagrid'
 begin
   require 'ruby-debug'
@@ -45,21 +47,30 @@ NO_MONGO = ENV['NO_MONGO']
 
 begin
   Mongoid.load_configuration({
-    "sessions" =>
+    "clients" =>
     {
-      "default" => 
+      "default" =>
       {
         "hosts" => ["localhost:27017"],
         "database" =>"datagrid_mongoid",
         "autocreate_indexes" => true,
         "logger" => nil,
+        "options" => {
+          "connect_timeout" => 2,
+          wait_queue_timeout: 2
+        }
       }
     }
   })
-  MongoMapper.connection = Mongo::Connection.new('localhost', 27017)
-  MongoMapper.database = "datagrid_mongo_mapper"
 
-rescue Mongo::ConnectionFailure
+  Mongoid.client(:default).collections # check mongo connection
+
+  if defined?(MongoMapper)
+    MongoMapper.connection = Mongo::Connection.new('localhost', 27017)
+    MongoMapper.database = "datagrid_mongo_mapper"
+  end
+
+rescue Mongo::Error::NoServerAvailable
   message = "Didn't find mongodb at localhost:27017."
   if NO_MONGO
     warn("MONGODB WARNING: #{message}. Skipping Mongoid and Mongomapper tests.")
@@ -78,7 +89,7 @@ RSpec.configure do |config|
     SequelEntry.where.delete
     unless NO_MONGO
       MongoidEntry.delete_all
-      MongoMapperEntry.delete_all
+      MongoMapperEntry.delete_all if defined?(MongoMapperEntry)
     end
 
   end

data/spec/support/active_record.rb

@@ -1,6 +1,6 @@
 
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
-ActiveRecord::Base.configurations = true
+#ActiveRecord::Base.configurations = true
 
 ActiveRecord::Base.logger = TEST_LOGGER
 
@@ -24,7 +24,7 @@ ActiveRecord::Schema.define(:version => 1) do
 
   create_table :groups do |t|
     t.string :name
-    t.float :rating 
+    t.float :rating
     t.timestamps
   end
 

data/spec/support/mongo_mapper.rb

@@ -1,32 +1,32 @@
-require "rubygems"
+if defined?(MongoMapper)
 
-class MongoMapperEntry
-  include MongoMapper::Document
+  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, Time
-  timestamps!
+    key :group_id, Integer
+    key :name, String
+    key :category, String
+    key :disabled, Boolean, :default => false
+    key :confirmed, Boolean, :default => false
+    key :shipping_date, Time
+    timestamps!
 
-end
+  end
 
-class MongoMapperGrid
-  include ::Datagrid
+  class MongoMapperGrid
+    include ::Datagrid
 
-  scope do
-    MongoMapperEntry
-  end
+    scope do
+      MongoMapperEntry
+    end
 
-  filter :name
-  integer_range_filters(:group_id, {:default => 0}, {:default => 100})
-  filter :disabled, :xboolean
+    filter :name
+    integer_range_filters(:group_id, {:default => 0}, {:default => 100})
+    filter :disabled, :xboolean
 
-  column :name
-  column :group_id
-  column :disabled
+    column :name
+    column :group_id
+    column :disabled
 
+  end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-25 00:00:00.000000000 Z
+date: 2017-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.22.2
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.22.2
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -126,30 +126,16 @@ dependencies:
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.1.7
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.1.7
-- !ruby/object:Gem::Dependency
-  name: mongo_mapper
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bson
   requirement: !ruby/object:Gem::Requirement
@@ -313,7 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby gem to create datagrids