roda-component 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c34cd225e507b714d1ed28cbcd790594ed9f1c6d
-  data.tar.gz: 573d2e494f92e75cd8fd5eaa78045258c604c738
+  metadata.gz: e05764f5a7a8fe5b77136f9891195edaca1359e2
+  data.tar.gz: 1d11a49a6c6c760fa831f26467c98f5fc36f8837
 SHA512:
-  metadata.gz: 24abc995392ede94e7dbc120d2f4ae0f67999456c2bee8f963cb3c822fa1487cd21cbca2d0c2646208bcc2c8210ad19ad87ca64bebc1b5a282d7073a20d52495
-  data.tar.gz: f7b60008671dce4daa71c1dedacbd74daa2cf727df68cf0b26ee27dfb31d99f0f3b962e68a2190f9e29ae1b7ad8a4d5f75b584a51a93f2e65a6040b0921a3f95
+  metadata.gz: f214e8ef5271ff4dff4cc64f90da2218169416ed066b75e1b757a62ad64413d375e8f46ce26330f8079560095ad1a5e25ff58f6c22a56e3841a3a0ddcb3e71ad
+  data.tar.gz: 5091aee707250510f74705c00f842c79bde57a9fcaaf96a6106616302db4bdba578e7ab9f39d58fed1412ed158f4de1c6939545d4115d8a17ccfcf978bae312e

data/Gemfile

@@ -5,6 +5,7 @@ gemspec
 
 gem 'roda-bin'
 gem "nokogiri", "~> 1.6.5", require: false
+gem "opal-browser", github: 'opal/opal-browser'
 gem 'awesome_print'
 gem 'tilt'
 gem 'sqlite3'

data/lib/roda/component/dom.rb

@@ -7,17 +7,17 @@ class Roda
         @raw_html = html
 
         if server?
-          @dom = raw_html.is_a?(String) ? Component::HTML(raw_html): raw_html
+          @dom = raw_html.is_a?(String) ? Component::HTML(raw_html.dup): raw_html
         else
-          @dom = raw_html.is_a?(String) ? Element[raw_html] : raw_html
+          @dom = raw_html.is_a?(String) ? Element[raw_html.dup] : raw_html
         end
       end
 
       def find string, &block
         if server?
-          @node = dom.css(string)
+          node = DOM.new dom.css(string)
         else
-          @node = dom.find(string)
+          node = DOM.new dom.find(string)
         end
 
         if block
@@ -26,15 +26,29 @@ class Roda
           end
         else
           if server?
-            @node = DOM.new node.first
-          else
-            @node = DOM.new node
+            node = DOM.new node.first
           end
         end
 
         node
       end
 
+      def data key = false, value = false
+        if server?
+          d = Hash[node.xpath("@*[starts-with(name(), 'data-')]").map{|a| [a.name, a.value]}]
+
+          if !key
+            d
+          elsif key && !value
+            d[key]
+          else
+            node["data-#{key}"] = value
+          end
+        else
+          super
+        end
+      end
+
       def html= content
         if server?
           node.inner_html = content

data/lib/roda/component/element.rb

@@ -2,4 +2,12 @@ class Element
   alias_native :val
   alias_native :prepend
   alias_native :serialize_array, :serializeArray
+  alias_native :has_class, :hasClass
+  alias_native :click
+end
+
+class String
+  def is_i?
+    self.to_i.to_s == self
+  end
 end

data/lib/roda/component/events.rb

@@ -9,6 +9,8 @@ class Roda
 
     class Events < Struct.new(:klass, :component_opts, :scope, :request)
       def on name, options = {}, form_klass = false, extra_opts = false, &block
+        options = '' if options.empty? && (name.to_s == 'history_change' || name.to_s == 'ready')
+
         if client? && options.is_a?(String)
           class_name   = klass._name
           class_events = (events[class_name] ||= {})
@@ -34,7 +36,14 @@ class Roda
       def trigger_jquery_events
         return unless e = events[klass._name]
 
-        (e[:_jquery_events] || []).each do |event|
+        vip_list = ['history_change']
+
+        j_events = (e[:_jquery_events] || [])
+        j_events = j_events.sort_by do |x|
+          [vip_list.index(x.last.to_s) || vip_list.length, j_events.index(x)]
+        end
+
+        j_events.each do |event|
           block, comp, selector, form_klass, opts, name = event
 
           opts = {} unless opts
@@ -43,9 +52,13 @@ class Roda
 
           case name.to_s
           when 'ready'
-            el = Element.find(selector)
+            el = Element.find(selector != '' ? selector : 'body')
 
             Component::Instance.new(component(comp), scope).instance_exec el, &block
+          when 'history_change'
+            $window.history.change do |he|
+              Component::Instance.new(component(comp), scope).instance_exec he, &block
+            end
           when 'form'
             warn 'missing form class option' unless form_klass
 

data/lib/roda/component/history.rb

@@ -0,0 +1,82 @@
+require 'roda/component/location'
+
+module Browser
+  # {Window} instances are {Native} objects used to wrap native window instances.
+  #
+  # Generally, you will want to use the top level {::Window} instance, which
+  # wraps `window` from the main page.
+  class Window
+    include Native
+
+    # @!attribute [r] history
+    # @return [History] the history for this window
+    def history
+      History.new(`#@native.history`) if `#@native.history`
+    end
+  end
+
+  # {History} allows manipulation of the session history.
+  #
+  # @see https://developer.mozilla.org/en-US/docs/Web/API/History
+  class History
+    include Native
+
+    # @!attribute [r] length
+    # @return [Integer] how many items are in the history
+    alias_native :length
+
+    # Go back in the history.
+    #
+    # @param number [Integer] how many items to go back
+    def back(number = 1)
+      `History.go(-number)`
+    end
+
+    # Go forward in the history.
+    #
+    # @param number [Integer] how many items to go forward
+    def forward(number = 1)
+      `History.go(number)`
+    end
+
+    # Push an item in the history.
+    #
+    # @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?
+
+      `History.pushState(jQuery.parseJSON(data.$to_json()), null, item)`
+    end
+
+    # Replace the current history item with another.
+    #
+    # @param item [String] the item to replace with
+    # @param data [Object] additional state to replace
+    def replace(item, data = nil)
+      data = `null` if data.nil?
+
+      `History.replaceState(data, null, item)`
+    end
+
+    def get_state
+      Native(`History.getState()`)
+    end
+
+    # @!attribute [r] current
+    # @return [String] the current item
+    def current
+      $window.location.path
+    end
+
+    def change &block
+      %x{
+        History.Adapter.bind(window,'statechange',function(e){
+          var state = History.getState();
+          state = #{Native(`state`)}
+          return #{block.call(`state`)}
+        });
+      }
+    end
+  end
+end

data/lib/roda/component/location.rb

@@ -0,0 +1,78 @@
+module Browser
+
+# Allows manipulation of a location, usually from {Window} and {DOM::Document}.
+#
+# @see https://developer.mozilla.org/en-US/docs/Web/API/Location
+class Location
+  include Native
+
+  # Change the location.
+  #
+  # @param url [String, #to_s] the URL to go to
+  def assign(url)
+    `#@native.assign(#{url.to_s})`
+  end
+
+  # Replace the current URL.
+  #
+  # @param url [String, #to_s] the URL to go to
+  def replace(url)
+    `#@native.replace(#{url.to_s})`
+  end
+
+  # Reload the page.
+  #
+  # @param force [Boolean] whether to force the reload
+  def reload(force = false)
+    `#@native.reload(force)`
+  end
+
+  # Convert the location to a string.
+  def to_s
+    `#@native.toString()`
+  end
+
+  # @!attribute fragment
+  # @return [String] the hash fragment of the location URI
+  alias_native :fragment, :hash
+  alias_native :fragment=, :hash=
+
+  # @!attribute host
+  # @return [String] the host part of the location URI
+  alias_native :host
+  alias_native :host=
+
+  # @!attribute uri
+  # @return [String] the whole location URI
+  alias_native :uri, :href
+  alias_native :uri=, :href=
+
+  # @!attribute path
+  # @return [String] the path part of the location URI
+  alias_native :path, :pathname
+  alias_native :path=, :pathname=
+
+  # @!attribute port
+  # @return [Integer] the port part of the location URI
+  alias_native :port
+  alias_native :port=
+
+  # @!attribute scheme
+  # @return [String] the scheme part of the location URI
+  alias_native :scheme, :protocol
+  alias_native :scheme=, :protocol=
+
+  # @!attribute query
+  # @return [String] the query part of the location URI
+  alias_native :query, :search
+  alias_native :query=, :search=
+end
+
+class Window
+  # @!attribute [r] location
+  # @return [Location] the location for the window
+  def location
+    Location.new(`#@native.location`) if `#@native.location`
+  end
+end
+end

data/lib/roda/component/titleize.rb

@@ -82,11 +82,11 @@ class String
   #   "notes on a scandal" # => "Notes on a Scandal"
   #   "the good german"    # => "The Good German"
   def titleize(opts={})
-    if defined? ActiveSupport
-      ActiveSupport::Inflector.titleize(self, opts)
-    else
+    # if defined? ActiveSupport
+    #   ActiveSupport::Inflector.titleize(self, opts)
+    # else
       Titleize.titleize(self)
-    end
+    # end
   end
   alias_method :titlecase, :titleize
 

data/lib/roda/component/version.rb

@@ -1,5 +1,5 @@
 class Roda
   class Component
-    VERSION = "0.1.15"
+    VERSION = "0.1.16"
   end
 end

data/lib/roda/component.rb

@@ -14,6 +14,7 @@ require 'roda/component/titleize'
 
 if RUBY_ENGINE == 'opal'
   require 'roda/component/element'
+  require 'roda/component/history'
 
   $component_opts ||= {
     events: {},
@@ -172,7 +173,7 @@ class Roda
         else
           parsed_html = Nokogiri::HTML.fragment(raw_html)
 
-          if parsed_html.children.length == 1
+          if parsed_html.children.length >= 1
             parsed_html.children.first
           else
             parsed_html
@@ -309,7 +310,7 @@ class Roda
       l_dom.find("[data-if]") do |field_dom|
         value = get_value_for field_dom['data-if'], data
 
-        unless value
+        unless value.present?
           field_dom.remove
         end
       end
@@ -317,7 +318,7 @@ class Roda
       l_dom.find("[data-unless]") do |field_dom|
         value = get_value_for field_dom['data-unless'], data
 
-        if value
+        if value.present?
           field_dom.remove
         end
       end
@@ -344,6 +345,8 @@ class Roda
           end
         end
       end
+
+      l_dom
     end
 
     def get_value_for field, data

data/lib/roda/plugins/component.rb

@@ -90,8 +90,8 @@ class Roda
               Document.ready? do
                 c = $component_opts[:comp][:"#{comp_name}"] = #{comp.class}.new
                 c.instance_variable_set(:@_cache, JSON.parse(Base64.decode64('#{cache}')))
-                c.#{action}(JSON.parse(Base64.decode64('#{options}')))
                 c.events.trigger_jquery_events
+                c.#{action}(JSON.parse(Base64.decode64('#{options}')))
               end
             end
           EOF
@@ -110,6 +110,7 @@ class Roda
 
           action  = options.delete(:call)    || :display
           trigger = options.delete(:trigger) || false
+          js      = options.delete(:js)
 
           # call action
           # TODO: make sure the single method parameter isn't a block
@@ -131,11 +132,11 @@ class Roda
 
           load_component_js comp, action
 
-          if comp_response.is_a? Roda::Component::DOM
+          if js && comp_response.is_a?(Roda::Component::DOM)
             comp_response = comp_response.to_xml
           end
 
-          if comp_response.is_a?(String) && js = options.delete(:js)
+          if comp_response.is_a?(String) && js
             comp_response << component_js
           end
 

data/test/dummy/components/forms/address.rb

@@ -1,6 +1,6 @@
 module Forms
   class Address < Roda::Component::Form
-    attr_accessor :line1, :line2, :city, :state, :zip
+    attr_accessor :line1, :line2, :city, :zip
 
     def validate
       assert_present :line1

data/test/dummy/config.ru

@@ -1,6 +1,11 @@
 require 'pry'
 require 'awesome_print'
 require './constants'
+
+require 'rubygems' unless defined?(Gem)
+require 'bundler/setup'
+Bundler.require(:default, RACK_ENV)
+
 require './app'
 
 run TestApp

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roda-component
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -326,7 +326,9 @@ files:
 - lib/roda/component/faye.rb
 - lib/roda/component/form.rb
 - lib/roda/component/form/validations.rb
+- lib/roda/component/history.rb
 - lib/roda/component/instance.rb
+- lib/roda/component/location.rb
 - lib/roda/component/titleize.rb
 - lib/roda/component/version.rb
 - lib/roda/plugins/component.rb