fron 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c0e03d014a5bf18112aa1e0e2b30a4c7ec7a882
-  data.tar.gz: 27d0049100bb53d0f9c837a1af4ce18af24a5e13
+  metadata.gz: 3c081b3b50bd27657d9e5f50c8f2b69c6f6b89bc
+  data.tar.gz: 3a71ea7cb7e1abfa225686200de85ef0ab5c99ca
 SHA512:
-  metadata.gz: 0d734cef0c1d6e98667dea326f803f7bacb92955ab334eefbce18687a2e9cffb285eeb150f8a0a8d00bc70974cda37e29bb6171c7e742a56a9d834f492f3539b
-  data.tar.gz: 772c38050e98c59879cff8454facc2821bdd12eb5162d450a184e1772e9ade8ddf716747eda73fd135f2d7e20239cdd60afa108c04ec4b8a236eb9670ef65b12
+  metadata.gz: 8fb542de4835a8f2a69d285396ed483afdcfc834df4a63bcb902c4be28db1786542253ca6e29ad3a50ae7b94458dfe8cb65121636e1236e47ccf615ae5f1c112
+  data.tar.gz: d3c7799e2f0e7da34a820c17b8e104ba5156fd25ab83d6a7a63815dabbd418d5ac4d0163c90ec7c5bcde05807fa8faffd3854b0d57c03427f00ba09caed99389

data/Gemfile.lock

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

data/lib/fron/version.rb

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

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

@@ -5,6 +5,7 @@ module Fron
       def initialize(options)
         @options = options
         @request = Request.new
+        @request.headers = {'Content-Type' => 'application/json'}
       end
 
       def all(&block)
@@ -39,8 +40,8 @@ module Fron
       end
 
       def transform(data)
-        newdata = data.dup
-        newdata.keys.each{ |key| newdata["#{@options[:resource]}[#{key}]"] = newdata.delete key}
+        newdata = {}
+        newdata[@options[:resource]] = data.dup
         newdata
       end
     end

data/opal/fron/core/component.rb

@@ -3,9 +3,20 @@ module Fron
     attr_reader :model
 
     class << self
-      attr_accessor :events
-      attr_accessor :tagname
-      attr_accessor :components
+      attr_reader :events
+      attr_reader :tagname
+      attr_reader :components
+      attr_reader :delegates
+
+      def inherited(subclass)
+        [:components,:events,:delegates].each do |type|
+          if (var = instance_variable_get("@#{type}"))
+            inst_var = subclass.instance_variable_get('@#{type}')
+            subclass.instance_variable_set("@#{type}", []) unless inst_var
+            subclass.send(type).concat var
+          end
+        end
+      end
 
       def tag(tag)
         @tagname = tag
@@ -22,14 +33,9 @@ module Fron
         @components << ( args << block )
       end
 
-      def delegate(method,target)
-        define_method(method) do
-          instance_variable_get("@#{target}").send(method)
-        end
-
-        define_method(method+"=") do |value|
-          instance_variable_get("@#{target}").send(method+"=",value)
-        end
+      def delegate(*args)
+        @delegates ||= []
+        @delegates << args
       end
     end
 
@@ -39,20 +45,29 @@ module Fron
         @model = args[0]
       when 2
         tag, @model = args
+      when 3
+        tag, options, @model = args
       end
 
       super tag || self.class.tagname || self.class.name.split("::").last
 
       applyEvents
       createComponents
+      applyDelegates
+
+      if options
+        options.each do |method,value|
+          self.send(method+"=",value) if self.respond_to?(method+"=")
+        end
+      end
 
       return if !respond_to?(:render) || !@model
       @model.on 'change' do render end
       render
     end
 
-    def component(name,comp,&block)
-      c = comp.is_a?(Class) ? comp.new(@model) : Component.new(comp, @model)
+    def component(name,comp,options,&block)
+      c = comp.is_a?(Class) ? comp.new(nil,options,@model) : Component.new(comp, options, @model)
       c.instance_eval(&block) if block
       self << c
       self.instance_variable_set "@#{name}", c
@@ -63,7 +78,23 @@ module Fron
     def createComponents
       return unless self.class.components
       self.class.components.each do |args|
-        component args[0], args[1], &args[2]
+        arguments = args.dup
+        block = arguments.last.is_a?(Proc) ? arguments.pop : nil
+        component *arguments, &block
+      end
+    end
+
+    def applyDelegates
+      return unless self.class.delegates
+      self.class.delegates.each do |args|
+        method, target = args
+        self.class.define_method(method) do
+          instance_variable_get("@#{target}").send(method)
+        end
+
+        self.class.define_method(method+"=") do |value|
+          instance_variable_get("@#{target}").send(method+"=",value)
+        end
       end
     end
 

data/opal/fron/request/request.rb

@@ -6,6 +6,7 @@ module Fron
 
     def initialize(url, headers = {})
       @url = url
+      @headers = headers
       @request = `new XMLHttpRequest()`
       `#{@request}.addEventListener('readystatechange' , function(){#{handle_state_change}})`
       self
@@ -16,10 +17,12 @@ module Fron
         @callback = callback
         if method.upcase == "GET" && data
           `#{@request}.open(#{method},#{@url+"?"+data.to_query_string})`
+          setHeaders
           `#{@request}.send()`
         else
           `#{@request}.open(#{method},#{@url})`
-          `#{@request}.send(#{data.to_form_data if data})`
+          setHeaders
+          `#{@request}.send(#{data.to_json if data})`
         end
       else
         raise "The request is already running!"
@@ -39,6 +42,11 @@ module Fron
     end
 
     private
+    def setHeaders
+      @headers.each_pair do |header,value|
+        `#{@request}.setRequestHeader(#{header},#{value})`
+      end
+    end
 
     def ready_state
       `#{@request}.readyState`

data/spec/core/component_inheritance_spec.rb

@@ -0,0 +1,43 @@
+require 'fron/core'
+
+class BaseComponent < Fron::Component
+  component :text, 'text'
+  on :click, :render
+  delegate :text, :text
+end
+
+class InheritedComponent < BaseComponent
+  component :title, 'title'
+end
+
+class SuperComponent < InheritedComponent
+end
+
+describe SuperComponent do
+  subject { described_class }
+
+  it "should inherit components in order" do
+    subject.components.should_not be nil
+    subject.components[0].should eq [:text,'text',nil]
+    subject.components[1].should eq [:title,'title',nil]
+  end
+end
+
+describe InheritedComponent do
+  subject { described_class }
+
+  it "should inherit components" do
+    subject.components.should_not be nil
+    subject.components[0].should eq [:text,'text',nil]
+  end
+
+  it "should inherit events" do
+    subject.events.should_not be nil
+    subject.events[0].should eq [:click, :render]
+  end
+
+  it "should inherit delegates" do
+    subject.delegates.should_not be nil
+    subject.delegates[0].should eq [:text,:text]
+  end
+end

data/spec/core/component_spec.rb

@@ -52,8 +52,8 @@ describe Fron::Component do
     describe '#delegate' do
       it 'should create delegated methods' do
         subject.delegate :text, :test
-        subject.instance_methods.include?(:text).should be true
-        subject.instance_methods.include?(:text=).should be true
+        subject.delegates.should_not be nil
+        subject.delegates[0].should eq [:text,:test]
       end
     end
   end

data/spec/request/request_spec.rb

@@ -32,13 +32,13 @@ describe Fron::Request do
 
     it 'should call #to_query_string on data if it is a GET' do
       expect(data).to receive(:to_query_string)
-      expect(data).not_to receive(:to_form_data)
+      expect(data).not_to receive(:to_json)
       subject.get data
     end
 
-    it 'should call #to_form_data on data if it is a GET' do
+    it 'should call #to_json on data if it is a GET' do
       expect(data).not_to receive(:to_query_string)
-      expect(data).to receive(:to_form_data)
+      expect(data).to receive(:to_json)
       subject.post data
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fron
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Gusztav Szikszai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2014-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -91,6 +91,7 @@ files:
 - spec/core/adapter/local_spec.rb
 - spec/core/adapter/rails_spec.rb
 - spec/core/application_spec.rb
+- spec/core/component_inheritance_spec.rb
 - spec/core/component_spec.rb
 - spec/core/configuration_spec.rb
 - spec/core/controlller_spec.rb