Skip to content

Commit

Permalink
Merge pull request #5 from spree-contrib/solidus-support
Browse files Browse the repository at this point in the history
Add Support for Solidus
  • Loading branch information
BenMorganIO committed Oct 14, 2015
2 parents 2a31af7 + 336a133 commit bc2a62e
Show file tree
Hide file tree
Showing 7 changed files with 61 additions and 9 deletions.
13 changes: 10 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
source 'https://rubygems.org'

gem 'spree_api', github: 'spree', branch: '3-0-stable'
gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '3-0-stable'
if ENV['SOLIDUS_API'].nil?
gem 'spree_api', github: 'spree', branch: '3-0-stable'
gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '3-0-stable'

gemspec
gemspec name: 'spree_api_v2'
else
gem 'solidus_api', github: 'solidusio/solidus'
gem 'solidus_auth_devise', github: 'solidusio/solidus_auth_devise'

gemspec name: 'solidus_api_v2'
end
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,9 @@ First bundle your dependencies, then run `rake`. `rake` will default to building
The dummy app can be regenerated by using `rake test_app`.

```shell
bundle && bundle exec rake
bundle
bundle exec rake GEMNAME=spree_api_v2
bundle exec rake GEMNAME=solidus_api_v2
```

## Sponsored by:
Expand Down
6 changes: 3 additions & 3 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
require 'bundler'
Bundler::GemHelper.install_tasks
Bundler::GemHelper.install_tasks name: ENV['GEMNAME']

require 'rspec/core/rake_task'

Expand All @@ -9,9 +9,9 @@ require 'generators/spree/install/install_generator'
RSpec::Core::RakeTask.new

task :default do
if Dir["spec/dummy"].empty?
if Dir['spec/dummy'].empty?
Rake::Task[:test_app].invoke
Dir.chdir("../../")
Dir.chdir('../../')
end
Rake::Task[:spec].invoke
end
Expand Down
3 changes: 2 additions & 1 deletion circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ machine:

test:
override:
- bundle exec rake
- bundle exec rake GEMNAME=spree_api_v2
- bundle exec rake GEMNAME=solidus_api_v2
5 changes: 5 additions & 0 deletions lib/solidus_api_v2.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
require 'solidus_core'
require 'active_model_serializers'

ENV['SOLIDUS_API'] = 'true'
require 'spree_api_v2/engine'
3 changes: 2 additions & 1 deletion lib/spree_api_v2/engine.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
module SpreeApiV2
class Engine < Rails::Engine
require 'spree/core'

isolate_namespace Spree
engine_name 'spree_api_v2'
engine_name ENV['SOLIDUS_API'].nil? ? 'spree_api_v2' : 'solidus_api_v2'

# use rspec for tests
config.generators do |g|
Expand Down
36 changes: 36 additions & 0 deletions solidus_api_v2.gemspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# encoding: UTF-8
Gem::Specification.new do |s|
s.platform = Gem::Platform::RUBY
s.name = 'solidus_api_v2'
s.version = '1.1.0'
s.summary = 'The V2 API for Solidus.'
s.description = 'Adds an assortment of new api endpoints that are JSON API compatible.'
s.required_ruby_version = '>= 2.0.0'

s.author = 'Ben A. Morgan'
s.email = 'ben@benmorgan.io'
s.homepage = 'http://spree-contrib.github.io/spree_api_v2'

s.files = `git ls-files`.split("\n")
s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
s.require_path = 'lib'
s.requirements << 'none'

s.add_dependency 'solidus_api', '~> 1.0'
s.add_dependency 'active_model_serializers', '= 0.10.0.rc2'

s.add_development_dependency 'capybara', '~> 2.4'
s.add_development_dependency 'coffee-rails'
s.add_development_dependency 'database_cleaner'
s.add_development_dependency 'factory_girl', '~> 4.5'
s.add_development_dependency 'ffaker'
s.add_development_dependency 'rspec-rails', '~> 3.3'
s.add_development_dependency 'rspec-its'
s.add_development_dependency 'sass-rails', '~> 5.0.0.beta1'
s.add_development_dependency 'selenium-webdriver'
s.add_development_dependency 'simplecov'
s.add_development_dependency 'sqlite3'
s.add_development_dependency 'pg'
s.add_development_dependency 'json_spec', '~> 1.1.4'
s.add_development_dependency 'shoulda-matchers', '~> 3.0.0'
end

0 comments on commit bc2a62e

Please sign in to comment.