resulang 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9f8ee4aa6b963ea749c10954d042c71f2099c9b7ad9267921ce99099223ba0c
-  data.tar.gz: 54cd1b85136bd67d37de5ad8c7b9ab222ca3341bd937e1d5e543ab0b8113a73d
+  metadata.gz: f77e7c4836d3b5579f4ab1389d961a70425894353419b91d4b41927a37581c25
+  data.tar.gz: fdeb85325dc87404c955436154b388445e823ac44c10b044eb53833b513dbb2f
 SHA512:
-  metadata.gz: fa6c3890faa19934257f5547c40564c5a44c0efb22c8cb49034d499be7ca8893aa36efbd69009685cf418423b71411bb1bd272a823aa43781f53e89d4a475ec5
-  data.tar.gz: b16d1895f0b89839d5bda160952006c77e9b50f5d2e27b4064c576cd11d59469c6cd7d2a5d75577f55065a135e907890da4246f5ee658b866c9fbdb30973956a
+  metadata.gz: 50dd554e11fccd5775d4be9da95aac13baf6e6eea07668d346940ad76ab26a2e3a950e288f974eb515088c53746adc6e01eb4123029eb7e0fb737871d4d3bc7b
+  data.tar.gz: 3ca3093dec8e3873b6986ff8cd073acb8134908a070129bd178a7a1f6229a19675718b14bdb1e063cf3aef332131968893211fa32fadc375f34569107bc8be4d

data/examples/my_resume/resume.rb

@@ -14,7 +14,13 @@ structure do
   end
 
   section :hobbies do
-    pointlist :info
+    list :points
+  end
+
+  section :other do
+    list :things do
+      string :name, :description
+    end
   end
 end
 
@@ -33,14 +39,29 @@ data do
   end
 
   skills do
-    things %{foo bar baz qux}
+    thing %{foo bar baz qux}
   end
 
   hobbies do
-    info do
-      point 'Reading about Haskell'
-      point 'Evangelizing monads'
-      point 'Making beer'
+    point 'Reading about Haskell'
+    point 'Evangelizing monads'
+    point 'Making beer'
+  end
+
+  other do
+    thing do
+      name 'foo'
+      description 'foo desc'
+    end
+
+    thing do
+      name 'bar'
+      description 'bar desc'
+    end
+
+    thing do
+      name 'baz'
+      description 'baz desc'
     end
   end
 end

data/examples/my_resume/templates/_hobbies.html.erb

@@ -1,6 +1,6 @@
 <ul>
-  <% info.points.each do |point| %>
-      <li><%= point %></li>
+  <% points.each do |p| %>
+      <li><%= p %></li>
   <% end %>
 </ul>
 

data/examples/my_resume/templates/_skills.html.erb

@@ -1 +1 @@
-<div><%= things.join(' / ') %></div>
+<div><%= things.join(' // ') %></div>

data/examples/my_resume/templates/resume.html.erb

@@ -16,6 +16,9 @@
     <div class="section">
       <%= render_section(:hobbies) %>
     </div>
+    <div class="section">
+      <%= render_section(:other) %>
+    </div>
   </body>
 </html>
 

data/lib/resulang/exec.rb

@@ -1,5 +1,4 @@
 require 'thor'
-require 'active_support/inflector'
 
 module Resulang
   class Exec < Thor

data/lib/resulang/fields.rb

@@ -1,3 +1,5 @@
+require 'active_support/inflector'
+
 module Resulang
   module Fields
     def self.included(base)
@@ -10,24 +12,6 @@ module Resulang
     class Link < String
     end
 
-    class PointList
-      attr_reader :points
-
-      def initialize(string: nil, &block)
-        @string = string
-        @points = [ ]
-        instance_eval(&block) if block
-      end
-
-      def point(string, &block)
-        points.push(PointList.new(string: string, &block))
-      end
-
-      def to_s
-        @string
-      end
-    end
-
     module ClassMethods
       protected def string(*attrs)
         fields(*attrs) { |value| value }
@@ -41,18 +25,36 @@ module Resulang
         fields(*attrs) { |value| Link.new(value) }
       end
 
-      protected def list(*attrs)
-        fields(*attrs) { |value| Array(value) }
+      protected def list(*attrs, &item_decl)
+        attrs.each do |name|
+          define_method(name) do |*args, &block|
+            field_get(name)
+          end
+
+          singular = ActiveSupport::Inflector.singularize(name)
+
+          define_method(singular) do |*args, &item_def|
+            if args.empty? && item_def.nil?
+              raise "no arguments or definition block given for list #{singular}"
+            end
+
+            items = field_get(name) || []
+
+            if item_def.nil?
+              args.each { |a| items.push(a) }
+            elsif
+              items.push(Class.new(Section, &item_decl).new(name: name, &item_def))
+            end
+
+            field_set(name, items)
+          end
+        end
       end
 
       protected def range(*attrs)
         fields(*attrs) { |*values| (values.first..values.last) }
       end
 
-      protected def pointlist(*attrs)
-        fields(*attrs) { |&block| PointList.new(&block) }
-      end
-
       private def fields(*names, &block)
         names.each do |name|
           define_method(name) do |*args, &b|

data/lib/resulang/section.rb

@@ -1,5 +1,3 @@
-require 'active_support/inflector'
-
 module Resulang
   class Section
     attr_reader :name

data/lib/resulang/version.rb

@@ -1,3 +1,3 @@
 module Resulang
-  VERSION = "1.0.0"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resulang
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Peter Brindisi