jievro-ast 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50cd22e469c4b1fd0283aa7777c9d163032d02d7
-  data.tar.gz: e896e1c622d0a00f0d6cfec4d2fbcae9babac635
+  metadata.gz: ebd32482a1dcf426a1e265165b5378b6e7da8bbb
+  data.tar.gz: 468191cc766d63b829e675fc2792805aca7b8942
 SHA512:
-  metadata.gz: 98929235e44c35a6cc6d8766c75b175d424d9f649915d0882f9f1011681a3221343c5ee295ac68b07b5e040a19c11ff9ccd805df299ed7374daa1a7b32affc04
-  data.tar.gz: bba3556c1357d212b787ccaada0d92d6cd37b97ef171b5dd561fed80f5758f30b7d45218926c76c834785fdd51a1518a7a5b664b5296c4aa8a5e3413ce61ca3b
+  metadata.gz: 8431d195cc533931b204b6ff0be6e6eca9f6fa5935ddfdd969497d683719ae13608fe77f3be3071e4ee5838526eb68ccc3b4c282b67cf033594b6d61fc4c50a6
+  data.tar.gz: 84d519c7f63362c3728698d70672b5383072316c1b4ad08d8396a4a1887e0eaf0f82b9a43c570037a8e7e1b813c7f9e8d13f5a8406d9c855fde2d01c6b4bfaaa

data/lib/jievro/ast/node.rb

@@ -1,58 +1,42 @@
 module Jievro
   module Ast
     class Node
+      attr_reader :parent, :type, :key, :value
 
       def initialize(initializer, parent = nil, key = nil)
-
         @parent = parent
         @key = key
 
-        if initializer.is_a?(Hash)
-          initialize_using_hash(initializer)
-          return
-        end
-
-        if initializer.is_a?(Array)
-          initialize_using_array(initializer)
-          return
-        end
-
-        valid = [FalseClass, TrueClass, String, Fixnum, Float]
-
-        if valid.include? initializer.class
-          @value = initializer
-          @type = '__literal'
-          return
+        case initializer
+        when 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
+                           FalseClass, TrueClass, String,
+                           Fixnum, Float, Array or Hash.
+                           #{initializer.class} given"
         end
-
-        raise Exception, "The initializer must be #{valid.join(', ')}, Array or Hash. #{initializer.class} given"
       end
 
-      def [] (key)
-        unless @value.has_key?(key)
-          raise Exception, "Key '#{key}' is invalid"
-        end
+      def [](key)
+        fail Exception, "Key '#{key}' is invalid" \
+          unless @value.key?(key)
 
         @value[key]
       end
 
-      def parent
-        @parent
-      end
-
-      def type
-        @type
-      end
-
-      def key
-        @key
-      end
-
       def keys
         @value.keys
       end
 
       def value
+        fail Exception, 'Cannot get value from a non literal node' \
+          unless @type == '__literal'
+
         @value
       end
 
@@ -62,44 +46,35 @@ module Jievro
 
       private
 
-      def initialize_using_hash(initializer)
+      def initialize_as_literal(initializer)
+        @value = initializer
+        @type = '__literal'
+      end
 
-        unless initializer.is_a?(Hash)
-          raise Exception, 'The initializer is not a Hash'
-        end
+      def initialize_as_array(initializer)
+        @value = {}
+        @type = '__collection'
 
-        unless initializer.has_key?(:__type)
-          raise Exception, 'Initializer is missing __type value'
+        initializer.each_with_index do |e, i|
+          @value[i] = Node.new(e, self, i)
         end
+      end
 
-        @value = Hash.new
-        @type = initializer[:__type]
+      def initialize_as_hash(initializer)
+        fail Exception, 'Initializer is missing __type value' \
+          unless initializer.key?(:__type)
 
-        initializer.keys.each { |k|
+        @value = {}
+        @type = initializer[:__type]
 
+        initializer.keys.each do |k|
           key = k.to_s
 
           # skip all the meta info
-          if key.to_s.start_with?('__')
-            next
-          end
+          next if key.to_s.start_with?('__')
 
           @value[k] = Node.new(initializer[k], self, key)
-        }
-      end
-
-      def initialize_using_array(initializer)
-
-        unless initializer.is_a?(Array)
-          raise Exception, 'The initializer is not an Array'
         end
-
-        @value = Hash.new
-        @type = '__collection'
-
-        initializer.each_with_index { |e, i|
-          @value[i] = Node.new(e, self, i)
-        }
       end
     end
   end

data/lib/jievro/ast/version.rb

@@ -1,5 +1,5 @@
 module Jievro
   module Ast
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jievro-ast
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Stefano Azzalini
@@ -14,42 +14,42 @@ dependencies:
   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.4.6
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: AST model used internally by jievro-parser