simple_helpers 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad5106d5e8ba4e9bb0e42eef4e4a105734d9933f
-  data.tar.gz: 095713110ea60c96ec9d0fa8eea86b73ce323021
+  metadata.gz: 75600df7a0ae09aa8c1b237125e570b7f2ed9d85
+  data.tar.gz: 09011776669374e42cb13f8be960c804b1e83901
 SHA512:
-  metadata.gz: 4fa4003a2dd23424a253b7c160e85142dd2bb6bff361bd6fc065ee40e6509e07e89205f652e7a5613df3be6fd6c3008b7da9572b37abb3d5f83a1ed6a0450ea8
-  data.tar.gz: aa0a33dece45792fa98a62137c181848aee560be67b5a7e35dbe9d712b1cbc27afe8b0100c9ed5a73904a58a3ebc7045a3486ad3025093c640cfa3759c348088
+  metadata.gz: 836d425d56ecb1d515164c81c4715bf29521070350c3902a7d1dd3a53256328ff1ae50179e2fe019d7f21e5cd47041c8f5cee881597d401ec311049ff5739806
+  data.tar.gz: 4400234e48e51e905ff601a66566bebeee24fcef2cba71101d80245d2d2a7dcb2734b3bfc4c58188761be4fcb29857eacbfa6d47c568d2008d19a21d4797c2ab

data/.travis.yml

@@ -1,3 +1,4 @@
 language: ruby
 rvm:
   - 1.9.3
+  - 2.0.0

data/README.md

@@ -45,7 +45,7 @@ require "simple_helpers"
 
 SimpleHelpers.configure do |config|
   config.helpers = {
-    page_title: { prefix: "MyBlog" }  # other options: suffix, separator
+    page_title: { suffix: "MyBlog", separator: " · " }  # other option: prefix
   }
 end
 ```

data/lib/simple_helpers/config.rb

@@ -1,6 +1,6 @@
 module SimpleHelpers
   class Config
-    DEFAULT_SEPARATOR = " · "
+    DEFAULT_SEPARATOR = " - "
 
     def self.helpers
       @helpers ||= {}

data/lib/simple_helpers/support.rb

@@ -5,6 +5,29 @@ module SimpleHelpers
       array.collect{|item| item.to_s}
     end
 
+    def self.create_method(controller, name)
+      controller.class_eval do
+        define_method(name) do |*args|
+          if args.empty?
+            send "#{name}_get"
+          else
+            send "#{name}_set", args.first
+          end
+        end
+
+        define_method("#{name}_set") do |*args|
+          instance_variable_set "@#{name}", args.first
+        end
+
+        define_method("#{name}_get") do |*args|
+          "%{prefix}%{prefix_separator}%{content}%{suffix_separator}%{suffix}" %
+            SimpleHelpers::Support.simple_helper_parts(controller, name)
+        end
+      end
+    end
+
+  private
+
     def self.scopes(controller, method_name)
       controller_name = controller.class.name.underscore
       controller_name.gsub!(/\//, "_")
@@ -24,12 +47,12 @@ module SimpleHelpers
       }
     end
 
-    def self.parser(controller, context)
-      entries(context).each do |key|
+    def self.replace_tags(controller, context)
+      tags(context).each do |tag|
         begin
-          value = simple_helper_value(controller, key)
+          value = simple_helper_value(controller, tag)
         ensure
-          context.sub!(key, value)
+          context.sub!(tag, value)
         end
       end
       context
@@ -44,7 +67,7 @@ module SimpleHelpers
       end
     end
 
-    def self.get_i18n_content(controller, key, options)
+    def self.get_text_from_locale(controller, key, options)
       scopes  = SimpleHelpers::Support.scopes(controller, key)
 
       result = SimpleHelpers::Support.translate(scopes[:first], options)
@@ -54,43 +77,20 @@ module SimpleHelpers
       result
     end
 
-    def self.create_method(controller, name)
-      controller.class_eval do
-        define_method(name) do |*args|
-          if args.empty?
-            send "#{name}_get"
-          else
-            send "#{name}_set", args.first
-          end
-        end
-
-        define_method("#{name}_set") do |*args|
-          instance_variable_set "@#{name}", args.first
-        end
-
-        define_method("#{name}_get") do |*args|
-          "%{prefix}%{prefix_separator}%{content}%{suffix_separator}%{suffix}" %
-            SimpleHelpers::Support.simple_helper_parts(controller, name)
-        end
-      end
-    end
-
-  private
-
-    def self.entries(context)
+    def self.tags(context)
       context.scan(/{{.*?}}/i)
     end
 
     def self.simple_helper_value(controller, key)
       tag = key.delete("{}")
       if tag.start_with? "@"
-        get_instance_variable(controller, tag)
+        get_from_instance_variable(controller, tag)
       else
         get_from_controller(controller, tag)
       end || ""
     end
 
-    def self.get_instance_variable(controller, key)
+    def self.get_from_instance_variable(controller, key)
       parts             = key.split(".")
       first_argument    = parts.shift
       instance_variable = controller.instance_variable_get(first_argument)
@@ -109,8 +109,8 @@ module SimpleHelpers
 
     def self.simple_helper_parts(controller, name)
       name_options   = controller.instance_variable_get("@#{name}_options") || {}
-      text_raw       = SimpleHelpers::Support.get_i18n_content(controller, name, name_options)
-      content        = SimpleHelpers::Support.parser(controller, text_raw)
+      text_raw       = SimpleHelpers::Support.get_text_from_locale(controller, name, name_options)
+      content        = SimpleHelpers::Support.replace_tags(controller, text_raw)
 
       helper_options = SimpleHelpers::Config.helpers[name.to_sym].merge(name_options)
       prefix         = helper_options.fetch(:prefix, "")

data/lib/simple_helpers/version.rb

@@ -2,7 +2,7 @@ module SimpleHelpers
   module Version
     MAJOR = 2
     MINOR = 0
-    PATCH = 0
+    PATCH = 1
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/templates/initializer.rb

@@ -3,6 +3,6 @@ require "simple_helpers"
 SimpleHelpers.configure do |config|
   # Helper methods that will be automatically created in the controllers
   # config.helpers = {
-  #   page_title: { prefix: "MySite", separator: " - " }
+  #   page_title: { prefix: "MySite" }
   # }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_helpers
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Vitor Oliveira