cambium 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76f6a0f62b15e34ce43ad75bd755cc2ac5074363
-  data.tar.gz: 5cd10be0dbc8590dd039d95cbd2e7a1dd3eab3a9
+  metadata.gz: b4ea6803ff7b5699c765fd57eb79353db74645cc
+  data.tar.gz: 92f9fee301ccb91d0bb9f9755343e39db07f1ff3
 SHA512:
-  metadata.gz: c7a6aa8263c90cbfd7ab1ee641cec7012c807f588a41f4072e188d80e52f44b7876a5ccfe899156026df68e2956c50733071daa2d9d945a4dbb2e1486660c7fe
-  data.tar.gz: 84fe86a884806e674a98149f99d09c90616f06e4427d34c854c9381be33fae22e3c8f4506abef9b1c917b534fdf11e5b1d2879a9d5bcd88a3c570373fed159a9
+  metadata.gz: 5284b848c3a7d298fd978b9650f6b64c1ece775801ba615d84f6d2db5a07bff6a035a569f63464cf8b17906bf6cf5658c0fd61c3dd70f0807d1c6b3b7557a2d0
+  data.tar.gz: 8bc1d2704a51bf91d44aa7fe06a63ed9a13a81413aa535100210541991fac0b0eac146d344a9d22c5a9bbbd50049414b5256bad677a75170314a875bb89c31e9

data/app/assets/stylesheets/cambium/admin/application.scss

@@ -6,7 +6,7 @@
 @import 'pickadate/classic';
 @import 'pickadate/classic.date';
 @import 'pickadate/classic.time';
-@import 'mark_it_zero/mark_it_zero';
+@import 'mark_it_zero';
 
 // ------------------------------------------ Partials
 

data/app/controllers/cambium/admin_controller.rb

@@ -82,7 +82,9 @@ class Cambium::AdminController < Cambium::BaseController
 
     def set_activities
       @activities = PaperTrail::Version.order(:created_at => :desc)
-        .includes(:item).limit(20)
+        .includes(:item).limit(40)
+      @activities = @activities
+        .reject { |a| a.item.blank? || a.whodunnit.blank? }.first(20)
       @users = User.where(:id => @activities.collect(&:whodunnit)
         .reject(&:blank?).map(&:to_i))
     end

data/cambium.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'bones-rails', '>= 1.1.3'
   spec.add_dependency 'kaminari'
-  spec.add_dependency 'mark_it_zero'
+  spec.add_dependency 'mark_it_zero', '~> 0.3.0'
   spec.add_dependency 'paper_trail'
   spec.add_dependency 'pg_search'
   spec.add_dependency 'pickadate-rails'
@@ -29,20 +29,4 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rake'
   spec.add_dependency 'superslug'
 
-  #   'ancestry',
-  #   'annotate',                     all models
-  #   'backbone-on-rails',            install:app
-  #   'coffee-rails',                 install:app
-  #   'devise',                       model:user
-  #   'factory_girl_rails',
-  #   'faker',
-  #   'hirb',
-  #   'jbuilder',
-  #   'jquery-rails',                 install:app
-  #   'jquery-fileupload-rails',
-  #   'simple_form',
-  #   'uglifier',                     install:app
-  #   'unicorn-rails',                install:app
-  #   'wysihtml5-rails',
-
 end

data/lib/cambium/version.rb

@@ -1,3 +1,3 @@
 module Cambium
-  VERSION = "1.1.5"
+  VERSION = "1.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cambium
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Sean C Davis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-19 00:00:00.000000000 Z
+date: 2015-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -57,16 +57,16 @@ dependencies:
   name: mark_it_zero
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: paper_trail
   requirement: !ruby/object:Gem::Requirement
@@ -289,7 +289,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Rails generators to facilitate development.