dslh 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 630bd38fc0b9b3ea7888b3848ee2d4d624096c1e
-  data.tar.gz: c8ad565a5705c9a5bdf74eb7748139cb4e651198
+  metadata.gz: 23606816e11bb7d500a3d596f1d7a9d0402e7019
+  data.tar.gz: dc4b77c1763562bfc9fe2f7cab15881b93239d11
 SHA512:
-  metadata.gz: 3816de53acef37f05ce31531d6238494fb7d12d5672b7eebda49f03914d08f132a2aec6bad558b4868790e2f247c9144142e49ff442f3bfa4731722f62fb10a6
-  data.tar.gz: a71302974f181b5560d94d1787cb38b230aebaf1d30d0733259c2ad203e4fe631509780adc739240863ca7f29b129f93eadc832621f8518f3d3a40abf83dbf72
+  metadata.gz: 18595e8bc2cd2cb93ebb1905957010af282ad3405e216972b1861317c341ee02599c3799725a83702213a5927c548bdcb15035da31308e39b0b4c9e4831e9697
+  data.tar.gz: 1e012c9cbb59d168111f362104af69656c1d0b8b57e58bde707eb338a928bcd40c6a45893a2c15891b14c8eed9a42339de27667a0b404c48e9870343c8fc4c46

data/lib/dslh.rb

@@ -39,7 +39,8 @@ class Dslh
 
   def initialize(options = {})
     @options = {
-      :time_inspecter => method(:inspect_time)
+      :time_inspecter => method(:inspect_time),
+      :dump_old_hash_array_format => false,
     }.merge(options)
 
     @options[:key_conv] ||= (@options[:conv] || proc {|i| i.to_s })
@@ -118,12 +119,12 @@ class Dslh
         buf.puts(indent + key_value)
       else
         buf.print(indent + key)
-        value_proc(value, depth, buf)
+        value_proc(value, depth, buf, true, key)
       end
     end
   end
 
-  def value_proc(value, depth, value_buf, newline = true)
+  def value_proc(value, depth, value_buf, newline = true, curr_key = nil)
     indent = (INDENT_SPACES * depth)
     next_indent = (INDENT_SPACES * (depth + 1))
     value_conv = @options[:value_conv]
@@ -142,28 +143,47 @@ class Dslh
     when Array
       if value.any? {|v| [Array, Hash].any? {|c| v.kind_of?(c) }}
         nested = true
-        value_buf.puts(' [')
-
-        value.each_with_index do |v, i|
-          case v
-          when Hash
-            value_buf.puts(next_indent + '_{')
-            deval0(v, depth + 2, value_buf)
-            value_buf.print(next_indent + '}')
-          when Array
-            value_buf.print(next_indent.slice(0...-1))
-            value_proc(v, depth + 1, value_buf, false)
+
+        if not @options[:dump_old_hash_array_format] and value.all? {|i| i.kind_of?(Hash) }
+          value_buf.puts(' do |*|')
+
+          value.each_with_index do |v, i|
+            deval0(v, depth + 1, value_buf)
+
+            if i < (value.length - 1)
+              value_buf.puts(indent + "end\n" + indent + curr_key + ' do |*|')
+            end
+          end
+
+          if newline
+            value_buf.puts(indent + 'end')
           else
-            value_buf.print(next_indent + v.pretty_inspect.strip.gsub("\n", "\n" + next_indent))
+            value_buf.print(indent + 'end')
           end
+        else
+          value_buf.puts(' [')
+
+          value.each_with_index do |v, i|
+            case v
+            when Hash
+              value_buf.puts(next_indent + '_{')
+              deval0(v, depth + 2, value_buf)
+              value_buf.print(next_indent + '}')
+            when Array
+              value_buf.print(next_indent.slice(0...-1))
+              value_proc(v, depth + 1, value_buf, false)
+            else
+              value_buf.print(next_indent + v.pretty_inspect.strip.gsub("\n", "\n" + next_indent))
+            end
 
-          value_buf.puts(i < (value.length - 1) ? ',' : '')
-        end
+            value_buf.puts(i < (value.length - 1) ? ',' : '')
+          end
 
-        if newline
-          value_buf.puts(indent + ']')
-        else
-          value_buf.print(indent + ']')
+          if newline
+            value_buf.puts(indent + ']')
+          else
+            value_buf.print(indent + ']')
+          end
         end
       elsif value.length == 1
         value_buf.puts(' ' + value.inspect)
@@ -239,22 +259,29 @@ class Dslh
       nested_hash = block ? ScopeBlock.nest(binding, 'block', method_name) : nil
       method_name = key_conv.call(method_name) if key_conv
 
-      if not @__options__[:allow_duplicate] and @__hash__.has_key?(method_name)
+      if not @__options__[:allow_duplicate] and @__hash__.has_key?(method_name) and not (block and block.arity == -1)
         raise "duplicate key #{method_name.inspect}"
       end
 
+      push_to_hash = proc do |v|
+        if block and block.arity == -1
+          @__hash__[method_name] ||= []
+          @__hash__[method_name] << v
+        else
+          @__hash__[method_name] = v
+        end
+      end
+
       if args.empty?
-        @__hash__[method_name] = nested_hash
+        push_to_hash.call(nested_hash)
       else
         args = args.map {|i| value_conv.call(i) } if value_conv
         value = args.length > 1 ? args : args[0]
 
         if nested_hash
-          @__hash__[method_name] = {
-          value => nested_hash
-        }
+          push_to_hash.call(value => nested_hash)
         else
-          @__hash__[method_name] = value
+          push_to_hash.call(value)
         end
 
         return @__hash__

data/lib/dslh/version.rb

@@ -1,3 +1,3 @@
 class Dslh
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end

data/spec/dslh_spec.rb

@@ -767,6 +767,14 @@ end
     expect(evaluated).to eq(template)
   end
 
+  it 'should convert json to dsl (old format)' do
+    template = JSON.parse(drupal_multi_az_template)
+
+    dsl = Dslh.deval(template)
+    evaluated = Dslh.eval(dsl, :key_conv => proc {|i| i.to_s }, :dump_old_hash_array_format => true)
+    expect(evaluated).to eq(template)
+  end
+
   it 'should convert json to dsl with key_conf' do
     template = JSON.parse(drupal_multi_az_template)
 
@@ -935,30 +943,28 @@ Resources do
       PolicyDocument do
         Version "2008-10-17"
         Id "UploadPolicy"
-        Statement [
-          _{
-            Sid "EnableReadWrite"
-            Action "s3:GetObject", "s3:PutObject", "s3:PutObjectACL"
-            Effect "Allow"
-            Resource do
-              Fn__Join [
-                "",
-                [
-                  "arn:aws:s3:::",
-                  _{
-                    Ref "S3Bucket"
-                  },
-                  "/*"
-                ]
+        Statement do |*|
+          Sid "EnableReadWrite"
+          Action "s3:GetObject", "s3:PutObject", "s3:PutObjectACL"
+          Effect "Allow"
+          Resource do
+            Fn__Join [
+              "",
+              [
+                "arn:aws:s3:::",
+                _{
+                  Ref "S3Bucket"
+                },
+                "/*"
               ]
+            ]
+          end
+          Principal do
+            AWS do
+              Fn__GetAtt "S3User", "Arn"
             end
-            Principal do
-              AWS do
-                Fn__GetAtt "S3User", "Arn"
-              end
-            end
-          }
-        ]
+          end
+        end
       end
       Bucket do
         Ref "S3Bucket"
@@ -969,20 +975,16 @@ Resources do
     Type "AWS::IAM::User"
     Properties do
       Path "/"
-      Policies [
-        _{
-          PolicyName "root"
-          PolicyDocument do
-            Statement [
-              _{
-                Effect "Allow"
-                Action "s3:*"
-                Resource "*"
-              }
-            ]
+      Policies do |*|
+        PolicyName "root"
+        PolicyDocument do
+          Statement do |*|
+            Effect "Allow"
+            Action "s3:*"
+            Resource "*"
           end
-        }
-      ]
+        end
+      end
     end
   end
   S3Keys do
@@ -1002,20 +1004,16 @@ Resources do
       AvailabilityZones do
         Fn__GetAZs ""
       end
-      LBCookieStickinessPolicy [
-        _{
-          PolicyName "CookieBasedPolicy"
-          CookieExpirationPeriod "30"
-        }
-      ]
-      Listeners [
-        _{
-          LoadBalancerPort "80"
-          InstancePort "80"
-          Protocol "HTTP"
-          PolicyNames ["CookieBasedPolicy"]
-        }
-      ]
+      LBCookieStickinessPolicy do |*|
+        PolicyName "CookieBasedPolicy"
+        CookieExpirationPeriod "30"
+      end
+      Listeners do |*|
+        LoadBalancerPort "80"
+        InstancePort "80"
+        Protocol "HTTP"
+        PolicyNames ["CookieBasedPolicy"]
+      end
       HealthCheck do
         Target "HTTP:80/"
         HealthyThreshold "2"
@@ -1039,11 +1037,9 @@ Resources do
       DesiredCapacity do
         Ref "WebServerCapacity"
       end
-      LoadBalancerNames [
-        _{
-          Ref "ElasticLoadBalancer"
-        }
-      ]
+      LoadBalancerNames do |*|
+        Ref "ElasticLoadBalancer"
+      end
     end
   end
   LaunchConfig do
@@ -1166,11 +1162,9 @@ Resources do
       InstanceType do
         Ref "InstanceType"
       end
-      SecurityGroups [
-        _{
-          Ref "WebServerSecurityGroup"
-        }
-      ]
+      SecurityGroups do |*|
+        Ref "WebServerSecurityGroup"
+      end
       KeyName do
         Ref "KeyName"
       end
@@ -1316,11 +1310,9 @@ Resources do
       DBInstanceClass do
         Ref "DBClass"
       end
-      DBSecurityGroups [
-        _{
-          Ref "DBSecurityGroup"
-        }
-      ]
+      DBSecurityGroups do |*|
+        Ref "DBSecurityGroup"
+      end
       AllocatedStorage do
         Ref "DBAllocatedStorage"
       end
@@ -1344,27 +1336,25 @@ Resources do
     Type "AWS::EC2::SecurityGroup"
     Properties do
       GroupDescription "Enable HTTP access via port 80, locked down to requests from the load balancer only and SSH access"
-      SecurityGroupIngress [
-        _{
-          IpProtocol "tcp"
-          FromPort "80"
-          ToPort "80"
-          SourceSecurityGroupOwnerId do
-            Fn__GetAtt "ElasticLoadBalancer", "SourceSecurityGroup.OwnerAlias"
-          end
-          SourceSecurityGroupName do
-            Fn__GetAtt "ElasticLoadBalancer", "SourceSecurityGroup.GroupName"
-          end
-        },
-        _{
-          IpProtocol "tcp"
-          FromPort "22"
-          ToPort "22"
-          CidrIp do
-            Ref "SSHLocation"
-          end
-        }
-      ]
+      SecurityGroupIngress do |*|
+        IpProtocol "tcp"
+        FromPort "80"
+        ToPort "80"
+        SourceSecurityGroupOwnerId do
+          Fn__GetAtt "ElasticLoadBalancer", "SourceSecurityGroup.OwnerAlias"
+        end
+        SourceSecurityGroupName do
+          Fn__GetAtt "ElasticLoadBalancer", "SourceSecurityGroup.GroupName"
+        end
+      end
+      SecurityGroupIngress do |*|
+        IpProtocol "tcp"
+        FromPort "22"
+        ToPort "22"
+        CidrIp do
+          Ref "SSHLocation"
+        end
+      end
     end
   end
 end
@@ -1572,30 +1562,28 @@ Resources do
       PolicyDocument do
         Version "2008-10-17"
         Id "UploadPolicy"
-        Statement [
-          _{
-            Sid "EnableReadWrite"
-            Action "s3:GetObject", "s3:PutObject", "s3:PutObjectACL"
-            Effect "Allow"
-            Resource do
-              Fn__Join [
-                "",
-                [
-                  "arn:aws:s3:::",
-                  _{
-                    Ref "S3Bucket"
-                  },
-                  "/*"
-                ]
+        Statement do |*|
+          Sid "EnableReadWrite"
+          Action "s3:GetObject", "s3:PutObject", "s3:PutObjectACL"
+          Effect "Allow"
+          Resource do
+            Fn__Join [
+              "",
+              [
+                "arn:aws:s3:::",
+                _{
+                  Ref "S3Bucket"
+                },
+                "/*"
               ]
+            ]
+          end
+          Principal do
+            AWS do
+              Fn__GetAtt "S3User", "Arn"
             end
-            Principal do
-              AWS do
-                Fn__GetAtt "S3User", "Arn"
-              end
-            end
-          }
-        ]
+          end
+        end
       end
       Bucket do
         Ref "S3Bucket"
@@ -1606,20 +1594,16 @@ Resources do
     Type "AWS::IAM::User"
     Properties do
       Path "/"
-      Policies [
-        _{
-          PolicyName "root"
-          PolicyDocument do
-            Statement [
-              _{
-                Effect "Allow"
-                Action "s3:*"
-                Resource "*"
-              }
-            ]
+      Policies do |*|
+        PolicyName "root"
+        PolicyDocument do
+          Statement do |*|
+            Effect "Allow"
+            Action "s3:*"
+            Resource "*"
           end
-        }
-      ]
+        end
+      end
     end
   end
   S3Keys do
@@ -1639,20 +1623,16 @@ Resources do
       AvailabilityZones do
         Fn__GetAZs ""
       end
-      LBCookieStickinessPolicy [
-        _{
-          PolicyName "CookieBasedPolicy"
-          CookieExpirationPeriod "30"
-        }
-      ]
-      Listeners [
-        _{
-          LoadBalancerPort "80"
-          InstancePort "80"
-          Protocol "HTTP"
-          PolicyNames ["CookieBasedPolicy"]
-        }
-      ]
+      LBCookieStickinessPolicy do |*|
+        PolicyName "CookieBasedPolicy"
+        CookieExpirationPeriod "30"
+      end
+      Listeners do |*|
+        LoadBalancerPort "80"
+        InstancePort "80"
+        Protocol "HTTP"
+        PolicyNames ["CookieBasedPolicy"]
+      end
       HealthCheck do
         Target "HTTP:80/"
         HealthyThreshold "2"
@@ -1676,11 +1656,9 @@ Resources do
       DesiredCapacity do
         Ref "WebServerCapacity"
       end
-      LoadBalancerNames [
-        _{
-          Ref "ElasticLoadBalancer"
-        }
-      ]
+      LoadBalancerNames do |*|
+        Ref "ElasticLoadBalancer"
+      end
     end
   end
   LaunchConfig do
@@ -1829,11 +1807,9 @@ Resources do
       InstanceType do
         Ref "InstanceType"
       end
-      SecurityGroups [
-        _{
-          Ref "WebServerSecurityGroup"
-        }
-      ]
+      SecurityGroups do |*|
+        Ref "WebServerSecurityGroup"
+      end
       KeyName do
         Ref "KeyName"
       end
@@ -1979,11 +1955,9 @@ Resources do
       DBInstanceClass do
         Ref "DBClass"
       end
-      DBSecurityGroups [
-        _{
-          Ref "DBSecurityGroup"
-        }
-      ]
+      DBSecurityGroups do |*|
+        Ref "DBSecurityGroup"
+      end
       AllocatedStorage do
         Ref "DBAllocatedStorage"
       end
@@ -2007,27 +1981,25 @@ Resources do
     Type "AWS::EC2::SecurityGroup"
     Properties do
       GroupDescription "Enable HTTP access via port 80, locked down to requests from the load balancer only and SSH access"
-      SecurityGroupIngress [
-        _{
-          IpProtocol "tcp"
-          FromPort "80"
-          ToPort "80"
-          SourceSecurityGroupOwnerId do
-            Fn__GetAtt "ElasticLoadBalancer", "SourceSecurityGroup.OwnerAlias"
-          end
-          SourceSecurityGroupName do
-            Fn__GetAtt "ElasticLoadBalancer", "SourceSecurityGroup.GroupName"
-          end
-        },
-        _{
-          IpProtocol "tcp"
-          FromPort "22"
-          ToPort "22"
-          CidrIp do
-            Ref "SSHLocation"
-          end
-        }
-      ]
+      SecurityGroupIngress do |*|
+        IpProtocol "tcp"
+        FromPort "80"
+        ToPort "80"
+        SourceSecurityGroupOwnerId do
+          Fn__GetAtt "ElasticLoadBalancer", "SourceSecurityGroup.OwnerAlias"
+        end
+        SourceSecurityGroupName do
+          Fn__GetAtt "ElasticLoadBalancer", "SourceSecurityGroup.GroupName"
+        end
+      end
+      SecurityGroupIngress do |*|
+        IpProtocol "tcp"
+        FromPort "22"
+        ToPort "22"
+        CidrIp do
+          Ref "SSHLocation"
+        end
+      end
     end
   end
 end
@@ -2305,11 +2277,9 @@ Resources do
       InstanceType do
         Ref "InstanceType"
       end
-      SecurityGroups [
-        _{
-          Ref "WebServerSecurityGroup"
-        }
-      ]
+      SecurityGroups do |*|
+        Ref "WebServerSecurityGroup"
+      end
       KeyName do
         Ref "KeyName"
       end
@@ -2420,22 +2390,20 @@ Resources do
     Type "AWS::EC2::SecurityGroup"
     Properties do
       GroupDescription "Enable HTTP access via port 80 and SSH access"
-      SecurityGroupIngress [
-        _{
-          IpProtocol "tcp"
-          FromPort "80"
-          ToPort "80"
-          CidrIp "0.0.0.0/0"
-        },
-        _{
-          IpProtocol "tcp"
-          FromPort "22"
-          ToPort "22"
-          CidrIp do
-            Ref "SSHLocation"
-          end
-        }
-      ]
+      SecurityGroupIngress do |*|
+        IpProtocol "tcp"
+        FromPort "80"
+        ToPort "80"
+        CidrIp "0.0.0.0/0"
+      end
+      SecurityGroupIngress do |*|
+        IpProtocol "tcp"
+        FromPort "22"
+        ToPort "22"
+        CidrIp do
+          Ref "SSHLocation"
+        end
+      end
     end
   end
 end
@@ -2676,4 +2644,68 @@ end
   end
     EOS
   end
+
+  it 'should convert hash to dsl (include hash array)' do
+    h = {:glossary=>[
+          {:title=>"example glossary",
+           :date=>Time.parse('2016/05/21 00:00 UTC')},
+          {:title=>"example glossary2",
+           :date=>Time.parse('2016/05/21 00:01 UTC')}],
+         :glossary2=>[
+          {:title=>"example glossary",
+           :date=>Time.parse('2016/05/21 00:00 UTC')}]}
+
+    dsl = Dslh.deval(h, :time_inspecter => proc {|i| i.to_s.inspect })
+    expect(dsl).to eq(<<-EOS)
+glossary do |*|
+  title "example glossary"
+  date "2016-05-21 00:00:00 UTC"
+end
+glossary do |*|
+  title "example glossary2"
+  date "2016-05-21 00:01:00 UTC"
+end
+glossary2 do |*|
+  title "example glossary"
+  date "2016-05-21 00:00:00 UTC"
+end
+    EOS
+  end
+
+  it 'should convert dsl to hash (include hash array)' do
+    h = {:glossary=>[
+          {:title=>"example glossary",
+           :date=>Time.parse('2016/05/21 00:00 UTC')},
+          {:title=>"example glossary2",
+           :date=>Time.parse('2016/05/21 00:01 UTC')}],
+         :glossary2=>[
+          {:title=>"example glossary",
+           :date=>Time.parse('2016/05/21 00:00 UTC')}]}
+
+    hash = Dslh.eval do
+      glossary do |*|
+        title "example glossary"
+        date "2016-05-21 00:00:00 UTC"
+      end
+      glossary do |*|
+        title "example glossary2"
+        date "2016-05-21 00:01:00 UTC"
+      end
+      glossary2 do |*|
+        title "example glossary"
+        date "2016-05-21 00:00:00 UTC"
+      end
+    end
+
+    expect(hash).to eq(
+      {"glossary"=>[
+        {"title"=>"example glossary",
+         "date"=>'2016-05-21 00:00:00 UTC'},
+        {"title"=>"example glossary2",
+         "date"=>'2016-05-21 00:01:00 UTC'}],
+       "glossary2"=>[
+        {"title"=>"example glossary",
+         "date"=>'2016-05-21 00:00:00 UTC'}]}
+    )
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dslh
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Genki Sugawara