xamplr-gen 1.9.10 → 1.9.11

data/Rakefile

@@ -14,7 +14,7 @@ begin
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
 
     gem.add_dependency('xamplr-pp', '>=1.2.0')
-    gem.add_dependency('xamplr', '>=1.9.8')
+    gem.add_dependency('xamplr', '>=1.9.13')
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-1.9.10
+1.9.11

data/lib/xamplr-gen/templates/element_empty.template

@@ -44,11 +44,11 @@
 |@element.attribute_child.each{ | attribute |
 |  if attribute.namespace then
 |
-                     [ :@#{attribute.name}, "#{attribute.name}", "#{attribute.namespace}" ],
+                     [ :@#{attribute.name}, "#{attribute.tag_name}", "#{attribute.namespace}" ],
 |
 |  else
 |
-                     [ :@#{attribute.name}, "#{attribute.name}" ],
+                     [ :@#{attribute.name}, "#{attribute.tag_name}" ],
 |
 |  end
 |}

data/lib/xamplr-gen/templates/element_mixed.template

@@ -44,11 +44,11 @@
 |@element.attribute_child.each{ | attribute |
 |  if attribute.namespace then
 |
-                     [ :@#{attribute.name}, "#{attribute.name}", "#{attribute.namespace}" ],
+                     [ :@#{attribute.name}, "#{attribute.tag_name}", "#{attribute.namespace}" ],
 |
 |  else
 |
-                     [ :@#{attribute.name}, "#{attribute.name}" ],
+                     [ :@#{attribute.name}, "#{attribute.tag_name}" ],
 |
 |  end
 |}

data/lib/xamplr-gen/templates/element_simple.template

@@ -44,11 +44,11 @@
 |@element.attribute_child.each{ | attribute |
 |  if attribute.namespace then
 |
-                     [ :@#{attribute.name}, "#{attribute.name}", "#{attribute.namespace}" ],
+                     [ :@#{attribute.name}, "#{attribute.tag_name}", "#{attribute.namespace}" ],
 |
 |  else
 |
-                     [ :@#{attribute.name}, "#{attribute.name}" ],
+                     [ :@#{attribute.name}, "#{attribute.tag_name}" ],
 |
 |  end
 |}

data/lib/xamplr-gen/xampl-cl-gen.rb

@@ -18,7 +18,8 @@ class ProjectGenerator
   end
 
   def print_base_filename
-    File.join(%w{ . generated })
+    #File.join(%w{ . generated })
+    'generated'
   end
 
   def print_options
@@ -172,7 +173,7 @@ _EOF_
                           :directory => directory)
 
       if okay
-        puts generator.print_elements(print_base_filename, print_options)
+        puts generator.print_elements("#{ directory }/#{ print_base_filename }", print_options)
         self.write_specialisation_file(generator.elements_map)
 
         generated_files = Dir.glob("#{ self.directory }/*.rb")
@@ -198,20 +199,19 @@ _EOF_
           #end
           #puts "WRITE TO FILE: #{ out_filename }"
 
-          if File.exists?('./generated.yuml') && (cl_options[:download_yuml_png] || cl_options[:download_yuml_pdf]) then
+          if File.exists?("#{ self.directory }/generated.yuml") && (cl_options[:download_yuml_png] || cl_options[:download_yuml_pdf]) then
             diagram = ""
-            File.open("./generated.yuml") do | f |
+            File.open("#{ self.directory }/generated.yuml") do | f |
               f.each do | line |
                 diagram << line.chomp
               end
             end
 
-
             okay = false
             if cl_options[:download_yuml_png] then
               begin
                 filename = (true == cl_options[:download_yuml_png]) ?  'generated.png' : cl_options[:download_yuml_png]
-                wget = "wget 'http://yuml.me/diagram/scruffy/class/#{diagram}' -O '#{filename}'"
+                wget = "wget 'http://yuml.me/diagram/scruffy/class/#{diagram}' -O '#{ self.directory }/#{filename}'"
                 okay = system(wget)
                 if okay then
                   puts "downloaded yuml png"

data/lib/xamplr-gen/xampl-generator.rb

@@ -573,6 +573,7 @@ module XamplGenerator
       generator.comprehend_from_files(filenames)
       generator.generate_to_directory(directory)
 
+      #TODO -- are these writing to the correct location, is this even possible to call anymore?
       generator.print_elements(write_elements) if write_elements
     end
   end

data/xamplr-gen.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xamplr-gen}
-  s.version = "1.9.10"
+  s.version = "1.9.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bob Hutchison"]
-  s.date = %q{2010-03-14}
+  s.date = %q{2010-07-14}
   s.default_executable = %q{xampl-gen}
   s.description = %q{This is the xampl code generator for Ruby.}
   s.email = %q{hutch@xampl.com}
@@ -72,7 +72,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/hutch/xamplr-gen}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{This is the xampl code generator for Ruby}
   s.test_files = [
     "test/helper.rb",
@@ -83,19 +83,19 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<cucumber>, [">= 0"])
       s.add_runtime_dependency(%q<xamplr-pp>, [">= 1.2.0"])
-      s.add_runtime_dependency(%q<xamplr>, [">= 1.9.8"])
+      s.add_runtime_dependency(%q<xamplr>, [">= 1.9.13"])
     else
       s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<xamplr-pp>, [">= 1.2.0"])
-      s.add_dependency(%q<xamplr>, [">= 1.9.8"])
+      s.add_dependency(%q<xamplr>, [">= 1.9.13"])
     end
   else
     s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<xamplr-pp>, [">= 1.2.0"])
-    s.add_dependency(%q<xamplr>, [">= 1.9.8"])
+    s.add_dependency(%q<xamplr>, [">= 1.9.13"])
   end
 end
 

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: xamplr-gen
 version: !ruby/object:Gem::Version 
-  version: 1.9.10
+  hash: 37
+  prerelease: false
+  segments: 
+  - 1
+  - 9
+  - 11
+  version: 1.9.11
 platform: ruby
 authors: 
 - Bob Hutchison
@@ -9,39 +15,55 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-14 00:00:00 -05:00
+date: 2010-07-14 00:00:00 -04:00
 default_executable: xampl-gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cucumber
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: xamplr-pp
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 2
+        - 0
         version: 1.2.0
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: xamplr
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.9.8
-    version: 
+        hash: 41
+        segments: 
+        - 1
+        - 9
+        - 13
+        version: 1.9.13
+  type: :runtime
+  version_requirements: *id003
 description: This is the xampl code generator for Ruby.
 email: hutch@xampl.com
 executables: 
@@ -111,21 +133,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: This is the xampl code generator for Ruby