wedge 0.1.66 → 0.1.67

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cc03dd1e943450e9ac281e2e70c71e119909bac
-  data.tar.gz: d7066f50276c808748676e32ecb6d740f1b1f4ba
+  metadata.gz: 4f648b76e8e443e40be3a210bb3ba8dd3f960dd1
+  data.tar.gz: 8aefe262e6c7b0c182ad403658ade6d46217069e
 SHA512:
-  metadata.gz: 808548fd23b4324e9dd229004def699ff7d5360bc8cce5082f1953027b31adafa431e2f5969c1a3f4170695cd8b699cfc924f293007996180494b6d6228a6ac0
-  data.tar.gz: 6211d3ffc026253ffda27ab24bd8cccf0080eae323ef9deecaa2d52982db98a0a95a64ce5f3d6df95410fa86195e2e2e5145a8988d8d45dd24017285a60bc908
+  metadata.gz: 0db89b405e950c3c7e12ca6e350275376d5536f78f015bafea62deec0f774f3642ab3e906ec02fe2a6de0020720e85a16e0c49127cc16ddb03e80e1fbd43a62b
+  data.tar.gz: 0d55c19a2bfe6ad86a109d91014844e095184baa8ac167931d3ebe84dacc0faea6b7d3619f2221dc1dbcfa0337e9675aa9588fcdd04d6861c831318735af154a

data/lib/wedge/dom.rb

@@ -30,11 +30,7 @@ class Wedge
       if client?
         node = Wedge::DOM.new dom.find(string)
       elsif server?
-        if block_given?
-          node = Wedge::DOM.new dom.css(string)
-        else
-          node = Wedge::DOM.new dom.at(string)
-        end
+        node = Wedge::DOM.new dom.css(string)
       end
 
       if block_given?
@@ -47,52 +43,128 @@ class Wedge
     end
 
     unless RUBY_ENGINE == 'opal'
-      def prepend d
-        if n = node.children.first
-          n.add_previous_sibling d
-        else
-          node << d
+
+      %w'content inner_html'.each do |meth|
+        define_method "#{meth}=" do |cont|
+          if node.is_a? Nokogiri::XML::NodeSet
+            node.each { |n| n.send("#{meth}=", cont) }
+          else
+            node.send "#{meth}=", cont
+          end
         end
       end
 
-      def append d
-        if n = node.children.first
-      def display el, options = {}, &block
-        d = d.dom if d.is_a? Wedge::DOM
-
-        return if el.data 'wedge-popover'
+      %w'add_child replace prepend_child'.each do |meth|
+        define_method meth do |*args|
+          if node.is_a? Nokogiri::XML::NodeSet
+            node.each { |n| n.send(meth, *args) }
+          else
+            node.send(meth, *args)
+          end
+        end
+      end
 
-        el.data 'wedge-popover', true
-        el = el.to_n
+      def []= key, value
+        if node.is_a? Nokogiri::XML::NodeSet
+          node.each { |n| n[key] = value }
+        else
+          node[key] = value
+        end
+      end
 
-        options = {
-          content: 'Loading...',
-          position: 'right middle',
-          openOn: 'hover'
-        }.merge(options)
+      def << d
+        if node.is_a? Nokogiri::XML::NodeSet
+          node.each { |n| n << d }
+        else
+          node << d
+        end
+      end
 
-        options[:classes] = "drop-theme-arrows #{options[:classes]}"
+      # def prepend d
+      #   if n = node.children.first
+      #     n.add_previous_sibling d
+      #   else
+      #     node << d
+      #   end
+      # end
 
-        options = options.to_n
+      def prepend d
+        if node.is_a? Nokogiri::XML::NodeSet
+          node.each do |n|
+            if nn = n.children.first
+              nn.add_previous_sibling d
+            else
+              nn << d
+            end
+          end
+        else
+          if n = node.children.first
+            n.add_previous_sibling d
+          else
+            node << d
+          end
+        end
+      end
 
-        opts = `$.extend(options, { target: el[0] })`
-        drop = Native(`new Drop(opts)`)
+      def append d
+        if node.is_a? Nokogiri::XML::NodeSet
+          node.each do |n|
+            if nn = n.children.last
+              nn.add_next_sibling d
+            else
+              nn << d
+            end
+          end
+        else
+          if n = node.children.last
+            n.add_next_sibling d
+          else
+            node.content << d
+          end
+        end
+      end
 
-        block.call(Native(opts)) if block_given?
+      def hide
+        if node.is_a? Nokogiri::XML::NodeSet
+          node.each do |n|
+            DOM.new(n).style 'display', 'none'
+          end
+        else
+          node.style 'display', 'none'
+        end
 
-        drop
+        node
       end
 
-      def ajax el, options = {}, &block
-        options = { content: 'loading' }.merge options
-        display el, options, &block
-      end
-          n.add_next_sibling d
+      def style *args
+        style_object = DOM.new(node).styles
+
+        if args.length == 1
+          style_object[args.first]
         else
-          node << d
+          style_object[args.first] = args.last
+          node['style'] = style_object.map { |k, v| [k, v].join(': ') }.join('; ')
         end
       end
 
+      def styles
+        style_array = node['style'].to_s.
+          split(';').
+          reject { |s| s.strip.empty? }.
+          map do |s|
+            parts = s.split(':', 2)
+            return nil if parts.nil?
+            return nil if parts.length != 2
+            return nil if parts.any? { |s| s.nil? }
+            [parts[0].strip, parts[1].strip]
+          end.
+          reject { |s| s.empty? }
+        style_object = {}
+        style_array.each { |key, value| style_object[key] = value }
+
+        style_object
+      end
+
       def data key = false, value = false
         d = Hash[node.xpath("@*[starts-with(name(), 'data-')]").map{|a| [a.name, a.value]}]
 
@@ -101,29 +173,55 @@ class Wedge
         elsif key && !value
           d[key]
         else
-          node["data-#{key}"] = value
+          key = "data-#{key}"
+
+          if node.is_a? Nokogiri::XML::NodeSet
+            node.each { |n| n[key] = value }
+          else
+            node[key] = value
+          end
         end
       end
 
       def val value
-        node.content = value
+        if node.is_a? Nokogiri::XML::NodeSet
+          node.each { |n| n.content = value }
+        else
+          node.content = value
+        end
       end
 
       def add_class classes
         classes = (classes || '').split ' ' unless classes.is_a? Array
-        new_classes =  ((node.attr('class') || '').split(' ') << classes).uniq.join(' ')
-        node['class'] = new_classes
+        if node.is_a? Nokogiri::XML::NodeSet
+          node.each do |n|
+            new_classes =  ((n.attr('class') || '').split(' ') << classes).uniq.join(' ')
+            n['class'] = new_classes
+          end
+        else
+          new_classes =  ((node.attr('class') || '').split(' ') << classes).uniq.join(' ')
+          node['class'] = new_classes
+        end
       end
 
       def remove_class classes
         classes = (classes || '').split ' ' unless classes.is_a? Array
-        (node.attr('class') || '').split(' ').reject { |n| n =~ /active|asc|desc/i }.join(' ')
+
+        if node.is_a? Nokogiri::XML::NodeSet
+          node.each { |n| n['class'] = (n.attr('class') || '').split(' ').reject { |c| classes.include? c }.join(' ') }
+        else
+          node['class'] = (node.attr('class') || '').split(' ').reject { |c| classes.include? c }.join(' ')
+        end
       end
 
       def attr key, value = false
         if value
           value = value.join ' ' if value.is_a? Array
-          node[key] = value
+          if node.is_a? Nokogiri::XML::NodeSet
+            node.each { |n| n[key] = value }
+          else
+            node[key] = value
+          end
         else
           super key
         end
@@ -132,13 +230,22 @@ class Wedge
 
     def html= content
       if server?
-        node.inner_html = content
+        # if the value is nil nokogiri will not update the dom
+        content = '' if content.nil?
+
+        if node.is_a? Nokogiri::XML::NodeSet
+          node.each { |n| n.inner_html = content }
+        else
+          node.inner_html = content
+        end
       else
         content = content.dom if content.is_a? Wedge::DOM
         node.html content
       end
 
       node
+    rescue
+      binding.pry
     end
 
     if RUBY_ENGINE == 'opal'
@@ -159,6 +266,9 @@ class Wedge
     end
 
     def html content = false
+      # if the value is nil nokogiri will not update the dom
+      content = '' if content.nil?
+
       if !content
         if server?
           node.inner_html

data/lib/wedge/plugins/ability_list.rb

@@ -18,7 +18,7 @@ class Wedge
       # Declares that the owner can perform `verb` on `class`.
       def can(verb, klass=nil, columns=[], &block)
         columns = [columns] unless columns.is_a? Array
-        rules << [true, verb, get_class_name(klass), columns, block]
+        rules << [true, verb, get_class(klass), columns, block]
       end
 
       # Inverse of `can`.
@@ -71,12 +71,19 @@ class Wedge
     private
 
       def get_class_name(klass)
-        [NilClass, Symbol].include?(klass.class) ? klass : klass.name
+        if !klass.is_a?(Symbol) && klass.method_defined?(:original_class_name)
+          klass.original_class_name
+        else
+          [NilClass, Symbol].include?(klass.class) ? klass : klass.name
+        end
       end
 
       def get_class(object)
-        return object.class.original_class_name if object.class.method_defined?(:original_class_name)
-        [NilClass, Symbol].include?(object.class) ? object : object.class.name
+        if object.class.method_defined?(:original_class)
+          object.class.original_class
+        else
+          [NilClass, Symbol, Class].include?(object.class) ? object : object.class
+        end
       end
     end
 

data/lib/wedge/plugins/form.rb

@@ -272,6 +272,8 @@ class Wedge
       end
 
       def _set_atts atts
+        return unless atts
+
         atts.each do |key, val|
           # grab the original key if alias is given
           _atts_keys << (key = _aliases.invert[key] || key)

data/lib/wedge/plugins/history.rb

@@ -52,8 +52,7 @@ if RUBY_ENGINE == 'opal'
       #
       # @param item [String] the item to push in the history
       # @param data [Object] additional state to push
-      def push(item, data = nil)
-        data = `null` if data.nil?
+      def push(item, data = {})
 
         `History.pushState(jQuery.parseJSON(data.$to_json()), null, item)`
       end

data/lib/wedge/utilis/titleize.rb

@@ -22,7 +22,7 @@ module Titleize
     title = title.downcase unless title[/[[:lower:]]/]  # assume all-caps need fixing
 
     phrases(title).map do |phrase|
-      words = phrase.split
+      words = phrase.gsub(/_/, ' ').split
       words.map do |word|
         def word.capitalize
           # like String#capitalize, but it starts with the first letter

data/lib/wedge/version.rb

@@ -1,3 +1,3 @@
 class Wedge
-  VERSION = '0.1.66'
+  VERSION = '0.1.67'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wedge
 version: !ruby/object:Gem::Version
-  version: 0.1.66
+  version: 0.1.67
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-07 00:00:00.000000000 Z
+date: 2015-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal-wedge
@@ -264,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Components for the Browser and Server