phrasing 2.1.0 → 2.1.1

data/README.md

@@ -90,4 +90,4 @@ Phrasing.allow_update_on_all_models_and_attributes = true
 
 Copyright (c) 2013, Infinum
 
-Phrasing relies heavily (or is built) on two other libraries: the Copycat gem and the ZenPen library. So thank you to the authors and all the contributors! 
+Phrasing relies heavily (or is built) on two other libraries: the [Copycat gem](https://github.com/Zorros/copycat) and the [ZenPen library](https://github.com/tholman/zenpen/tree/master/). So thank you to the authors and all the contributors! 

data/app/models/phrasing_phrase.rb

@@ -1,5 +1,4 @@
 class PhrasingPhrase < ActiveRecord::Base
-  require 'phrasing/ambiguous_phrases_error'
 
   unless ENV['PHRASING_DEBUG']
     self.logger = Logger.new('/dev/null')
@@ -7,11 +6,13 @@ class PhrasingPhrase < ActiveRecord::Base
 
   validates_presence_of :key, :locale
 
-  before_create :check_ambiguity
+  # These validation methods are used so the YAML file can be exported/imported properly.
+  validate :check_ambiguity, on: :create, :unless => Proc.new { |phrase| phrase.key.nil? }
+  validate :key_muts_not_end_with_a_dot, on: :create, :unless => Proc.new { |phrase| phrase.key.nil? }
 
   def self.create_phrase(key)
     phrasing_phrase = PhrasingPhrase.new
-    phrasing_phrase.key = key
+    phrasing_phrase.key = key.to_s
     phrasing_phrase.value = key.to_s.humanize
     phrasing_phrase.locale = I18n.locale
     phrasing_phrase.save!
@@ -69,7 +70,6 @@ class PhrasingPhrase < ActiveRecord::Base
 
   extend Serialize
 
-
   private
 
     def check_ambiguity
@@ -82,16 +82,20 @@ class PhrasingPhrase < ActiveRecord::Base
       while stripped_key.include?('.')
         stripped_key = stripped_key.split('.')[0..-2].join('.')
         if PhrasingPhrase.where(key: stripped_key).count > 0
-            raise Phrasing::AmbiguousPhrasesError, "Ambiguous calling! There exists a '#{stripped_key}' key, unable to call a new key '#{key}'"
+            errors.add(:key, "can't be named '#{key}', there already exists a key named '#{stripped_key}'. Ambiguous calling!")
         end
       end
     end
 
     def check_ambiguity_on_successors
       key_successor = "#{key}."
-      if PhrasingPhrase.where(PhrasingPhrase.arel_table[:key].matches("%#{key_successor}%")).count > 0
-        raise Phrasing::AmbiguousPhrasesError, "Ambiguous calling! There exists one or multiple keys beginning with '#{key_successor}', unable to call a new key '#{key}'"
+      if PhrasingPhrase.where(PhrasingPhrase.arel_table[:key].matches("#{key_successor}%")).count > 0
+        errors.add(:key, "can't be named '#{key}', there already exists one or multiple keys beginning with '#{key_successor}'. Ambiguous calling!")
       end
     end
 
+    def key_muts_not_end_with_a_dot
+      errors.add(:key, "mustn't end with a dot") if key[-1] == "."
+    end
+
 end

data/lib/phrasing.rb

@@ -1,7 +1,6 @@
 require 'phrasing'
 require "phrasing/implementation"
 require "phrasing/simple"
-require 'phrasing/phrasable_error_handler'
 
 module Phrasing
   module Rails
@@ -11,11 +10,6 @@ module Phrasing
         ::Rails.application.config.assets.paths << ::Rails.root.join('app', 'assets', 'images')
         ::Rails.application.config.assets.precompile += ['editor.js', 'phrasing_engine.css', 'icomoon.dev.svg', 'icomoon.svg', 'icomoon.eot', 'icomoon.ttf', 'icomoon.woff', 'phrasing_information_icon.png']
       end
-      initializer "phrasing" do
-        ActiveSupport.on_load(:action_controller) do
-          # ActionController::Base.send(:include, PhrasableErrorHandler)
-        end
-      end
     end
   end
 end

data/lib/phrasing/version.rb

@@ -1,3 +1,3 @@
 module Phrasing
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phrasing
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-14 00:00:00.000000000 Z
+date: 2013-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -101,9 +101,7 @@ files:
 - config/routes.rb
 - db/migrate/20120313191745_create_phrasing_phrases.rb
 - lib/phrasing.rb
-- lib/phrasing/ambiguous_phrases_error.rb
 - lib/phrasing/implementation.rb
-- lib/phrasing/phrasable_error_handler.rb
 - lib/phrasing/simple.rb
 - lib/phrasing/version.rb
 - lib/tasks/phrasing_tasks.rake

data/lib/phrasing/ambiguous_phrases_error.rb

@@ -1,3 +0,0 @@
-module Phrasing
-  class AmbiguousPhrasesError < StandardError; end
-end

data/lib/phrasing/phrasable_error_handler.rb

@@ -1,9 +0,0 @@
-module PhrasableErrorHandler
-  extend ActiveSupport::Concern
-  included do
-    rescue_from "Phrasing::AmbiguousPhrasesError", with: :phrasing_error
-    def phrasing_error(e)
-      render text: e.message
-    end
-  end
-end