wrap_it 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0bff3652d6d84abb2e4b5fd7e0fcfd1b3077c97
-  data.tar.gz: d7d2c2031a7f3329f7f22e23378e217c9a1248a9
+  metadata.gz: 452ea9b6986b74655e20c2b05043adfee92a6f3b
+  data.tar.gz: 5f9afcec73b2e3fcd904f918df595a3c884cce54
 SHA512:
-  metadata.gz: 96022ed7bb7fff92f6c0ee5cea9dd0be8c0e53d670a66014a7685edaeb51910a72692e23d308ef236eb8898acffef37bbd5b97ee406695078acfe53c209d2db1
-  data.tar.gz: d3b6e268405b869b07ac024a824f13589647e2e8d9ebc94edf295791ea4a0e2aea1bd04ad51ae538fbf7eb140d64cd0a59f3275fb2b0b409089c2dfcc2407803
+  metadata.gz: 4ced26c53ee1c80985c120ce7edde26b5a5a9306c8c37e25aee711bac374215f17a1b1dc9541bc279705cbd73664a6183e759c6c488b33ead6750a268c4b9c8a
+  data.tar.gz: d0565411c8abde8db3f6225adf5fe814a58ba100609573c3954887a3cab6e1b971c55e698a4b27cb2ea0a6a3ca10e0919aca8f422587cace395ec6171c423703

data/README.md

@@ -273,6 +273,12 @@ Creates your own DSL method to create child items. In arguments, you should spec
 
 # Changes
 
+`0.1.5`
+* fixed: switches and enums can damage instance variables
+* fixed: process helper_name option before initialize callbacks
+* fixed: convert user defined tag to string
+* added: Link class
+
 `0.1.4`
 * added: html_class_prefix
 

data/lib/wrap_it/base.rb

@@ -38,15 +38,20 @@ module WrapIt
     def initialize(template, *args, &block)
       @template, @arguments, @block = template, args, block
       self.options = @arguments.extract_options!
+
+      @helper_name = @options.delete(:helper_name)
+      @helper_name.is_a?(String) && @helper_name = @helper_name.to_sym
+
       @arguments.extend ArgumentsArray
       add_default_classes
+
       run_callbacks :initialize do
         @tag = @options.delete(:tag) ||
           self.class.get_derived(:@default_tag) || 'div'
-        @helper_name = @options.delete(:helper_name)
-        @helper_name.is_a?(String) && @helper_name = @helper_name.to_sym
+        @tag = @tag.to_s
       end
-      @argument = nil
+
+      @arguments = nil
     end
 
     def omit_content?
@@ -124,6 +129,10 @@ module WrapIt
       end
     end
 
+    def unwrap
+      @wrapper = nil
+    end
+
     protected
 
     #
@@ -132,10 +141,10 @@ module WrapIt
     # @param  name [<Symbol, String>] Tag name. Converted to `String`.
     #
     # @return [void]
-    def self.default_tag(name)
+    def self.default_tag(name, override = true)
       name.is_a?(String) || name.is_a?(Symbol) ||
         fail(ArgumentError, 'Tag name should be a String or Symbol')
-      @default_tag = name.to_s
+      override ? @default_tag = name.to_s : @default_tag ||= name.to_s
     end
 
     def self.omit_content
@@ -166,7 +175,9 @@ module WrapIt
 
     def do_render
       # cleanup options from empty values
-      @options.select! { |k, v| !v.nil? && !v.empty? }
+      @options.select! do |k, v|
+        !v.nil? && (!v.respond_to?(:empty?) || !v.empty?)
+      end
       run_callbacks :render do
         @content = content_tag(tag, @content, options)
       end

data/lib/wrap_it/callbacks.rb

@@ -5,8 +5,9 @@ module WrapIt
   # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
   #
   module Callbacks
+    extend DerivedAttributes
+
     def self.included(base)
-      extend DerivedAttributes
       base.extend ClassMethods
     end
 

data/lib/wrap_it/enums.rb

@@ -19,6 +19,7 @@ module WrapIt
     private
 
     def enums_init
+      @enums = {}
       opt_keys = @options.keys
       enums.each do |name, opts|
         value = nil
@@ -36,7 +37,7 @@ module WrapIt
     end
 
     def enums
-      @nums ||= self.class.collect_derived(:@enums, {}, :merge)
+      @enums_hash ||= self.class.collect_derived(:@enums, {}, :merge)
     end
 
     #
@@ -89,8 +90,7 @@ module WrapIt
           opts[:regexp] = /\A#{prefix}(?:#{values.join('|')})\z/
           opts[:html_class_prefix] = prefix
         end
-        var = "@#{name}".to_sym
-        define_method("#{name}") { instance_variable_get(var) }
+        define_method("#{name}") { @enums[name] }
         define_method("#{name}=", &Enums.setter(name, &block))
         @enums ||= {}
         @enums[name] = opts
@@ -104,7 +104,7 @@ module WrapIt
         opts = enums[name]
         v = value if opts[:values].include?(value)
         v ||= opts[:default] if opts.key?(:default)
-        instance_variable_set("@#{name}", v)
+        @enums[name] = v
         block.nil? || instance_exec(v, &block)
         if opts.key?(:regexp)
           remove_html_class(opts[:regexp])

data/lib/wrap_it/html_class.rb

@@ -46,7 +46,7 @@ module WrapIt
     #
     # @return [String] HTML class prefix.
     def html_class_prefix
-      self.class.html_class_prefix
+      @html_class_prefix ||= self.class.html_class_prefix
     end
 
     #
@@ -222,7 +222,7 @@ module WrapIt
       #
       # @return [void]
       def html_class_prefix(prefix = nil)
-        return get_derived(:@html_class_prefix) || '' if prefix.nil?
+        return(get_derived(:@html_class_prefix) || '') if prefix.nil?
         prefix.is_a?(String) || prefix.is_a?(Symbol) || fail(
           ArgumentError, 'prefix should be a String or Symbol'
         )

data/lib/wrap_it/link.rb

@@ -0,0 +1,41 @@
+module WrapIt
+  #
+  # Link
+  #
+  # @author Alexey Ovchinnikov <alexiss@cybernetlab.ru>
+  #
+  class Link < Base
+    include TextContainer
+
+    default_tag 'a'
+
+    def href
+      @options[:href]
+    end
+
+    def href=(value)
+      if value.is_a?(Hash)
+        defined?(Rails) || fail(
+          ArgumentError,
+          'Hash links supported only in Rails env'
+        )
+        value = @template.url_for(value)
+      end
+      value.is_a?(String) || fail(ArgumentError, 'Wrong link type')
+      @options[:href] = value
+    end
+
+    before_initialize do
+      link = @options[:link] || @options[:href] || @options[:url]
+      @options.delete(:link)
+      @options.delete(:href)
+      @options.delete(:url)
+      unless link.is_a?(String) || link.is_a?(Hash)
+        @block.nil? && tmp = @arguments.extract_first!(String)
+        link = @arguments.extract_first!(String)
+        tmp.nil? || @arguments.unshift(tmp)
+      end
+      link.nil? || self.href = link
+    end
+  end
+end

data/lib/wrap_it/switches.rb

@@ -19,8 +19,9 @@ module WrapIt
     private
 
     def switches_init
+      @switches = {}
       keys = switches.keys
-      keys.each { |switch| instance_variable_set("@#{switch}", false) }
+      # keys.each { |switch| @switches[switch] = false }
       @options.keys.select { |o| keys.include?(o) }.each do |switch|
         send("#{switches[switch][:name]}=", @options.delete(switch) == true)
       end
@@ -30,7 +31,7 @@ module WrapIt
     end
 
     def switches
-      @switches ||= self.class.collect_derived(:@switches, {}, :merge)
+      @switches_hash ||= self.class.collect_derived(:@switches, {}, :merge)
     end
 
     #
@@ -83,8 +84,7 @@ module WrapIt
             end
         end
         names = [name] + [[options[:aliases]] || []].flatten.compact
-        var = "@#{name}".to_sym
-        define_method("#{name}?") { instance_variable_get(var) == true }
+        define_method("#{name}?") { @switches[name] == true }
         define_method("#{name}=", &Switches.setter(name, &block))
         @switches ||= {}
         names.each { |n| @switches[n] = options }
@@ -102,7 +102,7 @@ module WrapIt
     def self.setter(name, &block)
       proc do |value|
         opts = switches[name]
-        instance_variable_set("@#{name}", value == true)
+        @switches[name] = value == true
         if value == true
           opts.key?(:html_class) && add_html_class(*opts[:html_class])
           block.nil? || instance_exec(true, &block)

data/lib/wrap_it/text_container.rb

@@ -7,7 +7,7 @@ module WrapIt
   module TextContainer
     def self.included(base)
       base.class_eval do
-        default_tag 'p'
+        default_tag 'p', false
 
         after_initialize do
           @body = @arguments.extract_first!(String) || empty_html

data/lib/wrap_it/version.rb

@@ -1,4 +1,4 @@
 #
 module WrapIt
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/lib/wrap_it.rb

@@ -74,3 +74,4 @@ end
 require 'wrap_it/base'
 require 'wrap_it/container'
 require 'wrap_it/text_container'
+require 'wrap_it/link'

data/spec/lib/base_spec.rb

@@ -14,10 +14,17 @@ describe WrapIt::Base do
     expect(successor(tag: 'p').tag).to eq 'p'
   end
 
-  it 'extends @arguments with ArgumentsArray module' do
+  it 'drops @arguments after init' do
     expect(
       successor.instance_variable_get(:@arguments)
-    ).to be_kind_of WrapIt::ArgumentsArray
+    ).to be_nil
+  end
+
+  it 'extends @arguments with ArgumentsArray module' do
+    args = nil
+    successor_class.class_eval { after_initialize { args = @arguments } }
+    successor
+    expect(args).to be_kind_of WrapIt::ArgumentsArray
   end
 
   it 'symbolizes options hash' do

data/spec/lib/container_spec.rb

@@ -6,4 +6,6 @@ describe WrapIt::Container do
 #    successor.test
 #    expect(successor.instance_variable_get(:@children).size).to eq 1
 #  end
+
+  pending 'adds safe helpers'
 end

data/spec/lib/html_class_spec.rb

@@ -10,12 +10,21 @@ describe WrapIt::HTMLClass do
     expect(sub_class.new(template).html_class).to eq %w(a d e b c)
   end
 
-  it 'has self.html_class_prefix and #html_class_prefix methods' do
-    expect(wrapper.html_class_prefix).to eq ''
-    wrapper_class.class_eval { html_class_prefix 'e-' }
-    expect(wrapper.html_class_prefix).to eq 'e-'
-    sub_class = Class.new(wrapper_class)
-    expect(sub_class.new(template).html_class_prefix).to eq 'e-'
+  describe '#html_class_prefix' do
+    it 'returns empty string by default' do
+      expect(wrapper.html_class_prefix).to eq ''
+    end
+
+    it 'returns value setted by class method' do
+      wrapper_class.class_eval { html_class_prefix 'e-' }
+      expect(wrapper.html_class_prefix).to eq 'e-'
+    end
+
+    it 'returns derived value' do
+      wrapper_class.class_eval { html_class_prefix 'e-' }
+      sub_class = Class.new(wrapper_class)
+      expect(sub_class.new(template).html_class_prefix).to eq 'e-'
+    end
   end
 
   it 'has #add_html_class with chaining' do

data/spec/lib/link_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe WrapIt::Link do
+  it 'has `a` tag by default' do
+    expect(successor.tag).to eq 'a'
+  end
+
+  it { expect(successor).to be_kind_of WrapIt::TextContainer }
+
+  it 'takes href from options' do
+    [:link, :href, :url].each do |key|
+      @successor = nil
+      expect(successor(key => 'url').href).to eq 'url'
+    end
+  end
+
+  it 'takes href from first string arg if block present' do
+    expect(successor('url') { 'text' }.href).to eq 'url'
+  end
+
+  it 'takes href from second string arg if no block given' do
+    expect(successor('text', 'url').href).to eq 'url'
+    expect(successor.instance_variable_get(:@body)).to eq 'text'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wrap_it
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Alexey Ovchinnikov
@@ -116,6 +116,7 @@ files:
 - lib/wrap_it/enums.rb
 - lib/wrap_it/html_class.rb
 - lib/wrap_it/html_data.rb
+- lib/wrap_it/link.rb
 - lib/wrap_it/no_rails.rb
 - lib/wrap_it/rails.rb
 - lib/wrap_it/switches.rb
@@ -130,6 +131,7 @@ files:
 - spec/lib/enums_spec.rb
 - spec/lib/html_class_spec.rb
 - spec/lib/html_data_spec.rb
+- spec/lib/link_spec.rb
 - spec/lib/switches_spec.rb
 - spec/rails/base_spec.rb
 - spec/rails/container_spec.rb
@@ -174,6 +176,7 @@ test_files:
 - spec/lib/enums_spec.rb
 - spec/lib/html_class_spec.rb
 - spec/lib/html_data_spec.rb
+- spec/lib/link_spec.rb
 - spec/lib/switches_spec.rb
 - spec/rails/base_spec.rb
 - spec/rails/container_spec.rb