tolaria 2.0.1 → 2.0.2

data/app/assets/javascripts/admin/lib/underscore.js

@@ -1,29 +1,26 @@
 // Underscore 1.8.3
 // https://github.com/jashkenas/underscore
 //
-// Copyright (c) Jeremy Ashkenas, DocumentCloud, and
-// Investigative Reporters & Editors
+// Copyright © Jeremy Ashkenas, DocumentCloud, and Investigative Reporters & Editors
 //
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files
+// (the "Software"), to deal in the Software without restriction,
+// including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software,
+// and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
 //
 // The above copyright notice and this permission notice shall be
 // included in all copies or substantial portions of the Software.
 //
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
+// ANY CLAIM,  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
+// THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 (function() {
 

data/lib/generators/tolaria/install/templates/administrators_migration.rb

@@ -1,4 +1,4 @@
-class CreateAdministrators < ActiveRecord::Migration
+class CreateAdministrators < ActiveRecord::Migration[5.0]
   def change
 
     create_table :administrators, force:true do |t|
@@ -13,15 +13,11 @@ class CreateAdministrators < ActiveRecord::Migration
       t.string :organization, null:false
 
       # Passcode and authentication system fields
-
       t.string :passcode, limit:60, null:false
       t.datetime :passcode_expires_at, null:false
-
       t.string :auth_token, limit:32, null:false, index:true
-
       t.datetime :account_unlocks_at, null:false
       t.integer :lockout_strikes, null:false, default:0
-
       t.integer :total_strikes, null:false, default:0
       t.integer :sessions_created, null:false, default:0
 

data/lib/tolaria.rb

@@ -9,7 +9,6 @@ require "kaminari"
 require "ransack"
 
 require "tolaria/version"
-require "tolaria/ransack"
 require "tolaria/engine"
 require "tolaria/config"
 require "tolaria/default_config"

data/lib/tolaria/version.rb

@@ -2,7 +2,7 @@ module Tolaria
 
   # Returns Tolaria’s version number
   def self.version
-    Gem::Version.new("2.0.1")
+    Gem::Version.new("2.0.2")
   end
 
   module VERSION

data/test/demo/db/migrate/20150601202901_create_administrators.rb

@@ -1,9 +1,9 @@
-class CreateAdministrators < ActiveRecord::Migration
+class CreateAdministrators < ActiveRecord::Migration[5.0]
   def change
 
     create_table :administrators, force:true do |t|
 
-      t.timestamps
+      t.timestamps null:false
 
       # The email used to log into this account
       t.string :email, null:false, index:true
@@ -13,15 +13,11 @@ class CreateAdministrators < ActiveRecord::Migration
       t.string :organization, null:false
 
       # Passcode and authentication system fields
-
       t.string :passcode, limit:60, null:false
       t.datetime :passcode_expires_at, null:false
-
       t.string :auth_token, limit:32, null:false, index:true
-
       t.datetime :account_unlocks_at, null:false
       t.integer :lockout_strikes, null:false, default:0
-
       t.integer :total_strikes, null:false, default:0
       t.integer :sessions_created, null:false, default:0
 

data/test/demo/db/migrate/20150603204006_add_testing_models.rb

@@ -1,4 +1,4 @@
-class AddTestingModels < ActiveRecord::Migration
+class AddTestingModels < ActiveRecord::Migration[5.0]
   def change
 
     create_table :blog_posts, force: :true do |t|

data/test/demo/db/migrate/20150609232013_create_footnotes.rb

@@ -1,4 +1,4 @@
-class CreateFootnotes < ActiveRecord::Migration
+class CreateFootnotes < ActiveRecord::Migration[5.0]
   def change
     create_table :footnotes do |t|
       t.timestamps null:false

data/test/demo/db/migrate/20150610135235_create_additional_demo_objects.rb

@@ -1,4 +1,4 @@
-class CreateAdditionalDemoObjects < ActiveRecord::Migration
+class CreateAdditionalDemoObjects < ActiveRecord::Migration[5.0]
   def change
 
     create_table :images, force:true do |t|

data/tolaria.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency "bcrypt", "~> 3.1"
   s.add_dependency "kaminari", "~> 0.16"
   s.add_dependency "rails", "~> 5.0"
-  s.add_dependency "ransack", "~> 1.7"
+  s.add_dependency "ransack", "~> 1.8"
   s.add_dependency "sass-rails", "~> 5.0"
   s.add_dependency "sass", "~> 3.0"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tolaria
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Corey Csuhta
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2016-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -334,7 +334,6 @@ files:
 - lib/tolaria/managed_class.rb
 - lib/tolaria/markdown.rb
 - lib/tolaria/random_tokens.rb
-- lib/tolaria/ransack.rb
 - lib/tolaria/reload.rb
 - lib/tolaria/routes.rb
 - lib/tolaria/version.rb

data/lib/tolaria/ransack.rb

@@ -1,43 +0,0 @@
-# Until Ransack releases a new gem version, we have to patch in this
-# Rails 5 support from their master branch
-
-module Ransack
-  module Helpers
-    module FormHelper
-
-      def sort_link(search_object, attribute, *args, &block)
-        search, routing_proxy = extract_search_and_routing_proxy(search_object)
-        unless Search === search
-          raise TypeError, 'First argument must be a Ransack::Search!'
-        end
-        args.unshift(capture(&block)) if block_given?
-        s = SortLink.new(search, attribute, args, params, &block)
-        link_to(s.name, url(routing_proxy, s.url_options), s.html_options(args))
-      end
-
-      class SortLink
-
-        def initialize(search, attribute, args, params)
-          @search         = search
-          @params         = parameters_hash(params)
-          @field          = attribute.to_s
-          @sort_fields    = extract_sort_fields_and_mutate_args!(args).compact
-          @current_dir    = existing_sort_direction
-          @label_text     = extract_label_and_mutate_args!(args)
-          @options        = extract_options_and_mutate_args!(args)
-          @hide_indicator = @options.delete(:hide_indicator) || Ransack.options[:hide_sort_order_indicators]
-          @default_order  = @options.delete :default_order
-        end
-
-        private
-
-        def parameters_hash(params)
-          return params unless params.respond_to?(:to_unsafe_h)
-          params.to_unsafe_h
-        end
-
-      end
-
-    end
-  end
-end