phrasing 4.0.0rc14 → 4.0.0rc15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b65fe7e7e01f0333d8b8ccf15155066a3f159d5
-  data.tar.gz: dfd04a8e7b78b499489695fc46a8f033ee05a19b
+  metadata.gz: 363ff7e672836ac3143fef33947f95101b10d314
+  data.tar.gz: c1b2b2a8a483553b3659ebd3aacbe3396bbbab53
 SHA512:
-  metadata.gz: 39a805e41b613e871ffc8c2502dfdf06225a5fc268b87b9bf5bbba1e8945f8405f11c78a60df7498a2d1eb021954913e0b697e7108b10337c2d4d7ffd3c5a233
-  data.tar.gz: 57d1cf20b19e7f259e5ad747086017029eb5b092ed88d0a829f877818ef7bf23afb2e5a993847440b3498f6c219e1fff517e355552e15a5e8871d798a8e3ee68
+  metadata.gz: 236cbd26a05837f61ac6ba1fdb501f024ae5f5c49328e8177243365f5a9bbfa73133f35d93c6d0a64af99c598bfa6c5ac5a559ab038cdef18d28e4de77e037ec
+  data.tar.gz: 00d517390daab7df483099dfe4636c184f200ae11ca26e082b3a97d28ace82e33e3da476ff34f707a81150d21c675eca06dc3673298b21efd3fede54c5d7b683

data/.travis.yml

@@ -3,11 +3,11 @@ language: ruby
 
 matrix:
   include:
-    - rvm: 1.9.3
-      env: "RAILS_VERSION=3.2.0"
     - rvm: 2.0.0
       env: "RAILS_VERSION=4.0.0"
     - rvm: 2.1.2
       env: "RAILS_VERSION=4.1.0"
     - rvm: 2.2.0
       env: "RAILS_VERSION=4.2.0"
+    - rvm: 2.3.0
+      env: "RAILS_VERSION=5.0.0"

data/Gemfile

@@ -3,14 +3,14 @@ source "https://rubygems.org"
 
 gemspec
 
-rails_version = ENV["RAILS_VERSION"] || "4.1.4"
+rails_version = ENV["RAILS_VERSION"] || "5.0.0"
 
 gem "rails", "~> #{rails_version}"
 
 gem 'factory_girl_rails'
 gem 'sqlite3'
 gem 'rspec-rails'
-gem 'capybara', '~> 2.3.0'
+gem 'capybara', '~> 2.7.0'
 gem 'jasmine-rails'
 gem 'pry-rails'
 gem 'sass', '3.4.0'

data/README.md

@@ -65,7 +65,6 @@ Include the required **javascript** files:
 ```javascript
 //= require jquery
 //= require jquery_ujs
-//= require jquery.cookie
 //= require phrasing
 ```
 
@@ -112,7 +111,6 @@ If you're experiencing problems with Rails apps using Turbolinks, include the [j
 ```javascript
 //= require jquery
 //= require jquery_ujs
-//= require jquery.cookie
 //= require jquery.turbolinks
 //= require phrasing
 //= require turbolinks

data/Release_notes_version_4.md

@@ -24,7 +24,6 @@ From phrasing v4.0.0rc3, add your jquery files manually:
 ```javascript
 //= require jquery
 //= require jquery_ujs
-//= require jquery.cookie
 //= require phrasing
 ```
 
@@ -34,4 +33,4 @@ Since Rails comes with outofbox generators that enable easy existing file detect
 
 ## HTML Sanitization
 
-There is a posibility we might add html sanitization to prevent ugly copy-pasted html insertion as well as XSS attacks.
+There is a posibility we might add html sanitization to prevent ugly copy-pasted html insertion as well as XSS attacks.

data/app/controllers/phrasing_phrases_controller.rb

@@ -6,7 +6,7 @@ class PhrasingPhrasesController < Phrasing.parent_controller.constantize
 
   include PhrasingHelper
 
-  before_filter :authorize_editor
+  before_action :authorize_editor
 
   def import_export
   end
@@ -17,7 +17,7 @@ class PhrasingPhrasesController < Phrasing.parent_controller.constantize
   def index
     params[:locale] ||= I18n.default_locale
     @phrasing_phrases = PhrasingPhrase.fuzzy_search(params[:search], params[:locale])
-    @locale_names = PhrasingPhrase.uniq.pluck(:locale)
+    @locale_names = PhrasingPhrase.distinct.pluck(:locale)
   end
 
   def edit

data/lib/phrasing.rb

@@ -2,7 +2,6 @@ require 'phrasing'
 require 'phrasing/serializer'
 require 'phrasing/rails/engine'
 require 'jquery-rails'
-require 'jquery-cookie-rails'
 require 'haml'
 
 module Phrasing

data/lib/phrasing/version.rb

@@ -1,3 +1,3 @@
 module Phrasing
-  VERSION = "4.0.0rc14"
+  VERSION = "4.0.0rc15"
 end

data/phrasing.gemspec

@@ -20,6 +20,5 @@ Gem::Specification.new do |s|
   s.add_dependency "railties", ">= 3.2"
   s.add_dependency "haml"
   s.add_dependency "jquery-rails"
-  s.add_dependency "jquery-cookie-rails"
   s.add_dependency "sass"
 end

data/spec/dummy/app/assets/javascripts/application.js

@@ -6,6 +6,5 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require jquery.cookie
 //= require phrasing
 //= require_tree .

data/spec/dummy/spec/javascripts/support/jasmine.yml

@@ -0,0 +1,50 @@
+# path to parent directory of src_files
+# relative path from Rails.root
+# defaults to app/assets/javascripts
+src_dir: "app/assets/javascripts"
+
+# path to additional directory of source file that are not part of assets pipeline and need to be included
+# relative path from Rails.root
+# defaults to []
+# include_dir:
+#   - ../mobile_app/public/js
+
+# path to parent directory of css_files
+# relative path from Rails.root
+# defaults to app/assets/stylesheets
+css_dir: "app/assets/stylesheets"
+
+# list of file expressions to include as source files
+# relative path from src_dir
+src_files:
+  - "application.{js.coffee,js,coffee}"
+
+# list of file expressions to include as css files
+# relative path from css_dir
+css_files:
+
+# path to parent directory of spec_files
+# relative path from Rails.root
+#
+# Alternatively accept an array of directory to include external spec files
+# spec_dir:
+#   - spec/javascripts
+#   - ../engine/spec/javascripts
+#
+# defaults to spec/javascripts
+spec_dir: spec/javascripts
+
+# list of file expressions to include as helpers into spec runner
+# relative path from spec_dir
+helpers:
+  - "helpers/**/*.{js.coffee,js,coffee}"
+
+# list of file expressions to include as specs into spec runner
+# relative path from spec_dir
+spec_files:
+  - "**/*[Ss]pec.{js.coffee,js,coffee}"
+
+# path to directory of temporary files
+# (spec runner and asset cache)
+# defaults to tmp/jasmine
+tmp_dir: "tmp/jasmine"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phrasing
 version: !ruby/object:Gem::Version
-  version: 4.0.0rc14
+  version: 4.0.0rc15
 platform: ruby
 authors:
 - Tomislav Car
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-20 00:00:00.000000000 Z
+date: 2016-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -67,20 +67,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: jquery-cookie-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -187,6 +173,7 @@ files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
+- spec/dummy/spec/javascripts/support/jasmine.yml
 - spec/factories/phrasing_phrases.rb
 - spec/features/dummy_spec.rb
 - spec/features/phrasing_spec.rb