listings 0.1.7 → 0.1.8

data/app/views/listings/_table_content.html.haml

@@ -26,7 +26,7 @@
     %ul.nav.clearfix
       - if listing.paginated?
         %li.pull-left
-          = paginate listing.items, :remote => true, :theme => listing.kaminari_theme, :params => listing.params, :remote => true
+          = paginate listing.items, :theme => listing.kaminari_theme, :params => listing.params, :remote => true
       - unless listing.export_formats.empty?
         %li.pull-right
           %ul.inline.list-inline

data/lib/listings/action_view_extensions.rb

@@ -3,7 +3,8 @@ module Listings
   module ActionViewExtensions
     def render_listing(key, options = {})
       options.reverse_merge! :params => {}
-      params_for_listing = {:listing => key}.merge(params).merge(options[:params]).with_indifferent_access
+      _params = Rails::VERSION::MAJOR < 5 ? params : params.to_unsafe_h
+      params_for_listing = {:listing => key}.merge(_params).merge(options[:params]).with_indifferent_access
       listing = prepare_listing(params_for_listing, self)
       res = listings_partial_render 'listing', listing
       Kaminari::Helpers::Tag.paginate_with_listings(nil)

data/lib/listings/kaminari_helpers_tag_patch.rb

@@ -9,9 +9,10 @@ module Kaminari
         Thread.current[:listings]
       end
 
+      alias_method :page_url_for_without_listing, :page_url_for
       # patch kaminari helpers
       # passing options of mountable engine routes seems to not be working
-      def page_url_for_with_listing(page)
+      def page_url_for(page)
         if Kaminari::Helpers::Tag.listings_to_paginate_with
           @params.delete :page
           params = {@param_name => page}.merge(@params).with_indifferent_access
@@ -22,8 +23,6 @@ module Kaminari
           page_url_for_without_listing(page)
         end
       end
-
-      alias_method_chain :page_url_for, :listing
     end
   end
 end

data/lib/listings/rspec/listings_helpers.rb

@@ -36,7 +36,12 @@ module RSpec::ListingsHelpers
 
   def fake_context
     controller = ActionController::Base.new
-    controller.request = ActionController::TestRequest.new(:host => "http://test.com")
+
+    controller.request = if Rails::VERSION::MAJOR < 5
+      ActionController::TestRequest.new(:host => "http://test.com")
+    else
+      ActionController::TestRequest.create
+    end
     context = controller.view_context
 
     context.class.send(:define_method, 'listings') do

data/lib/listings/sources/active_record_data_source.rb

@@ -80,15 +80,14 @@ module Listings::Sources
 
   class DataSource
     class << self
-      def for_with_active_record(model)
+      alias_method :for_without_active_record, :for
+      def for(model)
         if (model.is_a?(Class) && model.ancestors.include?(ActiveRecord::Base)) || model.is_a?(ActiveRecord::Relation)
           ActiveRecordDataSource.new(model)
         else
           for_without_active_record(model)
         end
       end
-
-      alias_method_chain :for, :active_record
     end
   end
 

data/lib/listings/sources/object_data_source.rb

@@ -58,15 +58,14 @@ module Listings::Sources
 
   class DataSource
     class << self
-      def for_with_object(model)
+      alias_method :for_without_object, :for
+      def for(model)
         if model.is_a?(Array) # TODO Enumerable
           ObjectDataSource.new(model)
         else
           for_without_object(model)
         end
       end
-
-      alias_method_chain :for, :object
     end
   end
 

data/lib/listings/version.rb

@@ -1,3 +1,3 @@
 module Listings
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/lib/listings/view_helper_methods.rb

@@ -26,7 +26,7 @@ module Listings
         res.delete param_page
         res.delete :controller
         res.delete :action
-        res.with_indifferent_access
+        Rails::VERSION::MAJOR < 5 ? res.with_indifferent_access : res.to_unsafe_h
       end
 
       def no_data_message

data/spec/dummy/config/application.rb

@@ -51,10 +51,10 @@ module Dummy
     config.active_record.whitelist_attributes = true if Rails::VERSION::MAJOR == 3
 
     # Enable the asset pipeline
-    config.assets.enabled = true
+    config.assets.enabled = true if Rails::VERSION::MAJOR < 5
 
     # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
+    config.assets.version = '1.0' if Rails::VERSION::MAJOR < 5
   end
 end
 

data/spec/dummy/config/environments/test.rb

@@ -9,7 +9,8 @@ Dummy::Application.configure do
 
   # Configure static asset server for tests with Cache-Control for performance
   config.serve_static_assets = true
-  config.static_cache_control = "public, max-age=3600"
+  config.static_cache_control = "public, max-age=3600" if Rails::VERSION::MAJOR < 5
+  config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' } if Rails::VERSION::MAJOR >= 5
 
   # Log error messages when you accidentally call methods on nil
   config.whiny_nils = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: listings
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-20 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -139,38 +139,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-debugger
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Simple creation of listings in rails applications.
 email:
 - bcardiff@gmail.com