alchemy_cms 3.1.0.beta4 → 3.1.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c7ef4a778e3a0130f1c0422d5a51d5d3c256f2f
-  data.tar.gz: 91ec8dc7bf118c1f1f315e81410d5edc7477d4ab
+  metadata.gz: d78b3cd4366f28718898767bfd2212e69395d267
+  data.tar.gz: 140a0432a7d56ebf61bea01496a2a595dc4d01d2
 SHA512:
-  metadata.gz: 44cd5e491679b63345d203a96d8695f4001583b27d53e78d2579fbca611b5d6cb8c6e86b9339e66436e54e0ff811f70fcf23021244e79e74429f0fff59109646
-  data.tar.gz: 0fcdb8fdbfc4077baa2f874e07b8de953ba43e5638ca0f38fdb348fda50ead3a0ecfeb5ddc0cf4b684f76ab3293ea57969c5a6c46ce0890b846c043851272c8b
+  metadata.gz: 27f13644e9cb1b682087d700fc8bc8832bc631eec3050afceb6de0c208b2529240bf4c305e6834d6be3a0108cd5e0450c4a2760711fcc1280db8e100b12aaa39
+  data.tar.gz: cf7ea49cb254531558138aa382e3cdba384e318dcadf7545abc467bb04393308a6fa71c5713faf3747ef6d38a4d2a92156d9217a1cfa4d3bfe7a509c352cc93c

data/Gemfile

@@ -9,14 +9,10 @@ end
 # Code coverage plattform
 gem 'coveralls', require: false
 
-gem 'database_cleaner'
-
 group :test do
   gem 'sqlite3'               if ENV['DB'].nil? || ENV['DB'] == 'sqlite'
   gem 'mysql2'                if ENV['DB'] == 'mysql'
   gem 'pg'                    if ENV['DB'] == 'postgresql'
-  gem 'poltergeist'
-  gem 'rspec-activemodel-mocks'
   unless ENV['CI']
     gem 'launchy'
   end

data/alchemy_cms.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'awesome_nested_set',               ['~> 3.0.0']
   gem.add_runtime_dependency 'cancancan',                        ['~> 1.9']
   gem.add_runtime_dependency 'coffee-rails',                     ['~> 4.0']
-  gem.add_runtime_dependency 'compass-rails',                    ['>= 1.1.2']
+  gem.add_runtime_dependency 'compass-rails',                    ['~> 1.1']
   gem.add_runtime_dependency 'dragonfly',                        ['~> 1.0.1']
   gem.add_runtime_dependency 'jquery-rails',                     ['~> 3.1.0']
   gem.add_runtime_dependency 'jquery-ui-rails',                  ['~> 5.0.0']
@@ -35,18 +35,19 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'non-stupid-digest-assets',         ['~> 1.0.3']
   gem.add_runtime_dependency 'rails',                            ['>= 4.0', '< 4.2']
   gem.add_runtime_dependency 'request_store',                    ['~> 1.1.0']
-  gem.add_runtime_dependency 'sass-rails',                       ['~> 4.0.5']
+  gem.add_runtime_dependency 'sass-rails',                       ['~> 4.0']
   gem.add_runtime_dependency 'sassy-buttons',                    ['~> 0.2.6']
   gem.add_runtime_dependency 'select2-rails',                    ['>= 3.5.9.1', '< 4.0']
   gem.add_runtime_dependency 'simple_form',                      ['~> 3.0']
   gem.add_runtime_dependency 'spinner.rb'
-  gem.add_runtime_dependency 'sprockets',                        ['~> 2.11.3']
   gem.add_runtime_dependency 'turbolinks',                       ['~> 2.5']
   gem.add_runtime_dependency 'tvdeyen-handles_sortable_columns', ['~> 0.1.5']
-  gem.add_runtime_dependency 'uglifier',                         ['>= 1.3.0']
 
-  gem.add_development_dependency 'capybara'
-  gem.add_development_dependency 'factory_girl_rails'
+  gem.add_development_dependency 'capybara',                     ['~> 2.4']
+  gem.add_development_dependency 'database_cleaner',             ['~> 1.3']
+  gem.add_development_dependency 'factory_girl_rails',           ['~> 4.5']
+  gem.add_development_dependency 'poltergeist',                  ['~> 1.5']
+  gem.add_development_dependency 'rspec-activemodel-mocks',      ['~> 1.0']
   gem.add_development_dependency 'rspec-rails',                  ['~> 3.0']
 
   gem.post_install_message =<<-MSG

data/bin/alchemy

@@ -33,11 +33,7 @@ class AlchemyInstaller < Thor
     system("#{rake_cmd} alchemy:install from_binary=true") || exit!(1)
     say "\nStep 3: Installing Alchemy User into Rails app", :yellow
     say "Please wait...", :yellow
-    system("#{rake_cmd} alchemy_devise:install:migrations") || exit!(1)
-    say "Done.", :green
-    say "\nStep 4: Setting up the database", :yellow
-    say "Please wait...", :yellow
-    system("#{rake_cmd} db:migrate") || exit!(1)
+    system("#{rails_cmd} g alchemy:devise:install") || exit!(1)
     say "Done.", :green
     cleanup
     say "\nSuccessfully installed Alchemy CMS\n", :green
@@ -53,7 +49,15 @@ class AlchemyInstaller < Thor
   end
 
   def rake_cmd
-    "cd #{@application} && bundle exec rake"
+    "#{bundle_cmd} rake"
+  end
+
+  def rails_cmd
+    "#{bundle_cmd} rails"
+  end
+
+  def bundle_cmd
+    "cd #{@application} && bundle exec"
   end
 
   def alchemy_template

data/lib/alchemy/test_support/factories.rb

@@ -1,3 +1,5 @@
+require 'factory_girl'
+
 FactoryGirl.define do
 
   factory :user, class: 'DummyUser' do

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
-  VERSION = "3.1.0.beta4"
+  VERSION = "3.1.0.beta5"
 
   def self.version
     VERSION

data/lib/rails/templates/alchemy.rb

@@ -2,5 +2,5 @@
 require File.expand_path('../../../alchemy/version', __FILE__)
 
 gem 'alchemy_cms', "#{Alchemy::VERSION}"
-gem 'alchemy-devise', '>= 2.1.0.beta2'
+gem 'alchemy-devise', '>= 2.1.0.beta3'
 gem 'capistrano', '~> 2.15.5', group: 'development'

data/spec/spec_helper.rb

@@ -13,9 +13,21 @@ ENV["RAILS_ENV"] = "test"
 
 require File.expand_path("../dummy/config/environment.rb", __FILE__)
 
-require "rails/test_help"
-require "rspec/rails"
-require 'factory_girl'
+require 'alchemy/seeder'
+require 'alchemy/test_support/auth_helpers'
+require 'alchemy/test_support/controller_requests'
+require 'alchemy/test_support/integration_helpers'
+require 'alchemy/test_support/essence_shared_examples'
+require 'alchemy/test_support/factories'
+require 'capybara/poltergeist'
+require 'capybara/rails'
+require 'database_cleaner'
+require 'rails/test_help'
+require 'rspec-activemodel-mocks'
+require 'rspec/rails'
+
+require_relative "support/hint_examples.rb"
+require_relative "support/transformation_examples.rb"
 
 ActionMailer::Base.delivery_method = :test
 ActionMailer::Base.perform_deliveries = true
@@ -25,17 +37,6 @@ Rails.backtrace_cleaner.remove_silencers!
 # Disable rails loggin for faster IO. Remove this if you want to have a test.log
 Rails.logger.level = 4
 
-require "capybara/rails"
-require 'capybara/poltergeist'
-require 'alchemy/seeder'
-require 'alchemy/test_support/auth_helpers'
-require 'alchemy/test_support/controller_requests'
-require 'alchemy/test_support/integration_helpers'
-require 'alchemy/test_support/factories'
-require 'alchemy/test_support/essence_shared_examples'
-require_relative "support/hint_examples.rb"
-require_relative "support/transformation_examples.rb"
-
 # Configure capybara for integration testing
 Capybara.default_driver = :rack_test
 Capybara.default_selector = :css

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 3.1.0.beta4
+  version: 3.1.0.beta5
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -122,16 +122,16 @@ dependencies:
   name: compass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement
@@ -256,14 +256,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.5
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.5
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: sassy-buttons
   requirement: !ruby/object:Gem::Requirement
@@ -327,89 +327,103 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sprockets
+  name: turbolinks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.11.3
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.11.3
+        version: '2.5'
 - !ruby/object:Gem::Dependency
-  name: turbolinks
+  name: tvdeyen-handles_sortable_columns
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: 0.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: 0.1.5
 - !ruby/object:Gem::Dependency
-  name: tvdeyen-handles_sortable_columns
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5
-  type: :runtime
+        version: '2.4'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: '2.4'
 - !ruby/object:Gem::Dependency
-  name: uglifier
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :runtime
+        version: '1.3'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.5'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: poltergeist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: rspec-activemodel-mocks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement