phil 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3668992d36762d34360443d60b52a7d95470ecf2
-  data.tar.gz: f79137b76250fdca9aba3a7f3ee47d9323a4bc22
+  metadata.gz: e4e9e638d0090cd7da74ee87511da0d030e7663e
+  data.tar.gz: 0e8f9990581a6453d907b61e345ab4401d714ed8
 SHA512:
-  metadata.gz: f5364b5be4065f4b3ffa0d768e049ef80cffadc33fc64df2f1e54db090ec82f0bd18a283e1ca7cc9826cbd2163c615bfd475e413f1082bbdf5f18a8a830aa401
-  data.tar.gz: 727d7a711e09ccb853ac3856e1fd622637b1722896a3ee53ba20ab0d24d3a2727ca9749f9361891bd7451fd22c26308dda5931757f604990c8f2e4f248608e7f
+  metadata.gz: f7800c0b205c027686b072112b8d04229a94579ba933cc4425d33a889bb61661e3f7edcad8308f670e9d8f42e3ce88e756603eb2650d15ad839442b635a3c342
+  data.tar.gz: 644f7e825b4c8cdd9afae619374a60a1cb905df3f60474b11f6b9df825ecfa15b262720647787d1b548c32fd401434dda0e6eca448426520f5d501e12ba3a8ae

data/README.md

@@ -50,13 +50,16 @@ Phil.markup "h1 p h2 ul p blockquote h5 h6"
 
 Generate a [placehold.it](http://placehold.it) image URL. Requires dimensions, but you can also request colors (in the format `#background/#foreground`) and containing text. Placehold.it doesn't play nice with some containing text characters so those are stripped out.
 
-You can pass arguments in any order – Phil is reasonably smart about figuring them out.
+You can pass parameters in any order if you like – Phil is reasonably smart about figuring them out – or name them if you're feeling verbose.
 
 ```ruby
 Phil.image 200                          # http://placehold.it/200
-Phil.image 200x400, #ff0000             # http://placehold.it/200x400/ff0000
-Phil.image 200x400, #ff0000/#00ff00     # http://placehold.it/200x400/ff0000/00ff00
+Phil.image '200x400', '#ff0000'         # http://placehold.it/200x400/ff0000
+Phil.image '200x400', '#ff0000/#00ff00' # http://placehold.it/200x400/ff0000/00ff00
 Phil.image 'Jackie Jormp-Jomp?', 600    # http://placehold.it/600&text=Jackie+Jormp-Jomp
+
+# or pass named parameters (you can use ranges for size here)
+Phil.image(text: 'Pants', width: 300, height: (300..500), background: '#ff0000', foreground: '#0000ff')
 ```
 
 ### Lorem methods (all take ranges or numbers)

data/lib/phil.rb

@@ -104,10 +104,8 @@ module Phil
     end
 
     def image(*arguments)
-      opts = {}
-      arguments.each do |arg|
-        opts.merge! parse_image_argument(arg.to_s)
-      end
+      opts = arguments.extract_options!
+      opts = format_image_argument_output(opts.merge! parse_image_arguments(arguments))
       opts[:size] && "http://placehold.it/#{opts[:size]}#{opts[:color]}#{opts[:text]}"
     end
 
@@ -141,15 +139,45 @@ module Phil
       "<#{name}>#{content}</#{name}>".html_safe
     end
 
-    def parse_image_argument(argument)
-      case argument
-      when /^(#[a-f\d]{3,6}(\/(?=#))?){1,2}$/
-        { :color => "/#{argument.gsub('#', '')}" }
-      when /^\d*x?\d*?$/
-        { :size => argument }
-      else
-        { :text => "&text=#{argument.gsub(/[^\d\w\!,\.;:-]+/, '+').gsub(/\+?$/, '')}" }
+    def convert_range(str)
+      range_ends = str.split('..')
+      str = range_ends[1] ? range_ends[0]..range_ends[1] : range_ends[0]
+    end
+
+    def parse_image_arguments(args)
+      output = {}
+      args.each do |arg|
+        case arg.to_s
+          when /^(#[a-f\d]{3,6}(\/(?=#))?){1,2}$/
+            output[:color] = arg
+          when /^([\d\.]*)x?([\d\.]*?)$/
+            output[:size] = arg
+          else
+            output[:text] = arg
+          end
+        end
+      output
+    end
+
+    def format_image_argument_output(args)
+
+      if !args[:color]
+        args[:color] = "#{args[:background]}#{args[:foreground]}"
+      end
+
+      if args[:width] && args[:height]
+        args[:size] = "#{Phil.pick(args[:width])}x#{Phil.pick(args[:height])}"
       end
+
+      args.each do |k, v|
+        case k
+        when /color/
+          args[k] = v.gsub(/\/?#/, '/')
+        when /text/
+          args[:text] = "&text=#{v.gsub(/[^\d\w\!,\.;:-]+/, '+').gsub(/\+?$/, '')}"
+        end
+      end
+
     end
 
   end

data/lib/phil/version.rb

@@ -1,3 +1,3 @@
 module Phil
-  VERSION = '0.9.3'
+  VERSION = '0.9.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phil
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Cameron Daigle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-15 00:00:00.000000000 Z
+date: 2013-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffaker