spree_api_auth 0.1.1 → 0.2.0

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.
Files changed (6) hide show
  1. data/Gemfile.lock +24 -36
  2. data/app/controllers/spree/api/v1/users_controller.rb +2 -2
  3. data/app/views/spree/api/v1/users/sign_in.rabl +1 -1
  4. data/app/views/spree/api/v1/users/sign_up.rabl +1 -1
  5. data/spree_api_auth.gemspec +3 -4
  6. metadata +11 -27
data/Gemfile.lock CHANGED
@@ -1,10 +1,9 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- spree_api_auth (0.1.1)
5
- spree_api
6
- spree_auth
7
- spree_core
4
+ spree_api_auth (0.2.0)
5
+ spree_api (= 1.2.0)
6
+ spree_core (= 1.2.0)
8
7
 
9
8
  GEM
10
9
  remote: http://rubygems.org/
@@ -25,14 +24,14 @@ GEM
25
24
  active_utils (1.0.4)
26
25
  activesupport (>= 2.3.11)
27
26
  i18n
28
- activemerchant (1.20.4)
27
+ activemerchant (1.28.0)
29
28
  active_utils (>= 1.0.2)
30
29
  activesupport (>= 2.3.11)
31
- braintree (>= 2.0.0)
32
30
  builder (>= 2.0.0)
33
31
  i18n
34
32
  json (>= 1.5.1)
35
- money (<= 3.7.1)
33
+ money
34
+ nokogiri
36
35
  activemodel (3.2.8)
37
36
  activesupport (= 3.2.8)
38
37
  builder (~> 3.0.0)
@@ -55,9 +54,6 @@ GEM
55
54
  json (~> 1.4)
56
55
  nokogiri (>= 1.4.4)
57
56
  uuidtools (~> 2.1)
58
- bcrypt-ruby (3.0.1)
59
- braintree (2.16.0)
60
- builder (>= 2.0.0)
61
57
  builder (3.0.0)
62
58
  cancan (1.6.7)
63
59
  capybara (1.0.1)
@@ -69,7 +65,7 @@ GEM
69
65
  xpath (~> 0.1.4)
70
66
  childprocess (0.3.5)
71
67
  ffi (~> 1.0, >= 1.0.6)
72
- cocaine (0.2.1)
68
+ cocaine (0.3.0)
73
69
  columnize (0.3.6)
74
70
  debugger (1.2.0)
75
71
  columnize (>= 0.3.1)
@@ -81,11 +77,6 @@ GEM
81
77
  deface (0.9.1)
82
78
  nokogiri (~> 1.5.0)
83
79
  rails (~> 3.1)
84
- devise (2.0.4)
85
- bcrypt-ruby (~> 3.0)
86
- orm_adapter (~> 0.0.3)
87
- railties (~> 3.1)
88
- warden (~> 1.1.1)
89
80
  diff-lcs (1.1.3)
90
81
  erubis (2.7.0)
91
82
  factory_girl (2.6.4)
@@ -99,14 +90,13 @@ GEM
99
90
  multi_xml
100
91
  i18n (0.6.0)
101
92
  journey (1.0.4)
102
- jquery-rails (2.0.3)
93
+ jquery-rails (2.1.1)
103
94
  railties (>= 3.1.0, < 5.0)
104
95
  thor (~> 0.14)
105
96
  json (1.7.5)
106
- kaminari (0.13.0)
97
+ kaminari (0.14.0)
107
98
  actionpack (>= 3.0.0)
108
99
  activesupport (>= 3.0.0)
109
- railties (>= 3.0.0)
110
100
  libwebsocket (0.1.5)
111
101
  addressable
112
102
  mail (2.4.4)
@@ -114,15 +104,15 @@ GEM
114
104
  mime-types (~> 1.16)
115
105
  treetop (~> 1.4.8)
116
106
  mime-types (1.19)
117
- money (3.7.1)
107
+ money (5.0.0)
118
108
  i18n (~> 0.4)
109
+ json
119
110
  multi_json (1.3.6)
120
111
  multi_xml (0.5.1)
121
112
  nested_set (1.7.0)
122
113
  activerecord (>= 3.0.0)
123
114
  railties (>= 3.0.0)
124
115
  nokogiri (1.5.5)
125
- orm_adapter (0.0.7)
126
116
  paperclip (2.7.0)
127
117
  activerecord (>= 2.3.0)
128
118
  activesupport (>= 2.3.2)
@@ -157,7 +147,7 @@ GEM
157
147
  rdoc (~> 3.4)
158
148
  thor (>= 0.14.6, < 2.0)
159
149
  rake (0.9.2.2)
160
- ransack (0.6.0)
150
+ ransack (0.7.0)
161
151
  actionpack (~> 3.0)
162
152
  activerecord (~> 3.0)
163
153
  polyamorous (~> 0.5.0)
@@ -177,32 +167,32 @@ GEM
177
167
  railties (>= 3.0)
178
168
  rspec (~> 2.11.0)
179
169
  rubyzip (0.9.9)
170
+ select2-rails (0.0.9)
171
+ thor (~> 0.14)
180
172
  selenium-webdriver (2.25.0)
181
173
  childprocess (>= 0.2.5)
182
174
  libwebsocket (~> 0.1.3)
183
175
  multi_json (~> 1.0)
184
176
  rubyzip
185
- spree_api (1.1.3)
177
+ spree_api (1.2.0)
186
178
  rabl (= 0.6.5)
187
- spree_auth (= 1.1.3)
188
- spree_core (= 1.1.3)
189
- spree_auth (1.1.3)
190
- cancan (= 1.6.7)
191
- devise (~> 2.0.0)
192
- spree_core (= 1.1.3)
193
- spree_core (1.1.3)
194
- activemerchant (= 1.20.4)
179
+ spree_core (= 1.2.0)
180
+ spree_core (1.2.0)
181
+ activemerchant (= 1.28.0)
195
182
  acts_as_list (= 0.1.4)
196
183
  aws-sdk (~> 1.3.4)
184
+ cancan (= 1.6.7)
197
185
  deface (>= 0.9.0)
198
186
  ffaker (~> 1.12.0)
199
187
  highline (= 1.6.11)
200
- jquery-rails (~> 2.0.0)
188
+ jquery-rails (~> 2.0)
201
189
  kaminari (>= 0.13.0)
190
+ money (= 5.0.0)
202
191
  nested_set (= 1.7.0)
203
192
  paperclip (~> 2.7)
204
- rails (~> 3.2.6)
205
- ransack (~> 0.6.0)
193
+ rails (~> 3.2.8)
194
+ ransack (~> 0.7.0)
195
+ select2-rails (= 0.0.9)
206
196
  state_machine (= 1.1.2)
207
197
  stringex (~> 1.3.2)
208
198
  sprockets (2.1.3)
@@ -219,8 +209,6 @@ GEM
219
209
  polyglot (>= 0.3.1)
220
210
  tzinfo (0.3.33)
221
211
  uuidtools (2.1.3)
222
- warden (1.1.1)
223
- rack (>= 1.0)
224
212
  xpath (0.1.4)
225
213
  nokogiri (~> 1.3)
226
214
 
data/app/controllers/spree/api/v1/users_controller.rb CHANGED
@@ -10,7 +10,7 @@ module Spree
10
10
  unauthorized
11
11
  return
12
12
  end
13
- @user.generate_api_key!
13
+ @user.generate_spree_api_key!
14
14
  end
15
15
 
16
16
  def sign_in
@@ -19,7 +19,7 @@ module Spree
19
19
  unauthorized
20
20
  return
21
21
  end
22
- @user.generate_api_key! if @user.api_key.blank?
22
+ @user.generate_spree_api_key! if @user.spree_api_key.blank?
23
23
  end
24
24
 
25
25
  end
data/app/views/spree/api/v1/users/sign_in.rabl CHANGED
@@ -1,2 +1,2 @@
1
1
  object @user
2
- attributes :id, :api_key, :email
2
+ attributes :id, :spree_api_key, :email
data/app/views/spree/api/v1/users/sign_up.rabl CHANGED
@@ -1,2 +1,2 @@
1
1
  object @user
2
- attributes :id, :api_key, :email
2
+ attributes :id, :spree_api_key, :email
data/spree_api_auth.gemspec CHANGED
@@ -2,7 +2,7 @@
2
2
  Gem::Specification.new do |s|
3
3
  s.platform = Gem::Platform::RUBY
4
4
  s.name = 'spree_api_auth'
5
- s.version = '0.1.1'
5
+ s.version = '0.2.0'
6
6
  s.summary = "Spree's Authenticattion API"
7
7
  s.description = "Spree's Authenticattion API"
8
8
  s.required_ruby_version = '>= 1.8.7'
@@ -16,9 +16,8 @@ Gem::Specification.new do |s|
16
16
  s.require_path = 'lib'
17
17
  s.requirements << 'none'
18
18
 
19
- s.add_dependency 'spree_core'
20
- s.add_dependency 'spree_api'
21
- s.add_dependency 'spree_auth'
19
+ s.add_dependency 'spree_core', '1.2.0'
20
+ s.add_dependency 'spree_api', '1.2.0'
22
21
 
23
22
  s.add_development_dependency 'capybara', '1.0.1'
24
23
  s.add_development_dependency 'factory_girl', '~> 2.6.4'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_api_auth
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.1
4
+ version: 0.2.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,56 +9,40 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-08-21 00:00:00.000000000 Z
12
+ date: 2012-09-10 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: spree_core
16
16
  requirement: !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
- - - ! '>='
19
+ - - '='
20
20
  - !ruby/object:Gem::Version
21
- version: '0'
21
+ version: 1.2.0
22
22
  type: :runtime
23
23
  prerelease: false
24
24
  version_requirements: !ruby/object:Gem::Requirement
25
25
  none: false
26
26
  requirements:
27
- - - ! '>='
27
+ - - '='
28
28
  - !ruby/object:Gem::Version
29
- version: '0'
29
+ version: 1.2.0
30
30
  - !ruby/object:Gem::Dependency
31
31
  name: spree_api
32
32
  requirement: !ruby/object:Gem::Requirement
33
33
  none: false
34
34
  requirements:
35
- - - ! '>='
36
- - !ruby/object:Gem::Version
37
- version: '0'
38
- type: :runtime
39
- prerelease: false
40
- version_requirements: !ruby/object:Gem::Requirement
41
- none: false
42
- requirements:
43
- - - ! '>='
44
- - !ruby/object:Gem::Version
45
- version: '0'
46
- - !ruby/object:Gem::Dependency
47
- name: spree_auth
48
- requirement: !ruby/object:Gem::Requirement
49
- none: false
50
- requirements:
51
- - - ! '>='
35
+ - - '='
52
36
  - !ruby/object:Gem::Version
53
- version: '0'
37
+ version: 1.2.0
54
38
  type: :runtime
55
39
  prerelease: false
56
40
  version_requirements: !ruby/object:Gem::Requirement
57
41
  none: false
58
42
  requirements:
59
- - - ! '>='
43
+ - - '='
60
44
  - !ruby/object:Gem::Version
61
- version: '0'
45
+ version: 1.2.0
62
46
  - !ruby/object:Gem::Dependency
63
47
  name: capybara
64
48
  requirement: !ruby/object:Gem::Requirement
@@ -185,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
185
169
  version: '0'
186
170
  segments:
187
171
  - 0
188
- hash: -2270508300482352318
172
+ hash: 220655074187747323
189
173
  requirements:
190
174
  - none
191
175
  rubyforge_project: