state-handler 0.1.1 → 0.1.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    state-handler (0.0.1)
+    state-handler (0.1.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/state-handler/mixing.rb

@@ -24,12 +24,6 @@ module StateHandler
         @blocks[state].call
       end
 
-      if self.class.patterns
-        self.class.patterns.each do |s, regex|
-          @blocks[s].call if @response.code.to_s =~ regex
-        end
-      end
-
       if self.class.groups
         self.class.groups.each do |group, states|
           @blocks[group].call if states.include?(state) && @blocks[group]
@@ -48,7 +42,11 @@ module StateHandler
     end
 
     def state
-      self.class.mapping.keys.each.find { |state| find_mapped(state) }
+      patterns = self.class.patterns
+      mapping = self.class.mapping
+
+      mapping.keys.each.find { |state| find_mapped(state) } ||
+        patterns.key(patterns.values.each.find { |regex| @response.code.to_s =~ regex })
     end
 
     def find_mapped(state)
@@ -63,7 +61,9 @@ module StateHandler
       state = name.to_s.gsub(/\?/, '').to_sym
 
       if name.to_s.end_with?('?')
-        raise StateHandler::UnexpectedState, "Got: #{state.inspect}" unless self.class.mapping[state]
+        unless self.class.mapping[state] || self.class.patterns[state]
+          raise StateHandler::UnexpectedState, "Got: #{state.inspect}"
+        end
         find_mapped(state)
       elsif block_given?
         @blocks[state] = block
@@ -95,10 +95,9 @@ module StateHandler
       end
 
       def match(regexp)
-        self.patterns[regexp.values.first] = regexp.keys.first
-      end
-
-      def method_missing
+        state = regexp.values.first
+        self.patterns[state] = regexp.keys.first
+        add_to_group(state)
       end
 
       def code(*codes, &block)
@@ -119,6 +118,10 @@ module StateHandler
       def create(state, value)
         raise ArgumentError, "State '#{state}' already defined" if self.mapping[state]
         self.mapping[state] = value
+        add_to_group(state)
+      end
+
+      def add_to_group(state)
         if @current_group
           self.groups[@current_group] ||= []
           self.groups[@current_group] << state

data/lib/state-handler/version.rb

@@ -1,3 +1,3 @@
 module StateHandler
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/spec/lib/state-handler/mixing_spec.rb

@@ -28,10 +28,16 @@ describe StateHandler::Mixing do
     end
   end
 
+  def create(code, &block)
+    s = OpenStruct.new(:code => code)
+    DuplicateDeclarationResponse.new s
+    DummyResponse.new s, &block
+  end
+
   describe "#exclude" do
     it "should call valid block" do
       expect {
-        DummyResponse.new(OpenStruct.new(:code => 400)) do |r|
+        create(400) do |r|
           r.ex :bad_params do
             raise ArgumentError
           end
@@ -41,7 +47,7 @@ describe StateHandler::Mixing do
 
     it "should not call block" do
       expect {
-        DummyResponse.new(OpenStruct.new(:code => 401)) do |r|
+        create(401) do |r|
           r.ex :bad_params do
             raise ArgumentError
           end
@@ -54,7 +60,7 @@ describe StateHandler::Mixing do
     context "when handler not matched" do
       it "should do nothing" do
         expect {
-          DummyResponse.new(OpenStruct.new(:code => 4001)) {  }
+          create(4001) {  }
         }.should_not raise_error
       end
     end
@@ -62,25 +68,19 @@ describe StateHandler::Mixing do
     context "when no handlers" do
       it "should do nothing" do
         expect {
-          DummyResponse.new(OpenStruct.new(:code => 401)) {  }
+          create(401) {}
         }.should_not raise_error
       end
     end
   end
 
-  subject {
-    DuplicateDeclarationResponse.new(response_struct)
-    DummyResponse.new(response_struct)
-  }
-
   describe "#exec" do
-    let(:response_struct) { OpenStruct.new(:code => 401) }
     class ExecException < Exception
     end
 
     it "should call block from 'at' notation with multiply states" do
       expect {
-        subject.exec do |r|
+        create(401) do |r|
           r.at :bad_params, :success, :fake do
             raise ExecException
           end
@@ -90,11 +90,31 @@ describe StateHandler::Mixing do
     end
 
     describe "#group" do
-      let(:response_struct) { OpenStruct.new(:code => 200) }
+      context "when matched value with regex" do
+        it "should call block" do
+          expect {
+            create(500) do |r|
+              r.error do
+                raise ExecException
+              end
+            end
+          }.should raise_error(ExecException)
+        end
+
+        it "should call block from group :errors" do
+          expect {
+            create(500) do |r|
+              r.errors do
+                raise ExecException
+              end
+            end
+          }.should raise_error(ExecException)
+        end
+      end
 
       it "should call block from excluded group :errors" do
         expect {
-          subject.exec do |r|
+          create(200) do |r|
             r.ex :errors do
               raise ExecException
             end
@@ -104,7 +124,7 @@ describe StateHandler::Mixing do
 
       it "should call block mapped to group :success" do
         expect {
-          subject.exec do |r|
+          create(200) do |r|
             r.success do
               raise ExecException
             end
@@ -114,10 +134,9 @@ describe StateHandler::Mixing do
     end
 
     describe "#match" do
-     let(:response_struct) { OpenStruct.new(:code => 500) }
      it "should call matched block" do
         expect {
-          subject.exec do |r|
+          create(500) do |r|
             r.bad_params do
               raise ExecException
             end
@@ -130,10 +149,9 @@ describe StateHandler::Mixing do
       end
     end
 
-    let(:response_struct) { OpenStruct.new(:code => 401) }
     it "should call block" do
       expect {
-        subject.exec do |r|
+        create(401) do |r|
           r.bad_params do
             raise ExecException
           end
@@ -147,12 +165,12 @@ describe StateHandler::Mixing do
   end
 
   describe "#codes" do
-    let(:response_struct) { OpenStruct.new(:code => 401) }
+    subject { create(401) {} }
     its(:bad_params?) { should be_true }
   end
 
   describe "#code" do
-    let(:response_struct) { OpenStruct.new(:code => 200) }
+    subject { create(200) {} }
 
     its(:enabled?) { should be_true }
     its(:false?) { should be_false }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: state-handler
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70195101020240 !ruby/object:Gem::Requirement
+  requirement: &70191862984340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70195101020240
+  version_requirements: *70191862984340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70195101018660 !ruby/object:Gem::Requirement
+  requirement: &70191862983820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70195101018660
+  version_requirements: *70191862983820
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70195101006480 !ruby/object:Gem::Requirement
+  requirement: &70191862983400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70195101006480
+  version_requirements: *70191862983400
 description: State handler per object params
 email: fatumka@gmail.com
 executables: []