fron 0.2.0rc1 → 1.0.0rc1

data/opal/fron/request/response.rb

@@ -1,5 +1,5 @@
 module Fron
-  # Response
+  # Class for handling responses from requests.
   class Response
     # @return [String] The response body
     attr_reader :body

data/opal/fron/storage.rb

@@ -1 +1,3 @@
+require 'fron/storage/store'
 require 'fron/storage/local_storage'
+require 'fron/storage/session_storage'

data/opal/fron/storage/local_storage.rb

@@ -2,52 +2,10 @@ module Fron
   module Storage
     # Local Storage wrapper and adapter
     module LocalStorage
-      # Gets a value from local storage with the given key
-      #
-      # @param key [String] The key
-      #
-      # @return [Object] The value
-      def self.get(key)
-        value = `window.localStorage.getItem(#{key}) || false`
-        value ? JSON.parse(value) : nil
-      end
-
-      # Sets a value to local storage with the given key
-      #
-      # @param key [String] The key
-      # @param data [Object] The value
-      def self.set(key, data)
-        `window.localStorage.setItem(#{key},#{data.to_json})`
-      end
-
-      # Removes a value from local storage with the given key
-      #
-      # @param key [String] The key
-      def self.remove(key)
-        `window.localStorage.removeItem(#{key})`
-      end
-
-      # Returns the all keys present in local storage
-      #
-      # @return [Array] Array of keys
-      def self.keys
-        %x{
-          ret = []
-          for (var key in localStorage){ ret.push(key) }
-          return ret
-        }
-      end
-
-      # Returns all values from local storage
-      #
-      # @return [Array] Array of values
-      def self.all
-        keys.map { |key| get key }
-      end
+      extend Store
 
-      # Clears local storage removeing all values
-      def self.clear
-        `window.localStorage.clear()`
+      def self.store
+        `window.localStorage`
       end
     end
   end

data/opal/fron/storage/session_storage.rb

@@ -0,0 +1,12 @@
+module Fron
+  module Storage
+    # Local Storage wrapper and adapter
+    module SessionStorage
+      extend Store
+
+      def self.store
+        `window.sessionStorage`
+      end
+    end
+  end
+end

data/opal/fron/storage/store.rb

@@ -0,0 +1,54 @@
+module Fron
+  module Storage
+    # Abstract wrapper and adapter for the Storage API
+    module Store
+      # Gets a value from the store with the given key
+      #
+      # @param key [String] The key
+      #
+      # @return [Object] The value
+      def get(key)
+        value = `#{store}.getItem(#{key}) || false`
+        value ? JSON.parse(value) : nil
+      end
+
+      # Sets a value to the store with the given key
+      #
+      # @param key [String] The key
+      # @param data [Object] The value
+      def set(key, data)
+        `#{store}.setItem(#{key},#{data.to_json})`
+      end
+
+      # Removes a value from the store with the given key
+      #
+      # @param key [String] The key
+      def remove(key)
+        `#{store}.removeItem(#{key})`
+      end
+
+      # Returns the all keys present in store
+      #
+      # @return [Array] Array of keys
+      def keys
+        %x{
+          ret = []
+          for (var key in #{store}){ ret.push(key) }
+          return ret
+        }
+      end
+
+      # Returns all values from the store
+      #
+      # @return [Array] Array of values
+      def all
+        keys.map { |key| get key }
+      end
+
+      # Clears the store, removeing all values
+      def clear
+        `#{store}.clear()`
+      end
+    end
+  end
+end

data/opal/fron/utils/drag.rb

@@ -12,29 +12,30 @@ module Fron
     # @return [DOM::Element] The documents body
     attr_reader :body
 
-    IS_TOUCH = `'ontouchstart' in window  && !window._phantom`
-
-    if IS_TOUCH
-      EVENTS = {
-        down: 'touchstart',
-        move: 'touchmove',
-        up:   'touchend'
-      }
-    else
-      EVENTS = {
-        down: 'mousedown',
-        move: 'mousemove',
-        up:   'mouseup'
-      }
-    end
+    IS_TOUCH = false
+
+    EVENTS = if IS_TOUCH
+               {
+                 down: 'touchstart',
+                 move: 'touchmove',
+                 up:   'touchend'
+               }
+             else
+               {
+                 down: 'mousedown',
+                 move: 'mousemove',
+                 up:   'mouseup'
+               }
+             end
 
     # Creates a new drag instance.
     #
     # @param base [DOM::Element] The element to monitor
-    def initialize(base)
+    def initialize(base, start_distance = 7)
       reset
       @base = base
       @body = DOM::Document.body
+      @start_distance = start_distance
 
       @base.on EVENTS[:down] do |event| start(event) end
     end
@@ -66,6 +67,8 @@ module Fron
       @up_method  = @body.on! EVENTS[:up]   do |evt| up(evt)  end
 
       request_animation_frame do move end
+
+      pos(event) if @start_distance == 0
     end
 
     # Runs when the pointer moves starts.
@@ -73,7 +76,7 @@ module Fron
     # @param event [Event] The event
     def pos(event)
       @position = position(event)
-      if diff.distance > 7 && !@started
+      if diff.distance >= @start_distance.to_i && !@started
         @started = true
         trigger 'start', @target
       end
@@ -128,7 +131,7 @@ module Fron
       if IS_TOUCH && event.touches
         Point.new `#{event.touches}[0].pageX`, `#{event.touches}[0].pageY`
       else
-        Point.new event.pageX, event.pageY
+        Point.new event.page_x, event.page_y
       end
     end
   end

data/opal/fron/utils/keyboard.rb

@@ -39,11 +39,8 @@ module Fron
     # @param event [DOM::Event] The event
     def keydown(event)
       return if DOM::Document.active_element
-      combo = [event.key]
-      combo << 'ctrl'  if event.ctrl?
-      combo << 'shift' if event.shift?
-      combo << 'alt'   if event.alt?
-      combo.uniq!
+
+      combo = Keyboard.calculate_shortcut event
 
       self.class.shortcuts.each do |shortcut|
         next unless shortcut[:parts].sort == combo.sort
@@ -53,18 +50,23 @@ module Fron
       end
     end
 
+    def self.calculate_shortcut(event)
+      combo = [event.key]
+      combo << 'ctrl'  if event.ctrl?
+      combo << 'shift' if event.shift?
+      combo << 'alt'   if event.alt?
+      combo << 'meta'  if event.meta?
+      combo.uniq
+    end
+
     # Handles the shortcut.
     #
     # @param shortcut [Hash] The shortcut
     def handle_shortcut(shortcut)
       action = shortcut[:action]
-      if shortcut[:block]
-        instance_exec(&shortcut[:block])
-      elsif respond_to? action
-        send action
-      else
-        warn self.class.name + " - shortcut #{shortcut[:parts].join('+')}:#{action} is not implemented!"
-      end
+      return instance_exec(&shortcut[:block]) if shortcut[:block]
+      return send(action) if respond_to? action
+      warn self.class.name + " - shortcut #{shortcut[:parts].join('+')}:#{action} is not implemented!"
     end
   end
 end

data/opal/fron/utils/point.rb

@@ -1,6 +1,3 @@
-# rubocop:disable VariableName
-require 'math'
-
 module Fron
   # Simple class for point with x and y coordinates.
   class Point
@@ -21,7 +18,8 @@ module Fron
     # @param x [Float] The x coordiante
     # @param y [Float] The y coordiante
     def initialize(x = 0, y = 0)
-      @x, @y = x, y
+      @x = x
+      @y = y
     end
 
     # Returns the difference from an other point.
@@ -74,5 +72,15 @@ module Fron
     def to_s
       "[#{x}, #{y}]"
     end
+
+    def clamp(width, height)
+      @x = @x.clamp(0, width)
+      @y = @y.clamp(0, height)
+      self
+    end
+
+    def to_h
+      { x: x, y: y }
+    end
   end
 end

data/opal/fron/utils/render_proc.rb

@@ -6,10 +6,11 @@ module Fron
     #
     # @param method [Method] The method
     # @param verbose [Boolean] Whether or not to log render time
-    def initialize(method, verbose)
+    def initialize(method, verbose, message)
       @running = false
       @method  = method
       @verbose = verbose
+      @message = message
     end
 
     # Runs the proc
@@ -19,7 +20,10 @@ module Fron
       request_animation_frame do
         time = Time.now
         @method.call
-        logger.info "Rendered #{@method.owner} in #{(Time.now - time) * 1000}ms" if @verbose
+        if @verbose
+          message = @message || "Rendered #{@method.owner}"
+          logger.info "[#{(Time.now - time) * 1000}ms] #{message}"
+        end
         @running = false
       end
     end

data/spec/core-ext/array_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Array do
-  subject { %w(a b) }
+  subject { %w(a b a) }
 
   describe '#reverse_each_with_index' do
     it 'should run in reverse' do
@@ -9,7 +9,15 @@ describe Array do
       subject.reverse_each_with_index do |item, index|
         array << [item, index]
       end
-      array.should eq [['b', 1], ['a', 0]]
+      array.should eq [['a', 2], ['b', 1], ['a', 0]]
+    end
+  end
+
+  describe '#sort_by!' do
+    it 'should sort the array in place' do
+      result = subject.sort_by! { |item| item }
+      result.should eq subject
+      subject.should eq %w(a a b)
     end
   end
 end

data/spec/core-ext/numeric_spec.rb

@@ -22,4 +22,10 @@ describe Numeric do
       subject.px.should eq '1px'
     end
   end
+
+  describe '#em' do
+    it 'should return the em representation' do
+      subject.em.should eq '0.5em'
+    end
+  end
 end

data/spec/core/behaviors/style_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+# Test Component
+class StyleTest < Fron::Component
+  tag 'style-test'
+
+  stylesheet 'http://test.com/index.css'
+
+  keyframes 'test', from: { color: :red },
+                    to: { color: :blue }
+
+  style background: :red,
+        img: {
+          width: 200.px
+        },
+        '&:hover' => {
+          color: :blue
+        }
+end
+
+describe StyleTest do
+  let(:style) { Fron::Sheet.render }
+
+  before do
+    subject
+  end
+
+  it 'should create style tag' do
+    style.should_not be_nil
+  end
+
+  it 'should set css for component' do
+    style.should match('style-test')
+  end
+
+  it 'should set css for sub rulest' do
+    style.should match('style-test img')
+  end
+
+  it 'should set css for hover' do
+    style.should match('style-test:hover')
+  end
+
+  it 'should create keyframes rule' do
+    style.should match('@keyframes test')
+  end
+
+  it 'should create styleheet link tag' do
+    style.should match('test.com')
+  end
+end

data/spec/core/component_inheritance_spec.rb

@@ -26,28 +26,23 @@ end
 describe SuperComponent do
   subject { described_class }
 
-  let(:components) { subject.instance_variable_get('@component') }
+  let(:registry) { subject.instance_variable_get('@registry') }
 
-  it 'should inherit components in order' do
-    components.should_not be nil
-    components[0].should eq [:text, 'text']
-    components[1].should eq [:title, 'title']
+  it 'should inherit registry in order' do
+    registry.should_not be nil
+    registry[0][:args].should eq [:text, 'text']
+    registry[2][:args].should eq [:title, 'title']
   end
 end
 
 describe InheritedComponent do
   subject { described_class }
 
-  let(:components) { subject.instance_variable_get('@component') }
-  let(:events) { subject.instance_variable_get('@on') }
+  let(:registry) { subject.instance_variable_get('@registry') }
 
-  it 'should inherit components' do
-    components.should_not be nil
-    components[0].should eq [:text, 'text']
-  end
-
-  it 'should inherit events' do
-    events.should_not be nil
-    events[0].should eq [:click, :render]
+  it 'should inherit registry' do
+    registry.should_not be nil
+    registry[0][:args].should eq [:text, 'text']
+    registry[1][:args].should eq [:click, :render]
   end
 end

data/spec/core/component_spec.rb

@@ -10,11 +10,10 @@ class TestComponent < Fron::Component
 end
 
 describe Fron::Component do
-  subject  { TestComponent.new }
+  subject { TestComponent.new }
 
   let(:listeners) { subject.instance_variable_get '@listeners' }
-  let(:components) { subject.instance_variable_get('@component') }
-  let(:events) { subject.instance_variable_get('@on') }
+  let(:registry) { subject.instance_variable_get('@registry') }
 
   describe 'DSL' do
     subject { TestComponent }
@@ -34,22 +33,18 @@ describe Fron::Component do
     end
 
     describe '#on' do
-      it 'should create events array' do
-        subject.on :click, :test
-        events.should_not be nil
-      end
-
-      it 'should push event into the events array' do
-        subject.on :click, :test
-        events.length.should be 2
+      it 'should add to registry' do
+        expect {
+          subject.on :click, :test
+        }.to change { registry.count }.by 1
       end
     end
 
     describe '#component' do
       it 'should create components array' do
-        subject.component :test, 'test'
-        components.should_not be nil
-        components.length.should be 1
+        expect {
+          subject.component :test, 'test'
+        }.to change { registry.count }.by 1
       end
 
       it 'should create attr_reader for component' do
@@ -65,7 +60,7 @@ describe Fron::Component do
     end
 
     it 'should apply events' do
-      listeners[:click].length.should eq 2
+      listeners[:click].length.should eq 1
     end
 
     it 'should create components' do