odm 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d0492cc264952b0257f26144c4d44845b4e4772
-  data.tar.gz: 67517e6cf32613e3b19c3533fa17fd10f566be68
+  metadata.gz: 9518ac3935b8d592921d9860e3910b06c1c4c2e7
+  data.tar.gz: dc28868ab840a32090382e233b70ca3c46a312af
 SHA512:
-  metadata.gz: 7bd7befd4a122576f1ba3ea5a6c8d9572f6faf300d6cb4fef551832c9c3ea6c887c5883a8370d84134c2a74459a4a86a1e34ef0e8b4159515e2ca7d26674492f
-  data.tar.gz: a13ddc9a3d73eb680763402b618e3862cd3eccc91ef2c123c8e62f7e6cbc59cfd89d66700a76ceef6231800868e4e0b59e83c9197f09e0a38e6beae93273e45b
+  metadata.gz: dd37c2a91f436337dedb2576ba0014b1b0aa60554d31608b887f9450b54ec118fba1f864cd87df409313d93d758b38907dee10761260cf5438beff9403b1a2df
+  data.tar.gz: 4768bc4d5dbe749a7fe49926860855cb553475926c69324432e5393aacae613004157a036c066fa96d68c1718ea8e4ade655240faf4382b2ee1f0efd2f217b08

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/examples/level.rb

@@ -0,0 +1,31 @@
+require_relative "../lib/odm"
+
+class ARRAYDEF < Array
+end
+
+class ARRAY1 < Array
+end
+
+class ARRAY2 < Array
+end
+
+#>              for deepness level 0  |  for deepness level 1
+odm= ODM.new(     { array: ARRAY1 },      { array: ARRAY2 }   ) do |opts|
+
+  # defaults for else places (if block not given, no parse will be made)
+  opts.array= ARRAYDEF
+
+end
+#> else -> use core classes
+
+
+obj= [[[]]]
+var= odm.parse obj
+
+
+puts obj.inspect
+puts [obj.class,obj[0].class,obj[0][0].class].join(', '),"\n"
+
+puts var.inspect
+puts [var.class,var[0].class,var[0][0].class].join(', ')
+

data/examples/{test.rb → parse.rb}

@@ -16,7 +16,8 @@ odm= ODM.new do |opts|
 end
 
 var= odm.parse [ {hello: {"world" => "hey!"} }, 123 ]
-puts [var.class,var[0].class,var[0][:hello].keys[0].class].join(', ')
+puts [var[0][:hello]["world"].class,var.class,var[0].class,var[0][:hello].keys[0].class].join(', ')
+
 
 require 'yaml'
 yaml_data= [ {hello: {"world" => "hey!"} }, 123 ].to_yaml

data/lib/odm.rb

@@ -38,7 +38,7 @@ module ODM
       define_method(core_class.to_s.downcase+"=") do |klass|
         raise(ArgumentError,"Invalid object for class: #{klass}") unless klass.class == ::Class
         raise(ArgumentError,"Invalid parse class: #{klass}, must be or subclass of the #{core_class} class") unless klass <= core_class
-        self.instance_variable_set( "@#{core_class.to_s.downcase}", klass )
+        self.instance_variable_set( "@#{core_class.to_s.downcase}", klass ) unless self.instance_variable_get("@#{core_class.to_s.downcase}") == klass
       end
 
       define_method(core_class.to_s.downcase) do
@@ -47,43 +47,97 @@ module ODM
 
     end
 
+    def __default__
+      ODM::CoreClasses.each{ |klass| self.instance_variable_set( "@#{klass.to_s.downcase}", nil ) }
+      __block__
+    end
+
+    def __block__
+      @block.call(self) unless @block.nil?
+    end
+
     def method_missing *args
       return nil
     end
 
-    def initialize &block
-      block.call(self)
+    def class_leveler(level)
+
+      self.__default__
+      unless @class_levels.empty?
+        unless @class_levels[level].nil?
+          @class_levels[level].each{|from_class,to_class| self.__send__( "#{from_class}=",to_class) }
+        end
+      end
+
+    end
+
+    def initialize *args, &block
+
+      @class_levels= args.select{|e|(e.class <= Hash)}.select{|hsh|(hsh.keys - ODM::CoreClasses.map{|e|e.to_s.downcase.to_sym}).empty?}
+      @block= block
+
+      __block__
+
     end
 
   end
 
   class Parser
 
-    def initialize &block
-      @class= Classes.new(&block)
+    def initialize *args, &block
+
+      @classes_instance= Classes.new(*args,&block)
+
+      #> set deepness level to 1
+      @level= 0
+
     end
 
-    def parse!(obj)
+
+    def parse(obj,*args,&block)
+
+      # duplicate obj
+      begin
+        obj= obj.dup
+      rescue Exception
+        begin
+          obj= obj.clone
+        rescue TypeError
+        end
+      end
+
+
+      @classes_instance.class_leveler(@level)
 
       case ODM::Helper.class?( obj.class ).to_s.downcase.to_sym
 
         when :array
-          var=  @class.__send__(ODM::Helper.class?( obj.class ).to_s.downcase)[ *obj.map!{ |e| self.parse!(e) } ]
-          begin; var.__send__( :initialize, obj ) ;rescue ::NoMethodError,::ArgumentError ;end
+          klass=  @classes_instance.__send__(ODM::Helper.class?( obj.class ).to_s.downcase)
+          return obj if klass.nil?
+
+          @level += 1
+          var= klass[ *obj.map!{ |e| self.parse(e) } ]
+          @level -= 1
+
           return var
 
         when :hash
-          var= @class.__send__(ODM::Helper.class?( obj.class ).to_s.downcase)[ *obj.map{ |k,v| { self.parse!(k) => self.parse!(v) } } ]
-          begin; var.__send__( :initialize, obj ) ;rescue ::NoMethodError,::ArgumentError ;end
+          klass=  @classes_instance.__send__(ODM::Helper.class?( obj.class ).to_s.downcase)
+          return obj if klass.nil?
+
+          @level += 1
+          var= klass[ *obj.map{ |k,v| { self.parse(k) => self.parse(v) } } ]
+          @level -= 1
+
           return var
 
         else
 
           begin
 
-            klass= @class.__send__(ODM::Helper.class?( obj.class ).to_s.downcase)
+            klass= @classes_instance.__send__(ODM::Helper.class?( obj.class ).to_s.downcase)
             return obj if klass.nil?
-            return klass.new(obj)
+            return klass.new(obj) #> ,*args,&block
 
           rescue ::NoMethodError, ::ArgumentError
             return obj
@@ -93,36 +147,40 @@ module ODM
 
     end
 
-    def parse(obj)
-      self.parse!(obj.dup)
-    end
 
-    def parse_json(obj)
+    def parse_json(obj,*args)
       require 'json'
-      self.parse(JSON.parse(obj))
+      self.parse(JSON.parse(obj),*args,&block)
     end
 
-    def parse_yaml(obj)
+    def parse_yaml(obj,*args)
       require 'yaml'
-      self.parse(YAML.load(obj))
+      self.parse(YAML.load(obj),*args,&block)
     end
 
     alias parse_yml parse_yaml
 
-    def parse_safe_yaml(obj)
+    def parse_safe_yaml(obj,*args)
       require 'yaml'
-      self.parse(YAML.safe_load(obj))
+      self.parse(YAML.safe_load(obj),*args,&block)
     end
 
     alias parse_safe_yml parse_safe_yaml
 
+    def test obj
+
+      require 'mpatch'
+      @classes_instance.conv2hash
+
+    end
+
   end
 
   # SyntaxSugar
   class << self
 
-    def new(&block)
-      Parser.new(&block)
+    def new(*args,&block)
+      Parser.new(*args,&block)
     end
 
     alias gen     new

data/odm.gemspec

@@ -9,6 +9,8 @@ Gem::Specification.new do |spec|
   spec.description   = %q{ Simple Object Data Mapper. Parse Array of Hash into random Class of classes to make it more object oriented }
   spec.summary       = %q{ Simple Object Data Mapper }
 
+  spec.homepage      = "https://github.com/adamluzsi/odm"
+
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: odm
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Adam Luzsi
@@ -52,10 +52,11 @@ files:
 - README.md
 - Rakefile
 - VERSION
-- examples/test.rb
+- examples/level.rb
+- examples/parse.rb
 - lib/odm.rb
 - odm.gemspec
-homepage: 
+homepage: https://github.com/adamluzsi/odm
 licenses: []
 metadata: {}
 post_install_message: