excemel 1.0.2-java → 1.1.0-java

data/Gemfile

@@ -1,10 +1,9 @@
 source "http://rubygems.org"
 
-gem 'blankslate', '~>2.1.2.4'
+gem 'blankslate', '~> 3.1.2'
 
 group :development do
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.2"
-  gem "rcov", ">= 0"
+  gem "bundler"
+  gem "simplecov"
   gem "rdoc", ">= 3.7"
 end

data/History.txt

@@ -13,4 +13,10 @@
 
 == 1.0.2
 
-- added the ability to remove attributes by passing nil as a value
+- added the ability to remove attributes by passing nil as a value
+
+== 1.1.0
+
+- upped XOM version to 1.2.9
+- upgraded blankslate dependency
+- tested with jruby 1.7.3

data/Manifest.txt

@@ -7,4 +7,4 @@ lib/excemel.rb
 lib/excemel/excemel.rb
 lib/module/lang.rb
 lib/module/xom.rb
-lib/java/xom-1.2.7.jar
+lib/java/xom-1.2.9.jar

data/{README.rdoc → README.md}

@@ -1,4 +1,6 @@
-== Project: Excemel
+# Excemel: Better XML for JRuby
+
+[![Code Climate](https://codeclimate.com/github/integrallis/excemel.png)](https://codeclimate.com/github/integrallis/excemel)
 
 Excemel is a Ruby DSL for Elliotte Rusty Harold's XOM XML library. It is based 
 on Jim Weirich's Builder. Excemel brings to JRuby the expressiveness and 
@@ -9,15 +11,15 @@ Excemel extends the semantics of Builder with methods to navigate the
 in memory XML document with XPath and exposing some of the powerful XML
 manipulation capabilities of XOM.
 
-== Usage
+## Usage
 
 See usage examples under /examples directory of this distribution
 
-== Contact
+## Contact
 
-Author::     Brian Sam-Bodden
-Email::      bsbodden@integrallis.com
-Home Page::  http://integrallis.com
-License::    MIT Licence (http://www.opensource.org/licenses/mit-license.html)
+* Author::     Brian Sam-Bodden
+* Email::      bsbodden@integrallis.com
+* Home Page::  http://integrallis.com
+* License::    MIT Licence (http://www.opensource.org/licenses/mit-license.html)
 
 

data/Rakefile

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
  
 #--
-# Copyright &169;2001-2008 Integrallis Software, LLC. 
+# Copyright &169;2001-2013 Integrallis Software, LLC. 
 # All Rights Reserved.
 # 
 # Permission is granted for use, copying, modification, distribution,
@@ -26,24 +26,6 @@ require 'rake'
 
 # --------------------------------------------------------------------
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "excemel"
-  gem.homepage = "http://github.com/bsbodden/excemel"
-  gem.license = "MIT"
-  gem.summary = "JRuby DSL for XOM"
-  gem.description = "JRuby DSL for XML Building and Manipulation with XPath & XQuery"
-  gem.email = "bsbodden@integrallis.com"
-  gem.authors = ["Brian Sam-Bodden"]
-  gem.platform = "java"
-  gem.files = FileList["History.txt", "Manifest.txt", "README.rdoc", "Gemfile", "Rakefile", "LICENSE", "lib/**/*.rb", "lib/java/*.jar"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-# --------------------------------------------------------------------
-
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
@@ -53,12 +35,10 @@ end
 
 # --------------------------------------------------------------------
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-  test.rcov_opts << '--exclude "gems/*"'
+require 'simplecov'
+SimpleCov.command_name 'Unit Tests'
+SimpleCov.start do
+  add_group "source", "lib"
 end
 
 task :default => :test

data/lib/excemel/excemel.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
- 
 #--
 # Copyright &169;2001-2008 Integrallis Software, LLC. 
 # All Rights Reserved.
@@ -23,7 +21,7 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
- 
+
 require 'rubygems' 
 require 'blankslate' 
 require 'java'
@@ -45,43 +43,11 @@ module Excemel
     # :resolve_includes => true|false replaces xi:include elements by the content they refer to
     # :namespace => provides a namespace prefix to the elements
     def initialize(options)
-      # extract options
-      validate = options[:validate] ? options[:validate] : false
-      root = options[:root]
-      xml = options[:xml]
-      url = options[:url]
-      file = options[:file]
-      namespace = options[:namespace]
-      resolve_includes = options[:resolve_includes] ? options[:resolve_includes] : false
-      
-      if root
-        unless namespace
-          @root = XOM::Element.new "#{root}"
-        else
-          @root = XOM::Element.new "#{root}", namespace
-          prefix = root.to_s.split(":").first if root.include? ":"
-          (@namespaces ||= {})[prefix] = namespace if prefix
-        end
-        
-        @doc = XOM::Document.new @root
-      else
-        builder = XOM::Builder.new validate 
-      end
-      
-      if xml
-        @doc = builder.build(xml, nil)
-      elsif url
-        @doc = builder.build url
-      elsif file
-        java_file = Lang::File.new file        
-        @doc = builder.build java_file       
-      end
+      resolve_includes = _extract_options(options, :resolve_includes, true)
       
-      if resolve_includes
-        @doc = XOM::XIncluder.resolve(@doc)
-      end
-      
-      @root = @doc.get_root_element unless @root
+      _build_document(options)
+            
+      @doc = XOM::XIncluder.resolve(@doc) if resolve_includes  
       @target = @root
     end
     
@@ -89,39 +55,10 @@ module Excemel
     # Add XML elements (tags) based on the name of the method called on the 
     # Document instance, blocks passed get processed recursively
     def method_missing(sym, *args, &block)
-      if sym.to_s != 'class' && sym.to_s != 'to_s' && sym.to_s != 'inspect' # WTF? If I don't do this I
-        text = nil                                 # end up with extraneous tags        
-        attrs = nil                                # in the resulting document!!
-        namespace = nil
-        sym = "#{sym}:#{args.shift}" if args.first.kind_of?(Symbol)
-        prefix = sym.to_s.split(":").first if sym.to_s.include? ":"
-        args.each do |arg|
-          case arg
-          when Hash
-            if arg.has_key? :namespace
-              namespace = arg[:namespace]
-              prefix = sym.to_s.split(":").first
-            else
-              attrs ||= {}
-              attrs.merge!(arg)
-            end
-          else
-            text ||= ''
-            text << arg.to_s
-          end
-        end
-        
-        # try to get the namespace from the saved namespaces
-        if prefix != nil && namespace.nil? && @namespaces != nil
-          namespace = "#{@namespaces[prefix]}"
-        end
-        
-        unless namespace
-          tag = XOM::Element.new sym.to_s
-        else
-          tag = XOM::Element.new sym.to_s, namespace
-        end 
-        
+      unless %w(class to_s inspect).include?(sym.to_s)                                      
+        sym = _extract_sym(args, sym)      
+        attrs, namespace, prefix, text = _process_args(args, sym)
+        tag = _build_tag(sym, namespace)   
         _add_attributes(tag, attrs)
         
         if block
@@ -283,6 +220,93 @@ module Excemel
       @target = old_target
     end    
     
+    def _build_tag(sym, namespace = nil)
+      unless namespace
+        tag = XOM::Element.new sym.to_s
+      else
+        tag = XOM::Element.new sym.to_s, namespace
+      end
+      tag
+    end
+    
+    def _get_namespace(prefix)
+      @namespaces ? "#{@namespaces[prefix]}" : nil
+    end
+    
+    def _extract_sym(args, sym)
+      args.first.kind_of?(Symbol) ? "#{sym}:#{args.shift}" : sym
+    end
+    
+    def _extract_prefix(sym)
+      sym.to_s.include? ":" ? sym.to_s.split(":").first : nil 
+    end
+    
+    def _process_args(args, sym)
+      attrs, namespace, text = nil
+      prefix = _extract_prefix(sym)
+      args.each do |arg|
+        case arg
+        when Hash
+          if arg.has_key? :namespace
+            namespace = arg[:namespace]
+            prefix = sym.to_s.split(":").first
+          else
+            attrs ||= {}
+            attrs.merge!(arg)
+          end
+        else
+          text ||= ''
+          text << arg.to_s
+        end
+      end
+      namespace = _get_namespace(prefix) if prefix
+      [attrs, namespace, prefix, text]
+    end
+    
+    def _extract_options(options, sym, boolean = false)
+      boolean ? (options[sym] ? options[sym] : false) : options[sym]
+    end
+    
+    def _generate_doc_from_source(options, builder)
+      doc = nil
+      xml = _extract_options(options, :xml)
+      url = _extract_options(options, :url)
+      file = _extract_options(options, :file)
+      
+      if xml
+        doc = builder.build(xml, nil)
+      elsif url
+        doc = builder.build url
+      elsif file
+        java_file = Lang::File.new file        
+        doc = builder.build java_file       
+      end
+      
+      doc
+    end
+    
+    def _build_document(options)
+      root = _extract_options(options, :root)
+      namespace = _extract_options(options, :namespace)
+      validate = _extract_options(options, :validate, true)
+      
+      if root
+        _build_document_from_root(root, namespace)
+      else
+        @doc = _generate_doc_from_source(options, XOM::Builder.new(validate))
+        @root = @doc.get_root_element
+      end
+    end
+    
+    def _build_document_from_root(root, namespace)
+      @root = _build_tag(root, namespace) 
+      if namespace
+        prefix = root.to_s.split(":").first if root.include? ":"
+        (@namespaces ||= {})[prefix] = namespace if prefix
+      end
+      @doc = XOM::Document.new @root
+    end
+    
   end 
   
 end

data/lib/module/xom.rb

@@ -25,7 +25,7 @@
 #++
  
 require 'java'
-require 'java/xom-1.2.7.jar'
+require 'java/xom-1.2.9.jar'
 
 module XOM
   include_package 'nu.xom'

metadata

@@ -1,124 +1,128 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: excemel
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.0.2
+version: !ruby/object:Gem::Version
+  prerelease:
+  version: 1.1.0
 platform: java
-authors: 
-  - Brian Sam-Bodden
-autorequire: 
+authors:
+- Brian Sam-Bodden
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2011-07-20 00:00:00 -07:00
-default_executable: 
-dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: blankslate
-    version_requirements: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: 2.1.2.4
-    requirement: *id001
-    prerelease: false
-    type: :runtime
-  - !ruby/object:Gem::Dependency 
-    name: bundler
-    version_requirements: &id002 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: 1.0.0
-    requirement: *id002
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: jeweler
-    version_requirements: &id003 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: 1.6.2
-    requirement: *id003
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: rcov
-    version_requirements: &id004 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    requirement: *id004
-    prerelease: false
-    type: :development
-  - !ruby/object:Gem::Dependency 
-    name: rdoc
-    version_requirements: &id005 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "3.7"
-    requirement: *id005
-    prerelease: false
-    type: :development
-description: JRuby DSL for XML Building and Manipulation with XPath & XQuery
+date: 2013-05-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: blankslate
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.2
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.2
+    none: false
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: bundler
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.7'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.7'
+    none: false
+  prerelease: false
+  type: :development
+description: JRuby DSL for XML Building and Manipulation with XPath
 email: bsbodden@integrallis.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-  - LICENSE
-  - README.rdoc
-files: 
-  - Gemfile
-  - History.txt
-  - LICENSE
-  - Manifest.txt
-  - README.rdoc
-  - Rakefile
-  - lib/excemel.rb
-  - lib/excemel/excemel.rb
-  - lib/java/xom-1.2.7.jar
-  - lib/module/lang.rb
-  - lib/module/xom.rb
-has_rdoc: true
+extra_rdoc_files:
+- LICENSE
+- README.md
+files:
+- Gemfile
+- History.txt
+- LICENSE
+- Manifest.txt
+- Rakefile
+- lib/excemel.rb
+- lib/excemel/excemel.rb
+- lib/java/xom-1.2.9.jar
+- lib/module/lang.rb
+- lib/module/xom.rb
+- README.md
 homepage: http://github.com/bsbodden/excemel
-licenses: 
-  - MIT
-post_install_message: 
+licenses:
+- MIT
+post_install_message:
 rdoc_options: []
-
-require_paths: 
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: !binary |-
+        MA==
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 2
-        segments: 
-          - 0
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: !binary |-
+        MA==
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.5.1
-signing_key: 
+rubyforge_project:
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
 summary: JRuby DSL for XOM
 test_files: []
-