paggio 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03850a7f3bf3978f419ccc6e7189ef8377f43780
-  data.tar.gz: 04c931b87504e60e8716e8e99871141242c7a3fa
+  metadata.gz: 1d1920260c7987e407745d55bee4b68cb3863fc7
+  data.tar.gz: 85e07d23af662cea97458b190900a147d174525c
 SHA512:
-  metadata.gz: bf6b9403e176a1cfc3cbbc106d129592b2ca98049dc2b0263cb96f22b005bbaf6e8558e1a7d539ef8162d25712c421fceae5dee06fa48c44c2c68786a946d639
-  data.tar.gz: 277e56800dbd8144c90701e5bb0f1bb6de6b9548edb76efc768af2f48d64ea0d3abaa78dde069703b14ecd7a5becc508abb697b3406ac15c849d9e5dd4682791
+  metadata.gz: c7004ebc7443c84654f9c38c2331220d1a2687f9af9508e5288046a64aa39b54cef8bff3654207a97a4367d965d6f49bca2aed65a6788410523c20e207cb247f
+  data.tar.gz: 9c5d4da6163c49968c00889c2ee919d0515604ce1a314ccafbc0462189d34b398d4bf366cfe3bcdbec1ef4fd21a1562a4d2332cf8898f3392bec3a09679d9e7c

data/Gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+gemspec
+
+gem 'rake'
+gem 'rspec'

data/Gemfile.lock

@@ -0,0 +1,26 @@
+PATH
+  remote: .
+  specs:
+    paggio (0.2.4)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.2.5)
+    rake (10.1.1)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  paggio!
+  rake
+  rspec

data/Rakefile

@@ -1,16 +1,10 @@
 #! /usr/bin/env ruby
 require 'rake'
 
-task :default => [:install, :test]
-
-task :install do
-	sh 'gem install --no-force rspec'
-	sh 'gem build *.gemspec'
-	sh 'gem install *.gem'
-end
+task :default => :test
 
 task :test do
 	FileUtils.cd 'spec' do
-		sh 'rspec css_spec.rb --backtrace --color --format doc'
+		sh 'rspec css_spec.rb html_spec.rb --backtrace --color --format doc'
 	end
 end

data/lib/paggio/css.rb

@@ -11,12 +11,13 @@
 require 'paggio/css/unit'
 require 'paggio/css/color'
 require 'paggio/css/definition'
+require 'paggio/css/rule'
+require 'paggio/css/font'
+require 'paggio/css/animation'
 
 class Paggio
 
 class CSS < BasicObject
-  Rule = ::Struct.new(:selector, :definition)
-
   def self.selector(list)
     result = ''
 
@@ -35,14 +36,16 @@ class CSS < BasicObject
     end
   end
 
-  attr_reader :rules
+  attr_reader :rules, :media, :fonts, :animations
 
   def initialize(&block)
     ::Kernel.raise ::ArgumentError, 'no block given' unless block
 
-    @selector = []
-    @current  = []
-    @rules    = []
+    @selector   = []
+    @current    = []
+    @rules      = []
+    @fonts      = []
+    @animations = []
 
     if block.arity == 0
       instance_exec(&block)
@@ -60,19 +63,49 @@ class CSS < BasicObject
 
     names.each {|name|
       @selector << name
-      @current  << Rule.new(CSS.selector(@selector), Definition.new)
+      @current  << Rule.new(CSS.selector(@selector), @media)
 
-      block.call(self)
+      block.call
 
       @selector.pop
       @rules << @current.pop
     }
   end
 
+  def media(query, *args, &block)
+    if block
+      old, @media = @media, query
+      block.call
+      @media = old
+    else
+      method_missing(:media, query, *args)
+    end
+  end
+
+  def font(name, *args, &block)
+    if block
+      @current << Font.new(name)
+      block.call
+      @fonts << @current.pop
+    else
+      method_missing(:font, name, *args)
+    end
+  end
+
+  def animation(name, *args, &block)
+    if block
+      @current << Animation.new(name)
+      block.call
+      @animations << @current.pop
+    else
+      method_missing(:animation, name, *args)
+    end
+  end
+
   # this is needed because the methods inside the rule blocks are actually
   # called on the CSS object
-  def method_missing(name, *args, &block)
-    @current.last.definition.__send__(name, *args, &block)
+  def method_missing(*args, &block)
+    @current.last.__send__(*args, &block)
   end
 end
 

data/lib/paggio/css/animation.rb

@@ -0,0 +1,54 @@
+#--
+#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+#                    Version 2, December 2004
+#
+#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+#   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+#
+#  0. You just DO WHAT THE FUCK YOU WANT TO.
+#++
+
+class Paggio; class CSS < BasicObject
+
+class Animation < BasicObject
+  class Step < BasicObject
+    attr_reader :value
+
+    def initialize(value)
+      @value      = value
+      @definition = Definition.new
+    end
+
+    def method_missing(*args, &block)
+      @definition.__send__(*args, &block)
+    end
+  end
+
+  attr_reader :name, :steps
+
+  def initialize(name)
+    @name  = name
+    @steps = []
+  end
+
+  def step(value, &block)
+    @steps << Step.new(value)
+    block.call
+  end
+
+  def from(value, &block)
+    @steps << Step.new(0.%)
+    block.call
+  end
+
+  def to(value, &block)
+    @steps << Step.new(100.%)
+    block.call
+  end
+
+  def method_missing(*args, &block)
+    @steps.last.__send__(*args, &block)
+  end
+end
+
+end; end

data/lib/paggio/css/definition.rb

@@ -35,10 +35,40 @@ class Definition < BasicObject
     Gradient.new(*args)
   end
 
-  def url(arg)
-    "url(#{arg.inspect})"
+  def url(value)
+    "url(#{value.to_s.inspect})"
   end
 
+  %w[url blur brightness rotate contrast grayscale invert opacity saturate sepia].each {|name|
+    define_method name do |value|
+      "#{name}(#{value})"
+    end
+  }
+
+  def rgb(r, g, b)
+    "rgb(#{r}, #{g}, #{b}, #{a})"
+  end
+
+  def rgba(r, g, b, a)
+    "rgba(#{r}, #{g}, #{b}, #{a})"
+  end
+
+  %w[scale skew translate].each {|name|
+    define_method name do |a, b = nil|
+      if b
+        "#{name}(#{a}, #{b})"
+      else
+        "#{name}(#{a})"
+      end
+    end
+  }
+
+  %w[translateX translateY translateZ rotateX rotateY rotateZ skewX skewY scaleX scaleY].each {|name|
+    define_method name do |value|
+      "#{name}(#{value})"
+    end
+  }
+
   def background(*args)
     if Gradient === args.first
       if args.length > 1
@@ -67,6 +97,15 @@ class Definition < BasicObject
 
       options.each {|name, value|
         case name
+        when :top, :bottom, :left, :right
+          if ::Hash === value
+            value.each {|n, v|
+              style "border-#{name}-#{n}", v
+            }
+          else
+            style "border-#{name}", value
+          end
+
         when :radius
           if ::Hash === value
             value.each {|horizontal, value|
@@ -135,8 +174,19 @@ class Definition < BasicObject
   end
 
   def animation(*args)
-    style 'animation', args
-    style '-webkit-animation', args
+    if Hash === args.first
+      if args.length == 1
+        options = args.first
+      end
+
+      options.each {|name, value|
+        style "-webkit-animation-#{name}", value
+        style "animation-#{name}", value
+      }
+    else
+      style 'animation', args
+      style '-webkit-animation', args
+    end
   end
 
   def transition(*args)
@@ -145,14 +195,36 @@ class Definition < BasicObject
     style '-moz-transition', args
   end
 
+  def user_select(*args)
+    style 'user-select', args
+    style '-webkit-user-select', args
+    style '-moz-user-select', args
+    style '-ms-user-select', args
+  end
+
+  def transform(*args)
+    style 'transform', args
+    style '-webkit-transform', args
+    style '-moz-transform', args
+    style '-ms-transform', args
+    style '-o-transform', args
+  end
+
+  def filter(*args)
+    style 'filter', args
+    style '-webkit-filter', args
+    style '-moz-filter', args
+    style '-ms-filter', args
+    style '-o-filter', args
+  end
+
   def method_missing(name, *args, &block)
-    name      = name.to_s
-    important = name.end_with? ?!
-    name      = name[0 .. -2] if important
+    name = name.to_s
 
-    @important = true if important
+    if name.end_with? ?!
+      name = name[0 .. -2]
 
-    if important && respond_to?(name)
+      @important = true
       __send__ name, *args, &block
       @important = false
 

data/lib/paggio/css/font.rb

@@ -0,0 +1,28 @@
+#--
+#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+#                    Version 2, December 2004
+#
+#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+#   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+#
+#  0. You just DO WHAT THE FUCK YOU WANT TO.
+#++
+
+class Paggio; class CSS < BasicObject
+
+class Font < BasicObject
+  attr_reader :name
+
+  def initialize(name)
+    @name       = name
+    @definition = Definition.new
+
+    font family: name
+  end
+
+  def method_missing(*args, &block)
+    @definition.__send__(*args, &block)
+  end
+end
+
+end; end

data/lib/paggio/css/rule.rb

@@ -0,0 +1,27 @@
+#--
+#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+#                    Version 2, December 2004
+#
+#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+#   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+#
+#  0. You just DO WHAT THE FUCK YOU WANT TO.
+#++
+
+class Paggio; class CSS < BasicObject
+
+class Rule < BasicObject
+  attr_reader :selector, :media
+
+  def initialize(selector, media)
+    @selector   = selector
+    @media      = media
+    @definition = Definition.new
+  end
+
+  def method_missing(*args, &block)
+    @definition.__send__(*args, &block)
+  end
+end
+
+end; end

data/lib/paggio/formatter.rb

@@ -78,11 +78,21 @@ class Formatter
 
   def indent(&block)
     if indent?
-      @options[:indent][:level] += 1
-      block.call
-      @options[:indent][:level] -= 1
+      if block
+        @options[:indent][:level] += 1
+        block.call
+        @options[:indent][:level] -= 1
+      else
+        @options[:indent][:level] += 1
+      end
     else
-      block.call
+      block.call if block
+    end
+  end
+
+  def deindent
+    if indent?
+      @options[:indent][:level] -= 1
     end
   end
 
@@ -140,6 +150,11 @@ Formatter.for HTML::Element do |f, item|
     f.print "<#{name} #{attrs.join(' ')}>"
   end
 
+  next if %w[
+    area base br col embed hr img input keygen link
+    menuitem meta param source track wbr
+  ].include?(name.to_s.downcase)
+
   f.indent {
     if inner = item.instance_eval { @inner_html }
       f.print inner
@@ -166,17 +181,55 @@ Formatter.for HTML::Element do |f, item|
   f.print "</#{name}>"
 end
 
+Formatter.for CSS::Definition::Style do |f, style|
+  f.print "#{style.name}: #{style.value}#{' !important' if style.important};"
+end
+
 Formatter.for CSS do |f, item|
+  item.fonts.each {|font|
+    f.print '@font-face {'
+    f.indent {
+      font.each {|style|
+        f.format style
+      }
+    }
+    f.print '}'
+  }
+
+  item.animations.each {|animation|
+    ['', '-webkit-', '-moz-', '-o-'].each {|platform|
+      f.print "@#{platform}keyframes #{animation.name} {"
+      animation.steps.each {|step|
+        f.print "#{step.value} {"
+        step.each {|style|
+          f.format style
+        }
+        f.print '}'
+      }
+      f.print '}'
+    }
+  }
+
   item.rules.reverse.each {|rule|
-    next if rule.definition.empty?
+    next if rule.empty?
+
+    if m = rule.media
+      f.print "@media #{m} {"
+      f.indent
+    end
 
     f.print "#{rule.selector} {"
     f.indent {
-      rule.definition.each {|style|
-        f.print "#{style.name}: #{style.value}#{' !important' if style.important};"
+      rule.each {|style|
+        f.format style
       }
     }
     f.print '}'
+
+    if rule.media
+      f.print '}'
+      f.deindent
+    end
   }
 end
 

data/lib/paggio/html/element.rb

@@ -13,9 +13,13 @@ require 'paggio/html/element/base'
 require 'paggio/html/element/blockquote'
 require 'paggio/html/element/button'
 require 'paggio/html/element/canvas'
+require 'paggio/html/element/embed'
 require 'paggio/html/element/img'
 require 'paggio/html/element/input'
 require 'paggio/html/element/object'
+require 'paggio/html/element/option'
+require 'paggio/html/element/optgroup'
+require 'paggio/html/element/select'
 require 'paggio/html/element/td'
 
 class Paggio; class HTML < BasicObject
@@ -52,15 +56,20 @@ class Element < BasicObject
   end
 
   def method_missing(name, content = nil, &block)
-    if content
-      self << ::Paggio::Utils.heredoc(content.to_s)
-    end
-
     if name.to_s.end_with? ?!
       @attributes[:id] = name[0 .. -2]
     else
-      @last = name
-      @class_names.push(name)
+      @class_names << name
+    end
+
+    if ::Hash === content
+      if content.has_key?(:class) || content.has_key?(:classes)
+        @class_names.unshift(*(content.delete(:class).to_s.split | content.delete(:classes).to_a))
+      end
+
+      ::Paggio::Utils.deep_merge!(@attributes, content)
+    elsif content
+      self >> content
     end
 
     @owner.extend!(self, &block) if block
@@ -69,10 +78,9 @@ class Element < BasicObject
   end
 
   def [](*names)
-    return unless @last
-
-    @class_names.pop
-    @class_names.push([@last, *names].join('-'))
+    if last = @class_names.pop
+      @class_names << [last, *names].join('-')
+    end
 
     self
   end
@@ -83,6 +91,11 @@ class Element < BasicObject
     self
   end
 
+  def >>(content)
+    self << ::Paggio::Utils.heredoc(content.to_s)
+    self
+  end
+
   defhelper :style do |hash|
     @attributes[:style] = hash.map {|name, value|
       "#{name}: #{value}"

data/lib/paggio/html/element/a.rb

@@ -27,7 +27,7 @@ class A < self
     media: :media,
   }.each {|name, attribute|
     defhelper name do |value|
-      @attributes[attribute] = value.to_s
+      @attributes[name] = value.to_s
     end
   }
 

data/lib/paggio/html/element/base.rb

@@ -17,7 +17,7 @@ class Base < self
     target: :target,
   }.each {|name, attribute|
     defhelper name do |value|
-      @attributes[attribute] = value.to_s
+      @attributes[name] = value.to_s
     end
   }
 end

data/lib/paggio/html/element/button.rb

@@ -22,7 +22,7 @@ class Button < self
     target:   :formtarget,
   }.each {|name, attributes|
     defhelper name do |value|
-      @attributes[attribute] = value.to_s
+      @attributes[name] = value.to_s
     end
   }
 

data/lib/paggio/html/element/canvas.rb

@@ -15,7 +15,7 @@ class Canvas < self
     height: :height
   }.each {|name, attribute|
     defhelper name do |value|
-      @attributes[attribute] = value.to_s
+      @attributes[name] = value.to_s
     end
   }
 end

data/lib/paggio/html/element/embed.rb

@@ -0,0 +1,24 @@
+#--
+#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+#                    Version 2, December 2004
+#
+#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+#   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+#
+#  0. You just DO WHAT THE FUCK YOU WANT TO.
+#++
+
+class Paggio; class HTML < BasicObject; class Element < BasicObject
+
+class Embed < self
+  { type:   :type,
+    height: :height,
+    width:  :width
+  }.each {|name, attribute|
+    defhelper name do |value|
+      @attributes[name] = value
+    end
+  }
+end
+
+end; end; end

data/lib/paggio/html/element/img.rb

@@ -23,7 +23,7 @@ class Img < self
     map: :usemap,
   }.each {|name, attribute|
     defhelper name do |value|
-      @attributes[attribute] = value.to_s
+      @attributes[name] = value.to_s
     end
   }
 

data/lib/paggio/html/element/input.rb

@@ -18,9 +18,10 @@ class Input < self
     place_holder: :placeholder,
     read_only:    :readonly,
     required:     :required,
+    limit:        :maxlength
   }.each {|name, attribute|
     defhelper name do |value|
-      @attributes[attribute] = value
+      @attributes[name] = value
     end
   }
 end

data/lib/paggio/html/element/object.rb

@@ -19,7 +19,7 @@ class Object < self
     width:  :width
   }.each {|name, attribute|
     defhelper name do |value|
-      @attributes[attribute] = value
+      @attributes[name] = value
     end
   }
 end

data/lib/paggio/html/element/optgroup.rb

@@ -0,0 +1,24 @@
+#--
+#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+#                    Version 2, December 2004
+#
+#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+#   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+#
+#  0. You just DO WHAT THE FUCK YOU WANT TO.
+#++
+
+class Paggio; class HTML < BasicObject; class Element < BasicObject
+
+class Optgroup < self
+  %w[label value].each {|name|
+    defhelper name do |value|
+      @attributes[name] = value
+    end
+  }
+
+  defhelper! :disabled
+  defhelper! :selected
+end
+
+end; end; end

data/lib/paggio/html/element/option.rb

@@ -0,0 +1,24 @@
+#--
+#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+#                    Version 2, December 2004
+#
+#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+#   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+#
+#  0. You just DO WHAT THE FUCK YOU WANT TO.
+#++
+
+class Paggio; class HTML < BasicObject; class Element < BasicObject
+
+class Option < self
+  %w[label value].each {|name|
+    defhelper name do |value|
+      @attributes[name] = value
+    end
+  }
+
+  defhelper! :disabled
+  defhelper! :selected
+end
+
+end; end; end

data/lib/paggio/html/element/select.rb

@@ -0,0 +1,25 @@
+#--
+#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+#                    Version 2, December 2004
+#
+#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+#   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+#
+#  0. You just DO WHAT THE FUCK YOU WANT TO.
+#++
+
+class Paggio; class HTML < BasicObject; class Element < BasicObject
+
+class Select < self
+  %w[form name size].each {|name|
+    defhelper name do |value|
+      @attributes[name] = value
+    end
+  }
+
+  defhelper! :auto_focus, :autofocus
+  defhelper! :disabled
+  defhelper! :required
+end
+
+end; end; end

data/paggio.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new {|s|
 	s.name     = 'paggio'
-	s.version  = '0.2.4'
+	s.version  = '0.2.5'
 	s.author   = 'meh.'
 	s.email    = 'meh@schizofreni.co'
 	s.homepage = 'http://github.com/meh/paggio'

data/spec/css_spec.rb

@@ -8,7 +8,7 @@ describe Paggio::CSS do
       end
     end
 
-    css.to_s.should == "#lol {\n\tcolor: black;\n}\n"
+    expect(css.to_s).to eq("#lol {\n\tcolor: black;\n}\n")
   end
 
   it 'builds border-radius correctly' do
@@ -18,7 +18,7 @@ describe Paggio::CSS do
       end
     end
 
-    css.to_s.should == "#lol {\n\t-moz-border-radius: 5px;\n\t-webkit-border-radius: 5px;\n\tborder-radius: 5px;\n}\n"
+    expect(css.to_s).to eq("#lol {\n\t-moz-border-radius: 5px;\n\t-webkit-border-radius: 5px;\n\tborder-radius: 5px;\n}\n")
 
     css = Paggio.css do
       rule '#lol' do
@@ -26,7 +26,7 @@ describe Paggio::CSS do
       end
     end
 
-    css.to_s.should == "#lol {\n\t-moz-border-radius-topleft: 5px;\n\t-webkit-border-top-left-radius: 5px;\n\tborder-top-left-radius: 5px;\n}\n"
+    expect(css.to_s).to eq("#lol {\n\t-moz-border-radius-topleft: 5px;\n\t-webkit-border-top-left-radius: 5px;\n\tborder-top-left-radius: 5px;\n}\n")
   end
 
   it 'builds box-shadow correctly' do
@@ -36,6 +36,20 @@ describe Paggio::CSS do
       end
     end
 
-    css.to_s.should == "#lol {\n\t-moz-box-shadow: 0 0 5px black;\n\t-webkit-box-shadow: 0 0 5px black;\n\tbox-shadow: 0 0 5px black;\n}\n"
+    expect(css.to_s).to eq("#lol {\n\t-moz-box-shadow: 0 0 5px black;\n\t-webkit-box-shadow: 0 0 5px black;\n\tbox-shadow: 0 0 5px black;\n}\n")
+  end
+
+  it 'builds @font-face' do
+    css = Paggio.css do
+      font 'hue' do
+        src url('test')
+      end
+    end
+
+    expect(css.to_s).to eq("@font-face {\n\tfont-family: hue;\n\tsrc: url(\"test\");\n}\n")
+  end
+
+  it 'builds @keyframes' do
+
   end
 end

data/spec/html_spec.rb

@@ -0,0 +1,153 @@
+require 'paggio'
+
+describe Paggio::HTML do
+  it 'builds an element' do
+    html = Paggio.html! do
+      div
+    end
+
+    expect(html.to_s).to eq("<div>\n</div>\n")
+  end
+
+  it 'builds an element with text content' do
+    html = Paggio.html! do
+      div "foo bar"
+    end
+
+    expect(html.to_s).to eq("<div>\n\tfoo bar\n</div>\n")
+
+    html = Paggio.html! do
+      div do
+        "foo bar"
+      end
+    end
+
+    expect(html.to_s).to eq("<div>\n\tfoo bar\n</div>\n")
+  end
+
+  it 'builds an element with attributes' do
+    html = Paggio.html! do
+      div class: :wut
+    end
+
+    expect(html.to_s).to eq("<div class=\"wut\">\n</div>\n")
+  end
+
+  it 'builds deeper trees' do
+    html = Paggio.html! do
+      div do
+        span do
+          "wut"
+        end
+      end
+    end
+
+    expect(html.to_s).to eq("<div>\n\t<span>\n\t\twut\n\t</span>\n</div>\n")
+  end
+
+  it 'sets classes with methods' do
+    html = Paggio.html! do
+      div.nice.element
+    end
+
+    expect(html.to_s).to eq("<div class=\"nice element\">\n</div>\n")
+  end
+
+  it 'nests when setting classes' do
+    html = Paggio.html! do
+      div.nice.element do
+        span.nicer 'lol'
+      end
+    end
+
+    expect(html.to_s).to eq("<div class=\"nice element\">\n\t<span class=\"nicer\">\n\t\tlol\n\t</span>\n</div>\n")
+  end
+
+  it 'joins class name properly' do
+    html = Paggio.html! do
+      i.icon[:legal]
+    end
+
+    expect(html.to_s).to eq("<i class=\"icon-legal\">\n</i>\n")
+
+    html = Paggio.html! do
+      i.icon.icon[:legal, :shmegal]
+    end
+
+    expect(html.to_s).to eq("<i class=\"icon icon-legal-shmegal\">\n</i>\n")
+  end
+
+  it 'sets the id' do
+    html = Paggio.html! do
+      div.omg!
+    end
+
+    expect(html.to_s).to eq("<div id=\"omg\">\n</div>\n")
+  end
+
+  it 'chains ids and classes' do
+    html = Paggio.html! do
+      div.omg!.wut
+    end
+
+    expect(html.to_s).to eq("<div id=\"omg\" class=\"wut\">\n</div>\n")
+  end
+
+  it 'chains ids and attributes' do
+    html = Paggio.html! do
+      div.omg! class: :wut
+    end
+
+    expect(html.to_s).to eq("<div id=\"omg\" class=\"wut\">\n</div>\n")
+  end
+
+  it 'chains classes and attributes' do
+    html = Paggio.html! do
+      div.wut width: 80
+    end
+
+    expect(html.to_s).to eq("<div width=\"80\" class=\"wut\">\n</div>\n")
+  end
+
+  it 'overrides with id from attributes' do
+    html = Paggio.html! do
+      div.omg! id: 'ikr'
+    end
+
+    expect(html.to_s).to eq("<div id=\"ikr\">\n</div>\n")
+    expect(html.to_s).not_to eq("<div id=\"omg\">\n</div>\n")
+  end
+
+  it 'coalesces classes from attributes' do
+    html = Paggio.html! do
+      div.wut class: 'rofl'
+    end
+
+    expect(html.to_s).to eq("<div class=\"rofl wut\">\n</div>\n")
+    expect(html.to_s).not_to eq("<div class=\"wut\" class=\"rofl\">n")
+
+    html = Paggio.html! do
+      div.wut class: 'rofl idk'
+    end
+
+    expect(html.to_s).to eq("<div class=\"rofl idk wut\">\n</div>\n")
+    expect(html.to_s).not_to eq("<div class=\"wut\" class=\"rofl idk\">n")
+  end
+
+  it 'coalesces multiple classes from attributes' do
+    html = Paggio.html! do
+      div.wut classes: %w[rofl idk]
+    end
+
+    expect(html.to_s).to eq("<div class=\"rofl idk wut\">\n</div>\n")
+    expect(html.to_s).not_to eq("<div class=\"wut\" classes=\"[&quot;rofl&quot;, &quot;idk&quot;]\">\n</div>\n")
+  end
+
+  it 'joins class name properly with class attributes' do
+    html = Paggio.html! do
+      i.icon(class: 'illegal')[:legal]
+    end
+
+    expect(html.to_s).to eq("<i class=\"illegal icon-legal\">\n</i>\n")
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paggio
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - meh.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: meh@schizofreni.co
@@ -17,12 +17,17 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".travis.yml"
+- Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - lib/paggio.rb
 - lib/paggio/css.rb
+- lib/paggio/css/animation.rb
 - lib/paggio/css/color.rb
 - lib/paggio/css/definition.rb
+- lib/paggio/css/font.rb
+- lib/paggio/css/rule.rb
 - lib/paggio/css/unit.rb
 - lib/paggio/formatter.rb
 - lib/paggio/html.rb
@@ -32,9 +37,13 @@ files:
 - lib/paggio/html/element/blockquote.rb
 - lib/paggio/html/element/button.rb
 - lib/paggio/html/element/canvas.rb
+- lib/paggio/html/element/embed.rb
 - lib/paggio/html/element/img.rb
 - lib/paggio/html/element/input.rb
 - lib/paggio/html/element/object.rb
+- lib/paggio/html/element/optgroup.rb
+- lib/paggio/html/element/option.rb
+- lib/paggio/html/element/select.rb
 - lib/paggio/html/element/td.rb
 - lib/paggio/html/helpers.rb
 - lib/paggio/markdown.rb
@@ -43,6 +52,7 @@ files:
 - lib/paggio/utils.rb
 - paggio.gemspec
 - spec/css_spec.rb
+- spec/html_spec.rb
 homepage: http://github.com/meh/paggio
 licenses:
 - WTFPL
@@ -63,10 +73,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby, HTML and CSS at war.
 test_files:
 - spec/css_spec.rb
-has_rdoc: 
+- spec/html_spec.rb