pattern-proc 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adc2ed80e8a4406782666406fd1cda3117de27ad
-  data.tar.gz: 14792f45f789de53c59a60cf429d1d8e86151645
+  metadata.gz: 2e6e5c92ff2acd52f48ad6a3499622f6b6605ce3
+  data.tar.gz: 48d17c98cf20548f02d4fb5a317c412235c22c3c
 SHA512:
-  metadata.gz: f18e19c8a4ad26628d01f35179f94aad549d9ea350c15fb6880524e0406a15758e1c52de4baf5dfb9379ba766c95761b755b692c8957cac33433e95444667c05
-  data.tar.gz: 4fcdedf9e878868403999bdd127d216d60b4030b90a3a5cb8f4b65f6a1b409de132a3a39b59ec5529f375e4e8d268fbdbdce3dc8e9bd04b477f3468027e400a5
+  metadata.gz: 331e688e706805d3e03687107141f45b2652f8c0e568c02c79bdd3de0de7e7c0c78b4764708da4968d8215cdb288563f5a5d6ab13438e0315f82b3d59ce6bb4e
+  data.tar.gz: acbdae026983fe1db56d77a1b88fd0aeca837980eb9637a5ccf421dcf03f2c1cf47b4ca26b92804959909838da7018f34bb60162f2fce614e3166d28da40aa4e

data/lib/pattern-proc/class_methods.rb

@@ -0,0 +1,14 @@
+module PatternProc
+  module ClassMethods
+    def self.included(klass)
+      klass.extend JustClassMethods
+    end
+  end
+
+  module JustClassMethods
+    def pattern(method)
+      @__patterns ||= {}
+      PatternProcPatterns.find_or_create_pattern @__patterns, self, method
+    end
+  end
+end

data/lib/pattern-proc/object_methods.rb

@@ -0,0 +1,5 @@
+module PatternProc
+  module ObjectMethods
+    private
+  end
+end

data/lib/pattern-proc/pattern_proc.rb

@@ -0,0 +1,70 @@
+require 'pattern-proc/pattern_proc_case'
+
+module PatternProc
+  class PatternProc
+
+    def initialize(cases = [])
+      @arity = -1
+      @cases = []
+      cases.each do |c| add_case c end
+    end
+
+    def with(*args, &block)
+      case_obj = PatternProcCase.new(args, &block)
+      add_case case_obj
+      case_obj
+    end
+
+    def to_proc
+      ->(*args) { call(args) }
+    end
+
+    private
+    def add_case(case_obj)
+      if @arity == -1
+        @arity = case_obj.arity
+      elsif @arity != case_obj.arity
+        raise "mismatched arity"
+      end
+      @cases << case_obj
+    end
+
+
+    def call(args)
+      if args.size == @arity
+        best_match = find_matches(args, true).first
+        if best_match
+          best_match.to_proc.call(args)
+        else
+          raise "no match"
+        end
+      elsif args.size < @arity
+        sliced_cases = find_matches(args, false)
+        if sliced_cases.size > 0
+          PatternProc.new(sliced_cases).to_proc
+        else
+          raise "no match"
+        end
+      else
+        raise "too many args"
+      end
+    end
+
+    def find_matches(args, stop_at_first_match)
+      results = []
+      sorted_cases = @cases.sort do |case_obj_1, case_obj_2|
+        case_obj_1.specificity <=> case_obj_2.specificity
+      end.reverse
+      sorted_cases.each do |case_obj|
+        result = case_obj.make_subcase(args)
+        if result
+          results << result
+          if stop_at_first_match
+            break
+          end
+        end
+      end
+      results
+    end
+  end
+end

data/lib/pattern-proc/pattern_proc_case.rb

@@ -0,0 +1,63 @@
+module PatternProc
+  class PatternProcCase
+
+    attr_reader :proc_applied_level
+    attr_reader :proc_arity
+
+    def initialize(args, previous_specificity = 0, proc_arity = 0, &block)
+      @expected_args = args
+      @proc = block
+      @proc_arity = proc_arity
+      @previous_specificity = previous_specificity || 0
+      if !block.nil? && block.arity > 0
+        @proc_arity = block.arity
+      end
+    end
+
+    def returns(value)
+      @return_value = value
+      self
+    end
+
+    # private ish
+    def expected_arity
+      @expected_args.size || 0
+    end
+
+    def arity
+      expected_arity + proc_arity
+    end
+
+    def specificity
+      expected_arity + @previous_specificity
+    end
+
+    def make_subcase(args)
+      match_len = [args.size, @expected_args.size].min
+      expected = @expected_args.take(match_len)
+      actual = args.take(match_len)
+      if expected == actual
+        new_proc = to_proc.curry
+        curry_count = args.size - @expected_args.size
+        new_arity = proc_arity
+        if curry_count > 0
+          send_args = args.drop(match_len).take(curry_count)
+          new_proc = new_proc.call(*send_args)
+          new_arity -= curry_count
+          if new_arity == 0
+            return PatternProcCase.new([], specificity).returns(new_proc)
+          elsif !(new_proc.is_a?(Proc))
+            raise "uh oh"
+          end
+        end
+        PatternProcCase.new(@expected_args.drop(match_len), specificity, new_arity, &new_proc).returns(@return_value)
+      else
+        nil
+      end
+    end
+
+    def to_proc
+      @proc || ->(*args) { @return_value }
+    end
+  end
+end

data/lib/pattern-proc/pattern_proc_patterns.rb

@@ -0,0 +1,21 @@
+require 'pattern-proc/pattern_proc'
+
+module PatternProc
+  class PatternProcPatterns
+    class << self
+      def find_or_create_pattern(patterns, receiver, method)
+        unless patterns[method] 
+          proc_obj = PatternProc.new
+          receiver.class_eval do
+            define_method(method) do |*args|
+              curried_method = proc_obj.to_proc.curry
+              curried_method[*args]
+            end
+          end
+          patterns[method] = proc_obj
+        end
+        patterns[method]
+      end
+    end
+  end
+end

data/lib/pattern-proc/test_methods.rb

@@ -0,0 +1,10 @@
+require 'metaclass'
+
+module PatternProc
+  module TestMethods
+    def pattern(method)
+      @__patterns ||= {}
+      PatternProcPatterns.find_or_create_pattern @__patterns, self.__metaclass__, method
+    end
+  end
+end

data/lib/pattern_proc.rb

@@ -1,167 +1,6 @@
-require 'metaclass'
+require 'pattern-proc/pattern_proc'
+require 'pattern-proc/pattern_proc_patterns'
+require 'pattern-proc/object_methods'
+require 'pattern-proc/class_methods'
+require 'pattern-proc/test_methods'
 
-module PatternProc
-  def self.included(klass)
-    klass.extend ClassMethods
-    Object.include ObjectMethods
-  end
-
-  class PatternProc
-
-    def initialize(cases = [])
-      @arity = -1
-      @cases = []
-      cases.each do |c| add_case c end
-    end
-
-    def with(*args, &block)
-      case_obj = PatternProcCase.new(args, &block)
-      add_case case_obj
-      case_obj
-    end
-
-    def to_proc
-      ->(*args) { call(args) }
-    end
-
-    private
-    def add_case(case_obj)
-      if @arity == -1
-        @arity = case_obj.arity
-      elsif @arity != case_obj.arity
-        raise "mismatched arity"
-      end
-      @cases << case_obj
-    end
-
-
-    def call(args)
-      if args.size == @arity
-        best_match = find_matches(args, true).first
-        if best_match
-          best_match.to_proc.call(args)
-        else
-          raise "no match"
-        end
-      elsif args.size < @arity
-        sliced_cases = find_matches(args, false)
-        if sliced_cases.size > 0
-          PatternProc.new(sliced_cases).to_proc
-        else
-          raise "no match"
-        end
-      else
-        raise "too many args"
-      end
-    end
-
-    def find_matches(args, stop_at_first_match)
-      results = []
-      sorted_cases = @cases.sort do |case_obj_1, case_obj_2|
-        case_obj_1.specificity <=> case_obj_2.specificity
-      end.reverse
-      sorted_cases.each do |case_obj|
-        result = case_obj.make_subcase(args)
-        if result
-          results << result
-          if stop_at_first_match
-            break
-          end
-        end
-      end
-      results
-    end
-  end
-
-  class PatternProcCase
-
-    attr_reader :proc_applied_level
-    attr_reader :proc_arity
-
-    def initialize(args, previous_specificity = 0, proc_arity = 0, &block)
-      @expected_args = args
-      @proc = block
-      @proc_arity = proc_arity
-      @previous_specificity = previous_specificity || 0
-      if !block.nil? && block.arity > 0
-        @proc_arity = block.arity
-      end
-    end
-
-    def returns(value)
-      @return_value = value
-      self
-    end
-
-    # private ish
-    def expected_arity
-      @expected_args.size || 0
-    end
-
-    def arity
-      expected_arity + proc_arity
-    end
-
-    def specificity
-      expected_arity + @previous_specificity
-    end
-
-    def make_subcase(args)
-      match_len = [args.size, @expected_args.size].min
-      expected = @expected_args.take(match_len)
-      actual = args.take(match_len)
-      if expected == actual
-        new_proc = to_proc.curry
-        curry_count = args.size - @expected_args.size
-        new_arity = proc_arity
-        if curry_count > 0
-          send_args = args.drop(match_len).take(curry_count)
-          new_proc = new_proc.call(*send_args)
-          new_arity -= curry_count
-          if new_arity == 0
-            return PatternProcCase.new([], specificity).returns(new_proc)
-          elsif !(new_proc.is_a?(Proc))
-            raise "uh oh"
-          end
-        end
-        PatternProcCase.new(@expected_args.drop(match_len), specificity, new_arity, &new_proc).returns(@return_value)
-      else
-        nil
-      end
-    end
-
-    def to_proc
-      @proc || ->(*args) { @return_value }
-    end
-  end
-
-  module ObjectMethods
-
-    def pattern(method)
-      find_or_create_pattern self.__metaclass__, method
-    end
-
-    private
-    def find_or_create_pattern(receiver, method)
-      @__pattern ||= {}
-      unless @__pattern[method] 
-        proc_obj = PatternProc.new
-        receiver.class_eval do
-          define_method(method) do |*args|
-            curried_method = proc_obj.to_proc.curry
-            curried_method[*args]
-          end
-        end
-        @__pattern[method] = proc_obj
-      end
-      @__pattern[method]
-    end
-
-  end
-
-  module ClassMethods
-    def pattern(method)
-      find_or_create_pattern self, method
-    end
-  end
-end

data/pattern-proc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'pattern-proc'
-  s.version     = '0.0.4'
+  s.version     = '0.0.6'
   s.date        = '2014-07-01'
   s.summary     = 'Pattern Proc'
   s.description = 'define a Proc with pattern matching "re-declaration" ala Haskell'

data/spec/lib/object_method_spec.rb

@@ -1,7 +1,8 @@
 require 'pattern_proc'
+include PatternProc::TestMethods
 
 class TestObjectClass
-  include PatternProc
+  include PatternProc::ClassMethods
   def my_func(a,b,c)
     raise "don't call me"
   end
@@ -12,7 +13,7 @@ end
 
 class TestSingletonClass
   class << self
-    include PatternProc
+    include PatternProc::ClassMethods
     def class_func(a,b,c)
       raise "don't call me"
     end
@@ -22,8 +23,16 @@ class TestSingletonClass
   end
 end
 
+class TestSingletonNoInclude
+  class << self
+    def a_func(a,b,c)
+      raise "don't call me"
+    end
+  end
+end
+
 describe "pattern object methods" do
-  context "class" do
+  context "object" do
     let (:obj) { TestObjectClass.new }
     context "in declaration" do
       it "allows declaration of pattern methods in a class" do
@@ -50,7 +59,7 @@ describe "pattern object methods" do
     end
   end
 
-  context "object" do
+  context "class" do
     let (:klass) { TestSingletonClass }
     context "in declaration" do
       it "allows declaration of pattern class methods in a class" do
@@ -77,4 +86,15 @@ describe "pattern object methods" do
       end
     end
   end
+
+  context "for testing" do
+    let (:klass) { TestSingletonNoInclude }
+    it "allows replacing methods on a class" do
+      klass.pattern(:a_func).with(1,2,3).returns(7)
+      klass.pattern(:a_func).with(2,3,4).returns(9)
+
+      klass.a_func(1,2).(3).should == 7
+      klass.a_func(2).(3,4).should == 9
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pattern-proc
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - William Pleasant-Ryan
@@ -21,6 +21,12 @@ files:
 - Gemfile.lock
 - LICENSE
 - README.md
+- lib/pattern-proc/class_methods.rb
+- lib/pattern-proc/object_methods.rb
+- lib/pattern-proc/pattern_proc.rb
+- lib/pattern-proc/pattern_proc_case.rb
+- lib/pattern-proc/pattern_proc_patterns.rb
+- lib/pattern-proc/test_methods.rb
 - lib/pattern_proc.rb
 - pattern-proc.gemspec
 - spec/lib/object_method_spec.rb