jievro-ast 0.5.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca0d93bc074485e2ba45a4c1bb4c08f5eb1ee7af
-  data.tar.gz: df3dd857a330104d2d4fdff7513bfa33e25108d2
+  metadata.gz: 49d9fe0ebd50c3c84a6de1eaa46c779a8d11477a
+  data.tar.gz: c73e464fb408e2eaa2df994b72df41ee454ba35d
 SHA512:
-  metadata.gz: 884d3b767545f81a4f20ee8aa57131fa5fc56d936e155075c81984e4fe02b67c442fd902cdfc6429657a2a86bb5f04a86c17848f530ef635e37c17467fe7885d
-  data.tar.gz: 39717a5271a2dcf3de6fc22163933c1897a77c6fe013a04d4715b5dfa7c739d2893760b4f38073a0cdec9965bd00d99f5a849fe9caf0f593b220ac8778065a42
+  metadata.gz: 5ccd7c52df8befc996f614267283f649b744fa81cfc80dab1703620754152863711a40342144f47fbcb3bb423f4bf440f9b8c4890fb54c5810092de45ec51a85
+  data.tar.gz: 9b6fc18a26281e6d18c651a3689d34d16fec5ce72bcc4d74eb4923190fb84c58c21bc5830728c97ab62de6335f3d486a287f8a4f22d37f14350f2951b7c915ca

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jievro-ast (0.5.0)
+    jievro-ast (0.7.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/jievro/ast/node.rb

@@ -1,27 +1,37 @@
 module Jievro
   module Ast
     class Node
-      TYPE_LITERAL = '__literal'
-      TYPE_COLLECTION = '__collection'
+      attr_reader :id, :parent, :type
 
-      attr_reader :parent, :type, :value
+      def initialize(initializer, parent = nil)
+        fail Exception, 'The initializer must be Hash' \
+          unless initializer.is_a?(Hash)
 
-      def initialize(initializer, parent = nil, key = nil)
+        fail Exception, 'Initializer is missing __type value' \
+          unless initializer.key?(:__type)
+
+        @id = Ast::Node.generate_next_id
         @parent = parent
-        @key = key
+        @value = {}
+        @type = initializer[:__type]
 
-        case initializer
-        when NilClass, FalseClass, TrueClass, String, Fixnum, Float
-          initialize_as_literal(initializer)
-        when Array
-          initialize_as_array(initializer)
-        when Hash
-          initialize_as_hash(initializer)
-        else
-          fail Exception, "The initializer must be
-                           NilClass, FalseClass, TrueClass, String,
-                           Fixnum, Float, Array or Hash.
-                           #{initializer.class} given"
+        initializer.keys.each do |k|
+          next if k == :__type
+
+          value = initializer[k]
+
+          if literal?(value)
+            @value[k] = value
+          else
+            if array?(value)
+              @value[k] = []
+              value.each_with_index do |v, i|
+                @value[k][i] = Node.new(v, self)
+              end
+            else
+              @value[k] = Node.new(value, self)
+            end
+          end
         end
       end
 
@@ -32,25 +42,12 @@ module Jievro
         @value[key]
       end
 
-      def key
-        @key.to_s
-      end
-
       def keys
         @value.keys
       end
 
-      def value
-        fail Exception, 'Cannot get value from a non literal node' \
-          unless @type == TYPE_LITERAL
-
-        @value
-      end
-
       def serialize
-        return @value if type == TYPE_LITERAL
-
-        if type == TYPE_COLLECTION
+        if array?(@value)
           serialized = []
         else
           serialized = {
@@ -59,7 +56,18 @@ module Jievro
         end
 
         each_with_index do |v, k|
-          serialized[k] = v.serialize
+          if literal?(v)
+            serialized[k] = v
+          else
+            if array?(v)
+              serialized[k] = []
+              v.each_with_index do |w, i|
+                serialized[k][i] = w.serialize
+              end
+            else
+              serialized[k] = v.serialize
+            end
+          end
         end
 
         serialized
@@ -72,9 +80,6 @@ module Jievro
       end
 
       def each_with_index
-        fail Exception, 'Cannot iterate a literal node' \
-          if @type == TYPE_LITERAL
-
         @value.keys.each do |v|
           yield @value[v], v
         end
@@ -82,33 +87,23 @@ module Jievro
 
       private
 
-      def initialize_as_literal(initializer)
-        @value = initializer
-        @type = TYPE_LITERAL
-      end
-
-      def initialize_as_array(initializer)
-        @value = {}
-        @type = TYPE_COLLECTION
-
-        initializer.each_with_index do |e, i|
-          @value[i] = Node.new(e, self, i)
+      def literal?(value)
+        case value
+        when NilClass, FalseClass, TrueClass, String, Fixnum, Float
+          return true
+        else
+          return false
         end
       end
 
-      def initialize_as_hash(initializer)
-        fail Exception, 'Initializer is missing __type value' \
-          unless initializer.key?(:__type)
-
-        @value = {}
-        @type = initializer[:__type]
-
-        initializer.keys.each do |k|
-          # skip all the meta info
-          next if k.to_s.to_s.start_with?('__')
+      def array?(value)
+        value.is_a?(Array)
+      end
 
-          @value[k] = Node.new(initializer[k], self, k)
-        end
+      def self.generate_next_id
+        @id = 0 if @id.nil?
+        @id += 1
+        @id
       end
     end
   end

data/lib/jievro/ast/version.rb

@@ -1,5 +1,5 @@
 module Jievro
   module Ast
-    VERSION = '0.5.0'
+    VERSION = '0.8.0'
   end
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: jievro-ast
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Stefano Azzalini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-08 00:00:00.000000000 Z
+date: 2015-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
 description: 
@@ -58,8 +58,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -79,17 +79,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ~>
+  - - "~>"
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: AST model used internally by jievro-parser