demeler 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f45f975d6d264007855d0b65b8e99411c35ac272
-  data.tar.gz: 16a199c800c43a2673ef63694988ff5ca1a97329
+  metadata.gz: 3903bce53b962d00a70df078d45ecc40b99cedfb
+  data.tar.gz: 5ca0c7cfb19aa5366695cab87f87313ae06522e3
 SHA512:
-  metadata.gz: 057051d643c2387b0cf4234a5b221d9c73bb5b5e40750cb177bc5b4ebd9b7a213e90440e06df66d08b777ebff5101696a05230189a3fe91c3b633f2043d47360
-  data.tar.gz: af215ceb16abeb57bb96741b88d8b4784eeb2b33f93b4c3148555c691704d746a22fa6dd6d6dfa96a5d89afe659966c2dde9498d6c98bad7410c3d5c276640fc
+  metadata.gz: 85133de7aebdb53534f25ae96bf0df604dcc82292e21cf413bc0a0c4e53d1a186687619e2370b197071f70668e9060990cabbd867be1ef7466f7590ace6fb92a
+  data.tar.gz: 4f0f0691707eecf112b03fea0d06b1d72a8b5c1c35e0a3e568c4259a753bb042d1bb0b0560ca70790de6be6f66599f7f68ce8e7422a144785d44cddd91eb2c27

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.0.4
+
+* Added a `parms` argument to `alink` so that parameters that are being passed can be added as a hash. See the README.
+* Added a test in specs to test the passing of parameters in `alink`.
+* Updated the README and Notes.
+
 # 1.0.3
 
 * Updated the README and Notes.

data/README.md

@@ -107,13 +107,12 @@ end
 <!-- end generated output -->
 ```
 
-If you have more than one thing to pass into Demeler, put your things into an Array or Hash. For example, say you have two lists of countries and cities.
+If you have more than one thing to pass into Demeler, put your things into an Array or Hash. For example, say you have two lists of countries and cities, you can pass them in a hash (Ruby's default) like this:
 
 ```ruby
 countries = ['USA', 'Canada', 'France']
 cities = ['Los Angeles', 'Paris', 'Berlin']
-data = {:countries=>countries, :cities=>cities}
-Demeler.build(nil, true, data) do
+Demeler.build(nil, true, :countries=>countries, :cities=>cities) do
   p usr[:countries].inspect
   p usr[:cities].inspect
 end
@@ -370,7 +369,7 @@ Name | Type | Value
 *args | Array | An array of arguments from the call that was intercepted. Tag_generator will try to make sense of them.
 block | Proc | The block with your code.
 
-### def alink(text, args={})
+### def alink(text, args={}, parms={})
 
 The `alink` method is a shortcut to build an `a` tag. You could also write a `a` tag like so:
 
@@ -388,12 +387,28 @@ Demeler.build do
 end
 ```
 
-Yes, I know. Six of one, half-dozen of another. It had a legacy beginning, and I kept it in here.
+Better yet, the `alink` method lets you easily add parameters. To do this, you have to place the args in curly brackets, then list your parameters at the end like so:
+
+```ruby
+params={:id=>77}
+out =Demeler.build do
+  alink("Jobs", {:href=>"jobs"}, :id=>params[:id], :job=>'commercial')
+end
+```
+
+The HTML generated will look like this:
+
+```html
+<!-- begin generated output -->
+<a href="jobs?id=77&job=commercial">Jobs</a>
+<!-- end generated output -->
+```
 
 Name | Type | Value
 ---- | ---- | -----
 text | String | The text to be inserted into the tag.
 *args | Hash | An hash of attributes which must include the :href attribute.
+*parms | Hash | An hash of parameters to be passed when the link is clicked.
 
 ### def checkbox(name, opts, values)
 

data/lib/demeler.rb

@@ -117,11 +117,25 @@ class Demeler
   #  creating the 'a' tag.
   # @param [Proc] block
   #
-  def alink(text, args={})Hash
+  def alink(text, args={}, parms={})Hash
     raise ArgumentError.new("In Demeler#alink, expected String for argument 1, text") if !text.kind_of?(String)
     raise ArgumentError.new("In Demeler#alink, expected Hash for argument 2, opts") if !args.kind_of?(Hash)
     raise ArgumentError.new("In Demeler#alink, expected an href option in opts") if !args[:href]
+
+    href = args.delete(:href).to_s
     opts = args.clone
+    if !parms.empty?
+      href << '?'
+      parms.each do |k,v|
+        href << k.to_s
+        href << '='
+        href << v.to_s
+        href << '&'
+      end
+    else
+      href << '&' # will be removed
+    end
+    opts[:href] = href[0..-2] # remove last '&'
     opts[:text] = text
     tag_generator(:a, opts)
   end

data/lib/demeler/version.rb

@@ -1,4 +1,4 @@
 module Version
-  VERSION = "1.0.3"
-  MODIFIED = "2017-06-12"
+  VERSION = "1.0.4"
+  MODIFIED = "2017-06-17"
 end

data/notes

@@ -37,7 +37,7 @@ git push -u origin master
 #----------------------------------------
 
 # To upload the gem to rubygems.org
-gem push demeler-1.0.2.gem
+gem push demeler-1.0.4.gem
 
 sudo gem install demeler
 

data/spec/demeler.rb

@@ -43,6 +43,12 @@ describe "Simple Demeler with no Object" do
     @d.to_s.should.equal "<a href=\"registration\">Registration</a>"
   end
 
+  it "should be a link with parameters" do
+    @d.clear
+    @d.alink("Registration", {:href=>"registration"}, :id=>77, :name=>"Mike")
+    @d.to_s.should.equal "<a href=\"registration?id=77&name=Mike\">Registration</a>"
+  end
+
   it "should be a plain checkbox control" do
     @d.clear
     @d.checkbox(:vehicle, {}, :volvo=>"Volvo", :saab=>"Saab", :mercedes=>"Mercedes", :audi=>"Audi")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: demeler
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Michael J. Welch, Ph.D.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-12 00:00:00.000000000 Z
+date: 2017-06-17 00:00:00.000000000 Z
 dependencies: []
 description: This gem takes your ruby input, plus an object such as a Sequel::Model
   object, and generates HTML code. If the object has values, they're inserted into