citrus 2.5.0 → 3.0.0

data/CHANGES

@@ -1,3 +1,9 @@
+= 3.0.0 / 2014-03-14
+
+  * Moved Object#grammar to citrus/core_ext.rb. Citrus no longer installs core
+    extensions by default. Use "require 'citrus/core_ext.rb'" instead of
+    "require 'citrus'" to keep the previous behavior.
+
 = 2.5.0 / 2014-03-13
 
   * Inputs may be generated from many different sources, including Pathname and

data/lib/citrus/core_ext.rb

@@ -0,0 +1,19 @@
+require 'citrus'
+class Object
+  # A sugar method for creating Citrus grammars from any namespace.
+  #
+  #     grammar :Calc do
+  #     end
+  #
+  #     module MyModule
+  #       grammar :Calc do
+  #       end
+  #     end
+  #
+  def grammar(name, &block)
+    namespace = respond_to?(:const_set) ? self : Object
+    namespace.const_set(name, Citrus::Grammar.new(&block))
+  rescue NameError
+    raise ArgumentError, "Invalid grammar name: #{name}"
+  end
+end

data/lib/citrus/version.rb

@@ -1,6 +1,6 @@
 module Citrus
   # The current version of Citrus as [major, minor, patch].
-  VERSION = [2, 5, 0]
+  VERSION = [3, 0, 0]
 
   # Returns the current version of Citrus as a string.
   def self.version

data/lib/citrus.rb

@@ -1556,23 +1556,3 @@ module Citrus
     end
   end
 end
-
-class Object
-  # A sugar method for creating Citrus grammars from any namespace.
-  #
-  #     grammar :Calc do
-  #     end
-  #
-  #     module MyModule
-  #       grammar :Calc do
-  #       end
-  #     end
-  #
-  def grammar(name, &block)
-    warn("Object#grammar will no longer be available by default in citrus 3.0; You should require 'citrus/core_ext'.")
-    namespace = respond_to?(:const_set) ? self : Object
-    namespace.const_set(name, Citrus::Grammar.new(&block))
-  rescue NameError
-    raise ArgumentError, "Invalid grammar name: #{name}"
-  end
-end

data/test/helper.rb

@@ -2,7 +2,7 @@ lib = File.expand_path('../../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'test/unit'
-require 'citrus'
+require 'citrus/core_ext'
 
 class Test::Unit::TestCase
   include Citrus

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: citrus
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 3.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -46,6 +46,7 @@ files:
 - doc/links.markdown
 - doc/syntax.markdown
 - doc/testing.markdown
+- lib/citrus/core_ext.rb
 - lib/citrus/file.rb
 - lib/citrus/grammars.rb
 - lib/citrus/version.rb