simple_states 0.1.0.pre1 → 0.1.0.pre2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/Gemfile.lock CHANGED
@@ -1,16 +1,16 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- simple_states (0.0.10)
4
+ simple_states (0.1.0.pre2)
5
5
  activesupport
6
6
  hashr (~> 0.0.10)
7
7
 
8
8
  GEM
9
9
  remote: http://rubygems.org/
10
10
  specs:
11
- activesupport (3.1.1)
11
+ activesupport (3.1.3)
12
12
  multi_json (~> 1.0)
13
- hashr (0.0.16)
13
+ hashr (0.0.18)
14
14
  mocha (0.9.12)
15
15
  multi_json (1.0.3)
16
16
  rake (0.9.2.2)
@@ -59,7 +59,7 @@ module SimpleStates
59
59
  if state = target_state(object)
60
60
  object.past_states << object.state if object.state
61
61
  object.state = state.to_sym
62
- object.send(:"#{state}_at=", Time.now) if object.respond_to?(:"#{state}_at=") && object.respond_to?(:"#{state}_at") && object.send(:"#{state}_at").nil?
62
+ object.send(:"#{state}_at=", now) if object.respond_to?(:"#{state}_at=") && object.respond_to?(:"#{state}_at") && object.send(:"#{state}_at").nil?
63
63
  object.save! if @saving
64
64
  end
65
65
  end
@@ -84,6 +84,10 @@ module SimpleStates
84
84
  object.class.instance_method(method).arity rescue 0
85
85
  end
86
86
 
87
+ def now
88
+ Time.respond_to?(:zone) && Time.zone ? Time.zone.now : Time.now.utc
89
+ end
90
+
87
91
  def raise_invalid_transition(object)
88
92
  raise TransitionException, "#{object.inspect} can not receive event #{name.inspect} while in state #{object.state.inspect}."
89
93
  end
@@ -46,8 +46,6 @@ module SimpleStates
46
46
  if merge_ix = events.index { |event| event.name == :all }
47
47
  merge = events.slice!(merge_ix)
48
48
  events.each_with_index do |event, ix|
49
- # method = ? :append : :prepend
50
-
51
49
  event.merge(merge, ix < merge_ix)
52
50
  end
53
51
  merge_events(events)
@@ -1,3 +1,3 @@
1
1
  module SimpleStates
2
- VERSION = '0.1.0.pre1'
2
+ VERSION = '0.1.0.pre2'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: simple_states
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0.pre1
4
+ version: 0.1.0.pre2
5
5
  prerelease: 6
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2011-11-11 00:00:00.000000000Z
12
+ date: 2011-12-01 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: activesupport
16
- requirement: &70253625773880 !ruby/object:Gem::Requirement
16
+ requirement: &70191004044960 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70253625773880
24
+ version_requirements: *70191004044960
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: hashr
27
- requirement: &70253625773380 !ruby/object:Gem::Requirement
27
+ requirement: &70191004043800 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 0.0.10
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70253625773380
35
+ version_requirements: *70191004043800
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rake
38
- requirement: &70253625772880 !ruby/object:Gem::Requirement
38
+ requirement: &70191004042340 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 0.9.2
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *70253625772880
46
+ version_requirements: *70191004042340
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: test_declarative
49
- requirement: &70253625772480 !ruby/object:Gem::Requirement
49
+ requirement: &70191004041700 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *70253625772480
57
+ version_requirements: *70191004041700
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: mocha
60
- requirement: &70253625771980 !ruby/object:Gem::Requirement
60
+ requirement: &70191004041140 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
65
65
  version: '0'
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *70253625771980
68
+ version_requirements: *70191004041140
69
69
  description: ! '[description]'
70
70
  email: svenfuchs@artweb-design.de
71
71
  executables: []
@@ -75,7 +75,6 @@ files:
75
75
  - lib/simple_states/event.rb
76
76
  - lib/simple_states/states.rb
77
77
  - lib/simple_states/version.rb
78
- - lib/simple_states/version.rb.orig
79
78
  - lib/simple_states.rb
80
79
  - Gemfile
81
80
  - Gemfile.lock
@@ -108,3 +107,4 @@ signing_key:
108
107
  specification_version: 3
109
108
  summary: ! '[summary]'
110
109
  test_files: []
110
+ has_rdoc:
@@ -1,7 +0,0 @@
1
- module SimpleStates
2
- <<<<<<< HEAD
3
- VERSION = '0.0.12'
4
- =======
5
- VERSION = '0.1.0.pre1'
6
- >>>>>>> b2d770121d822721e1f16e339717c2385eba4d8d
7
- end