citero-jruby 1.2.0 → 2.1.0

data/lib/citero-jruby/CSF.rb

@@ -1,3 +1,4 @@
+require 'citero-jruby/core_ext'
 module Citero
   
   # Java is required in this module.
@@ -23,7 +24,7 @@ module Citero
         #Defines the method and caches it to the class
         self.class.send(:define_method, meth) do
           # Splits the method and parameter. See formatize and directionize
-          @csf::config()::getStringArray(meth.to_s).to_a
+          @csf::config()::getStringArray(meth.to_s.to_java_name).to_a
         end
         # calls the method
         send meth, *args, &block
@@ -44,13 +45,13 @@ module Citero
     # Private method. Checks to see if the method name is a valid key
     # for the configuration file.
     def matches? meth
-      @csf::config()::containsKey(meth.to_s)
+      @csf::config()::containsKey(meth.to_s.to_java_name)
     end
     private :matches?
     
     # A list of keys that is available in this properties configuration
     def keys
-      @keys ||= Array.new(@csf::config()::getKeys.collect {|key| key})
+      @keys ||= Array.new(@csf::config()::getKeys.collect {|key| key.to_ruby_name})
     end
   end
 end

data/lib/citero-jruby/base.rb

@@ -4,6 +4,7 @@ module Citero
 
   # Import of an important java enum type
   java_import Java::EduNyuLibraryCitero::Formats
+  java_import Java::EduNyuLibraryCitero::CitationStyles
 
   # Calling the map method creates a new instance of the Base class, with splatter operator passed in
   def self.map *args
@@ -20,6 +21,11 @@ module Citero
     @from_formats ||= formats :isSourceFormat
   end
   
+  # List of available Citation Styles Citero can exports to as a module class method for quick checks.
+  def self.citation_styles
+    @citation_styles ||= CitationStyles::values.collect {|style| style.name.downcase}
+  end
+  
   private
   def self.formats meth
     Formats::values.select {|format| format.send(meth) }.collect {|format| format.name.downcase}
@@ -111,7 +117,7 @@ module Citero
     # that can accept the formats, and checks to see if the formats are in a list
     # of formats as defined by the Java enum Format.
     def matches? meth
-      directions.include? directionize(meth) and method("#{directionize(meth)}_formats").call.include? formatize(meth)
+      directions.include?(directionize(meth)) && (method("#{directionize(meth)}_formats").call.include?(formatize(meth)) || Citero.citation_styles.include?(formatize(meth)))
     end
     private :matches?
     

data/lib/citero-jruby/core_ext.rb

@@ -0,0 +1,12 @@
+String.class_eval do
+  def to_java_name
+    if self.include? '_'
+      self.gsub(/(_[a-z])/) { $1[1].capitalize }
+    else
+      self
+    end
+  end
+  def to_ruby_name
+    (self.gsub(/([A-Z])/) { "_"+$1 }).downcase
+  end
+end

data/lib/citero-jruby/version.rb

@@ -1,4 +1,4 @@
 module Citero
   # Citeros current version
-  VERSION = "1.2.0"
+  VERSION = "2.1.0"
 end

metadata

@@ -2,14 +2,14 @@
 name: citero-jruby
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 1.2.0
+  version: 2.1.0
 platform: ruby
 authors:
 - hab278
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -150,6 +150,7 @@ files:
 - lib/citero-jruby.rb
 - lib/citero-jruby/base.rb
 - lib/citero-jruby/citero.jar
+- lib/citero-jruby/core_ext.rb
 - lib/citero-jruby/CSF.rb
 - lib/citero-jruby/version.rb
 - Rakefile