hutch-xamplr 1.3.8 → 1.3.9

data/Rakefile

@@ -11,7 +11,7 @@ begin
     gem.authors = ["Bob Hutchison"]
     gem.rubyforge_project = 'xampl'
 
-    gem.add_dependency('xamplr-pp', '>=1.0.0')
+    gem.add_dependency('hutch-xamplr-pp', '>=1.1.0')
     gem.add_dependency('libxml-ruby', '>=1.1.3')
 
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
 :minor: 3
-:patch: 8
+:patch: 9

data/lib/xamplr/from-xml.rb

@@ -4,9 +4,9 @@ module Xampl
 
   class FromXML
 
-    attr :checkWellFormed, false
-    attr :is_realising, false
-    attr :tokenise_content, false
+    attr :checkWellFormed #1.9.1 , false
+    attr :is_realising #1.9.1 , false
+    attr :tokenise_content #1.9.1 , false
 
     @reader = nil
 

data/lib/xamplr/xampl-generator.rb

@@ -45,14 +45,14 @@ module XamplGenerator
             "xamplr/templates/package.template",
     ]
 
-    def initialize(options = nil, *predefined_elements)
+    def initialize(options_in = nil, *predefined_elements)
       @elements_map = {}
       @xpp = nil
       @templates = nil
       @generated_package_map = nil
 
-      if options then
-        @options = options
+      if options_in then
+        @options = options_in
       else
         @options = Xampl.make(Options) do |options|
           options.new_index_attribute("id")
@@ -366,7 +366,8 @@ module XamplGenerator
       name.gsub!(/[A-Z]/, "_\\&")
       name.gsub!(/__+/, "_")
       class_name = ""
-      name.each("_") do |chunk|
+      #name.each("_") do |chunk|
+      name.split("_").each do |chunk|
         class_name << chunk.capitalize
       end
       class_name.gsub!("_", "")

data/xamplr.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xamplr}
-  s.version = "1.3.8"
+  s.version = "1.3.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bob Hutchison"]
@@ -263,14 +263,14 @@ Gem::Specification.new do |s|
     s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<xamplr-pp>, [">= 1.0.0"])
+      s.add_runtime_dependency(%q<xamplr-pp>, [">= 1.1.0"])
       s.add_runtime_dependency(%q<libxml-ruby>, [">= 1.1.3"])
     else
-      s.add_dependency(%q<xamplr-pp>, [">= 1.0.0"])
+      s.add_dependency(%q<xamplr-pp>, [">= 1.1.0"])
       s.add_dependency(%q<libxml-ruby>, [">= 1.1.3"])
     end
   else
-    s.add_dependency(%q<xamplr-pp>, [">= 1.0.0"])
+    s.add_dependency(%q<xamplr-pp>, [">= 1.1.0"])
     s.add_dependency(%q<libxml-ruby>, [">= 1.1.3"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hutch-xamplr
 version: !ruby/object:Gem::Version 
-  version: 1.3.8
+  version: 1.3.9
 platform: ruby
 authors: 
 - Bob Hutchison
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.0
+        version: 1.1.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: libxml-ruby