spree_api_auth 0.1.1 → 0.2.0

data/Gemfile.lock

@@ -1,10 +1,9 @@
 PATH
   remote: .
   specs:
-    spree_api_auth (0.1.1)
-      spree_api
-      spree_auth
-      spree_core
+    spree_api_auth (0.2.0)
+      spree_api (= 1.2.0)
+      spree_core (= 1.2.0)
 
 GEM
   remote: http://rubygems.org/
@@ -25,14 +24,14 @@ GEM
     active_utils (1.0.4)
       activesupport (>= 2.3.11)
       i18n
-    activemerchant (1.20.4)
+    activemerchant (1.28.0)
       active_utils (>= 1.0.2)
       activesupport (>= 2.3.11)
-      braintree (>= 2.0.0)
       builder (>= 2.0.0)
       i18n
       json (>= 1.5.1)
-      money (<= 3.7.1)
+      money
+      nokogiri
     activemodel (3.2.8)
       activesupport (= 3.2.8)
       builder (~> 3.0.0)
@@ -55,9 +54,6 @@ GEM
       json (~> 1.4)
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
-    bcrypt-ruby (3.0.1)
-    braintree (2.16.0)
-      builder (>= 2.0.0)
     builder (3.0.0)
     cancan (1.6.7)
     capybara (1.0.1)
@@ -69,7 +65,7 @@ GEM
       xpath (~> 0.1.4)
     childprocess (0.3.5)
       ffi (~> 1.0, >= 1.0.6)
-    cocaine (0.2.1)
+    cocaine (0.3.0)
     columnize (0.3.6)
     debugger (1.2.0)
       columnize (>= 0.3.1)
@@ -81,11 +77,6 @@ GEM
     deface (0.9.1)
       nokogiri (~> 1.5.0)
       rails (~> 3.1)
-    devise (2.0.4)
-      bcrypt-ruby (~> 3.0)
-      orm_adapter (~> 0.0.3)
-      railties (~> 3.1)
-      warden (~> 1.1.1)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     factory_girl (2.6.4)
@@ -99,14 +90,13 @@ GEM
       multi_xml
     i18n (0.6.0)
     journey (1.0.4)
-    jquery-rails (2.0.3)
+    jquery-rails (2.1.1)
       railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
     json (1.7.5)
-    kaminari (0.13.0)
+    kaminari (0.14.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-      railties (>= 3.0.0)
     libwebsocket (0.1.5)
       addressable
     mail (2.4.4)
@@ -114,15 +104,15 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.19)
-    money (3.7.1)
+    money (5.0.0)
       i18n (~> 0.4)
+      json
     multi_json (1.3.6)
     multi_xml (0.5.1)
     nested_set (1.7.0)
       activerecord (>= 3.0.0)
       railties (>= 3.0.0)
     nokogiri (1.5.5)
-    orm_adapter (0.0.7)
     paperclip (2.7.0)
       activerecord (>= 2.3.0)
       activesupport (>= 2.3.2)
@@ -157,7 +147,7 @@ GEM
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     rake (0.9.2.2)
-    ransack (0.6.0)
+    ransack (0.7.0)
       actionpack (~> 3.0)
       activerecord (~> 3.0)
       polyamorous (~> 0.5.0)
@@ -177,32 +167,32 @@ GEM
       railties (>= 3.0)
       rspec (~> 2.11.0)
     rubyzip (0.9.9)
+    select2-rails (0.0.9)
+      thor (~> 0.14)
     selenium-webdriver (2.25.0)
       childprocess (>= 0.2.5)
       libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
-    spree_api (1.1.3)
+    spree_api (1.2.0)
       rabl (= 0.6.5)
-      spree_auth (= 1.1.3)
-      spree_core (= 1.1.3)
-    spree_auth (1.1.3)
-      cancan (= 1.6.7)
-      devise (~> 2.0.0)
-      spree_core (= 1.1.3)
-    spree_core (1.1.3)
-      activemerchant (= 1.20.4)
+      spree_core (= 1.2.0)
+    spree_core (1.2.0)
+      activemerchant (= 1.28.0)
       acts_as_list (= 0.1.4)
       aws-sdk (~> 1.3.4)
+      cancan (= 1.6.7)
       deface (>= 0.9.0)
       ffaker (~> 1.12.0)
       highline (= 1.6.11)
-      jquery-rails (~> 2.0.0)
+      jquery-rails (~> 2.0)
       kaminari (>= 0.13.0)
+      money (= 5.0.0)
       nested_set (= 1.7.0)
       paperclip (~> 2.7)
-      rails (~> 3.2.6)
-      ransack (~> 0.6.0)
+      rails (~> 3.2.8)
+      ransack (~> 0.7.0)
+      select2-rails (= 0.0.9)
       state_machine (= 1.1.2)
       stringex (~> 1.3.2)
     sprockets (2.1.3)
@@ -219,8 +209,6 @@ GEM
       polyglot (>= 0.3.1)
     tzinfo (0.3.33)
     uuidtools (2.1.3)
-    warden (1.1.1)
-      rack (>= 1.0)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 

data/app/controllers/spree/api/v1/users_controller.rb

@@ -10,7 +10,7 @@ module Spree
             unauthorized 
             return 
           end
-          @user.generate_api_key!
+          @user.generate_spree_api_key!
         end
 
         def sign_in
@@ -19,7 +19,7 @@ module Spree
             unauthorized
             return 
           end
-          @user.generate_api_key! if @user.api_key.blank?
+          @user.generate_spree_api_key! if @user.spree_api_key.blank?
         end
 
       end

data/app/views/spree/api/v1/users/sign_in.rabl

@@ -1,2 +1,2 @@
 object @user
-attributes :id, :api_key, :email
+attributes :id, :spree_api_key, :email

data/app/views/spree/api/v1/users/sign_up.rabl

@@ -1,2 +1,2 @@
 object @user
-attributes :id, :api_key, :email
+attributes :id, :spree_api_key, :email

data/spree_api_auth.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_api_auth'
-  s.version     = '0.1.1'
+  s.version     = '0.2.0'
   s.summary     = "Spree's Authenticattion API"
   s.description = "Spree's Authenticattion API"
   s.required_ruby_version = '>= 1.8.7'
@@ -16,9 +16,8 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_dependency 'spree_core'
-  s.add_dependency 'spree_api'
-  s.add_dependency 'spree_auth'
+  s.add_dependency 'spree_core', '1.2.0'
+  s.add_dependency 'spree_api', '1.2.0'
 
   s.add_development_dependency 'capybara', '1.0.1'
   s.add_development_dependency 'factory_girl', '~> 2.6.4'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_api_auth
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,56 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-21 00:00:00.000000000 Z
+date: 2012-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: spree_api
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: spree_auth
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -185,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2270508300482352318
+      hash: 220655074187747323
 requirements:
 - none
 rubyforge_project: