tram-page 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 890e2cc8021a94d4155ebc4a2647bb9049dda8cc
-  data.tar.gz: f26c9d0e09a3e72ccf78bfc9014ac9e041c88bd6
+  metadata.gz: 375d5937b0f9c997aa2cd574e06c8f8899310e17
+  data.tar.gz: 629dd6b504f6ba91a71a52a4e33dd665ff1cfaee
 SHA512:
-  metadata.gz: 62d4b2e9809b2df49e383d26d3d87b4f8df929786f0c92e60336225df29c389060d79289e3bfb63ca634147a3c30ad0110e3a13a73ad74b2d158dbc66fe2146e
-  data.tar.gz: 30e9b419a6eaba364be62c8f51460b9d07bf87c2d593d311ded63dae3a6a56c921215bb20385d0ecb9839de16b947d4fb614b9fb66e41b42e69bd0dd51cc28ff
+  metadata.gz: a4b84cb6c46012e27c73d637abcce63a78c915210ffa93e923bec41314f546daaafaf84af668a4671c26c6be9676755ebf1de42ef722f0d4dc1e924e2f562b34
+  data.tar.gz: ec1fd25fba5e7e5aa0b74f94b0b20361c237b8e7a48c817857c655ac8e690f88a8d48678f9cd5525f68bbf6b262683fee5820a687e252b0e17a22c07eb1788ed

data/lib/tram/page/version.rb

@@ -3,6 +3,6 @@
 # rubocop:disable Style/ClassAndModuleChildren
 module Tram
   class Page
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/lib/tram/page.rb

@@ -6,22 +6,34 @@ class Tram::Page
   class << self
     attr_accessor :i18n_scope
 
-    def section(name, options = {}, &block)
+    def section(name, options = {})
       @__sections ||= []
-      @__sections << [name, options, block]
+
+      n = name.dup.to_sym
+      if @__sections.map(&:first).include?(n)
+        raise "Section #{n} already exists"
+      end
+      n = define_section_method(n, options)
+      @__sections << [n, options]
     end
 
     def url_helper(name)
       raise "Rails url_helpers module is not defined" unless defined?(Rails)
       delegate name, to: :"Rails.application.routes.url_helpers"
     end
+
+    private
+
+    def define_section_method(n, options)
+      return n unless options[:value]
+      define_method(n) { instance_exec(&options[:value]) }
+      n
+    end
   end
 
   def to_h(options = {})
-    data = page_methods(options).map do |(name, opts, block)|
-      value = instance_eval(&block) if block
-      value ||= public_send(opts[:method] || name)
-
+    data = page_methods(options).map do |(name, opts)|
+      value = public_send(opts[:method] || name)
       [name, value]
     end
     Hash[data]
@@ -38,7 +50,7 @@ class Tram::Page
     methods = self.class.instance_variable_get(:"@__sections") || []
     except = Array(options[:except])
     only = Array(options[:only])
-    methods.reject do |(name, _, _)|
+    methods.reject do |(name, _)|
       (except.any? && except.include?(name)) ||
         (only.any? && !only.include?(name))
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tram-page
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Viktor Sokolov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-16 00:00:00.000000000 Z
+date: 2017-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler