citeproc 0.0.9 → 1.0.0.pre1

data/.travis.yml

@@ -5,9 +5,17 @@ rvm:
   - 1.9.3
   - jruby-18mode
   - jruby-19mode
-#  - rbx-18mode
-#  - rbx-19mode
+  - rbx-18mode
+  - rbx-19mode
   - 1.8.7
   - ree
 notifications:
-  email: false
+  email:
+    - i@nukshuk.io
+  on_success: change
+  on_failure: always
+matrix:
+  allow_failures:
+    rvm:
+      - rbx-18mode
+      - rbx-19mode

data/Gemfile

@@ -12,6 +12,13 @@ group :optional do
 	gem 'bibtex-ruby', '~>2.0.10', :require => 'bibtex'
 	
   gem 'simplecov', '~>0.6.4'
+
+  gem 'guard', '~>1.2'
+  gem 'guard-rspec', '~>1.1'
+  gem 'guard-cucumber', '~>1.2'
+
+	gem 'yard', '~>0.8', :platforms => [:mri_19]
+	gem 'redcarpet', '~>2.1', :platforms => [:mri_19]
   
   gem 'unicode_utils', '~>1.3.0', :platform => :mri_19
   gem 'unicode', '~>0.4.2', :platform => :mri_18

data/Guardfile

@@ -0,0 +1,14 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { 'spec' }
+end
+
+guard 'cucumber' do
+  watch(%r{^features/.+\.feature$})
+  watch(%r{^features/support/.+$})          { 'features' }
+  watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }
+end

data/citeproc.gemspec

@@ -25,11 +25,9 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('multi_json', '~>1.3.5')
   s.add_runtime_dependency('namae', '~>0.1')
   
-  s.add_development_dependency('cucumber', ['~>1.2.0'])
-  s.add_development_dependency('rspec', ['~>2.10.0'])
-  s.add_development_dependency('watchr', ['~>0.7'])
-  s.add_development_dependency('rake', ['~>0.9.2'])
-  s.add_development_dependency('yard', ['~>0.8.1'])
+  s.add_development_dependency 'cucumber', '~>1.2'
+  s.add_development_dependency 'rspec', '~>2.7'
+  s.add_development_dependency 'rake', '~>0.9'
 
   s.files        = `git ls-files`.split("\n")
   s.test_files   = `git ls-files -- {test,spec,features}/*`.split("\n")

data/cucumber.yml

@@ -0,0 +1 @@
+default: --format progress --require features --color

data/features/support/env.rb

@@ -0,0 +1,8 @@
+begin
+  require 'simplecov'
+  require 'debugger'
+rescue LoadError
+  # ignore
+end
+
+require 'citeproc'

data/lib/citeproc.rb

@@ -2,7 +2,7 @@
 require 'date'
 require 'forwardable'
 require 'observer'
-require 'uri'
+require 'open-uri'
 
 require 'multi_json'
 require 'namae'

data/lib/citeproc/compatibility.rb

@@ -90,12 +90,17 @@ end
 # Robust unicode upcase/downcase
 #
 
-if RUBY_PLATFORM == 'java'
+if RUBY_PLATFORM =~ /java/i
   require 'java'
 
   puts java.lang.System.getProperty('file.encoding')
   
   module CiteProc
+    
+    def jruby
+      yield
+    end
+    
     def upcase(string)
       java.lang.String.new(string).to_upper_case(java.util.Locale::ENGLISH).to_s
     end
@@ -115,8 +120,11 @@ if RUBY_PLATFORM == 'java'
 
 else
 
-  module CiteProc
-    private
+  module CiteProc    
+    
+    def jruby
+      false
+    end
 
     begin
       require 'unicode'

data/lib/citeproc/engine.rb

@@ -1,5 +1,6 @@
 module CiteProc
 
+  # @abstract
   class Engine
     extend Forwardable
 

data/lib/citeproc/variable.rb

@@ -167,9 +167,16 @@ module CiteProc
       @type ||= self.class.name.split(/::/)[-1].downcase.to_sym
     end
 
-    # @return [Boolean] whether or not the variable can be (safely) cast to a numeric value
+		# Tests whether the variable contains numeric content. Content is
+		# considered numeric if it solely consists of numbers. Numbers may have
+		# prefixes and suffixes ("D2", "2b", "L2d"), and may be separated by a
+		# comma, hyphen, or ampersand, with or without spaces ("2, 3", "2-4",
+		# "2 & 4"). For example, "2nd" tests "true" whereas "second" and
+		# "2nd edition" test "false".
+		#
+    # @return [Boolean] whether or not the variable's value is numeric
     def numeric?
-      !!match(/\d/)
+      !!match(/^\w*\d+\w*(\s*[,&-]\s*\w*\d+\w*)*$/i)
     end
     
     # @return [Fixnum] the first (!) numeric data contained in the variable's

data/lib/citeproc/version.rb

@@ -1,3 +1,3 @@
 module CiteProc
-  VERSION = '0.0.9'.freeze
+  VERSION = '1.0.0.pre1'.freeze
 end

data/spec/citeproc/variable_spec.rb

@@ -121,17 +121,47 @@ module CiteProc
       context 'variable contains a number' do
         it 'returns true (string initialized)' do
           Variable.new('23').should be_numeric
-          Variable.new('foo 23').should be_numeric
+          Variable.new('X23').should be_numeric
+          Variable.new('23rd').should be_numeric
         end
         it 'returns true (integer initialized)' do
           Variable.new(23).should be_numeric
         end
       end 
+
       context 'variable does not contain a number' do
         it 'returns false for strings' do
           Variable.new('test').should_not be_numeric
         end
       end
+      
+      context 'variable contains numbers but is not numeric' do
+        it 'returns false for strings' do
+          Variable.new('23rd test').should_not be_numeric
+          Variable.new('23rd, 24th & 25th edition').should_not be_numeric
+        end
+      end
+      
+      context 'variable contains multiple numbers' do
+        it 'returns true for simple ranges' do
+          Variable.new('23-24').should be_numeric
+          Variable.new('23 - 24').should be_numeric
+          Variable.new('23-  24').should be_numeric
+        end
+        
+        it 'returns true for simple lists' do
+          Variable.new('23,24').should be_numeric
+          Variable.new('23 , 24').should be_numeric
+          Variable.new('23,  24').should be_numeric
+          Variable.new('23 ,24').should be_numeric
+          Variable.new('23 ,24,25 , 26, 27').should be_numeric
+        end
+        
+        it 'returns true for complex lists' do
+          Variable.new('23rd, 24th & 25th').should be_numeric
+          Variable.new('X23, A2-49th & 25th & A1, B2').should be_numeric
+        end
+      end
     end
     
     describe '#strip_markup' do

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: citeproc
 version: !ruby/object:Gem::Version
-  version: 0.0.9
-  prerelease: 
+  version: 1.0.0.pre1
+  prerelease: 6
 platform: ruby
 authors:
 - Sylvester Keil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-09 00:00:00.000000000 Z
+date: 2012-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70283202228100 !ruby/object:Gem::Requirement
+  requirement: &70221817636060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *70283202228100
+  version_requirements: *70221817636060
 - !ruby/object:Gem::Dependency
   name: namae
-  requirement: &70283202246360 !ruby/object:Gem::Requirement
+  requirement: &70221817635560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,62 +32,40 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70283202246360
+  version_requirements: *70221817635560
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70283202244140 !ruby/object:Gem::Requirement
+  requirement: &70221817635100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *70283202244140
+  version_requirements: *70221817635100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70283202253680 !ruby/object:Gem::Requirement
+  requirement: &70221817634600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70283202253680
-- !ruby/object:Gem::Dependency
-  name: watchr
-  requirement: &70283202250860 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :development
-  prerelease: false
-  version_requirements: *70283202250860
+  version_requirements: *70221817634600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70283202267480 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.2
-  type: :development
-  prerelease: false
-  version_requirements: *70283202267480
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &70283202263440 !ruby/object:Gem::Requirement
+  requirement: &70221817634140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70283202263440
+  version_requirements: *70221817634140
 description: ! "\n    A cite processor interface for Citation Style Language (CSL)
   styles.\n    "
 email:
@@ -104,10 +82,12 @@ files:
 - AGPL
 - BSDL
 - Gemfile
+- Guardfile
 - README.md
 - Rakefile
-- auto.watchr
 - citeproc.gemspec
+- cucumber.yml
+- features/support/env.rb
 - lib/citeproc.rb
 - lib/citeproc/abbreviate.rb
 - lib/citeproc/assets.rb
@@ -157,9 +137,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
@@ -167,6 +147,7 @@ signing_key:
 specification_version: 3
 summary: A cite processor interface.
 test_files:
+- features/support/env.rb
 - spec/citeproc/abbreviate_spec.rb
 - spec/citeproc/assets_spec.rb
 - spec/citeproc/attributes_spec.rb

data/auto.watchr

@@ -1,22 +0,0 @@
-
-# Rules
-# --------------------------------------------------
-watch( '^spec/.+_spec.rb' ) { |m| rspec m[0] }
-watch( '^lib/(.*)\.rb' ) { |m| rspec "spec/#{m[1]}_spec.rb" }
-
-# Signal Handling
-# --------------------------------------------------
-Signal.trap('QUIT') { rspec 'spec' } # Ctrl-\
-Signal.trap('INT' ) { abort("\n") } # Ctrl-C
-
-def rspec (*paths)
-	paths = paths.reject { |p| !File.exists?(p) }
-	run "bundle exec rspec --tty -c #{ paths.empty? ? 'spec' : paths.join(' ') }"
-end
-
-def run (cmd)
-  puts cmd
-  system cmd
-end
-
-rspec 'spec'