blockenspiel 0.3.0-java → 0.3.1-java

data/History.rdoc

@@ -1,3 +1,11 @@
+=== 0.3.1 / 2009-11-08
+
+* Blockenspiel#invoke can now take its options hash as the second argument
+  (instead of the third) when using dynamic target generation, since the
+  second argument is otherwise unused in this case.
+* Now defines Blockenspiel::VERSION, as a versionomy object if the
+  versionomy library is available, or as a version string if not.
+
 === 0.3.0 / 2009-11-04
 
 * dsl_attr_writer and dsl_attr_accessor convenience methods are available

data/Rakefile

@@ -138,8 +138,6 @@ task :compile_java do
   end
 end
 
-task :package => :compile_java
-
 
 # Publish RDocs
 desc 'Publishes RDocs to RubyForge'

data/lib/blockenspiel/impl.rb

@@ -655,6 +655,10 @@ module Blockenspiel
   # 
   # See the Blockenspiel::Builder class for more details on add_method.
   # 
+  # When using dynamic target generation, you may pass the options hash as
+  # the second argument to invoke instead of the third, since you will not
+  # be passing a target object as the second argument.
+  # 
   # (And yes, you guessed it: this API is a DSL block, and is itself
   # implemented using Blockenspiel.)
   
@@ -663,6 +667,18 @@ module Blockenspiel
     unless block_
       raise ::ArgumentError, "Block expected"
     end
+    
+    # Perform dynamic target generation if requested
+    if builder_block_
+      # Support passing the opts hash as the second argument since we
+      # aren't passing a target as an argument.
+      opts_ = target_ || opts_
+      builder_ = ::Blockenspiel::Builder.new
+      invoke(builder_block_, builder_)
+      target_ = builder_._create_target
+    end
+    
+    # Read options
     parameter_ = opts_[:parameter]
     parameterless_ = opts_[:parameterless]
     
@@ -674,14 +690,6 @@ module Blockenspiel
       return block_.call
     end
     
-    # Perform dynamic target generation if requested
-    if builder_block_
-      opts_ = target_ || opts_
-      builder_ = ::Blockenspiel::Builder.new
-      invoke(builder_block_, builder_)
-      target_ = builder_._create_target
-    end
-    
     # Handle parametered block case
     if parameter_ != false && block_.arity == 1 || parameterless_ == false
       if block_.arity != 1

data/lib/blockenspiel/version.rb

@@ -37,6 +37,8 @@
 module Blockenspiel
   
   # Current gem version, as a frozen string.
-  VERSION_STRING = '0.3.0'.freeze
+  VERSION_STRING = '0.3.1'.freeze
+  
+  autoload(:VERSION, ::File.dirname(__FILE__)+'/versionomy.rb')
   
 end

data/lib/blockenspiel/versionomy.rb

@@ -0,0 +1,51 @@
+# -----------------------------------------------------------------------------
+# 
+# Blockenspiel version
+# 
+# -----------------------------------------------------------------------------
+# Copyright 2008-2009 Daniel Azuma
+# 
+# All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# 
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# * Neither the name of the copyright holder, nor the names of any other
+#   contributors to this software, may be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+# -----------------------------------------------------------------------------
+;
+
+
+begin
+  require 'versionomy'
+rescue ::LoadError
+end
+
+
+module Blockenspiel
+  
+  unless const_defined?(:VERSION)
+    # Current gem version, as a Versionomy::Value if the versionomy library
+    # is available, or as a frozen string if not.
+    VERSION = defined?(::Versionomy) ? ::Versionomy.parse(VERSION_STRING, :standard) : VERSION_STRING
+  end
+  
+end

data/tests/tc_dynamic.rb

@@ -197,6 +197,25 @@ end
       end
       
       
+      # Test passing options in.
+      # 
+      # * Asserts that the "parameter" option is recognized
+      
+      def test_options_recognized
+        block_ = ::Proc.new do
+          set_value(:a, 1)
+        end
+        hash_ = ::Hash.new
+        assert_raise(::Blockenspiel::BlockParameterError) do
+          ::Blockenspiel.invoke(block_, :parameterless => false) do
+            add_method(:set_value) do |key_, value_|
+              hash_[key_] = value_
+            end
+          end
+        end
+      end
+      
+      
     end
     
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: blockenspiel
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: java
 authors: 
   - Daniel Azuma
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-04 00:00:00 -08:00
+date: 2009-11-08 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -31,7 +31,7 @@ files:
   - lib/blockenspiel.rb
   - lib/blockenspiel/impl.rb
   - lib/blockenspiel/version.rb
-  - lib/blockenspiel_unmixer.jar
+  - lib/blockenspiel/versionomy.rb
   - tests/tc_basic.rb
   - tests/tc_behaviors.rb
   - tests/tc_dsl_attrs.rb
@@ -43,6 +43,7 @@ files:
   - ImplementingDSLblocks.rdoc
   - README.rdoc
   - Rakefile
+  - lib/blockenspiel_unmixer.jar
 has_rdoc: true
 homepage: http://virtuoso.rubyforge.org/blockenspiel
 licenses: []