florrick 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20ab91439eaf4ce4d05675e501a0667f48138633
-  data.tar.gz: 0df8702cce5af859de517f3e34a645608aa9b993
+  metadata.gz: d99e1315bb37101ae10cb3e6dbbb72abc0af64e5
+  data.tar.gz: 8373a863cb8713c6bddeb554cfa0f127acfa21e1
 SHA512:
-  metadata.gz: df6f287a92029579b87b8589e140792ed7f747464666718ab2e177fa7a40b91eff1a7dc03aa5b13799a6a668394f89fef60ec8f79cf3f4489901b82adefca782
-  data.tar.gz: 64a594f1d4b80a821f09117b340c11ac4ce91d72c85d0014cc7193898be33e7cb57c13991f68ed62e9c43271d2d279e2c7001246870e7710e2cab3c1149aed54
+  metadata.gz: 86cae527b35f612d7cbf198c0e0756c33410f9e2aa06cb10b1306d46113a3693702a4b53f5e9788e92efdc3080e0984f95f58f573b8c0d4588ded828b8de81e0
+  data.tar.gz: 9ffeda401001ade5e88b2b67dbf4d8c95889d173e0dcc2b8416ded9e96a895a03088c1cbf7d907451789bcc67779e6eb0cb1d16b80cdfa6521e3ff6c17fa6bf7

data/lib/florrick/builder.rb

@@ -1,8 +1,8 @@
 module Florrick
   class Builder
-    
+
     VALID_EXPORT_TYPES = [String, Numeric, Date, Time]
-    
+
     attr_reader :original_string, :objects
 
     def initialize(string, objects = {})
@@ -12,15 +12,21 @@ module Florrick
 
     def output
       string = @original_string.dup
-      string.gsub(/(\{\{([(\w+)\.]+)\}\})/) do
+      string.gsub(/(\{\{([(\w+)\.]+)(?>\ ?\|\ ?([\w\-\+\ \!\?\[\]\(\)]+))?\}\})/) do
+        original_string = $1
+        fallback_string = $3
         parts = $2.split('.')
         final_string = nil
         previous_object = @objects[parts.shift.to_sym]
-        final_string = $1 if previous_object.nil?
+
+        if previous_object.nil?
+          final_string = fallback_string || original_string
+        end
+
         until final_string
           # get the latest part
           if var = parts.shift
-            # if the previous object is suitable for string interpolation, we can 
+            # if the previous object is suitable for string interpolation, we can
             # pass the var to it and get out a string or an integer.
             if previous_object.respond_to?(:string_interpolation_value_for)
               if previous_object.class.string_interpolation_for?(var)
@@ -33,14 +39,14 @@ module Florrick
                 previous_object = previous_object.send(var)
               else
                 # can't do this :(
-                final_string = $1
+                final_string = fallback_string || original_string
               end
             elsif VALID_EXPORT_TYPES.any? { |t| previous_object.is_a?(t)}
               previous_object = Florrick::Formatter.convert(var, previous_object)
             else
               # does not respond to string_interpolation_value_for and isn't a valid object,
               # we can't do anything here just return the passed value.
-              final_string = $1
+              final_string = fallback_string || original_string
             end
           else
             # we're at the end now, if we can return the previous object, lets do it otherwise
@@ -48,7 +54,7 @@ module Florrick
             if VALID_EXPORT_TYPES.any? { |t| previous_object.is_a?(t)}
               final_string = previous_object.to_s
             else
-              final_string = $1
+              final_string = fallback_string || original_string
             end
           end
         end

data/lib/florrick/version.rb

@@ -1,3 +1,3 @@
 module Florrick
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: florrick
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-02 00:00:00.000000000 Z
+date: 2015-01-31 00:00:00.000000000 Z
 dependencies: []
 description: A Rails extension for providing awesome user-initiated string interpolation
 email:
@@ -26,7 +26,8 @@ files:
 - lib/florrick/railtie.rb
 - lib/florrick/version.rb
 homepage: https://github.com/adamcooke/florrick
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -44,9 +45,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A Rails extension for providing awesome user-initiated string interpolation
 test_files: []
-has_rdoc: