simple_states 1.1.0.rc7 → 1.1.0.rc8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b4846151d903961bc29e2a5004515bead3d5064
-  data.tar.gz: efbcb59bdcf552e31492117d6b779253e1505a67
+  metadata.gz: 9cbfef0efaf93d1c51a1598450fecc545aa1f553
+  data.tar.gz: f0587d5e61c30fa30ca244dffe59468a38c66843
 SHA512:
-  metadata.gz: 940486943b52ef093d0ac0c6204b0b2aec31b3b2831022344173f757d7bd7da5a17885335ac946b7045a43e71d13d8c4b2e25c71ac97412fc0b751b0f74ed00f
-  data.tar.gz: 89a8bcf7b64d517112def866dd41babfd5f9400ae15100f39837bccbc21a600e17f894fbc1476cacb153d12551448758af6b91bc2158147a4b85fa300c8e32cc
+  metadata.gz: 3afe817b596759582d3c044a9aaecd0be85ccb147fe3e74ac128538027fccac06ec12fd8c6316ab2db08589902711923f9c77017df3db8bd7358ca9ed9b26f8a
+  data.tar.gz: a7e809db0bcadb50a8f87049170894de4e9edcac90b09f6204c054220a039d082e25a4631adc3ce8044ede719723061960a9172f13f896f5b6967de9b1117585

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple_states (1.1.0.rc6)
+    simple_states (1.1.0.rc7)
       activesupport
       hashr (~> 0.0.10)
 

data/lib/simple_states/event.rb

@@ -1,5 +1,4 @@
 require 'active_support/core_ext/module/delegation'
-require 'hashr'
 
 module SimpleStates
   class Event
@@ -7,11 +6,7 @@ module SimpleStates
 
     def initialize(name, options = {})
       @name    = name
-      @options = Hashr.new(options) do
-        def except
-          self[:except]
-        end
-      end
+      @options = options
     end
 
     def call(object, *args)
@@ -40,18 +35,18 @@ module SimpleStates
 
       def skip?(object, args)
         result = false
-        result ||= !send_methods(object, options.if, args) if options.if?
-        result ||= send_methods(object, options.unless, args) if options.unless?
+        result ||= !send_methods(object, options[:if], args) if options[:if]
+        result ||= send_methods(object, options[:unless], args) if options[:unless]
         result
       end
 
       def can_transition?(object)
-        !options.from || object.state && Array(options.from).include?(object.state.to_sym)
+        !options[:from] || object.state && Array(options[:from]).include?(object.state.to_sym)
       end
 
       def run_callbacks(object, type, args)
         object.save! if save?
-        send_methods(object, options.send(type), args)
+        send_methods(object, options[type], args)
       end
 
       def set_state(object, args)
@@ -78,7 +73,7 @@ module SimpleStates
       end
 
       def target_state
-        options.to || "#{name}ed".sub(/eed$/, 'ed').to_sym
+        options[:to] || "#{name}ed".sub(/eed$/, 'ed').to_sym
       end
 
       def send_methods(object, methods, args)

data/lib/simple_states/version.rb

@@ -1,3 +1,3 @@
 module SimpleStates
-  VERSION = '1.1.0.rc7'
+  VERSION = '1.1.0.rc8'
 end

data/simple_states.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
   s.rubyforge_project = '[none]'
 
   s.add_dependency 'activesupport'
-  s.add_dependency 'hashr', '~> 0.0.10'
 
   s.add_development_dependency 'rake', '~> 0.9.2'
   s.add_development_dependency 'test_declarative'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_states
 version: !ruby/object:Gem::Version
-  version: 1.1.0.rc7
+  version: 1.1.0.rc8
 platform: ruby
 authors:
 - Sven Fuchs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2015-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: hashr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.10
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement