bindable_block 0.0.4 → 0.0.5

data/README.md

@@ -3,14 +3,14 @@
 `instance_exec` can't take block arguments. Get around that with BindableProc
 
 ```ruby
-
 require 'bindable_block'
+
 User = Struct.new :name
 greeter = BindableBlock.new(User) { "Welcome, #{name}" }
 greeter.bind(User.new "Josh").call # => "Welcome, Josh"
-
 ```
 
+[Here](https://github.com/JoshCheek/surrogate/blob/eb1d7f98a148c032f6d3ef1d8df8b703386f286d/lib/surrogate/options.rb#L32-34) is an example.
 
 ## Installation
 

data/README.mountain_berry_fields.md

@@ -12,6 +12,7 @@ greeter.bind(User.new "Josh").call # => "Welcome, Josh"
 <% end %>
 ```
 
+[Here](https://github.com/JoshCheek/surrogate/blob/eb1d7f98a148c032f6d3ef1d8df8b703386f286d/lib/surrogate/options.rb#L32-34) is an example.
 
 ## Installation
 

data/lib/bindable_block.rb

@@ -4,8 +4,11 @@ class BindableBlock
 
   # match args to arity, since instance_method has lambda properties
   class ArgAligner
-    def self.align(args, instance_method)
-      new(args, instance_method).call
+    def initialize(args, instance_method)
+      @result, @args, @parameters = [], args, instance_method.parameters.map(&:first)
+      take num :req
+      take [num(:opt), args.size].min
+      take args.size if has? :rest
     end
 
     def call
@@ -16,36 +19,17 @@ class BindableBlock
 
     attr_reader :args, :parameters, :result
 
-    def initialize(args, instance_method)
-      @result, @args, @parameters = [], args, instance_method.parameters.map(&:first)
-      track_if_has_rest
-      parameters.delete :rest
-      remove_block
-      take num_required
-      parameters.delete :req
-      take 1 while parameters.shift && args.any?
-      take args.size if has_rest?
+    def has?(type)
+      parameters.any? { |param| param == type }
     end
 
-    def num_required
-      parameters.count { |param| param == :req }
+    def num(type)
+      parameters.count { |param| param == type }
     end
 
     def take(n)
       n.times { result << args.shift }
     end
-
-    def remove_block
-      parameters.pop if parameters.last == :block
-    end
-
-    def track_if_has_rest
-      @has_splat = parameters.any? { |param| param == :rest }
-    end
-
-    def has_rest?
-      @has_splat
-    end
   end
 
 
@@ -76,7 +60,7 @@ class BindableBlock
   private
 
   def align(args)
-    ArgAligner.align args, instance_method
+    ArgAligner.new(args, instance_method).call
   end
 
   def method_name

data/lib/bindable_block/version.rb

@@ -1,3 +1,3 @@
 class BindableBlock
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bindable_block
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-05 00:00:00.000000000 Z
+date: 2012-06-09 00:00:00.000000000 Z
 dependencies: []
 description: instance_exec can't pass block arguments through. Use a bindable block
   instead.