rows_controller 0.2.4 → 0.3.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. data/Gemfile +1 -2
  2. data/Gemfile.lock +34 -58
  3. data/app/controllers/rows_controller.rb +4 -1
  4. data/lib/rows_controller/version.rb +1 -1
  5. data/spec/integration/order_spec.rb +1 -1
  6. metadata +9 -9
data/Gemfile CHANGED
@@ -1,8 +1,7 @@
1
1
  source "http://rubygems.org"
2
2
 
3
- gem 'rails', '3.1.3'
3
+ gem 'rails'
4
4
  gem 'jquery-rails'
5
- gem 'rows_controller'
6
5
 
7
6
  group :test do
8
7
  gem "capybara"
data/Gemfile.lock CHANGED
@@ -1,35 +1,25 @@
1
1
  GEM
2
2
  remote: http://rubygems.org/
3
3
  specs:
4
- actionmailer (3.1.3)
5
- actionpack (= 3.1.3)
6
- mail (~> 2.3.0)
7
- actionpack (3.1.3)
8
- activemodel (= 3.1.3)
9
- activesupport (= 3.1.3)
4
+ actionmailer (0.6.1)
5
+ actionpack (>= 0.9.5)
6
+ actionpack (3.2.2.rc1)
7
+ activemodel (= 3.2.2.rc1)
8
+ activesupport (= 3.2.2.rc1)
10
9
  builder (~> 3.0.0)
11
10
  erubis (~> 2.7.0)
12
- i18n (~> 0.6)
13
- rack (~> 1.3.5)
11
+ journey (~> 1.0.1)
12
+ rack (~> 1.4.0)
14
13
  rack-cache (~> 1.1)
15
- rack-mount (~> 0.8.2)
16
14
  rack-test (~> 0.6.1)
17
- sprockets (~> 2.0.3)
18
- activemodel (3.1.3)
19
- activesupport (= 3.1.3)
15
+ sprockets (~> 2.1.2)
16
+ activemodel (3.2.2.rc1)
17
+ activesupport (= 3.2.2.rc1)
20
18
  builder (~> 3.0.0)
19
+ activerecord (1.6.0)
20
+ activesupport (3.2.2.rc1)
21
21
  i18n (~> 0.6)
22
- activerecord (3.1.3)
23
- activemodel (= 3.1.3)
24
- activesupport (= 3.1.3)
25
- arel (~> 2.2.1)
26
- tzinfo (~> 0.3.29)
27
- activeresource (3.1.3)
28
- activemodel (= 3.1.3)
29
- activesupport (= 3.1.3)
30
- activesupport (3.1.3)
31
22
  multi_json (~> 1.0)
32
- arel (2.2.1)
33
23
  builder (3.0.0)
34
24
  capybara (1.1.2)
35
25
  mime-types (>= 1.16)
@@ -38,45 +28,37 @@ GEM
38
28
  rack-test (>= 0.5.4)
39
29
  selenium-webdriver (~> 2.0)
40
30
  xpath (~> 0.1.4)
41
- childprocess (0.3.0)
31
+ childprocess (0.3.1)
42
32
  ffi (~> 1.0.6)
43
33
  diff-lcs (1.1.3)
44
34
  erubis (2.7.0)
45
35
  ffi (1.0.11)
46
36
  hike (1.2.1)
47
37
  i18n (0.6.0)
48
- jquery-rails (1.0.19)
49
- railties (~> 3.0)
38
+ journey (1.0.3)
39
+ jquery-rails (2.0.0)
40
+ railties (>= 3.2.0.beta, < 5.0)
50
41
  thor (~> 0.14)
51
42
  json (1.6.5)
52
- mail (2.3.0)
53
- i18n (>= 0.4.0)
54
- mime-types (~> 1.16)
55
- treetop (~> 1.4.8)
43
+ json_pure (1.6.5)
56
44
  mime-types (1.17.2)
57
- multi_json (1.0.4)
45
+ multi_json (1.1.0)
58
46
  nokogiri (1.5.0)
59
- polyglot (0.3.3)
60
- rack (1.3.6)
47
+ rack (1.4.1)
61
48
  rack-cache (1.1)
62
49
  rack (>= 0.4)
63
- rack-mount (0.8.3)
64
- rack (>= 1.0.0)
65
50
  rack-ssl (1.3.2)
66
51
  rack
67
52
  rack-test (0.6.1)
68
53
  rack (>= 1.0)
69
- rails (3.1.3)
70
- actionmailer (= 3.1.3)
71
- actionpack (= 3.1.3)
72
- activerecord (= 3.1.3)
73
- activeresource (= 3.1.3)
74
- activesupport (= 3.1.3)
75
- bundler (~> 1.0)
76
- railties (= 3.1.3)
77
- railties (3.1.3)
78
- actionpack (= 3.1.3)
79
- activesupport (= 3.1.3)
54
+ rails (0.9.5)
55
+ actionmailer (>= 0.6.1)
56
+ actionpack (>= 1.4.0)
57
+ activerecord (>= 1.6.0)
58
+ rake (>= 0.4.15)
59
+ railties (3.2.2.rc1)
60
+ actionpack (= 3.2.2.rc1)
61
+ activesupport (= 3.2.2.rc1)
80
62
  rack-ssl (~> 1.3.2)
81
63
  rake (>= 0.8.7)
82
64
  rdoc (~> 3.4)
@@ -84,7 +66,6 @@ GEM
84
66
  rake (0.9.2.2)
85
67
  rdoc (3.12)
86
68
  json (~> 1.4)
87
- rows_controller (0.1.0)
88
69
  rspec (2.8.0)
89
70
  rspec-core (~> 2.8.0)
90
71
  rspec-expectations (~> 2.8.0)
@@ -98,24 +79,20 @@ GEM
98
79
  activesupport (>= 3.0)
99
80
  railties (>= 3.0)
100
81
  rspec (~> 2.8.0)
101
- rubyzip (0.9.5)
102
- selenium-webdriver (2.17.0)
103
- childprocess (>= 0.2.5)
82
+ rubyzip (0.9.6.1)
83
+ selenium-webdriver (2.13.0)
84
+ childprocess (>= 0.2.1)
104
85
  ffi (~> 1.0.9)
105
- multi_json (~> 1.0.4)
86
+ json_pure
106
87
  rubyzip
107
- spork (0.8.5)
108
- sprockets (2.0.3)
88
+ spork (0.9.0)
89
+ sprockets (2.1.2)
109
90
  hike (~> 1.2)
110
91
  rack (~> 1.0)
111
92
  tilt (~> 1.1, != 1.3.0)
112
93
  sqlite3 (1.3.5)
113
94
  thor (0.14.6)
114
95
  tilt (1.3.3)
115
- treetop (1.4.10)
116
- polyglot
117
- polyglot (>= 0.3.1)
118
- tzinfo (0.3.31)
119
96
  watchr (0.7)
120
97
  xpath (0.1.4)
121
98
  nokogiri (~> 1.3)
@@ -126,8 +103,7 @@ PLATFORMS
126
103
  DEPENDENCIES
127
104
  capybara
128
105
  jquery-rails
129
- rails (= 3.1.3)
130
- rows_controller
106
+ rails
131
107
  rspec-rails
132
108
  spork
133
109
  sqlite3
data/app/controllers/rows_controller.rb CHANGED
@@ -55,7 +55,10 @@ class RowsController < ApplicationController
55
55
  private
56
56
  def save_and_respond(notice, failure_template)
57
57
  if resource.save
58
- respond_with(resource)
58
+ respond_with(resource) do |format|
59
+ format.html { redirect_to :action => :edit, :id => resource.id }
60
+ format.xml { render :xml => resource.errors, :status => :unprocessable_entity }
61
+ end
59
62
  flash[:notice] = notice
60
63
  else
61
64
  respond_with(resource) do |format|
data/lib/rows_controller/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Rows
2
- VERSION = '0.2.4'
2
+ VERSION = '0.3.2'
3
3
  end
data/spec/integration/order_spec.rb CHANGED
@@ -13,7 +13,7 @@ describe "Order" do
13
13
  fill_in "Name", :with => "a name"
14
14
  click_button "Create"
15
15
  page.should have_content("Order created.")
16
- page.should have_content("Show Order")
16
+ page.should have_content("Edit Order")
17
17
 
18
18
  Order.all.first.name.should == "a name"
19
19
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rows_controller
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.4
4
+ version: 0.3.2
5
5
  prerelease:
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: 2012-02-23 00:00:00.000000000 Z
12
+ date: 2012-02-26 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: sqlite3
16
- requirement: &81766660 !ruby/object:Gem::Requirement
16
+ requirement: &69804540 !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: :development
23
23
  prerelease: false
24
- version_requirements: *81766660
24
+ version_requirements: *69804540
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: rspec-rails
27
- requirement: &81765120 !ruby/object:Gem::Requirement
27
+ requirement: &69802990 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *81765120
35
+ version_requirements: *69802990
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: capybara
38
- requirement: &81764180 !ruby/object:Gem::Requirement
38
+ requirement: &69802050 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
43
43
  version: '0'
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *81764180
46
+ version_requirements: *69802050
47
47
  description: YourController < RowsController ( < ApplicationController).
48
48
  email:
49
49
  - dittmar.krall@matique.de
@@ -120,7 +120,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
120
120
  version: '0'
121
121
  segments:
122
122
  - 0
123
- hash: -51311327
123
+ hash: 96169197
124
124
  required_rubygems_version: !ruby/object:Gem::Requirement
125
125
  none: false
126
126
  requirements: