andy_rails_toolbox 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d490a832956c4287797e3213abfba7ecb66e5179
-  data.tar.gz: 858db06595597e257a290054b5e4afb3251ae4f5
+  metadata.gz: 290b2eef6daf36498d9d7bb54ec8c3667ac23454
+  data.tar.gz: c3ead3f7c84415d4ccac7f4bcb020defeb8213f2
 SHA512:
-  metadata.gz: 5a42df778e012a8f4bf7866b0eace5d8be5ed433608120b6dd126e16a8acdfd703016a553d393af75c8ef35d5f394ed91a423bbc9073a4b32d5928c6fa1dfbc1
-  data.tar.gz: d6babe40c2412f7439352160ca9b9d748a6ff30dd61bb5d485941e39fa9e4f583b1def9e35f26a8c88425f0bec651760f3a0ca31157646ce1c203b76597b1bd7
+  metadata.gz: 619d0caa1528cee00e98b1fba0af73026aecb296e414145444e22ed01168b6334ebff3729bba87c31a62eac8a4eef35560d1bd1de64b413625d10f17f7d4884c
+  data.tar.gz: 7c62f301586d085391ce8cc6e2733a437a6cc1446a0a3dc17d243d313240e756555ea71e7a4b14d8a45ff9d31494ea746281ac8b71bd2a6f463a82a3b17d55d1

data/README.md

@@ -47,24 +47,30 @@ bs_icon 'user'
 BUTTONS
 
 ``` ruby
-html_button 'button'
+link_button 'link_label', '/'
+# => <a class="btn btn-default" href="/">link_label</a>
+link_button 'link_label', '/', color: 'primary'
+# => <a class="btn btn-primary" href="/">link_label</a>
+link_button 'link_label', '/', size: 'sm'
+# => <a class="btn btn-default btn-sm" href="/">link_label</a>
+link_button 'link_label', '/', block: true
+# => <a class="btn btn-default btn-block" href="/">link_label</a>
+link_button 'link_label', '/', active: true
+# => <a class="btn btn-default active" href="/">link_label</a>
+link_button 'link_label', '/', disabled: true
+# => <a class="btn btn-default disabled" href="/">link_label</a>
+link_button 'link-button', '/', class: 'preset-class'
+# => <a class="btn btn-default preset-class" href="/">link_label</a>
+link_button 'link-button', '/', label_hidden: 'xs'
+# => <a class="btn btn-default" href="/"><span class="hidden-xs">link_label</span></a>
+link_button 'link_label', '/', icon: 'user'
+# => <a class="btn btn-default" href="/"><i class="fa fa-user"></i> link_label</a>
+button 'button'
 # => <button name="button" type="button" class="btn btn-default">button</button>
-html_button 'button', color: 'primary'
-# => <button name="button" type="button" class="btn btn-primary">button</button>
-html_button 'button', size: 'sm'
-# => <button name="button" type="button" class="btn btn-default btn-sm">button</button>
-html_button 'button', block: true
-# => <button name="button" type="button" class="btn btn-default btn-block">button</button>
-html_button 'button', icon: 'user'
-# => <button name="button" type="button" class="btn btn-default"><i class="fa fa-user"></i> button</button>
-html_button 'button', active: true
-# => <button name="button" type="button" class="btn btn-default active">button</button>
 submit_button 'submit'
 # => <button name="submit" type="submit" class="btn btn-primary"><i class="fa fa-check"></i> submit</button>
 reset_button 'reset'
 # => <button name="reset" type="reset" class="btn btn-default"><i class="fa fa-eraser"></i> reset</button>
-link_button 'link', '/'
-# => <a class="btn btn-default" href="/">link</a>
 ```
 
 IMAGES
@@ -155,28 +161,6 @@ fa_icon "user 4x"
 # => <i class="fa fa-user fa-4x"></i>
 ```
 
-#### HashHelper Examples
-
-``` ruby
-options = { a: '1', b: '2', c: '3' }
-
-get_value :a, options
-# => '1'
-get_value :d, options
-# => nil
-get_value :d, options, '4'
-# => '4'
-
-pop_value :a, options
-# => '1'
-# options = { b: '2', c: '3' }
-pop_value :d, options
-# => nil
-pop_value :d, options, '4'
-# => '4'
-# options = { a: '1', b: '2', c: '3' }
-```
-
 #### TimeagoHelper
 
 Add below codes to file `app/assets/javascripts/application.js`

data/app/helpers/bootstrap_helper.rb

@@ -6,13 +6,13 @@ module BootstrapHelper
 
   # Generates an icon.
   def bs_icon(icon, html_options = {})
-    html_options = html_options.stringify_keys
+    html_options = html_options.symbolize_keys
     classes = ['glyphicon']
     classes << "glyphicon-#{icon}"
-    if preset_class = html_options.delete('class')
-      classes << preset_class
+    if html_options[:class]
+      classes << html_options[:class]
     end
-    html_options['class'] = classes * ' '
+    html_options[:class] = classes * ' '
 
     content_tag(:span, nil, html_options)
   end
@@ -26,76 +26,70 @@ module BootstrapHelper
     html_options, options, label = options, label, capture(&block) if block_given?
 
     html_options ||= {}
-    html_options = html_options.stringify_keys
+    html_options = html_options.symbolize_keys
     html_options = normalize_button_options_for_bootstrap(html_options)
 
-    if (label_hidden = html_options.delete('label_hidden')) && !block_given?
+    if (label_hidden = html_options.delete(:label_hidden)) && !block_given?
       label = content_tag :span, label, class: "hidden-#{label_hidden}"
     end
 
-    if (icon = html_options.delete('icon')) && !block_given?
+    if (icon = html_options.delete(:icon)) && !block_given?
       label = fa_icon(icon, text: label)
     end
 
-    if html_options['confirm']
-      html_options['data-confirm'] = html_options.delete('confirm')
+    if html_options[:confirm]
+      html_options[:'data-confirm'] = html_options.delete(:confirm)
     end
 
-    if html_options['disable_with']
-      html_options['data-disable-with'] = html_options.delete('disable_with')
+    if html_options[:disable_with]
+      html_options[:'data-disable-with'] = html_options.delete(:disable_with)
     end
 
     link_to(label, options, html_options)
   end
 
-  def new_button(label = nil, options = nil, html_options = nil)
+  def new_button(label = nil, options = nil, html_options = {})
     button_options = { icon: 'plus', color: 'primary' }
-    html_options ||= {}
     html_options.update button_options
 
     link_button(label, options, html_options)
   end
 
   # Generates a link show button.
-  def show_button(label = nil, options = nil, html_options = nil)
+  def show_button(label = nil, options = nil, html_options = {})
     button_options = { icon: 'search', color: 'info' }
-    html_options ||= {}
     html_options.update button_options
 
     link_button(label, options, html_options)
   end
 
   # Generates a link edit button.
-  def edit_button(label = nil, options = nil, html_options = nil)
+  def edit_button(label = nil, options = nil, html_options = {})
     button_options = { icon: 'edit', color: 'warning' }
-    html_options ||= {}
     html_options.update button_options
 
     link_button(label, options, html_options)
   end
 
   # Generates a link destroy button.
-  def destroy_button(label = nil, options = nil, html_options = nil)
+  def destroy_button(label = nil, options = nil, html_options = {})
     button_options = { icon: 'trash', color: 'danger', method: :delete, confirm: 'Are you sure?' }
-    html_options ||= {}
     html_options.update button_options
 
     link_button(label, options, html_options)
   end
 
   # Generates a link back button.
-  def back_button(label = nil, options = nil, html_options = nil)
+  def back_button(label = nil, options = nil, html_options = {})
     button_options = { icon: 'reply' }
-    html_options ||= {}
     html_options.update button_options
 
     link_button(label, options, html_options)
   end
 
   # Generates a link cancel button.
-  def cancel_button(label = nil, options = nil, html_options = nil)
+  def cancel_button(label = nil, options = nil, html_options = {})
     button_options = { icon: 'ban' }
-    html_options ||= {}
     html_options.update button_options
 
     link_button(label, options, html_options)
@@ -110,43 +104,41 @@ module BootstrapHelper
     html_options, label = label, capture(&block) if block_given?
 
     html_options ||= {}
-    html_options = html_options.stringify_keys
+    html_options = html_options.symbolize_keys
     html_options = normalize_button_options_for_bootstrap(html_options, :button)
 
-    html_options['type'] ||= 'button'
+    html_options[:type] ||= 'button'
 
-    if (label_hidden = html_options.delete('label_hidden')) && !block_given?
+    if (label_hidden = html_options.delete(:label_hidden)) && !block_given?
       label = content_tag :span, label, class: "hidden-#{label_hidden}"
     end
 
-    if (icon = html_options.delete('icon')) && !block_given?
+    if (icon = html_options.delete(:icon)) && !block_given?
       label = fa_icon(icon, text: label)
     end
 
-    if html_options['confirm']
-      html_options['data-confirm'] = html_options.delete('confirm')
+    if html_options[:confirm]
+      html_options[:'data-confirm'] = html_options.delete(:confirm)
     end
 
-    if html_options['disable_with']
-      html_options['data-disable-with'] = html_options.delete('disable_with')
+    if html_options[:disable_with]
+      html_options[:'data-disable-with'] = html_options.delete(:disable_with)
     end
 
     button_tag(label, html_options)
   end
 
   # Generates a submit button.
-  def submit_button(label = nil, html_options = nil)
+  def submit_button(label = nil, html_options = {})
     button_options = { icon: 'check', color: 'primary', name: 'submit', type: 'submit' }
-    html_options ||= {}
     html_options.update button_options
 
     button(label, html_options)
   end
 
   # Generates a reset button.
-  def reset_button(label = nil, html_options = nil)
+  def reset_button(label = nil, html_options = {})
     button_options = { icon: 'eraser', name: 'reset', type: 'reset' }
-    html_options ||= {}
     html_options.update button_options
 
     button(label, html_options)
@@ -157,134 +149,125 @@ module BootstrapHelper
   # ---------- #
 
   # Generates a responsive-friendly image tag
-  def image_responsive(source, options = {})
-    add_css_class 'img-responsive', options
-    image_tag source, options
-  end
+  def image_responsive(source, html_options = {})
+    html_options = html_options.symbolize_keys
 
-  # Generates an image tag with rounded corners.
-  def image_rounded(source, options = {})
-    add_css_class 'img-rounded', options
-    image_tag source, options
-  end
+    classes = ['img-responsive']
+    if html_options[:class]
+      classes << html_options[:class]
+    end
 
-  # Generates an image tag with circle.
-  def image_circle(source, options = {})
-    add_css_class 'img-circle', options
-    image_tag source, options
-  end
+    html_options[:class] = classes * ' '
 
-  # Generates an image tag within thumbnail.
-  def image_thumbnail(source, options = {})
-    add_css_class 'img-thumbnail', options
-    image_tag source, options
+    image_tag(source, html_options)
   end
 
-  # ------------ #
-  # - OVERRIDE - #
-  # ------------ #
+  # Generates an image tag with rounded corners.
+  def image_rounded(source, html_options = {})
+    html_options = html_options.symbolize_keys
 
-  # override rails helper: content_tag
-  def content_tag(name, content_or_options_with_block = nil, options = nil, escape = true, &block)
-    if block_given?
-      options = content_or_options_with_block if content_or_options_with_block.is_a? Hash
-      normalize_typography_options(options) if options
-      content_tag_string name, capture(&block), options, escape
-    else
-      normalize_typography_options(options) if options
-      content_tag_string name, content_or_options_with_block, options, escape
+    classes = ['img-rounded']
+    if html_options[:class]
+      classes << html_options[:class]
     end
+
+    html_options[:class] = classes * ' '
+
+    image_tag(source, html_options)
   end
 
-  private
+  # Generates an image tag with circle.
+  def image_circle(source, html_options = {})
+    html_options = html_options.symbolize_keys
 
-  def normalize_button_options_for_bootstrap(html_options = {}, type = :link)
-    classes = ['btn']
-    if color = html_options.delete('color')
-      classes << "btn-#{color}"
-    else
-      classes << 'btn-default'
-    end
-    if size = html_options.delete('size')
-      classes << "btn-#{size}"
-    end
-    if block = html_options.delete('block')
-      classes << 'btn-block'
-    end
-    if active = html_options.delete('active')
-      classes << 'active'
-    end
-    if type == :link && html_options['disabled']
-      html_options.delete('disabled')
-      classes << 'disabled'
-    end
-    if preset_class = html_options.delete('class')
-      classes << preset_class
+    classes = ['img-circle']
+    if html_options[:class]
+      classes << html_options[:class]
     end
 
-    html_options['class'] = classes * ' '
-    html_options
+    html_options[:class] = classes * ' '
+
+    image_tag(source, html_options)
   end
 
-  # ------------- #
-  # - UTILITIES - #
-  # ------------- #
-
-  # Appends new class names to the given options.
-  def add_css_class(class_names, options)
-    class_names = class_names.to_s if class_names.is_a? Symbol
-    class_names = class_names.split if class_names.is_a? String
-    if symbolize_keys(options).key? :class
-      options_class_names = options[:class].split
-      class_names.each do |value|
-        options_class_names << %(#{value.strip}) unless options_class_names.include? value
-      end
-      class_names = options_class_names
+  # Generates an image tag within thumbnail.
+  def image_thumbnail(source, html_options = {})
+    html_options = html_options.symbolize_keys
+
+    classes = ['img-thumbnail']
+    if html_options[:class]
+      classes << html_options[:class]
     end
-    options[:class] = %(#{class_names * ' '})
-  end
 
-  # Adds the pull class to the given options is applicable.
-  def add_pull_class(options)
-    pull = pop_value :pull, options
-    add_css_class(%(pull-#{pull}), options) if pull
-  end
+    html_options[:class] = classes * ' '
 
-  # Adds the text align class to the given options if applicable.
-  def add_align_class(options)
-    align = pop_value :align, options
-    add_css_class(%(text-#{align}), options) if align
+    image_tag(source, html_options)
   end
 
-  # Adds the text transform class to the given options if applicable.
-  def add_transform_class(options)
-    transform = pop_value :transform, options
-    add_css_class(%(text-#{transform}), options) if transform
-  end
+  # ------------ #
+  # - OVERRIDE - #
+  # ------------ #
 
-  # Adds the color to the given options if applicable.
-  def add_color_class(options)
-    color = pop_value :color, options
-    add_css_class(%(text-#{color}), options) if color
-  end
+  def content_tag(name, content = nil, options = nil, escape = true, &block)
+    options, content = content, capture(&block) if block_given?
 
-  # Adds the bgcolor to the given options if applicable.
-  def add_bgcolor_class(options)
-    bgcolor = pop_value :bgcolor, options
-    add_css_class(%(bg-#{bgcolor}), options) if bgcolor
-  end
+    options ||= {}
+    options = options.symbolize_keys
+    options = normalize_options_for_typography(options)
 
-  # Adds the active to the given options if applicable.
-  def add_active_class(options)
-    active = pop_value :active, options
-    add_css_class('active', options) if active
+    content_tag_string(name, content, options, escape)
   end
 
-  def normalize_typography_options(options)
-    add_pull_class options
-    add_align_class options
-    add_transform_class options
-    add_color_class options
-    add_bgcolor_class options
-  end
+  private
+
+    def normalize_button_options_for_bootstrap(html_options = {}, type = :link)
+      classes = ['btn']
+      if color = html_options.delete(:color) { 'default' }
+        classes << "btn-#{color}"
+      end
+      if size = html_options.delete(:size)
+        classes << "btn-#{size}"
+      end
+      if block = html_options.delete(:block)
+        classes << 'btn-block'
+      end
+      if active = html_options.delete(:active)
+        classes << 'active'
+      end
+      if type == :link && html_options[:disabled]
+        html_options.delete(:disabled)
+        classes << 'disabled'
+      end
+      if html_options[:class]
+        classes << html_options[:class]
+      end
+
+      html_options[:class] = classes * ' '
+      html_options
+    end
+
+    def normalize_options_for_typography(html_options = {})
+      classes = []
+      if pull = html_options.delete(:pull)
+        classes << "pull-#{pull}"
+      end
+      if align = html_options.delete(:align)
+        classes << "text-#{align}"
+      end
+      if transform = html_options.delete(:transform)
+        classes << "text-#{transform}"
+      end
+      if color = html_options.delete(:color)
+        classes << "text-#{color}"
+      end
+      if bgcolor = html_options.delete(:bgcolor)
+        classes << "text-#{bgcolor}"
+      end
+      if html_options[:class]
+        classes << html_options[:class]
+      end
+
+      html_options[:class] = classes * ' '
+      html_options
+    end
 end

data/app/helpers/qrcode_helper.rb

@@ -1,21 +1,21 @@
 module QrcodeHelper
   def qrcode(data = '', options = {})
     # Google API: https://google-developers.appspot.com/chart/infographics/docs/qr_codes
-    width = pop_value :width, options, '200'
-    output_encoding = pop_value :output_encoding, options
-    error_correction_level = pop_value :error_correction_level, options
-    margin = pop_value :margin, options
+    width                  = options.delete(:width) { '200' }
+    output_encoding        = options.delete(:output_encoding)
+    error_correction_level = options.delete(:error_correction_level)
+    margin                 = options.delete(:margin)
 
     qrcode_url = 'https://chart.googleapis.com/chart?cht=qr'
     qrcode_url += "&chl=#{data}"
     qrcode_url += "&chs=#{width}x#{width}"
-    qrcode_url += "&choe=#{output_encoding}" unless output_encoding.nil?
-    if error_correction_level.nil? or margin.nil?
-      qrcode_url += "&chld=#{error_correction_level}" unless error_correction_level.nil?
-      qrcode_url += "&chld=|#{margin}" unless margin.nil?
-    else
+    qrcode_url += "&choe=#{output_encoding}" if output_encoding
+    if error_correction_level && margin
       qrcode_url += "&chld=#{error_correction_level}|#{margin}"
+    else
+      qrcode_url += "&chld=#{error_correction_level}" if error_correction_level
+      qrcode_url += "&chld=|#{margin}" if margin
     end
-    image_tag qrcode_url, alt: data
+    image_tag(qrcode_url, alt: data)
   end
 end

data/app/helpers/timeago_helper.rb

@@ -1,7 +1,12 @@
 module TimeagoHelper
-  def timeago(time, options = {})
+  def timeago(time = nil, html_options = {})
     time = time.to_time if time.is_a? String
-    options[:class] ||= 'timeago'
-    content_tag(:abbr, time.to_s, options.merge(title: time.getutc.iso8601)) if time
+    classes = ['timeago']
+    if html_options[:class]
+      classes << html_options[:class]
+    end
+    html_options[:class] = classes * ' '
+    html_options[:title] = time.getutc.iso8601
+    content_tag(:abbr, time.try(:to_s), html_options)
   end
 end

data/lib/andy_rails_toolbox/version.rb

@@ -1,3 +1,3 @@
 module AndyRailsToolbox
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,27 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: andy_rails_toolbox
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - ChouAndy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-30 00:00:00.000000000 Z
+date: 2015-05-31 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.10
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.10
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.1
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.4.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.4.4
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.3.4
 - !ruby/object:Gem::Dependency
@@ -94,7 +150,6 @@ files:
 - app/assets/javascripts/jquery.timeago.load.coffee
 - app/assets/javascripts/jquery.timeago.zh-TW.js
 - app/helpers/bootstrap_helper.rb
-- app/helpers/hash_helper.rb
 - app/helpers/markdown_helper.rb
 - app/helpers/qrcode_helper.rb
 - app/helpers/timeago_helper.rb

data/app/helpers/hash_helper.rb

@@ -1,26 +0,0 @@
-module HashHelper
-
-  # -------- #
-  # - Hash - #
-  # -------- #
-
-  # Returns a specific value from the given hash (or the default value if not set).
-  def get_value(key, hash, default_value = nil)
-    value = hash.delete key
-    value = default_value if value.nil? and !default_value.nil?
-    value
-  end
-
-  # Removes and returns a specific value from the given hash (or the default value if not set).
-  def pop_value(key, hash, default_value = nil)
-    symbolize_keys hash unless hash.empty?
-    get_value key.to_sym, hash, default_value
-  end
-
-  # all keys of the given hash symbolize.
-  def symbolize_keys(hash)
-    result = {}
-    hash.each { |key, value| result[key.to_sym] = value }
-    hash.replace result
-  end
-end