htmlgrid 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2847726b7e6ac148bca47055c992b5d330ca670e
-  data.tar.gz: 5c53eb62fb668b52bc7baab302b6a50127838e6a
+  metadata.gz: 429bd52a98041fb93eaca98d1768c33f5b597fcb
+  data.tar.gz: feb3061e2a0a4417fad883ab1ad6a7a25d9cbe81
 SHA512:
-  metadata.gz: 48861a4c77a5f83517637e23b88200145c0dfe26097d342e06c1d7fe559699a70f3310462647a370e6ee9a6941ee6d42d71557bad0a8a9b15f1c7a9f81007e39
-  data.tar.gz: f3a7b84c902d5e5615e50e2a602e7c58d789148614205fc0a28e1342b5477dfc468de1a8442909a3afa67cf4c7599427f1b9ba25866436696d5179c8b86b78d1
+  metadata.gz: 50a6229fc0748b68ac6673c6e33260b6786c60f2569c41d9399faccba30aadd660667fe38edd1cc9db116751c1accaae004910b01cccee4ed1c7d3c39ec03bc4
+  data.tar.gz: 6be80e669e1c8dd1597f30fc77b25410c0020394ede7c7de78aa8fa79fd730b343d89826b43d77eb2ad502665d6cf8f8acdd89614a63c698f29ea2c0e04cf7c1

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.1.3 / 15.08.2016
+
+* Add session variable fallback assignment
+
 === 1.1.2 / 10.08.2016
 
 * Fix warnings by syntax or coding style

data/lib/htmlgrid/composite.rb

@@ -51,6 +51,21 @@ module HtmlGrid
 		CSS_ID = nil
 		DEFAULT_CLASS = Value
 		LOOKANDFEEL_MAP = {}
+
+    def self.component(klass, key, name=nil)
+      methname = klass.to_s.downcase.gsub('::', '_') << '_' << key.to_s
+      define_method(methname) { |*args|
+        model, session = args
+        args = [model.send(key), session || @session, self]
+        if(name)
+          args.unshift(name)
+          lookandfeel_map.store(methname.to_sym, name.to_sym)
+        end
+        klass.new(*args)
+      }
+      methname.to_sym
+    end
+
 		def init
 			super
 			setup_grid()
@@ -102,19 +117,6 @@ module HtmlGrid
 		def symbol_map
 			@symbol_map ||= self::class::SYMBOL_MAP.dup
 		end
-		def AbstractComposite.component(klass, key, name=nil)
-			methname = klass.to_s.downcase.gsub('::', '_') << '_' << key.to_s
-			define_method(methname) { |*args|
-				model, session = args
-				args = [model.send(key), session, self]
-				if(name)
-					args.unshift(name)
-					lookandfeel_map.store(methname.to_sym, name.to_sym)
-				end
-				klass.new(*args)
-			}
-			methname.to_sym
-		end
 	end
 	class TagComposite < AbstractComposite
 		def compose(model=@model)

data/lib/htmlgrid/version.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 module HtmlGrid
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 end

data/test/test_composite.rb

@@ -88,6 +88,9 @@ module CompositeTest
     public :labels?
   end
   class StubCompositeModel
+    def qux
+      'qux'
+    end
   end
   class StubCompositeLookandfeel
     def event_url(one)
@@ -109,6 +112,9 @@ module CompositeTest
     def error(key)
     end
   end
+
+  class StubCompositeSession2 < StubCompositeSession; end
+
   class StubCompositeForm < HtmlGrid::Form
     COMPONENTS = {
       [0, 0] => StubComposite
@@ -141,6 +147,23 @@ module CompositeTest
       @composite = StubComposite.new(
         StubCompositeModel.new, StubCompositeSession.new)
     end
+
+    def test_component_session_fallback_assignment_without_session_argment
+      StubComposite.component(StubComposite, :qux)
+      model    = StubCompositeModel.new
+      session1 = StubCompositeSession.new
+      composite = StubComposite.new(model, session1)
+      # via instance variable (without argument)
+      composite = composite.compositetest_stubcomposite_qux(model)
+      assert_kind_of(StubCompositeSession, composite.session)
+      assert_equal(session1, composite.session)
+      # via argument
+      session2 = StubCompositeSession2.new
+      composite = composite.compositetest_stubcomposite_qux(model, session2)
+      assert_kind_of(StubCompositeSession2, composite.session)
+      assert_equal(session2, composite.session)
+    end
+
     def test_create_method
       foo = nil
       foo = @composite.create(:foo, @composite.model)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: htmlgrid
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2016-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sbsm