fron 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c081b3b50bd27657d9e5f50c8f2b69c6f6b89bc
-  data.tar.gz: 3a71ea7cb7e1abfa225686200de85ef0ab5c99ca
+  metadata.gz: 3c8bd754f6372347b316b3fd740d149d0ae7c161
+  data.tar.gz: fd0f5c90f5555e54bee2643663ec94aab3932753
 SHA512:
-  metadata.gz: 8fb542de4835a8f2a69d285396ed483afdcfc834df4a63bcb902c4be28db1786542253ca6e29ad3a50ae7b94458dfe8cb65121636e1236e47ccf615ae5f1c112
-  data.tar.gz: d3c7799e2f0e7da34a820c17b8e104ba5156fd25ab83d6a7a63815dabbd418d5ac4d0163c90ec7c5bcde05807fa8faffd3854b0d57c03427f00ba09caed99389
+  metadata.gz: 4c592e4dd96a7653a6bd58a0f36766fe46be4b67483bf2bd5b5cc7fb391f056da487ced52ccf2ca53409b0cc2cdb7a855c7502908463d0c0cf9816799f548a9f
+  data.tar.gz: bb19996d1ec2c74df54787283a2262995ed0e5fa1bd554cbff18f67152322abcd15146780ea522e2c5beb3b04241824e0e8a480493f40dac33364a569e3a37f2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fron (0.1.1)
+    fron (0.1.3)
       opal (~> 0.6.2)
 
 GEM

data/lib/fron/version.rb

@@ -1,3 +1,3 @@
 module Fron
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/opal/fron.rb

@@ -1,4 +1,5 @@
 require 'opal'
+require './fron/core-ext'
 require './fron/dom'
 require './fron/request'
 require './fron/storage'

data/opal/fron/core-ext.rb

@@ -0,0 +1,5 @@
+require './core-ext/hash'
+require './core-ext/kernel'
+require './core-ext/numeric'
+require './core-ext/proc'
+require './core-ext/string'

data/opal/fron/core-ext/hash.rb

@@ -14,4 +14,18 @@ class Hash
     end
     r
   end
+
+  def deepDiff(b)
+    a = self
+    (a.keys + b.keys).uniq.inject({}) do |diff, k|
+      if a[k] != b[k]
+        if a[k].respond_to?(:deepDiff) && b[k].respond_to?(:deepDiff)
+          diff[k] = a[k].deepDiff(b[k])
+        else
+          diff[k] = [a[k], b[k]]
+        end
+      end
+      diff
+    end
+  end
 end

data/opal/fron/core-ext/kernel.rb

@@ -0,0 +1,10 @@
+module Kernel
+  def requestAnimationFrame(&block)
+    return unless `!!window.requestAnimationFrame`
+    `window.requestAnimationFrame(function(){ #{block.call} })`
+  end
+
+  def timeout(ms = 0,&block)
+    `setTimeout(function(){#{block.call}},#{ms})`
+  end
+end

data/opal/fron/core-ext/numeric.rb

@@ -0,0 +1,9 @@
+class Numeric
+  def clamp min, max
+    [[self, max].min, min].max
+  end
+
+  def round(decimals = 0)
+    `#{self}.toFixed(#{decimals})`.to_f
+  end
+end

data/opal/fron/core-ext/proc.rb

@@ -0,0 +1,9 @@
+class Proc
+  def throttle(ms)
+    Native `throttle(#{self},#{ms}, {leading: false})`
+  end
+
+  def debounce(ms, leading = false)
+    Native `debounce(#{self},#{ms},#{leading})`
+  end
+end

data/opal/fron/core-ext/string.rb

@@ -0,0 +1,7 @@
+class String
+  def camelize
+    `#{self}.replace(/(?:-|_|(\/))([a-z\d]*)/gi,function(m,first,second){
+      return second.charAt(0).toUpperCase() + second.substr(1).toLowerCase()
+    })`
+  end
+end

data/opal/fron/core/adapters/local.rb

@@ -16,14 +16,15 @@ module Fron
         block.call Fron::Storage::LocalStorage.get id
       end
 
-      def set(id, data, &block)
+      def set(model, data, &block)
+        id = model.id
         id = SecureRandom.uuid unless id
         data[:id] = id
         unless (errors = validate data)
           Fron::Storage::LocalStorage.set id, data
-          block.call nil
+          block.call nil, data
         else
-          block.call errors
+          block.call errors, {}
         end
         data
       end

data/opal/fron/core/adapters/rails.rb

@@ -8,9 +8,16 @@ module Fron
         @request.headers = {'Content-Type' => 'application/json'}
       end
 
-      def all(&block)
+      def del(model,&block)
+        setUrl model
+        @request.request 'DELETE', transform({})  do
+          block.call
+        end
+      end
+
+      def all(data = nil, &block)
         setUrl nil
-        @request.get { |response| block.call response.json }
+        @request.get(data) { |response| block.call response.json }
       end
 
       def get(id,&block)
@@ -18,29 +25,38 @@ module Fron
         @request.get { |response| block.call response.json }
       end
 
-      def set(id,data,&block)
-        setUrl id
-        method = id ? 'put' : 'post'
+      def set(model,data,&block)
+        setUrl model
+        method = model.id ? 'put' : 'post'
         @request.send(method,transform(data)) do |response|
-          block.call case response.status
+          error = case response.status
           when 201, 204
             nil
           when 422
             response.json
           end
+          block.call error, response.json
         end
       end
 
       private
 
-      def setUrl(id)
-        base = @options[:endpoint] + "/" + @options[:resources]
+      def setUrl(model)
+        id = model.is_a?(Fron::Model) ? model.id : model
+        endpoint = if @options[:endpoint].is_a? Proc
+            model.instance_eval &@options[:endpoint]
+          else
+            @options[:endpoint]
+          end
+        base = endpoint + "/" + @options[:resources]
         base += id ? "/" + id.to_s : ".json"
         @request.url = base
       end
 
       def transform(data)
         newdata = {}
+        meta = DOM::Document.head.find("meta[name=csrf-token]")
+        newdata[:authenticity_token] = meta['content'] if meta
         newdata[@options[:resource]] = data.dup
         newdata
       end

data/opal/fron/core/configuration.rb

@@ -5,7 +5,7 @@ module Fron
     class Yield < Component
     end
 
-    attr_accessor :title, :stylesheets, :logger
+    attr_accessor :title, :stylesheets, :logger, :injectBlock
     attr_reader :routeBlock, :main, :app
 
     def initialize
@@ -21,5 +21,9 @@ module Fron
     def layout(&block)
       @app.instance_exec @main, &block
     end
+
+    def customInject(&block)
+      @injectBlock = block
+    end
   end
 end

data/opal/fron/core/eventable.rb

@@ -9,12 +9,12 @@ module Fron
       block
     end
 
-    def trigger(event, triggerGlobal = true)
+    def trigger(event, data = {}, triggerGlobal = true)
       return unless @events
       return unless @events[event]
-      Eventable.trigger event, false if triggerGlobal && self != Fron::Eventable
+      Eventable.trigger event, data, false if triggerGlobal && self != Fron::Eventable
       @events[event].each do |block|
-        block.call
+        block.call data
       end
     end
 

data/opal/fron/core/model.rb

@@ -24,8 +24,8 @@ module Fron
         end
       end
 
-      def all(&block)
-        @adapterObject.all do |items|
+      def all(data = nil, &block)
+        @adapterObject.all data do |items|
           break unless block_given?
           block.call items.map{ |item| self.new item }
         end
@@ -47,8 +47,8 @@ module Fron
     end
 
     def update(attributes = {}, &block)
-      data = @data.dup.merge! attributes
-      self.class.instance_variable_get("@adapterObject").set id, data do |errors|
+      data = gather.merge! attributes
+      self.class.instance_variable_get("@adapterObject").set self, data do |errors,data|
         @errors = errors
         merge data
         block.call if block_given?
@@ -61,9 +61,29 @@ module Fron
 
     private
 
+    def clone(data = {})
+      cl = self.class.new @data.merge data
+      cl.instance_variable_set "@errors", self.errors
+      cl
+    end
+
+    def destroy(&block)
+      self.class.instance_variable_get("@adapterObject").del self do
+        block.call if block_given?
+      end
+    end
+
+    def gather
+      @data.dup.reject{|key| !self.class.fields.include?(key)}
+    end
+
     def merge(data)
       data.each_pair do |key,value|
-        self.send(key+"=", value) if self.respond_to?(key+"=")
+        if self.respond_to?(key+"=")
+          self.send(key+"=", value)
+        else
+          @data[key] = value
+        end
       end
     end
   end

data/opal/fron/core/router.rb

@@ -31,17 +31,17 @@ module Fron
 
     def self.pathToRegexp(path)
       return path if path == "*"
-      {regexp: Regexp.new('^'+path.gsub(/:(.+)/, '(.+)')), map: path.match(/:(.+)/).to_a[1..-1] }
+      {regexp: Regexp.new('^'+path.gsub(/:([^\/]+)/, '([^\/]+)')), map: path.scan(/:([^\/]+)/).flatten }
     end
 
-    def route(hash = DOM::Window.hash, controller = nil)
+    def route(hash = DOM::Window.hash, controller = nil, startParams = {})
       routes = controller ? (controller.class.routes || []) : @routes
       routes.each do |r|
         if r[:path] == '*'
           if r[:controller]
-            break route(hash,r[:controller])
+            break route(hash,r[:controller],startParams)
           else
-            break applyRoute(controller,r)
+            break applyRoute(controller,r,startParams)
           end
         else
           matches = hash.match(r[:path][:regexp]).to_a[1..-1]
@@ -53,9 +53,9 @@ module Fron
               end
             end
             if r[:action]
-              break applyRoute(controller,r,params)
+              break applyRoute(controller,r,startParams.merge(params))
             else
-              break route hash.gsub(r[:path][:regexp],''), r[:controller]
+              break route hash.gsub(r[:path][:regexp],''), r[:controller], startParams.merge(params)
             end
           end
         end
@@ -72,10 +72,15 @@ module Fron
           end
         end
       end
+      controller.send(:empty) if controller.respond_to?(:empty)
       controller.send(route[:action], params)
       @config.logger.info "Navigate >> #{controller.class}##{route[:action]} with params #{params}"
       @config.main.empty
-      @config.main << controller.base
+      if @config.injectBlock
+        @config.injectBlock.call controller.base
+      else
+        @config.main << controller.base
+      end
     end
   end
 end

data/opal/fron/dom.rb

@@ -10,3 +10,4 @@ require './dom/fragment'
 require './dom/document'
 require './dom/window'
 require './dom/event'
+require './dom/file-reader'

data/opal/fron/dom/document.rb

@@ -1,11 +1,15 @@
 module DOM
   module Document
+    def self.activeElement
+      find ':focus'
+    end
+
     def self.head
-      find 'head'
+      @head ||= find 'head'
     end
 
     def self.body
-      find 'body'
+      @body ||= find 'body'
     end
 
     def self.title

data/opal/fron/dom/element.rb

@@ -87,10 +87,6 @@ module DOM
       `#{@el}.innerHTML = #{value}`
     end
 
-    def empty
-      self.html = ''
-    end
-
     def value
       `#{@el}.value`
     end
@@ -107,6 +103,22 @@ module DOM
       `#{@el}.checked = #{value}`
     end
 
+    def disabled
+      `#{@el}.disabled`
+    end
+
+    def disabled=(value)
+      `#{@el}.disabled = #{value}`
+    end
+
+    def focus
+      `#{@el}.focus()`
+    end
+
+    def files
+      Native `#{@el}.files`
+    end
+
     def tag
       `#{@el}.tagName`.downcase
     end

data/opal/fron/dom/event.rb

@@ -1,10 +1,125 @@
 module DOM
   class Event
+
+    SPECIAL_KEYS = {
+      8 => 'backspace',
+      9 => 'tab',
+      12 => 'num',
+      13 => 'enter',
+      16 => 'shift',
+      17 => 'ctrl',
+      18 => 'alt',
+      19 => 'pause',
+      20 => 'capslock',
+      27 => 'esc',
+      32 => 'space',
+      33 => 'pageup',
+      34 => 'pagedown',
+      35 => 'end',
+      36 => 'home',
+      37 => 'left',
+      38 => 'up',
+      39 => 'right',
+      40 => 'down',
+      44 => 'print',
+      45 => 'insert',
+      46 => 'delete',
+      48 => '0',
+      49 => '1',
+      50 => '2',
+      51 => '3',
+      52 => '4',
+      53 => '5',
+      54 => '6',
+      55 => '7',
+      56 => '8',
+      57 => '9',
+      65 => 'a',
+      66 => 'b',
+      67 => 'c',
+      68 => 'd',
+      69 => 'e',
+      70 => 'f',
+      71 => 'g',
+      72 => 'h',
+      73 => 'i',
+      74 => 'j',
+      75 => 'k',
+      76 => 'l',
+      77 => 'm',
+      78 => 'n',
+      79 => 'o',
+      80 => 'p',
+      81 => 'q',
+      82 => 'r',
+      83 => 's',
+      84 => 't',
+      85 => 'u',
+      86 => 'v',
+      87 => 'w',
+      88 => 'x',
+      89 => 'y',
+      90 => 'z',
+      91 => 'cmd',
+      92 => 'cmd',
+      93 => 'cmd',
+      96 => 'num_0',
+      97 => 'num_1',
+      98 => 'num_2',
+      99 => 'num_3',
+      100 => 'num_4',
+      101 => 'num_5',
+      102 => 'num_6',
+      103 => 'num_7',
+      104 => 'num_8',
+      105 => 'num_9',
+      106 => 'multiply',
+      107 => 'add',
+      108 => 'enter',
+      109 => 'subtract',
+      110 => 'decimal',
+      111 => 'divide',
+      124 => 'print',
+      144 => 'num',
+      145 => 'scroll',
+      186 => ';',
+      187 => '=',
+      188 => ',',
+      189 => '-',
+      190 => '.',
+      191 => '/',
+      192 => '`',
+      219 => '[',
+      220 => '\\',
+      221 => ']',
+      222 => '\'',
+      224 => 'cmd',
+      57392 => 'ctrl',
+      63289 => 'num'
+    }
+
     def initialize(e,targetClass)
       @e = e
       @targetClass = targetClass
     end
 
+    def key
+      return SPECIAL_KEYS[keyCode] if SPECIAL_KEYS[keyCode]
+      `String.fromCharCode(#{keyCode}).toLowerCase()`
+    end
+
+    def stopImmediatePropagation
+      `#{@e}.stopImmediatePropagation()`
+    end
+
+    def dataTransfer
+      Native `#{@e}.dataTransfer`
+    end
+
+    def button
+      `#{@e}.button`
+    end
+
     def target
       @targetClass.new `#{@e}.target`
     end

data/opal/fron/dom/file-reader.rb

@@ -0,0 +1,14 @@
+module DOM
+  class FileReader
+    include Events
+
+    def initialize
+      @el = `new FileReader()`
+    end
+
+    def readAsDataURL(file)
+      return unless file
+      `#{@el}.readAsDataURL(file.native)`
+    end
+  end
+end

data/opal/fron/dom/modules/events.rb

@@ -1,8 +1,10 @@
 module DOM
   module Events
+    attr_reader :listeners
+
     def trigger(type, data = {})
       %x{
-        event = document.createEvent("HTMLEvents");
+        var event = document.createEvent("HTMLEvents");
         event.initEvent(#{type}, true, true);
         for (key in #{data}) {
           value = #{data}[key];
@@ -12,28 +14,20 @@ module DOM
       }
     end
 
-    def on(type, &listener)
-      klass = if defined? self.class::EVENT_TARGET_CLASS
-        self.class::EVENT_TARGET_CLASS
-      else
-        Hash
-      end
-      method = `function(e){#{ listener.call Event.new(`e`,klass)}}`
-
-      @listeners       ||= {}
-      @listeners[type] ||= []
-      @listeners[type] << method
+    def on!(type, &listener)
+      _on type, true, &listener
+    end
 
-      `#{@el}.addEventListener(#{type},#{method})`
-      method
+    def on(type, &listener)
+      _on type, &listener
     end
 
     def off(type = nil, method = nil)
       return unless @listeners
 
       if type == nil
-        @listeners.keys.each do |type|
-          removeListeners type
+        @listeners.keys.each do |ltype|
+          removeListeners ltype
         end
       elsif method == nil
         removeListeners type
@@ -41,6 +35,7 @@ module DOM
         return unless @listeners[type].index(method)
         @listeners[type].delete method
         `#{@el}.removeEventListener(#{type},#{method})`
+        `#{@el}.removeEventListener(#{type},#{method},true)`
       end
     end
 
@@ -54,6 +49,22 @@ module DOM
 
     private
 
+    def _on(type, capture = false, &listener)
+      klass = if defined? self.class::EVENT_TARGET_CLASS
+                self.class::EVENT_TARGET_CLASS
+              else
+                Hash
+              end
+      method = `function(e){#{ listener.call Event.new(`e`,klass)}}`
+
+      @listeners       ||= {}
+      @listeners[type] ||= []
+      @listeners[type] << method
+
+      `#{@el}.addEventListener(#{type},#{method},#{capture})`
+      method
+    end
+
     def removeListeners(type)
       @listeners[type].each do |method|
         @listeners[type].delete method

data/opal/fron/dom/node.rb

@@ -35,6 +35,10 @@ module DOM
       el ? DOM::NODE.new(el) : nil
     end
 
+    def empty
+      children.each { |node| node.remove! }
+    end
+
     def empty?
       `#{@el}.childNodes.length === 0`
     end
@@ -65,7 +69,8 @@ module DOM
     end
 
     def insertBefore(what,where)
-      `#{@el}.insertBefore(#{what},#{where})`
+      return what >> self unless where # Fir for firefox...
+      `#{@el}.insertBefore(#{NODE.getElement what},#{NODE.getElement where})`
     end
 
     # Text manipulation

data/opal/fron/request.rb

@@ -1,3 +1,2 @@
-require './core-ext/hash'
 require './request/response'
 require './request/request'

data/spec/core/adapter/local_spec.rb

@@ -33,21 +33,21 @@ describe Fron::Adapters::LocalAdapter do
   describe "#set" do
     it "should call localStorage#set" do
       Fron::Storage::LocalStorage.should receive(:set).once
-      subject.set 0, {name: 'test'}, &proc
+      subject.set double(id: 0), {name: 'test'}, &proc
     end
 
     it "should run the block with nil if there are no errors" do
-      proc.should receive(:call).with nil
-      subject.set 0, {name: 'test'}, &proc
+      proc.should receive(:call).with nil, {name: 'test', id: 0}
+      subject.set double(id: 0), {name: 'test'}, &proc
     end
 
     it "should run the block with erros if ther are any" do
-      proc.should receive(:call).with({name: ["can't be blank"]})
-      subject.set 0, {name: ''}, &proc
+      proc.should receive(:call).with({name: ["can't be blank"]}, {})
+      subject.set double(id: 0), {name: ''}, &proc
     end
 
     it "should add id if there isn't any" do
-      result = subject.set nil, {name: ''}, &proc
+      result = subject.set double(id: nil), {name: ''}, &proc
       result[:id].should_not be nil
     end
   end

data/spec/core/adapter/rails_spec.rb

@@ -1,6 +1,9 @@
 require 'fron/core'
 require 'fron/storage'
 
+class TestModel < Fron::Model
+end
+
 describe Fron::Adapters::RailsAdapter do
 
   subject do
@@ -14,6 +17,8 @@ describe Fron::Adapters::RailsAdapter do
 
   let(:proc) { Proc.new {} }
   let(:request) { double :request }
+  let(:model) { TestModel.new({ id: 0 }) }
+  let(:newModel) { TestModel.new }
 
   before do
     subject.instance_variable_set "@request", request
@@ -45,19 +50,19 @@ describe Fron::Adapters::RailsAdapter do
     it "should call POST request for new record" do
       request.should receive(:url=).with "test/users.json"
       request.should receive(:post) do |&block|
-        block.call double status: 201
+        block.call double status: 201, json: ''
       end
       proc.should receive(:call)
-      subject.set nil, {}, &proc
+      subject.set newModel, {}, &proc
     end
 
     it "should call PUT request for exsistsing record" do
       request.should receive(:url=).with "test/users/0"
       request.should receive(:put) do |&block|
-        block.call double status: 201
+        block.call double status: 201, json: ''
       end
       proc.should receive(:call)
-      subject.set 0, {}, &proc
+      subject.set model, {}, &proc
     end
 
     it "should call block with error" do
@@ -65,8 +70,8 @@ describe Fron::Adapters::RailsAdapter do
       request.should receive(:put) do |&block|
         block.call double status: 422, json: 'error'
       end
-      proc.should receive(:call).with 'error'
-      subject.set 0, {}, &proc
+      proc.should receive(:call).with 'error', 'error'
+      subject.set model, {}, &proc
     end
   end
 end

data/spec/core/model_spec.rb

@@ -12,11 +12,11 @@ class MockAdapter
     block.call({name: 'User'})
   end
 
-  def set(id,&block)
-    if id == 0
-      block.call
+  def set(model,data,&block)
+    if model.id == 0
+      block.call(nil, data)
     else
-      block.call({errors: true})
+      block.call({errors: true}, {})
     end
   end
 end

data/spec/core/router_spec.rb

@@ -10,10 +10,6 @@ class TestRouteController < Fron::Controller
   route "show/:id", :show
   route "*", :test
 
-  before :empty, [:show]
-
-  def empty
-  end
   def show
   end
   def test
@@ -27,6 +23,7 @@ describe Fron::Router do
   let(:window_listeners) {window.instance_variable_get("@listeners")}
   let(:controller) { TestRouteController.new }
   let(:config) { double :config, {
+      injectBlock: nil,
       logger: double(:logger,info:  true),
       main: double(:main, :"<<" => true, "empty" => true)
     }
@@ -45,7 +42,7 @@ describe Fron::Router do
       it "should return regexp for path" do
         result = described_class.map "/test", :test
         result[:path][:regexp].should eq Regexp.new "^/test"
-        result[:path][:map].should eq nil
+        result[:path][:map].should eq []
         result[:action].should eq :test
       end
 

data/spec/dom/event_spec.rb

@@ -17,6 +17,7 @@ describe DOM::Event do
     metaKey: false,
     preventDefault: function(){return 1},
     stopPropagation: function(){return 2},
+    stopImmediatePropagation: function(){},
     target: {test: 'data'} }
   }}
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fron
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Gusztav Szikszai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-26 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -57,7 +57,12 @@ files:
 - lib/fron.rb
 - lib/fron/version.rb
 - opal/fron.rb
+- opal/fron/core-ext.rb
 - opal/fron/core-ext/hash.rb
+- opal/fron/core-ext/kernel.rb
+- opal/fron/core-ext/numeric.rb
+- opal/fron/core-ext/proc.rb
+- opal/fron/core-ext/string.rb
 - opal/fron/core.rb
 - opal/fron/core/adapters/local.rb
 - opal/fron/core/adapters/rails.rb
@@ -73,6 +78,7 @@ files:
 - opal/fron/dom/document.rb
 - opal/fron/dom/element.rb
 - opal/fron/dom/event.rb
+- opal/fron/dom/file-reader.rb
 - opal/fron/dom/fragment.rb
 - opal/fron/dom/modules/classlist.rb
 - opal/fron/dom/modules/dimensions.rb