datagrid 1.1.2 → 1.2.0

data/spec/spec_helper.rb

@@ -1,5 +1,9 @@
 require 'rubygems'
 require 'bundler'
+require 'mongoid'
+require 'mongo_mapper'
+
+
 
 begin
   Bundler.setup(:default, :development)
@@ -35,7 +39,26 @@ end
 
 File.open('spec.log', "w").close
 TEST_LOGGER = Logger.new('spec.log')
+NO_MONGO = ENV['NO_MONGO']
 
+begin
+  Mongoid.from_hash({
+    "host" => "localhost",
+    "database" =>"datagrid_mongoid",
+    "autocreate_indexes" => true,
+    "logger" => nil,
+  })
+  MongoMapper.connection = Mongo::Connection.new('localhost', 27017)
+  MongoMapper.database = "datagrid_mongo_mapper"
+
+rescue Mongo::ConnectionFailure
+  message = "Didn't find mongodb at localhost:27017."
+  if NO_MONGO
+    warn("MONGODB WARNING: #{message}. Skipping Mongoid and Mongomapper tests.")
+  else
+    raise "#{message}. Run with NO_MONGO=true env variable to skip mongodb tests"
+  end
+end
 
 RSpec.configure do |config|
 
@@ -44,11 +67,19 @@ RSpec.configure do |config|
     #TODO better database truncation
     Group.delete_all
     Entry.delete_all
-    MongoidEntry.delete_all
-    MongoMapperEntry.delete_all
+    unless NO_MONGO
+      MongoidEntry.delete_all
+      MongoMapperEntry.delete_all
+    end
 
   end
 
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+
+  if NO_MONGO
+    config.filter_run_excluding :mongoid => true
+    config.filter_run_excluding :mongomapper => true
+  end
 
 end
 

data/spec/support/matchers.rb

@@ -4,33 +4,10 @@ def equal_to_dom(text)
   EqualToDom.new(text)
 end
 
-
-def include_dom(text)
-  IncludeDom.new(text)
-end
-
 def match_css_pattern(pattern)
   CssPattern.new(pattern)
 end
 
-
-class IncludeDom
-  def initialize(expectation)
-    @expectation = Nokogiri::HTML::DocumentFragment.parse(expectation.strip).to_s
-  end
-
-  def matches?(text)
-    @matcher = Nokogiri::HTML::DocumentFragment.parse(text.strip).to_s
-    @matcher == @expectation
-  end
-
-  def failure_message
-    "Expected dom \n#{@matcher.inspect}\n to include \n#{@expectation.inspect}\n, but it wasn't"
-  end
-  
-end
-
-
 class EqualToDom
 
   def initialize(expectation)
@@ -47,6 +24,10 @@ class EqualToDom
     "Expected dom \n#{@matcher}\n to match \n#{@expectation}\n, but it wasn't"
   end
 
+  def description
+    "equal to dom #{@expectation[0..20]}"
+  end
+
   private
 
   def force_encoding(text)
@@ -101,4 +82,8 @@ class CssPattern
   def negative_failure_message
     "Expected do not match dom pattern. But it was"
   end
+
+  def description
+    "match dom pattern"
+  end
 end

data/spec/support/mongo_mapper.rb

@@ -1,8 +1,4 @@
 require "rubygems"
-require 'mongo_mapper'
-
-MongoMapper.connection = Mongo::Connection.new('localhost', 27017)
-MongoMapper.database = "datagrid_mongo_mapper"
 
 class MongoMapperEntry
   include MongoMapper::Document

data/spec/support/mongoid.rb

@@ -1,13 +1,4 @@
 require "rubygems"
-require 'mongoid'
-
-
-Mongoid.from_hash({
-  "host" => "localhost",
-  "database" =>"datagrid_mongoid",
-  "autocreate_indexes" => true,
-  "logger" => nil,
-})
 
 #Mongoid.logger = TEST_LOGGER #TODO: understand why still output to STDOUT
 

data/spec/support/test_partials/client/datagrid/_form.html.erb

@@ -0,0 +1,13 @@
+<%= form_for grid, options do |f| -%>
+  <p>Namespaced form partial.</p>
+  <% grid.filters.each do |filter| %>
+    <div class="datagrid-filter filter">
+      <%= f.datagrid_label filter %>
+      <%= f.datagrid_filter filter %>
+    </div>
+  <% end %>
+  <div class="datagrid-actions">
+    <%= f.submit I18n.t("datagrid.form.search").html_safe, :class => "datagrid-submit" %>
+    <%= link_to I18n.t('datagrid.form.reset').html_safe, url_for(grid.to_param => {}), :class => "datagrid-reset" %>
+  </div>
+<% end -%>

data/spec/support/test_partials/client/datagrid/_head.html.erb

@@ -0,0 +1,9 @@
+<tr>
+  <p>Namespaced head partial.</p>
+  <% grid.html_columns(*options[:columns]).each do |column| %>
+    <th class="<%= datagrid_column_classes(grid, column) %>">
+      <%= column.header %>
+      <%= datagrid_order_for(grid, column, options) if column.order && options[:order]%>
+    </th>
+  <% end %>
+</tr>

data/spec/support/test_partials/client/datagrid/_order_for.html.erb

@@ -0,0 +1,11 @@
+<div class="order">
+  <p>Namespaced order_for partial.</p>
+  <%= link_to(
+      I18n.t("datagrid.table.order.asc").html_safe,
+      url_for(grid.param_name => grid.as_query.merge(:order => column.name, :descending => false)),
+      :class => "asc") %>
+  <%= link_to(
+      I18n.t("datagrid.table.order.desc").html_safe,
+      url_for(grid.param_name => grid.as_query.merge(:order => column.name, :descending => true )),
+      :class => "desc") %>
+</div>

data/spec/support/test_partials/client/datagrid/_row.html.erb

@@ -0,0 +1,6 @@
+<tr class="<%= options[:cycle] && cycle(*options[:cycle]) %>">
+  <p>Namespaced row partial.</p>
+  <% grid.html_columns(*options[:columns]).each do |column| %>
+    <td class="<%= datagrid_column_classes(grid, column) %>"><%= datagrid_value(grid, column, asset) %></td>
+  <% end %>
+</tr>

data/spec/support/test_partials/client/datagrid/_table.html.erb

@@ -0,0 +1,19 @@
+<%#
+Local variables:
+* grid - instance of Datagrid
+* assets - Array of database Entities
+* options - passed options Hash
+%>
+<p>Namespaced table partial.</p>
+<%= content_tag :table, options[:html] do %>
+  <thead>
+    <%= datagrid_header(grid, options) %>
+  </thead>
+  <tbody>
+    <% if assets.empty? %>
+    <tr><td class="noresults" colspan="100%"><%= I18n.t('datagrid.no_results').html_safe %></td></tr>
+    <% else %>
+    <%= datagrid_rows(grid, assets, options) %>
+    <% end %>
+  </tbody>
+<% end %>

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2014-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -154,14 +154,14 @@ dependencies:
   name: mongo_mapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.11.0
 - !ruby/object:Gem::Dependency
@@ -196,14 +196,14 @@ dependencies:
   name: fastercsv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: This allows you to easily build datagrid aka data tables with sortable
@@ -214,8 +214,9 @@ extensions: []
 extra_rdoc_files:
 - LICENSE.txt
 files:
-- .document
-- .rspec
+- ".document"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - Rakefile
@@ -301,6 +302,11 @@ files:
 - spec/support/mongoid.rb
 - spec/support/simple_report.rb
 - spec/support/test_partials/_actions.html.erb
+- spec/support/test_partials/client/datagrid/_form.html.erb
+- spec/support/test_partials/client/datagrid/_head.html.erb
+- spec/support/test_partials/client/datagrid/_order_for.html.erb
+- spec/support/test_partials/client/datagrid/_row.html.erb
+- spec/support/test_partials/client/datagrid/_table.html.erb
 - templates/controller.rb.erb
 - templates/grid.rb.erb
 - templates/index.html.erb
@@ -314,12 +320,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []