scaffold_parser 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f042c0e917538cbf64c26da83731d871a9b024d
-  data.tar.gz: 74d9920de765dab0b8daa84774a740f8f9e0c4d7
+  metadata.gz: 96091a0980204269f8a932357cb225cd1d2d9ae8
+  data.tar.gz: 7ab015075a04be35f3199cfd399b6b14747b1bdd
 SHA512:
-  metadata.gz: 50d8898fce80d67adb3451646ac39e9ba46dcb669a36803e0d1550dc1f43a100443a290dfef9d8870cdb658bb190f60139b5559f7b2928cfd4b8914710662c0e
-  data.tar.gz: e753b2f92964c5efd0d566312f8599f24bb9a3475bef511267b9d45f99d3b0d0c131f0617dd9f7942fecf93dcdf9994b5a06c1120714a95b08908641e8399573
+  metadata.gz: df55b57182decf235dca79704cef3238b60330143620ddf55ab351126ff4c6457d42fe00724e7bcd92193db3b25a73d5b5aa636014b6a3dc75765ba8dd812963
+  data.tar.gz: 61fa3c5464cd7c0e8970daa7d96f7a113e238e11ea0362d0cece1b679a1ae86a4607ab48428b26195fcb9060dd34c7eea797843b04a3df2f655c1ed03c302304

data/lib/scaffold_parser/scaffolders/xsd/parser/handlers/at_method.rb

@@ -7,6 +7,22 @@ module ScaffoldParser
             include BaseMethod
             include Utils
 
+            def to_s
+              f = StringIO.new
+
+              f.puts "def #{method_name}"
+              f.puts indent(method_body.lines).join
+              f.puts "end"
+
+              f.puts
+
+              f.puts "def #{method_name}_attributes"
+              f.puts "  attributes_at '#{at}'"
+              f.puts "end"
+
+              f.string.strip
+            end
+
             def method_body
               "at '#{at}'"
             end
@@ -15,12 +31,13 @@ module ScaffoldParser
               [source.xmlns_prefix, "#{source.name}"].compact.join(':')
             end
 
-            def to_h_with_attrs_method
-              "hash[:#{method_name}] = #{method_name} if has? '#{at}'"
+            def to_h_method
+              "hash[:#{method_name}] = #{method_name} if has? '#{at}'\n"\
+                "hash[:#{method_name}_attributes] = #{method_name}_attributes if has? '#{at}'"
             end
 
             def to_builder
-              "root << build_element('#{at}', data[:#{method_name}]) if data.key? :#{method_name}"
+              "root << build_element('#{at}', data[:#{method_name}], data[:#{method_name}_attributes]) if data.key? :#{method_name}"
             end
 
             def sequence(_)

data/lib/scaffold_parser/scaffolders/xsd/parser/handlers/klass.rb

@@ -56,10 +56,15 @@ module ScaffoldParser
                 f.puts if methods.any?
                 f.puts methods.map { |method| indent(method.to_s.lines).join  }.join("\n\n")
                 f.puts if methods.any?
-                f.puts "  def to_h_with_attrs"
-                f.puts "    hash = ParserCore::HashWithAttributes.new({}, attributes)"
+                f.puts "  def to_h"
+                f.puts "    hash = {}"
+                f.puts "    hash[:attributes] = attributes"
                 f.puts
-                methods.each { |method| f.puts "    #{method.to_h_with_attrs_method}" }
+                methods.each do |method|
+                  method.to_h_method.lines.each do |line|
+                    f.puts "    #{line}"
+                  end
+                end
                 f.puts if methods.any?
                 if includes.any?
                   f.puts "    mega.inject(hash) { |memo, r| memo.merge r }"
@@ -96,8 +101,8 @@ module ScaffoldParser
               f.puts
               f.puts "  def builder"
               f.puts "    root = Ox::Element.new(name)"
-              f.puts "    if data.respond_to? :attributes"
-              f.puts "      data.attributes.each { |k, v| root[k] = v }"
+              f.puts "    if data.key? :attributes"
+              f.puts "      data[:attributes].each { |k, v| root[k] = v }"
               f.puts "    end"
               f.puts
               if inherit_from

data/lib/scaffold_parser/scaffolders/xsd/parser/handlers/list_method.rb

@@ -24,11 +24,11 @@ module ScaffoldParser
               [source.xmlns_prefix, "#{source.name}"].compact.join(':')
             end
 
-            def to_h_with_attrs_method
+            def to_h_method
               if item_class == 'String'
                 "hash[:#{method_name}] = #{method_name} if has? '#{name_with_prefix}'"
               else
-                "hash[:#{method_name}] = #{method_name}.map(&:to_h_with_attrs) if has? '#{name_with_prefix}'"
+                "hash[:#{method_name}] = #{method_name}.map(&:to_h) if has? '#{name_with_prefix}'"
               end
             end
 

data/lib/scaffold_parser/scaffolders/xsd/parser/handlers/module.rb

@@ -35,10 +35,15 @@ module ScaffoldParser
                   methods.each { |method| template.methods << indent(method.to_s.lines).join  }
 
                   meth = StringIO.new
-                  meth.puts "  def to_h_with_attrs"
-                  meth.puts "    hash = ParserCore::HashWithAttributes.new({}, attributes)"
+                  meth.puts "  def to_h"
+                  meth.puts "    hash = {}"
+                  meth.puts "    hash[:attributes] = attributes"
                   meth.puts
-                  methods.each { |method| meth.puts "    #{method.to_h_with_attrs_method}" }
+                  methods.each do |method|
+                    method.to_h_method.lines.each do |line|
+                      meth.puts "    #{line}"
+                    end
+                  end
                   meth.puts
                   meth.puts "    hash"
                   meth.puts "  end"
@@ -60,8 +65,8 @@ module ScaffoldParser
                   meth = StringIO.new
                   meth.puts "  def builder"
                   meth.puts "    root = Ox::Element.new(name)"
-                  meth.puts "    if data.respond_to? :attributes"
-                  meth.puts "      data.attributes.each { |k, v| root[k] = v }"
+                  meth.puts "    if data.key? :attributes"
+                  meth.puts "      data[:attributes].each { |k, v| root[k] = v }"
                   meth.puts "    end"
                   meth.puts
                   meth.puts methods.map { |method| indent(indent(method.to_builder.lines)).join  }.join("\n")

data/lib/scaffold_parser/scaffolders/xsd/parser/handlers/proxy_list_method.rb

@@ -22,11 +22,11 @@ module ScaffoldParser
               [source.xmlns_prefix, "#{source.name}"].compact.join(':')
             end
 
-            def to_h_with_attrs_method
+            def to_h_method
               if item_class == 'String'
                 "hash[:#{method_name}] = #{method_name} if has? '#{name_with_prefix}'"
               else
-                "hash[:#{method_name}] = #{method_name}.map(&:to_h_with_attrs) if has? '#{name_with_prefix}'"
+                "hash[:#{method_name}] = #{method_name}.map(&:to_h) if has? '#{name_with_prefix}'"
               end
             end
 

data/lib/scaffold_parser/scaffolders/xsd/parser/handlers/submodel_method.rb

@@ -32,8 +32,8 @@ module ScaffoldParser
               [source.xmlns_prefix, "#{method_name}"].compact.join(':')
             end
 
-            def to_h_with_attrs_method
-              "hash[:#{method_name}] = #{method_name}.to_h_with_attrs if has? '#{at}'"
+            def to_h_method
+              "hash[:#{method_name}] = #{method_name}.to_h if has? '#{at}'"
             end
 
             def to_builder

data/scaffold_parser.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'scaffold_parser'
-  spec.version       = '0.7.0'
+  spec.version       = '0.8.0'
   spec.authors       = ['Premysl Donat']
   spec.email         = ['pdonat@seznam.cz']
 
@@ -19,12 +19,13 @@ Gem::Specification.new do |spec|
   spec.executables   = ['scaffold_parser']
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_dependency 'xsd_model'
+  spec.add_dependency 'activesupport'
+
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'pry-byebug'
-  spec.add_development_dependency 'nokogiri'
-  spec.add_development_dependency 'activesupport'
   spec.add_development_dependency 'saharspec'
 end

metadata

@@ -1,59 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: scaffold_parser
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Premysl Donat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-12 00:00:00.000000000 Z
+date: 2018-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: xsd_model
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="