phrasing 3.2.8 → 3.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b5fb967e75c11f73ea2f60a81c83f5eb121bf91
-  data.tar.gz: 1e8b527c8a9307a5264fb9d62771697713a41f5d
+  metadata.gz: 206cd001ae079192daf6410a4b9be6bb757ea18e
+  data.tar.gz: 63433e277e04cfcfd66a89f4a4ffba8f3f94f7c9
 SHA512:
-  metadata.gz: 128cedbf49e4c1ac8d5ad775a7e05746ee05705f73032f959be34978b531a7baf70fc5499e026f996e3b67683d26fff7fa9f3317a9ced36a14c02127ad7fb976
-  data.tar.gz: d6770c0a73a6d305c995942154741a238b4a57b0b8f55ef243900616ca77c303b49db6a8fe9a8e38991d45ef74c03d6b1e44d8ee0fb2cf169cc1f51eedb8ab43
+  metadata.gz: c9c161bcfbea4965777007fe2a0c3e6b67291f803663f151c7ee8dacf8bc8385754a419a314f7c9c4b7a7a326c3ba161621909e675b831dd94a157cca440d41a
+  data.tar.gz: 1c0a1ff71038dd6cb0d4130bb507ca6630249c13083a2bd55fa2fa647ca9acf94b8228a6e8f7e73a2edaeb60a79f255c0fc9f8ce327c8a475f50978576d93433

data/.travis.yml

@@ -1,9 +1,12 @@
 language: ruby
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.2
-env:
-  - "RAILS_VERSION=3.2.0"
-  - "RAILS_VERSION=4.0.0"
-  - "RAILS_VERSION=4.1.0"
+
+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"

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Phrasing Change Log
 
+## 3.2.9 (January 7th, 2015)
+
+Require only haml, not haml-rails.
+
 ## 3.2.8 (January 6th, 2015)
 
 Fix confirm dialogs when deleting phrases and phrase versions.

data/Gemfile

@@ -8,8 +8,7 @@ rails_version = ENV["RAILS_VERSION"] || "4.1.4"
 gem "rails", "~> #{rails_version}"
 
 gem 'factory_girl_rails'
-gem 'haml-rails'
 gem 'sqlite3'
 gem 'rspec-rails'
 gem 'capybara', '~> 2.2.0'
-gem 'jasmine-rails'
+gem 'jasmine-rails'

data/lib/phrasing.rb

@@ -4,7 +4,7 @@ require "phrasing/simple"
 require "phrasing/serializer"
 require 'jquery-rails'
 require 'jquery-cookie-rails'
-require 'haml-rails'
+require 'haml'
 
 module Phrasing
   module Rails
@@ -79,4 +79,4 @@ module Phrasing
     end
 
 
-end
+end

data/lib/phrasing/version.rb

@@ -1,3 +1,3 @@
 module Phrasing
-  VERSION = "3.2.8"
+  VERSION = "3.2.9"
 end

data/phrasing.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "rails", ">= 3.2.0"
   s.add_dependency "railties", ">= 3.2"
-  s.add_dependency "haml-rails"
+  s.add_dependency "haml"
   s.add_dependency "jquery-rails"
   s.add_dependency "jquery-cookie-rails"
   s.add_dependency "sass"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phrasing
 version: !ruby/object:Gem::Version
-  version: 3.2.8
+  version: 3.2.9
 platform: ruby
 authors:
 - Tomislav Car
@@ -40,7 +40,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: haml-rails
+  name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="