inesita 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdaaffe2e4aafb5d72428c08684f3c3c2330611d
-  data.tar.gz: 6f1453ef8e9cdd016baf70935a2a719144fe1667
+  metadata.gz: b37363ed5044f4dc5a61efe0d92ba7f2eecd8938
+  data.tar.gz: d04e1ee6dd0e06d748777b60adfaa2fb0446085a
 SHA512:
-  metadata.gz: 26968cf01a88384d6eee6ee5a66f54e588437c652abbf18ec50fcd8c63a8fe3783c6ea11352ff4c0384a9e79f4466a9a2854e70b1a8cb3753e5a4e2d9fd6ca52
-  data.tar.gz: 112e86389819cd90b5b9f864ba59acd540e989f18a8bb27d962e7323ab71c5681cac57c1004e89ba44ac21ab07206b4af3a5d1e08daa6b5abf74c3135c57cd83
+  metadata.gz: 53a97e1c19d97eff209dc3e9b7daa1be6a34b72a9ab5549cd8af76c73c526cb13a3a5a5a62c489af34b6806b5af285f40aba0c3f0b6e4fded198f474555ab01b
+  data.tar.gz: 40bc04dadbe5c5244fc46cf4c80548c47d085e77a4d1d4c60247f1c080be0797079882c8b30951ecc44b88ab9419955d0b5962406a47a6319a94c02562151cc4

data/CHANGELOG.md

@@ -1,4 +1,16 @@
-## [0.4.4] - 2016.10.4
+## [0.5.0] - 2016.10.22
+
+### Added
+- Injection (you can inject any object)
+- `before_render` callback to `Component`
+
+### Changed
+- Store is deprecated, use Injection
+
+### Removed
+- `init` callback, use `initialize` instead
+
+## [0.4.4] - 2016.10.04
 
 ### Added
 - `on_enter` callback to Router

data/inesita.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'inesita'
-  s.version     = '0.4.4'
+  s.version     = '0.5.0'
   s.authors     = ['Michał Kalbarczyk']
   s.email       = 'fazibear@gmail.com'
   s.homepage    = 'http://github.com/inesita-rb/inesita'

data/lib/inesita/cli/template/Gemfile.tt

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # inesita gem
-gem 'inesita', '~> 0.4.0'
+gem 'inesita', '~> 0.5.0'
 gem 'inesita-livereload', '~> 0.1.0'
 
 # add this gems to minify files on build

data/lib/inesita/cli/template/app/store.rb.tt

@@ -1,5 +1,5 @@
 class Store
-  include Inesita::Store
+  include Inesita::Injection
 
   def initialize
     @store = {}

data/opal/inesita.rb

@@ -7,8 +7,8 @@ require 'virtual_dom'
 require 'inesita/browser'
 require 'inesita/error'
 require 'inesita/component_virtual_dom_extension'
-require 'inesita/component_properties'
 require 'inesita/component_helpers'
+require 'inesita/injection'
 require 'inesita/component'
 require 'inesita/routes'
 require 'inesita/router'

data/opal/inesita/application.rb

@@ -3,10 +3,10 @@ module Inesita
     include Inesita::Component
 
     def initialize(options = {})
-      setup_router(options[:router])
-      setup_layout(options[:layout])
+      setup_router(options.delete(:router))
+      setup_layout(options.delete(:layout))
       setup_root
-      setup_store(options[:store])
+      setup_injections(options)
     end
 
     def render
@@ -18,7 +18,7 @@ module Inesita
     def setup_router(router)
       if router
         raise Error, "Invalid #{router} class, should mixin Inesita::Router" unless router.include?(Inesita::Router)
-        @router = router.new
+        @router = inject(:router, router.new)
       else
         @router = Class.new { define_method(:method_missing) { raise 'Router missing' } }.new
       end
@@ -27,7 +27,7 @@ module Inesita
     def setup_layout(layout)
       if layout
         raise Error, "Invalid #{layout} class, should mixin Inesita::Layout" unless layout.include?(Inesita::Layout)
-        @layout = layout.new
+        @layout = inject(:layout, layout.new)
       end
     end
 
@@ -41,11 +41,12 @@ module Inesita
       end
     end
 
-    def setup_store(store)
-      return unless store
-      raise Error, "Invalid #{store} class, should mixin Inesita::Store" unless store.include?(Inesita::Store)
-      @store = store.new.with_root_component(@root).with_router(@router).store
-      @store.init
+    def setup_injections(injections)
+      return unless injections
+      return unless injections.is_a?(Hash)
+      injections.each do |key, value|
+        inject(key, value.new)
+      end
     end
   end
 end

data/opal/inesita/component.rb

@@ -2,10 +2,8 @@ module Inesita
   module Component
     include VirtualDOM::DOM
     include ComponentHelpers
-    include ComponentProperties
     include ComponentVirtualDomExtension
-
-    def init; end
+    include Injection
 
     def render
       raise Error, "Implement #render in #{self.class} component"
@@ -13,7 +11,7 @@ module Inesita
 
     def mount_to(element)
       raise Error, "Can't mount #{self.class}, target element not found!" unless element
-      @root_component = self
+      inject(:root_component, self)
       @virtual_dom = render_virtual_dom
       @root_node = VirtualDOM.create(@virtual_dom)
       Browser.append_child(element, @root_node)
@@ -28,7 +26,10 @@ module Inesita
       @virtual_dom = new_virtual_dom
     end
 
+    def before_render; end;
+
     def render_virtual_dom
+      before_render
       @cache_component_counter = 0
       @__virtual_nodes__ = []
       render
@@ -39,14 +40,6 @@ module Inesita
       end
     end
 
-    def render!
-      Browser.animation_frame do
-        if @root_component
-          @root_component.render_if_root
-        end
-      end
-    end
-
     def cache_component(component, &block)
       @cache_component ||= {}
       @cache_component_counter ||= 0
@@ -61,5 +54,11 @@ module Inesita
     def unhook(mthd)
       VirtualDOM::UnHook.method(method(mthd))
     end
+
+    attr_reader :props
+    def with_props(props)
+      @props = props
+      self
+    end
   end
 end

data/opal/inesita/component_helpers.rb

@@ -1,5 +1,14 @@
 module Inesita
   module ComponentHelpers
+    def inject(name, what)
+      Injection.class_eval do
+        define_method(name) do
+          what
+        end
+      end
+      what
+    end
+
     def class_names(hash)
       class_names = []
       hash.each do |key, value|

data/opal/inesita/component_virtual_dom_extension.rb

@@ -3,7 +3,7 @@ module Inesita
     def self.included(base)
       base.alias_method :__a, :a
       base.define_method(:a) do |params, &block|
-        params = { onclick: -> { @router.go_to(params[:href]) } }.merge(params) if params[:href] && @router
+        params = { onclick: -> { router.go_to(params[:href]) } }.merge(params) if params[:href] && router
         __a(params, &block)
       end
     end
@@ -12,12 +12,7 @@ module Inesita
       raise Error, "Component is nil in #{self.class} class" if comp.nil?
       @__virtual_nodes__ ||= []
       @__virtual_nodes__ << cache_component(comp) do
-        comp = (comp.is_a?(Class) ? comp.new : comp)
-          .with_root_component(@root_component)
-          .with_router(@router)
-          .with_store(@store)
-        comp.init
-        comp
+        comp.is_a?(Class) ? comp.new : comp
       end.with_props(opts[:props] || {}).render_virtual_dom
     end
   end

data/opal/inesita/injection.rb

@@ -0,0 +1,9 @@
+module Inesita
+  module Injection
+    def render!
+      Browser.animation_frame do
+        root_component.render_if_root
+      end
+    end
+  end
+end

data/opal/inesita/injection_methods.rb

@@ -0,0 +1,7 @@
+module Inesita
+  module InjectionMethods
+    def render!
+      root_component.render!
+    end
+  end
+end

data/opal/inesita/layout.rb

@@ -3,7 +3,7 @@ module Inesita
     include Component
 
     def outlet
-      @router
+      router
     end
   end
 end

data/opal/inesita/store.rb

@@ -1,23 +1,15 @@
 module Inesita
+  # TODO: Remove it.
   module Store
-
-    def init; end
-    def store; self end
-
-    def render!
-      root_component.render!
+    def self.included(base)
+      $console.warn('"include Inesita::Store" is deprecated. Use "include Inesita::Injection" insted.')
+      self.include Injection
     end
 
-    attr_reader :root_component
-    def with_root_component(component)
-      @root_component = component
-      self
-    end
-
-    attr_reader :router
-    def with_router(router)
-      @router = router
-      self
+    def render!
+      Browser.animation_frame do
+        root_component.render_if_root
+      end
     end
   end
 end

data/spec/opal/application_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Inesita::Application do
   let(:application) { Inesita::Application }
   let(:layout) { Class.new { include Inesita::Layout } }
-  let(:store) { Class.new { include Inesita::Store } }
+  let(:injection) { Class.new { include Inesita::Injection } }
   let(:router) do
     Class.new do
       include Inesita::Router
@@ -38,11 +38,11 @@ describe Inesita::Application do
     expect { application.new(layout: layout) }.not_to raise_error
   end
 
-  it 'should fail with wrong :store class' do
-    expect { application.new(store: Class) }.to raise_error Inesita::Error
-  end
-
   it 'should not fail with :layout class' do
     expect { application.new(router: router) }.not_to raise_error
   end
+
+  it 'should not fail with any class for injection' do
+    expect { application.new(test: injection) }.not_to raise_error
+  end
 end

data/spec/opal/injecion_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe Inesita::Injection do
+  let(:application) { Inesita::Application }
+  let(:injection) { Class.new { include Inesita::Injection } }
+
+  it 'should respond to #render!' do
+    expect(injection.new).to respond_to(:render!)
+  end
+
+  it 'should respond to #root_component' do
+    expect(injection.new).to respond_to(:root_component)
+  end
+
+  it 'should respond to injection name method' do
+    expect(application.new(test: injection)).to respond_to(:test)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inesita
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Michał Kalbarczyk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-04 00:00:00.000000000 Z
+date: 2016-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -214,9 +214,10 @@ files:
 - opal/inesita/browser.rb
 - opal/inesita/component.rb
 - opal/inesita/component_helpers.rb
-- opal/inesita/component_properties.rb
 - opal/inesita/component_virtual_dom_extension.rb
 - opal/inesita/error.rb
+- opal/inesita/injection.rb
+- opal/inesita/injection_methods.rb
 - opal/inesita/layout.rb
 - opal/inesita/router.rb
 - opal/inesita/routes.rb
@@ -225,10 +226,10 @@ files:
 - spec/lib/spec_helper.rb
 - spec/opal/application_spec.rb
 - spec/opal/component_spec.rb
+- spec/opal/injecion_spec.rb
 - spec/opal/layout_spec.rb
 - spec/opal/router_spec.rb
 - spec/opal/spec_helper.rb
-- spec/opal/store_spec.rb
 homepage: http://github.com/inesita-rb/inesita
 licenses:
 - MIT
@@ -258,7 +259,7 @@ test_files:
 - spec/lib/spec_helper.rb
 - spec/opal/application_spec.rb
 - spec/opal/component_spec.rb
+- spec/opal/injecion_spec.rb
 - spec/opal/layout_spec.rb
 - spec/opal/router_spec.rb
 - spec/opal/spec_helper.rb
-- spec/opal/store_spec.rb

data/opal/inesita/component_properties.rb

@@ -1,27 +0,0 @@
-module Inesita
-  module ComponentProperties
-    attr_reader :root_component
-    def with_root_component(component)
-      @root_component = component
-      self
-    end
-
-    attr_reader :router
-    def with_router(router)
-      @router = router
-      self
-    end
-
-    attr_reader :store
-    def with_store(store)
-      @store = store
-      self
-    end
-
-    attr_reader :props
-    def with_props(props)
-      @props = props
-      self
-    end
-  end
-end

data/spec/opal/store_spec.rb

@@ -1,17 +0,0 @@
-require 'spec_helper'
-
-describe Inesita::Store do
-  let(:store) { Class.new { include Inesita::Store } }
-
-  it 'should respond to #store' do
-    expect(store.new).to respond_to(:store)
-  end
-
-  it 'should respond to #render!' do
-    expect(store.new).to respond_to(:render!)
-  end
-
-  it 'should respond to #with_root_component' do
-    expect(store.new).to respond_to(:with_root_component)
-  end
-end