phrasing 4.0.0rc1 → 4.0.0rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75aa378d3f0142b6218e526c92f6774dea7fdab4
-  data.tar.gz: 44392541b00771fd8ace7a7e8a2997cc5742139d
+  metadata.gz: b9dcfc2841ec28bd67e4753423cc4b95a6620b4f
+  data.tar.gz: 9979a2f18909e0e8acf2d1655cf7cc05c5a2f310
 SHA512:
-  metadata.gz: 3ff1aa31583ef783238cac57b9c601a0d57c2a0a52ccc38696c2239c5619f6a7470dbfcd5219ce99f9ebe0255e995dc95e5f29aaf1448efd2abd926d62e34893
-  data.tar.gz: 8c4a00598712079d7a1c7d99ba8898a1510ba916d2494da18409bcbe0bbdcfcf65511bbc8d1d225b27045af0fe0c690f6feaf85e715a7c06f06b4579c768c852
+  metadata.gz: 626fdf49d11632970a2f55c434dd92c9bbd2cdc25d5a7a58ab365455580d7e723bb24a6cc4f77ff56d82244be3d747ade1f588ad8300eb6bc77f8d56f7947769
+  data.tar.gz: 6026e75cf96b9b934fde9f798c47462a70de07d51026bfbfa4095eabe8a8cebc1977179040c9ef55083d44062d8d4f5608207da66ec7fa7fdc329a12ca6f3077

data/4.0.0_changes.md

@@ -0,0 +1 @@
+# Changes

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Phrasing Change Log
 
+## 3.2.7 (October 3rd, 2014)
+
+Add a config option to set a parent controller to Phrasing Engine Controllers.
+
+## 3.2.6 (September 15th, 2014)
+
+Show Home page only when view responds to :root_path.
+
 ## 3.2.5 (June 17th, 2014)
 
 Added index for phrasing_phrase_id in versions table.

data/README.md

@@ -114,7 +114,6 @@ The `phrase` view helper can take the `options` hash as the last parameter. Feat
 url: custom_url # point Phrasing to other actions in other controllers
 inverse: true # change the hovered background and underline colors to better fit darker backgrounds
 class: custom_class # add custom CSS classes to your phrases to change the appearance of phrases in your application
-interpolation: { %min: 10 } # add variables to your translations just like w/ I18n
 scope: 'homepage.footer' # add scopes just like you would w/ I18.n. If the first argument is 'test', than the key would be 'homepage.footer.test'
 ```
 

data/Release_notes_version_4.md

@@ -11,7 +11,7 @@ However, when using the phrase(key) method, if the key doesn't currently exist i
 
 ## Interpolation
 
-Try not to use the interpolation option anymore since it will probably be kicked out in the first stable release.
+The interpolation option has been kicked out.
 
 The problem with the interpolation option is that most clients won't understand what's happening when they see something like "Hi, my name is %{name}" once they are editing data.
 

data/app/controllers/phrasing_phrase_versions_controller.rb

@@ -1,4 +1,4 @@
-class PhrasingPhraseVersionsController < ActionController::Base
+class PhrasingPhraseVersionsController < Phrasing.parent_controller.constantize
 
   def destroy
     phrase_version = PhrasingPhraseVersion.find(params[:id])

data/app/controllers/phrasing_phrases_controller.rb

@@ -1,4 +1,4 @@
-class PhrasingPhrasesController < ActionController::Base
+class PhrasingPhrasesController < Phrasing.parent_controller.constantize
 
   layout 'phrasing'
 

data/app/helpers/inline_helper.rb

@@ -1,6 +1,6 @@
 module InlineHelper
 # Normal phrase
-# phrase("headline", url: www.infinum.co/yabadaba, inverse: true, interpolation: {min: 15, max: 20}, scope: "models.errors")
+# phrase("headline", url: www.infinum.co/yabadaba, inverse: true, scope: "models.errors")
 
 # Data model phrase
 # phrase(record, :title, inverse: true, class: phrase-record-title)
@@ -18,7 +18,7 @@ module InlineHelper
   private
 
     def inline(record, attribute, options={})
-      return uneditable_phrase(record, attribute, options) unless can_edit_phrases?
+      return uneditable_phrase(record, attribute) unless can_edit_phrases?
 
       klass  = 'phrasable phrasable_on'
       klass += ' inverse'      if options[:inverse]
@@ -37,12 +37,8 @@ module InlineHelper
       inline(record, :value, options)
     end
 
-    def uneditable_phrase(record, attribute, options={})
-      record_value = if options[:interpolation]
-        I18n.interpolate(record.send(attribute), options[:interpolation])
-      else
-        record.send(attribute)
-      end
+    def uneditable_phrase(record, attribute)
+      record_value = record.send(attribute)
       record_value.to_s.html_safe
     end
 

data/lib/phrasing.rb

@@ -1,37 +1,20 @@
 require 'phrasing'
-require "phrasing/serializer"
+require 'phrasing/serializer'
+require 'phrasing/rails/engine'
 require 'jquery-rails'
 require 'jquery-cookie-rails'
 require 'haml-rails'
 
 module Phrasing
-  module Rails
-    class Engine < ::Rails::Engine
-      initializer :assets, group: :all do
-        ::Rails.application.config.assets.paths << ::Rails.root.join('app', 'assets', 'fonts')
-        ::Rails.application.config.assets.paths << ::Rails.root.join('app', 'assets', 'images')
-        ::Rails.application.config.assets.precompile +=  %w(editor.js
-                                                            phrasing_engine.css
-                                                            phrasing_engine.js
-                                                            icomoon.dev.svg
-                                                            icomoon.svg
-                                                            icomoon.eot
-                                                            icomoon.ttf
-                                                            icomoon.woff
-                                                            phrasing_icon_edit_all.png)
-      end
-    end
-  end
-end
-
-
-module Phrasing
-
   mattr_accessor :allow_update_on_all_models_and_attributes
-  mattr_accessor :route
+  @@allow_update_on_all_models_and_attributes = false
 
+  mattr_accessor :route
   @@route = 'phrasing'
 
+  mattr_accessor :parent_controller
+  @@parent_controller = "ApplicationController"
+
   def self.setup
     yield self
   end

data/lib/phrasing/rails/engine.rb

@@ -0,0 +1,19 @@
+module Phrasing
+  module Rails
+    class Engine < ::Rails::Engine
+      initializer :assets, group: :all do
+        ::Rails.application.config.assets.paths << ::Rails.root.join('app', 'assets', 'fonts')
+        ::Rails.application.config.assets.paths << ::Rails.root.join('app', 'assets', 'images')
+        ::Rails.application.config.assets.precompile +=  %w(editor.js
+                                                            phrasing_engine.css
+                                                            phrasing_engine.js
+                                                            icomoon.dev.svg
+                                                            icomoon.svg
+                                                            icomoon.eot
+                                                            icomoon.ttf
+                                                            icomoon.woff
+                                                            phrasing_icon_edit_all.png)
+      end
+    end
+  end
+end

data/lib/phrasing/version.rb

@@ -1,3 +1,3 @@
 module Phrasing
-  VERSION = "4.0.0rc1"
+  VERSION = "4.0.0rc2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phrasing
 version: !ruby/object:Gem::Version
-  version: 4.0.0rc1
+  version: 4.0.0rc2
 platform: ruby
 authors:
 - Tomislav Car
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-22 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -103,6 +103,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- 4.0.0_changes.md
 - CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
@@ -144,6 +145,7 @@ files:
 - lib/generators/phrasing/templates/db/migrate/create_phrasing_phrase_versions.rb
 - lib/generators/phrasing/templates/db/migrate/create_phrasing_phrases.rb
 - lib/phrasing.rb
+- lib/phrasing/rails/engine.rb
 - lib/phrasing/serializer.rb
 - lib/phrasing/version.rb
 - phrasing.gemspec
@@ -217,4 +219,3 @@ signing_key:
 specification_version: 4
 summary: Edit phrases inline for Rails applications!
 test_files: []
-has_rdoc: