florrick 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d99e1315bb37101ae10cb3e6dbbb72abc0af64e5
-  data.tar.gz: 8373a863cb8713c6bddeb554cfa0f127acfa21e1
+  metadata.gz: 495895562e335c2a36e35c3a6bdd8476a2756a1d
+  data.tar.gz: a970aad1d680cf16079543a0ddb6970ddad5a319
 SHA512:
-  metadata.gz: 86cae527b35f612d7cbf198c0e0756c33410f9e2aa06cb10b1306d46113a3693702a4b53f5e9788e92efdc3080e0984f95f58f573b8c0d4588ded828b8de81e0
-  data.tar.gz: 9ffeda401001ade5e88b2b67dbf4d8c95889d173e0dcc2b8416ded9e96a895a03088c1cbf7d907451789bcc67779e6eb0cb1d16b80cdfa6521e3ff6c17fa6bf7
+  metadata.gz: eecfa6c2b2e54e7e6b8c54d67b743dae428e9c158727867ce69b50aeaef17cdc632d7248a83ea9fe19a175db5ce8ef8f2a200dfb71010c16237f69717d215e76
+  data.tar.gz: 797bf52c99f07d9eea0dd2413bbb6dda79ae745b11de23cff5f25412cb00b8abed2033da4e271b9dfeccb5dc9b49429b83c03a394751e770949c95979be24f53

data/lib/florrick/active_record_extension.rb

@@ -1,10 +1,10 @@
 module Florrick
   module ActiveRecordExtension
-    
+
     def self.included(base)
       base.extend ClassMethods
     end
-    
+
     def string_interpolation_value_for(var)
       if self.class.florrick_fields[:strings].keys.include?(var.to_sym)
         block = self.class.florrick_fields[:strings][var.to_sym]
@@ -17,7 +17,7 @@ module Florrick
         false
       end
     end
-    
+
     module ClassMethods
 
       #
@@ -26,7 +26,7 @@ module Florrick
       def florrick_fields
         @florrick_fields ||= {:strings => {}, :relationships =>{}}
       end
-      
+
       #
       # Accept a new set of configuration for this model
       #
@@ -35,21 +35,21 @@ module Florrick
         dsl.instance_eval(&block)
         dsl
       end
-      
+
       #
       # Return whether or not a given key can be replaced
       #
       def string_interpolation_for?(var)
         florrick_fields[:strings].keys.include?(var.to_sym)
       end
-      
+
       #
-      # Return whether or not a given relationship key can be replaced 
+      # Return whether or not a given relationship key can be replaced
       #
       def string_interpolation_relationship_for?(var)
         florrick_fields[:relationships].keys.include?(var.to_sym)
       end
     end
-    
+
   end
 end

data/lib/florrick/builder.rb

@@ -1,7 +1,7 @@
 module Florrick
   class Builder
 
-    VALID_EXPORT_TYPES = [String, Numeric, Date, Time]
+    VALID_EXPORT_TYPES = [String, Numeric, Date, Time, Array]
 
     attr_reader :original_string, :objects
 
@@ -32,8 +32,8 @@ module Florrick
               if previous_object.class.string_interpolation_for?(var)
                 # we can do this easily
                 previous_object = previous_object.string_interpolation_value_for(var)
-                # if the previous object was nil, just set to an empty string
-                final_string = "" if previous_object.nil?
+                # if the previous object was nil, just set to the fallback string or empty
+                final_string = fallback_string || '' if previous_object.nil?
               elsif previous_object.class.string_interpolation_relationship_for?(var)
                 # maybe we can do this on another object
                 previous_object = previous_object.send(var)
@@ -52,13 +52,19 @@ module Florrick
             # we're at the end now, if we can return the previous object, lets do it otherwise
             # we'll just return the string as we can't do anything.
             if VALID_EXPORT_TYPES.any? { |t| previous_object.is_a?(t)}
-              final_string = previous_object.to_s
+              final_string = previous_object
             else
               final_string = fallback_string || original_string
             end
           end
         end
-        final_string
+
+        case final_string
+        when Array
+          final_string.join(", ")
+        else
+          final_string.to_s
+        end
       end
     end
 

data/lib/florrick/builtin_formatters.rb

@@ -12,6 +12,7 @@ require 'digest/md5'
 Florrick::Formatter.add('downcase', [String]) { |s| s.downcase }
 Florrick::Formatter.add('upcase', [String]) { |s| s.upcase }
 Florrick::Formatter.add('humanize', [String]) { |s| s.humanize }
+Florrick::Formatter.add('capitalize', [String]) { |s| s.capitalize }
 Florrick::Formatter.add('strip', [String]) { |s| s.strip }
 Florrick::Formatter.add('sha1', [String]) { |s| Digest::SHA1.hexdigest(s) }
 Florrick::Formatter.add('md5', [String]) { |s| Digest::MD5.hexdigest(s) }
@@ -22,6 +23,15 @@ Florrick::Formatter.add('md5', [String]) { |s| Digest::MD5.hexdigest(s) }
 Florrick::Formatter.add('double', [Numeric]) { |s| s * 2 }
 Florrick::Formatter.add('triple', [Numeric]) { |s| s * 3 }
 
+#
+# Array formatters
+#
+Florrick::Formatter.add('join_with_commas', [Array]) { |a| a.join(', ')}
+Florrick::Formatter.add('join_with_spaces', [Array]) { |a| a.join(' ') }
+Florrick::Formatter.add('join_with_new_lines', [Array]) { |a| a.join("\n") }
+Florrick::Formatter.add('as_list', [Array]) { |a| a.map { |v| "* #{v}"}.join("\n") }
+Florrick::Formatter.add('to_sentence', [Array]) { |a| a.to_sentence }
+
 #
 # DateTime formatters
 #

data/lib/florrick/dsl.rb

@@ -1,16 +1,16 @@
 module Florrick
   class DSL
-    
+
     def initialize(model)
       @model = model
     end
-    
+
     def string(*vars, &block)
       vars.each do |var|
         @model.florrick_fields[:strings][var.to_sym] = block
       end
     end
-    
+
     def relationship(*vars, &block)
       vars.each do |var|
         @model.florrick_fields[:relationships][var.to_sym] = block

data/lib/florrick/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: florrick
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-31 00:00:00.000000000 Z
+date: 2015-02-28 00:00:00.000000000 Z
 dependencies: []
 description: A Rails extension for providing awesome user-initiated string interpolation
 email: