inidol 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a210656292325922a490e94132fc8f0af77d842
-  data.tar.gz: 137a76d65bf0ba946625a6de3bd82ae1052c2d7f
+  metadata.gz: 34b81768e0e3a7c6b7f8ccba6caea3dbb590d6fc
+  data.tar.gz: 3d848d947252d17175ebd5398d00b5a7bebeb59e
 SHA512:
-  metadata.gz: c6fadb6fa6505390d2449c733d4b1340e92e01da449475bac8de64302f5ba39b20c60409f650ecb3866a6b7f3b9e44f0d025e8b93e5b836ae448435dba57e281
-  data.tar.gz: 12c03c2a758d591addd37bb7c8b1d8dcff8e42347347289d2ec7fd3bdcc17368b51c1eb92d81b97ee2693d1c2c975f1ba0e90d08b7b97e9d1cea25fdd9db4b92
+  metadata.gz: d77c89595b8b9074ae5f9f4533d07e8e8ac1541d1a18f105c8d0fd9af8253a412a521794460c6d1d1cc81405aec62f8f0a891a153158271eabe45b80ac3eaaaf
+  data.tar.gz: efe7e8cb8a50298ae476d68f7cb4a5fe5632d5df292fc539d7501003392018cdeec36eadf7527a36152a1698ddb3893d1849f477b3f316475d2a6e3c3dadffcf

data/lib/inidol.rb

@@ -47,15 +47,20 @@ class INIHash < BabelBridge::Parser
     end
   end
 
-  rule :property, :name, '=', :values, :comment? do
+  rule :property, :names, '=', :types, :comment? do
     def evaluate
-      value = values.evaluate
-      parser.current?[name.evaluate] = value.size <= 1 ? value[0] : value
+      current = parser.current?[names.evaluate]
+
+      if current.instance_of?(Array)
+        current << types.evaluate
+      else
+        parser.current?[names.evaluate] = types.evaluate  
+      end
     end
   end
 
-  rule :values, any(:array, :types)
-  rule :types, any(:int, :bool, :string, :content)
+  rule :names, any(:array, :name)
+  rule :types, any(:float, :int, :bool, :string, :content)
 
   rule :int,/[-]?[0-9]+/ do
     def evaluate
@@ -63,6 +68,24 @@ class INIHash < BabelBridge::Parser
     end 
   end
 
+  rule :dot_digits, many(/\.[0-9]+/) do
+    def evaluate
+      to_s.split(".")[1..-1]
+    end
+  end
+
+  rule :float, :int, :dot_digits do
+    def evaluate 
+      after_dot = dot_digits.evaluate
+
+      if after_dot.size <= 1
+        (int.evaluate.to_s + "." + after_dot[0]).to_f
+      else
+        int.evaluate.to_s + "." + after_dot.join('.')
+      end
+    end
+  end
+
   rule :bool, /true|false/ do
     def evaluate
       to_s == 'true'
@@ -75,15 +98,16 @@ class INIHash < BabelBridge::Parser
     end
   end
 
-  rule :content, /[^\n\=\[\]";#,]+/ do
+  rule :content, /[^\n\=\[\]";#]+/ do
     def evaluate
-      to_s.chomp
+      to_s.chomp.strip
     end 
   end
 
-  rule :array, many(:types, ',') do
+  rule :array, :name, '[]' do
     def evaluate
-      types.map { |value| value.evaluate }
+      parser.current?[name.evaluate] = [] if not parser.current?[name.evaluate].instance_of?(Array)
+      name.evaluate.to_sym
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inidol
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - homonoid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-16 00:00:00.000000000 Z
+date: 2017-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: babel_bridge
@@ -24,7 +24,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-description: Inidol is for Hash -> INI converting
+description: Inidol is for Hash -> INI and back converting
 email: 
 executables: []
 extensions: []