rocketio 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f1dbf572c1e7970aec62ce4ef9c086d30ecf81a
-  data.tar.gz: ca84526779a8871ca2f7fb63be1e2544c48cc61a
+  metadata.gz: 058d969c6b3f050392f25ce9be512029b10cf7cf
+  data.tar.gz: fe12296fa46e09d621044bc15a926099daf0f85d
 SHA512:
-  metadata.gz: a3f8c8aba7c0e2d786487f35ad8b066bc208fe49df69cf42c1e9ef7aa4e40a4f772b5f9cc6264ae08c5a5525b006cf6336da162d066aa9223cde0f7b522b454f
-  data.tar.gz: de2d3b6d29d64fa7a8d5f6e6c5c3e9cebd030c76b3231430acb094f53bdce0fd5d9687008e3b607d24768597c1600d84636ab01b54cc4679a0acbe4cbfa6272a
+  metadata.gz: 57ff44d810bc535f35cacc5fd09983e9fda1c2902296e14744ec56e7c59a80fa2229c3302ce2a27a0a24fc6a613a4063cc25510c70e124a77fa9286315d70acb
+  data.tar.gz: 98a60d1d19ef24fa204796f607eefb9dea785a11af451ad5bceb6b60027709869f30a79d2402bee2e4521a02b27216340b3b99bf33b56a62c55c67e38881492e

data/lib/rocketio/controller/render.rb

@@ -69,7 +69,7 @@ module RocketIO
       engine, engine_opts = resolve_engine(opts)
       template = block_given? ? yield : resolve_template(template, engine)
       scope    = opts.fetch(:scope, self)
-      locals   = opts.fetch(:locals, RocketIO::EMPTY_HASH).freeze
+      locals   = template_vars.merge(opts.fetch(:locals, RocketIO::EMPTY_HASH)).freeze
       layout   = opts.fetch(:layout, self.layout)
       template = compile_template(template, engine, engine_opts).render(scope, locals)
       layout   ? render_layout(layout, opts) {template} : template
@@ -110,8 +110,8 @@ module RocketIO
         end
       end
 
-      scope    = opts.fetch(:scope, self)
-      locals   = opts.fetch(:locals, RocketIO::EMPTY_HASH).freeze
+      scope  = opts.fetch(:scope, self)
+      locals = template_vars.merge(opts.fetch(:locals, RocketIO::EMPTY_HASH)).freeze
       compile_template(template, engine, engine_opts)
         .render(scope, locals, &(block || RocketIO::EMPTY_STRING_PROC))
     end
@@ -164,3 +164,4 @@ require 'rocketio/controller/render/engine'
 require 'rocketio/controller/render/layout'
 require 'rocketio/controller/render/layouts'
 require 'rocketio/controller/render/templates'
+require 'rocketio/controller/render/template_vars'

data/lib/rocketio/controller/render/template_vars.rb

@@ -0,0 +1,34 @@
+module RocketIO
+  class Controller
+
+    # define variables to be used on templates alongside provided locals.
+    #
+    # @param name
+    # @param value
+    #
+    def self.define_template_var name, value = nil, &block
+      value || block || raise(ArgumentError, 'A value or a block expected')
+      (@__template_vars__ ||= {})[name.to_sym] = (block || value).freeze
+      define_template_vars_methods
+    end
+
+    def self.define_template_vars_methods source = self
+      return unless source.instance_variables.include?(:@__template_vars__)
+      vars = source.instance_variable_get(:@__template_vars__).each_with_object(allocate.__template_vars__.dup) do |(name,value),o|
+        o[name] = :"__#{name}_template_var__"
+        if value.is_a?(Proc)
+          define_method(o[name], &value)
+        else
+          define_method(o[name]) {value}
+        end
+      end.freeze
+      define_method(:__template_vars__) {vars}
+    end
+
+    def __template_vars__; RocketIO::EMPTY_HASH end
+
+    def template_vars
+      __template_vars__.each_with_object({}) {|(k,v),o| o[k] = __send__(v)}
+    end
+  end
+end

data/lib/rocketio/version.rb

@@ -1,3 +1,3 @@
 module RocketIO
-  VERSION = '0.0.7'.freeze
+  VERSION = '0.0.8'.freeze
 end

data/test/render/template_vars_test.rb

@@ -0,0 +1,106 @@
+require 'setup'
+
+spec :template_vars do
+  context :compositing do
+    it 'inherits vars from superclass' do
+      a = mock_controller {
+        define_template_var(:a, 'a')
+      }
+      b = mock_controller(a) {}.initialize_controller
+      assert(b.template_vars[:a]) == 'a'
+    end
+
+    it 'complements vars inherited from superclass' do
+      a = mock_controller {
+        define_template_var(:a, 'a')
+      }
+      b = mock_controller(a) {
+        define_template_var(:b, 'b')
+      }.initialize_controller
+      assert(b.template_vars[:a]) == 'a'
+      assert(b.template_vars[:b]) == 'b'
+    end
+
+    it 'overrides vars inherited from superclass' do
+      a = mock_controller {
+        define_template_var(:a, 'a')
+      }
+      b = mock_controller(a) {
+        define_template_var(:a, 'b')
+      }.initialize_controller
+      assert(b.template_vars[:a]) == 'b'
+    end
+
+    test '`inherit` overrides vars inherited from superclass' do
+      a = mock_controller {
+        define_template_var(:a, 'a')
+      }
+      b = mock_controller(a) {
+        define_template_var(:a, 'b')
+      }
+      c = mock_controller(a) {
+        inherit :template_vars, from: b
+      }.initialize_controller
+      assert(c.template_vars[:a]) == 'b'
+    end
+
+    test '`inherit` complements vars inherited from superclass' do
+      a = mock_controller {
+        define_template_var(:a, 'a')
+      }
+      b = mock_controller(a) {
+        define_template_var(:b, 'b')
+      }
+      c = mock_controller(a) {
+        inherit :template_vars, from: b
+      }.initialize_controller
+      assert(c.template_vars[:a]) == 'a'
+      assert(c.template_vars[:b]) == 'b'
+    end
+
+    test '`inherit` overrides defined vars' do
+      a = mock_controller {
+        define_template_var(:a, 'a')
+      }
+      b = mock_controller {
+        define_template_var(:a, 'b')
+        inherit :template_vars, from: a
+      }.initialize_controller
+      assert(b.template_vars[:a]) == 'a'
+    end
+  end
+
+  context :rendering do
+
+    it 'accepts plain value via second argument' do
+      c = mock_controller {
+        define_template(:get) {'<%= x %>'}
+        define_template_var(:x, 'y')
+      }.initialize_controller
+      assert(c.render(:get)) == 'y'
+    end
+
+    it 'accepts a proc as second argument' do
+      c = mock_controller {
+        define_template(:get) {'<%= x %>'}
+        define_template_var(:x, -> {'y'})
+      }.initialize_controller
+      assert(c.render(:get)) == 'y'
+    end
+
+    it 'accepts a block without second argument' do
+      c = mock_controller {
+        define_template(:get) {'<%= x %>'}
+        define_template_var(:x) {'y'}
+      }.initialize_controller
+      assert(c.render(:get)) == 'y'
+    end
+
+    it 'raises ArgumentError if no value nor block given' do
+      assert { mock_controller {
+        define_template_var(:x)
+      }}.raise(ArgumentError)
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocketio
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Slee Woo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-10 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -138,6 +138,7 @@ files:
 - lib/rocketio/controller/render/engine.rb
 - lib/rocketio/controller/render/layout.rb
 - lib/rocketio/controller/render/layouts.rb
+- lib/rocketio/controller/render/template_vars.rb
 - lib/rocketio/controller/render/templates.rb
 - lib/rocketio/controller/request.rb
 - lib/rocketio/controller/response.rb
@@ -178,6 +179,7 @@ files:
 - test/render/put.erb
 - test/render/render_test.rb
 - test/render/setup.rb
+- test/render/template_vars_test.rb
 - test/render/templates/a/get.erb
 - test/render/templates/master.erb
 - test/render/templates_test.rb
@@ -210,5 +212,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: '["rocketio-0.0.7", "Simple, fast, scalable web framework for Ruby"]'
+summary: '["rocketio-0.0.8", "Simple, fast, scalable web framework for Ruby"]'
 test_files: []