florrick 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 495895562e335c2a36e35c3a6bdd8476a2756a1d
-  data.tar.gz: a970aad1d680cf16079543a0ddb6970ddad5a319
+  metadata.gz: 72ded218986890ab953e08fd2827246f536c98e6
+  data.tar.gz: e3499a4fb82bec5a3d5d0f0a4fd6db718ba7474e
 SHA512:
-  metadata.gz: eecfa6c2b2e54e7e6b8c54d67b743dae428e9c158727867ce69b50aeaef17cdc632d7248a83ea9fe19a175db5ce8ef8f2a200dfb71010c16237f69717d215e76
-  data.tar.gz: 797bf52c99f07d9eea0dd2413bbb6dda79ae745b11de23cff5f25412cb00b8abed2033da4e271b9dfeccb5dc9b49429b83c03a394751e770949c95979be24f53
+  metadata.gz: 774763f7e32f619b9d3fd55726944cd9a14b485046ecbefef9269d701ced77e0c957996529861af11ca69968a023175641043dd072f9a459e54b917a760a9f9a
+  data.tar.gz: 48aaf1f0e22df3c6302c12ef6de6af79d2df94977b230bfed60aab6d7a6dd290a4630c6fe6b404ada233521ab7170a748f5a8438f8d85846420d4426dc37dd99

data/lib/florrick.rb

@@ -6,10 +6,10 @@ require 'florrick/builtin_formatters'
 require 'florrick/railtie' if defined?(Rails)
 
 module Florrick
-  
+
   # A quick helper method for quickly running conversion
   def self.convert(string, objects = {})
     Builder.new(string, objects).output
   end
-  
+
 end

data/lib/florrick/builder.rb

@@ -33,7 +33,9 @@ module Florrick
                 # we can do this easily
                 previous_object = previous_object.string_interpolation_value_for(var)
                 # if the previous object was nil, just set to the fallback string or empty
-                final_string = fallback_string || '' if previous_object.nil?
+                if previous_object.nil? || (previous_object.is_a?(Array) && previous_object.empty?)
+                  final_string = fallback_string || ''
+                end
               elsif previous_object.class.string_interpolation_relationship_for?(var)
                 # maybe we can do this on another object
                 previous_object = previous_object.send(var)

data/lib/florrick/formatter.rb

@@ -1,17 +1,17 @@
 module Florrick
   class Formatter
-    
+
     class << self
       # Return all formatters available
       def formatters
         @formatters ||= {}
       end
-      
+
       # Add a new global formatter
       def add(name, types = [], &block)
         formatters[name.to_sym] = self.new(name, types, &block)
       end
-      
+
       # Run a string through a given formatter and return the result. If not possible, return false.
       def convert(name, value)
         if formatter = formatters[name.to_sym]
@@ -21,11 +21,11 @@ module Florrick
         end
       end
     end
-    
+
     def initialize(name, types, &block)
       @name, @types, @block = name, types, block
     end
-    
+
     def convert(value)
       if @types.empty? || @types.any? { |t| value.is_a?(t)}
         @block.call(value)
@@ -35,6 +35,6 @@ module Florrick
     rescue
       '???'
     end
-    
+
   end
 end

data/lib/florrick/railtie.rb

@@ -1,12 +1,12 @@
 module Florrick
   class Railtie < Rails::Railtie
-    
+
     initializer 'florrick.initialize' do
       ActiveSupport.on_load(:active_record) do
         require 'florrick/active_record_extension'
         ActiveRecord::Base.send :include, Florrick::ActiveRecordExtension
       end
     end
-    
+
   end
 end

data/lib/florrick/version.rb

@@ -1,3 +1,3 @@
 module Florrick
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: florrick
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Adam Cooke