omniauth-shopify 0.0.2 → 0.1.0

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - ruby-head
+  - ree

data/README.md

@@ -2,6 +2,8 @@
 
 Strategy for authenticating to Shopify API using OmniAuth.
 
+[![Build Status](https://secure.travis-ci.org/yevgenko/omniauth-shopify.png)](http://travis-ci.org/yevgenko/omniauth-shopify)
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -26,16 +28,29 @@ The following information is provided back to you for this provider:
 
 ```ruby
 {
-  uid: 'example.myshopify.com',
+  uid: 'some-store',
   info: {
-    name: 'example.myshopify.com',
+    name: 'some-store',
+    urls: { site: 'https://some-store.myshopify.com/admin' }
   },
-  credentials: {
-    token: 'thetoken' # can be used to auth to the API
+  credentials: { # basic auth
+    username: 'api_key',
+    password: 'password'
   }
 }
 ```
 
+## Examples
+
+[examples/][] directory contains few simple [sinatra][] apps:
+
+* auth_hash.rb - displays auth hash schema
+* api_consumer.rb - consuming api with [httparty][]
+
+So, make sure you have [sinatra][] and [httparty][] gems and run it as follow:
+
+    SHOPIFY_KEY="apikey" SHOPIFY_SECRET="secret" ruby auth_hash.rb
+
 ## Contributing
 
 1. Fork it
@@ -43,3 +58,8 @@ The following information is provided back to you for this provider:
 3. Commit your changes (`git commit -am 'Added some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+
+[examples/]:https://github.com/yevgenko/omniauth-shopify/tree/master/examples
+[sinatra]:http://www.sinatrarb.com/
+[httparty]:https://github.com/jnunemaker/httparty

data/Rakefile

@@ -4,3 +4,5 @@ require 'rake/testtask'
 Rake::TestTask.new do |t|
   t.test_files = FileList['spec/**/*_spec.rb']
 end
+
+task :default => :test

data/examples/api_consumer.rb

@@ -0,0 +1,23 @@
+$:.push File.dirname(__FILE__) + '/../lib'
+
+require 'sinatra'
+require 'omniauth-shopify'
+require 'httparty'
+
+use Rack::Session::Cookie
+use OmniAuth::Strategies::Shopify, ENV['SHOPIFY_KEY'], ENV['SHOPIFY_SECRET']
+
+get '/' do
+  <<-HTML
+  <ul>
+    <li><a href='/auth/shopify'>Sign in with Shopify</a></li>
+  </ul>
+  HTML
+end
+
+get '/auth/shopify/callback' do
+  content_type 'text/plain'
+  url = request.env['omniauth.auth']['info']['urls']['site']
+  credentials = request.env['omniauth.auth']['credentials']
+  HTTParty.get("#{url}/orders.json?limit=5", :basic_auth => credentials, :headers => { 'ContentType' => 'application/json' }).inspect
+end

data/lib/omniauth-shopify/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Shopify
-    VERSION = "0.0.2"
+    VERSION = "0.1.0"
   end
 end

data/lib/omniauth/strategies/shopify.rb

@@ -17,6 +17,10 @@ module OmniAuth
       def identifier
         i = options.identifier || request.params[options.identifier_param.to_s]
         i = nil if i == ''
+        if i
+          i.gsub!(/https?:\/\//, '') # remove http:// or https://
+          i.gsub!(/\..*/, '') # remove .myshopify.com
+        end
         i
       end
 
@@ -28,11 +32,7 @@ module OmniAuth
       end
 
       def create_permission_url
-        url = identifier
-        url.gsub!(/https?:\/\//, '')                            # remove http:// or https://
-        url.concat(".myshopify.com") unless url.include?('.')   # extend url to myshopify.com if no host is given
-
-        "http://#{url}/admin/api/auth?api_key=#{options[:api_key]}"
+        "http://#{identifier}.myshopify.com/admin/api/auth?api_key=#{options[:api_key]}"
       end
 
       def start
@@ -60,9 +60,15 @@ module OmniAuth
         super
       end
 
-      uid{ request.params[options.identifier_param.to_s] }
-      info{ {:name => request.params[options.identifier_param.to_s]} }
-      credentials{ {:token => self.token} }
+      uid{ identifier }
+      info{ {
+        :name => identifier,
+        :urls => {:site => "https://#{identifier}.myshopify.com/admin"}
+      } }
+      credentials{ { # basic auth
+        :username => options.api_key,
+        :password => Digest::MD5.hexdigest(options.secret + self.token)
+      } }
     end
   end
 end

data/spec/omniauth/strategies/shopify_spec.rb

@@ -41,6 +41,10 @@ describe OmniAuth::Strategies::Shopify do
     Digest::MD5.hexdigest('hush' + calculated_signature.sort.join)
   end
 
+  def password
+    Digest::MD5.hexdigest('hush' + query_parameters['t'])
+  end
+
   describe '#request_phase' do
     it 'must prompt for a shop url' do
       get '/auth/shopify'
@@ -64,11 +68,19 @@ describe OmniAuth::Strategies::Shopify do
     end
 
     it 'must have proper uid' do
-      last_request.env['omniauth.auth']['uid'].must_equal query_parameters['shop']
+      last_request.env['omniauth.auth']['uid'].must_equal 'some-shop'
+    end
+
+    it 'must have site URL' do
+      last_request.env['omniauth.auth']['info']['urls']['site'].must_equal "https://some-shop.myshopify.com/admin"
+    end
+
+    it 'must have username' do
+      last_request.env['omniauth.auth']['credentials']['username'].must_equal 'apikey'
     end
 
-    it 'must have token' do
-      last_request.env['omniauth.auth']['credentials']['token'].must_equal query_parameters['t']
+    it 'must have password' do
+      last_request.env['omniauth.auth']['credentials']['password'].must_equal password
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-shopify
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-13 00:00:00.000000000Z
+date: 2012-03-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &17205819720 !ruby/object:Gem::Requirement
+  requirement: &16165760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *17205819720
+  version_requirements: *16165760
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &17205819280 !ruby/object:Gem::Requirement
+  requirement: &16165240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17205819280
+  version_requirements: *16165240
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &17205818820 !ruby/object:Gem::Requirement
+  requirement: &16164740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17205818820
+  version_requirements: *16164740
 description: Strategy for authenticating to Shopify API with OmniAuth.
 email:
 - craftsman@yevgenko.me
@@ -52,10 +52,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
-- examples/sinatra.rb
+- examples/api_consumer.rb
+- examples/auth_hash.rb
 - lib/omniauth-shopify.rb
 - lib/omniauth-shopify/version.rb
 - lib/omniauth/strategies/shopify.rb