simple_helpers 2.0.0.beta → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3760bdc12e9255f34b9063c8cd29e114ccf6575d
-  data.tar.gz: 78da44fe321d6a08c0e2ad04e1efc06ff790f1ee
+  metadata.gz: ad5106d5e8ba4e9bb0e42eef4e4a105734d9933f
+  data.tar.gz: 095713110ea60c96ec9d0fa8eea86b73ce323021
 SHA512:
-  metadata.gz: 8913a3406650bb585131a0e6b0fa36fac915d1c8f2059284ac47617177e1896a7c6d432f07232656c5b05068b7b35909ed884d5039fe3d8091a548c4528c360c
-  data.tar.gz: ae85af3ed3457fec3ca431e88b679a627cd55eb799483b286775d6aca8aea33e2654fcfd5a5853798afc35bc472fc4e80fee486fdd0ddc59d0281e87cebe1479
+  metadata.gz: 4fa4003a2dd23424a253b7c160e85142dd2bb6bff361bd6fc065ee40e6509e07e89205f652e7a5613df3be6fd6c3008b7da9572b37abb3d5f83a1ed6a0450ea8
+  data.tar.gz: aa0a33dece45792fa98a62137c181848aee560be67b5a7e35dbe9d712b1cbc27afe8b0100c9ed5a73904a58a3ebc7045a3486ad3025093c640cfa3759c348088

data/Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec

data/README.md

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

data/lib/simple_helpers/config.rb

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

data/lib/simple_helpers/railtie.rb

@@ -19,7 +19,6 @@ module SimpleHelpers
           initialize_method.bind(self).call(*args)
         end
       end
-      ::I18n.load_path += Dir[File.dirname(__FILE__) + "/../../locales/*.yml"]
     end
   end
 end

data/lib/simple_helpers/support.rb

@@ -24,27 +24,10 @@ module SimpleHelpers
       }
     end
 
-    def self.template(controller, context)
-      context.scan(/{{.*?}}/i).each do |key|
-        parts  = key.delete("{}").split(".")
-
+    def self.parser(controller, context)
+      entries(context).each do |key|
         begin
-          first_argument = parts.shift
-          if first_argument.start_with? "@"
-            instance_variable = controller.instance_variable_get(first_argument)
-
-            value = if parts.empty?
-                      instance_variable
-                    else
-                      thing = parts.shift.to_sym
-                      instance_variable[thing] if instance_variable.respond_to?(thing)
-                    end
-          else
-            value = controller.send first_argument
-          end
-          value = "" unless value
-        rescue
-          value = ""
+          value = simple_helper_value(controller, key)
         ensure
           context.sub!(key, value)
         end
@@ -61,7 +44,9 @@ module SimpleHelpers
       end
     end
 
-    def self.get_content(scopes, options)
+    def self.get_i18n_content(controller, key, options)
+      scopes  = SimpleHelpers::Support.scopes(controller, key)
+
       result = SimpleHelpers::Support.translate(scopes[:first], options)
       if result.empty?
         result = SimpleHelpers::Support.translate(scopes[:second], options)
@@ -84,23 +69,64 @@ module SimpleHelpers
         end
 
         define_method("#{name}_get") do |*args|
-          scopes         = SimpleHelpers::Support.scopes(controller, name)
-          options_hash   = instance_variable_get("@#{name}_options")
-          result         = SimpleHelpers::Support.get_content(scopes, options_hash)
-          helper_options = SimpleHelpers::Config.helpers[name.to_sym]
-
-          prefix    = helper_options.fetch(:prefix, "")
-          content   = SimpleHelpers::Support.template(controller, result)
-          separator = if prefix.empty? || content.empty?
-                        ""
-                      else
-                        helper_options.fetch(:separator, " - ")
-                      end
-
-          "#{prefix}#{separator}#{content}"
+          "%{prefix}%{prefix_separator}%{content}%{suffix_separator}%{suffix}" %
+            SimpleHelpers::Support.simple_helper_parts(controller, name)
         end
       end
     end
 
+  private
+
+    def self.entries(context)
+      context.scan(/{{.*?}}/i)
+    end
+
+    def self.simple_helper_value(controller, key)
+      tag = key.delete("{}")
+      if tag.start_with? "@"
+        get_instance_variable(controller, tag)
+      else
+        get_from_controller(controller, tag)
+      end || ""
+    end
+
+    def self.get_instance_variable(controller, key)
+      parts             = key.split(".")
+      first_argument    = parts.shift
+      instance_variable = controller.instance_variable_get(first_argument)
+
+      if parts.empty?
+        instance_variable
+      else
+        thing = parts.shift.to_sym
+        instance_variable[thing] if instance_variable.respond_to?(thing)
+      end
+    end
+
+    def self.get_from_controller(controller, key)
+      controller.send key
+    end
+
+    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)
+
+      helper_options = SimpleHelpers::Config.helpers[name.to_sym].merge(name_options)
+      prefix         = helper_options.fetch(:prefix, "")
+      suffix         = helper_options.fetch(:suffix, "")
+      separator      = helper_options.fetch(:separator, SimpleHelpers::Config::DEFAULT_SEPARATOR)
+
+      {
+        prefix: prefix,
+        suffix: suffix,
+        separator: separator,
+        content: content,
+        prefix_separator: prefix.empty? || content.empty? ? "" : separator,
+        suffix_separator: suffix.empty? || content.empty? ? "" : separator
+      }
+    end
+
   end
+
 end

data/lib/simple_helpers/version.rb

@@ -3,6 +3,6 @@ module SimpleHelpers
     MAJOR = 2
     MINOR = 0
     PATCH = 0
-    STRING = "#{MAJOR}.#{MINOR}.#{PATCH}.beta"
+    STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_helpers
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta
+  version: 2.0.0
 platform: ruby
 authors:
 - Vitor Oliveira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2013-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -114,9 +114,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3