fanforce-internal-utils 0.1.3 → 0.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGQzYWQ0MGI5YzE2MTBhY2JkYzIwZmY5MDM3ZmNkYTJjNmM2NjVlYw==
+    NWM5MDQxZDc2NmI0YjZkYzEzMDJhZjE5MjEzYjg5OWZmYTJiZTY5OA==
   data.tar.gz: !binary |-
-    ZTFkODYwOTc5ZTdlYmE0MmE0NzAwYzAyZWExNjMxODc4MGQ0MjI4Yw==
+    NDAyY2I1ZDhmNjMyNjgyNWZiNGU5OWY3Mzc4YjA0NjE3ZWIyNDhjZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZjU4MTEzODM5YWE1MWJmMzEyZWI2MmIzYmYxNjllZWNmNzU4NzRjZmQ5MDcx
-    YWQyMTA5ZWUwYmEzMjdjOTQ5NGNhYTBlNTBlZmIwOTNhNGRmZjI5MzliNDRm
-    NzliNmQ2MzJlOGQ1OTVhZGE5Yjc1ZThiMzI0NDE2YmVkODkxODk=
+    ZDkxNTM1ODU0NjA1Njg3Y2QzZDZlZDE1ZmE1YTAwYzVlMmQyZDNjY2EyOGQ4
+    YzgxNzA2OWIzNTI2MWI3MWY4NjgxYzFiMDUxYTZhZjYzOTZiZjJmOTY2NDNk
+    NWJlZDQxOTU5OTlkMDA3ZTgzZDE5ZGYwOTUxNzIzNDg5YTJkYWM=
   data.tar.gz: !binary |-
-    YjZmZjZhOTJhMDhlNjAzYTJhODc4ZjM2OTIxODE2OWM3NGEzZmM1YjAyM2Mw
-    ZDA0NjAwYjVjN2ZlMjZhOWE1MzIzNWY2ZjVkZDg1ZWU0ZDQ0MzY4ZWE4ZTQ4
-    Mzc2YjI3NjJjZjEwNjFlNzE1M2U4NWJkZjJiNTE2YmQ1ZThkOGE=
+    ZTc1ZTgyNDIzNzY4YjAyMjkyMjZkZGQ1NDM2YmYwNjFmYWY1ZTFhNjBhYzc5
+    MzY5OWYzNzM0M2RkYWFmODk4NTRlZjk4Mzc2NGI1ZjhiODBjNDY2M2Y0Mzgy
+    NmY4Mjk0MjA2MDkxYjNmZjAyYWFiNTkzMmM0YWI0NGZkZWM1ZGM=

data/lib/fanforce/utils/utils.rb

@@ -70,25 +70,20 @@ module Fanforce::Utils
 
   # Creates a string representation of a javascript object for $.tmpl
   def compile_jquery_tmpls(options={}, &block)
-    begin require 'haml' rescue LoadError raise "You must have the haml gem installed for Fanforce.compile_jquery_templates to work." end
+    begin require 'haml' rescue LoadError raise 'You must have the haml gem installed to use Fanforce.compile_jquery_templates.' end
     context = Object.new
     class << context
       include Haml::Helpers
     end
     context.init_haml_helpers
 
-    format = if options[:format] == 'html' then :html else options[:callback].present? ? :jsonp : :json end
+    format = options[:format] == 'html' ? :html : :json
 
     return context.capture_haml(&block) if format == :html
     single_line_html = context.capture_haml(&block).split(/\r?\n/).inject('') {|sl, l| sl += l.strip + ' ' }
     matches = single_line_html.scan(/<script id=[\"'](.*?)[\"'](?:.*?)>(.*?)(?:<\/script>)/mi)
 
-    templates = matches.inject({}) {|t,m| t[m[0]] = m[1]; t }
-    if format == :jsonp
-      "#{options[:callback]}(#{templates.to_json})"
-    else
-      templates.to_json
-    end
+    matches.inject({}) {|t,m| t[m[0]] = m[1]; t }.to_json
   end
 
 end

data/lib/fanforce/utils/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   module Utils
-    VERSION = '0.1.3'
+    VERSION = '0.1.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-internal-utils
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Caleb Clark