glow 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0550be368ae00a626ff64429e3747c7f3857344
-  data.tar.gz: 693ed08c618b648ce4370d4480ddc6b5f6a85f8b
+  metadata.gz: df9186c0da8a8d2ccec64c0dcd5309b750abfa13
+  data.tar.gz: 16c654a7a1cfddde426a0ead6e1afcd9590af6e3
 SHA512:
-  metadata.gz: ebb004662219a21c4265569adb1407946675fa33904a289de52220a1a67bfa52e80d09495ff4cef67546568cbefbee0de7a53f1f91a2c7c9c94c1cd78ff6774c
-  data.tar.gz: bf1a9d81292d5d121d05337fc4906a9289846d7b53c7679a30a40f53fe07e507f4ab33becb610e69a1eca2e6b943857e5a531f4068a3b0da0f6effaed11dc86f
+  metadata.gz: 633193f5c7abed31cd56cc1de59497f6e4393d6671d6bd6fbcba14246052545ed018ed2b1047daf727b9d9b8474990871db0a648e5a6bcdcfeb4c7a4fa65ea19
+  data.tar.gz: 195ea5b8ed22967a6177ebeebfec1d0de9574444368632b54cef0ccc57df73c653651d42b7ac9c1855de550b422e9f0f3b992e243edbcd8d7d894b9a90ded46c

data/.travis.yml

@@ -1,10 +1,11 @@
+language: ruby
 before_install:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
 env:
-  - "RAILS_VERSION=4.2.8"
-  - "RAILS_VERSION=5.0.3"
-  - "RAILS_VERSION=5.1.1"
+  - "RAILS_VERSION=5.0.6"
+  - "RAILS_VERSION=5.1.5"
 rvm:
-  - 2.2.7
-  - 2.3.4
+  - 2.3.6
+  - 2.4.3
+  - 2.5.0

data/README.md

@@ -76,19 +76,7 @@ In your gemfile add
 
 .
 
-### Rails 3.0
-
-Run
-
-    rails generate glow:install
-
-Then add
-
-    javascipt_include_tag 'glow'
-
-to your layout.
-
-### Rails >=3.1 (including Rails 4)
+### Rails >= 4
 
 Add
 
@@ -96,6 +84,10 @@ Add
 
 to your manifest.
 
+### Rails 3
+
+Please use [v0.0.14](https://github.com/zweitag/glow/tree/v0.0.14)
+
 ## License
 
 See MIT-LICENSE.

data/glow.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ['--main', 'README.md', '--charset=UTF-8']
   s.extra_rdoc_files = ['README.md', 'MIT-LICENSE']
 
-  s.add_dependency "railties", ">= 3.0.0"
-  s.add_dependency "actionpack", ">= 3.0.0"
+  s.add_dependency "railties", ">= 4.0.0"
+  s.add_dependency "actionpack", ">= 4.0.0"
   s.add_dependency "jquery-rails"
 end

data/lib/glow.rb

@@ -1,8 +1,4 @@
 module Glow
-  if ::Rails.version < "3.1"
-    require 'glow/railtie'
-  else
-    require 'glow/engine'
-  end
+  require 'glow/engine'
   require 'glow/version'
 end

data/lib/glow/version.rb

@@ -1,3 +1,3 @@
 module Glow
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end

data/spec/controllers/flash_controller_spec.rb

@@ -3,24 +3,20 @@ require 'spec_helper'
 require 'htmlentities'
 
 ActionDispatch::Flash::FlashHash.class_eval do
-  if Rails::VERSION::MAJOR == 3
-    def discard?(key); @used.include?(key); end
-  else
-    def discard?(key); @discard.include?(key); end
-  end
+  def discard?(key); @discard.include?(key.to_s); end
   def keep?(key); !discard?(key); end
 end
 
-describe FlashController do
+describe FlashController, type: :controller do
   it "should display flash message on redirect" do
-    post :redirect, type: :notice, message: 'Glow!'
+    post :redirect, params: { type: :notice, message: 'Glow!' }
 
     flash[:notice].should be == 'Glow!'
     flash.keep?(:notice).should be true
   end
 
   it "should display flash message on xhr" do
-    xhr :get, :ajax, type: :notice, message: 'Glow!'
+    get :ajax, params: { type: :notice, message: 'Glow!' }, xhr: true
 
     flash[:notice].should be == 'Glow!'
     flash.discard?(:notice).should be true
@@ -30,18 +26,18 @@ describe FlashController do
   end
 
   it "should handle unicode on xhr" do
-    xhr :get, :ajax, type: :notice, message: 'utf8: ✓'
+    get :ajax, params: { type: :notice, message: 'utf8: ✓' }, xhr: true
     @response.headers['X-Message-Type'].should be == 'notice'
     HTMLEntities.new.decode(@response.headers['X-Message']).should be == 'utf8: ✓'
   end
 
   it "should not display flash message on xhr when skip_glow is set" do
-    xhr :get, :ajax, type: :notice, message: 'utf8: ✓', skip_glow: true
+    get :ajax, params: { type: :notice, message: 'utf8: ✓', skip_glow: true }, xhr: true
     @response.headers.should_not have_key 'X-Message-Type'
   end
 
   it "should pass flash message on JSON requests" do
-    get :ajax, type: :notice, message: 'Glow!', format: :json
+    get :ajax, params: { type: :notice, message: 'Glow!' }, format: :json
 
     flash[:notice].should be == 'Glow!'
     flash.discard?(:notice).should be true
@@ -51,7 +47,7 @@ describe FlashController do
   end
 
   it "should not pass flash message on XML requests" do
-    get :ajax, type: :notice, message: 'Glow!', format: :xml
+    get :ajax, params: { type: :notice, message: 'Glow!' }, format: :xml
 
     @response.headers['X-Message-Type'].should be_nil
     @response.headers['X-Message'].should be_nil

data/spec/dummy/Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-gem 'rails', "~> 3.0.0"
+gem 'rails'
 gem 'jquery-rails'
 gem 'glow', path: '../..'
 #group :test, :development do

data/spec/features/flash_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe "the flash view" do
+describe "the flash view", type: :feature do
   it "redirects" do
     visit root_path
     click_on 'redirect'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glow
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Daniel Kirsch
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-19 00:00:00.000000000 Z
+date: 2018-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -70,11 +70,9 @@ files:
 - README.md
 - Rakefile
 - glow.gemspec
-- lib/generators/glow/install/install_generator.rb
 - lib/glow.rb
 - lib/glow/engine.rb
 - lib/glow/filter.rb
-- lib/glow/railtie.rb
 - lib/glow/version.rb
 - spec/controllers/flash_controller_spec.rb
 - spec/dummy/.rspec

data/lib/generators/glow/install/install_generator.rb

@@ -1,19 +0,0 @@
-require 'rails'
-
-module Glow
-  module Generators
-    class InstallGenerator < ::Rails::Generators::Base
-
-      desc "This generator installs glow.js. You must inclu"
-      class_option :ui, :type => :boolean, :default => false, :desc => "Include jQueryUI"
-      source_root File.expand_path('../../../../../vendor/assets/javascripts', __FILE__)
-
-      def copy_glow
-        say_status("copying", "glow", :green)
-        copy_file "glow.js", "public/javascripts/glow.js"
-        say("Please include glow.js in your layout")
-      end
-
-    end
-  end
-end if ::Rails.version < "3.1"

data/lib/glow/railtie.rb

@@ -1,13 +0,0 @@
-require 'glow/filter'
-require 'rails/railtie'
-require 'action_controller'
-
-module Glow
-  class Railtie < Rails::Railtie
-    initializer 'glow' do
-      ActiveSupport.on_load :action_controller do
-        include Glow::Filter
-      end
-    end
-  end
-end