sandboxy 1.1.1 → 2.0.0

data/examples/rails_example/test/controllers/authors_controller_test.rb

@@ -0,0 +1,48 @@
+require 'test_helper'
+
+class AuthorsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    @author = authors(:one)
+  end
+
+  test "should get index" do
+    get authors_url
+    assert_response :success
+  end
+
+  test "should get new" do
+    get new_author_url
+    assert_response :success
+  end
+
+  test "should create author" do
+    assert_difference('Author.count') do
+      post authors_url, params: { author: {  } }
+    end
+
+    assert_redirected_to author_url(Author.last)
+  end
+
+  test "should show author" do
+    get author_url(@author)
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get edit_author_url(@author)
+    assert_response :success
+  end
+
+  test "should update author" do
+    patch author_url(@author), params: { author: {  } }
+    assert_redirected_to author_url(@author)
+  end
+
+  test "should destroy author" do
+    assert_difference('Author.count', -1) do
+      delete author_url(@author)
+    end
+
+    assert_redirected_to authors_url
+  end
+end

data/examples/rails_example/test/controllers/books_controller_test.rb

@@ -0,0 +1,48 @@
+require 'test_helper'
+
+class BooksControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    @book = books(:one)
+  end
+
+  test "should get index" do
+    get books_url
+    assert_response :success
+  end
+
+  test "should get new" do
+    get new_book_url
+    assert_response :success
+  end
+
+  test "should create book" do
+    assert_difference('Book.count') do
+      post books_url, params: { book: {  } }
+    end
+
+    assert_redirected_to book_url(Book.last)
+  end
+
+  test "should show book" do
+    get book_url(@book)
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get edit_book_url(@book)
+    assert_response :success
+  end
+
+  test "should update book" do
+    patch book_url(@book), params: { book: {  } }
+    assert_redirected_to book_url(@book)
+  end
+
+  test "should destroy book" do
+    assert_difference('Book.count', -1) do
+      delete book_url(@book)
+    end
+
+    assert_redirected_to books_url
+  end
+end

data/examples/rails_example/test/controllers/libraries_controller_test.rb

@@ -0,0 +1,48 @@
+require 'test_helper'
+
+class LibrariesControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    @library = libraries(:one)
+  end
+
+  test "should get index" do
+    get libraries_url
+    assert_response :success
+  end
+
+  test "should get new" do
+    get new_library_url
+    assert_response :success
+  end
+
+  test "should create library" do
+    assert_difference('Library.count') do
+      post libraries_url, params: { library: {  } }
+    end
+
+    assert_redirected_to library_url(Library.last)
+  end
+
+  test "should show library" do
+    get library_url(@library)
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get edit_library_url(@library)
+    assert_response :success
+  end
+
+  test "should update library" do
+    patch library_url(@library), params: { library: {  } }
+    assert_redirected_to library_url(@library)
+  end
+
+  test "should destroy library" do
+    assert_difference('Library.count', -1) do
+      delete library_url(@library)
+    end
+
+    assert_redirected_to libraries_url
+  end
+end

data/examples/rails_example/test/controllers/sandbox_controller_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class SandboxControllerTest < ActionDispatch::IntegrationTest
+  # test "the truth" do
+  #   assert true
+  # end
+end

data/examples/rails_example/test/fixtures/books.yml

@@ -0,0 +1,11 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+# This model initially had no columns defined. If you add columns to the
+# model remove the '{}' from the fixture names and add the columns immediately
+# below each fixture, per the syntax in the comments below
+#
+one: {}
+# column: value
+#
+two: {}
+# column: value

data/examples/rails_example/test/fixtures/libraries.yml

@@ -0,0 +1,11 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+# This model initially had no columns defined. If you add columns to the
+# model remove the '{}' from the fixture names and add the columns immediately
+# below each fixture, per the syntax in the comments below
+#
+one: {}
+# column: value
+#
+two: {}
+# column: value

data/examples/rails_example/test/models/application_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class ApplicationTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

data/examples/rails_example/test/models/{bar_test.rb → author_test.rb}

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class BarTest < ActiveSupport::TestCase
+class AuthorTest < ActiveSupport::TestCase
   # test "the truth" do
   #   assert true
   # end

data/examples/rails_example/test/models/{foo_test.rb → book_test.rb}

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class FooTest < ActiveSupport::TestCase
+class BookTest < ActiveSupport::TestCase
   # test "the truth" do
   #   assert true
   # end

data/examples/rails_example/test/models/library_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class LibraryTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

data/examples/rails_example/test/system/applications_test.rb

@@ -0,0 +1,9 @@
+require "application_system_test_case"
+
+class ApplicationsTest < ApplicationSystemTestCase
+  # test "visiting the index" do
+  #   visit applications_url
+  #
+  #   assert_selector "h1", text: "Application"
+  # end
+end

data/examples/rails_example/test/system/authors_test.rb

@@ -0,0 +1,9 @@
+require "application_system_test_case"
+
+class AuthorsTest < ApplicationSystemTestCase
+  # test "visiting the index" do
+  #   visit authors_url
+  #
+  #   assert_selector "h1", text: "Author"
+  # end
+end

data/examples/rails_example/test/system/books_test.rb

@@ -0,0 +1,9 @@
+require "application_system_test_case"
+
+class BooksTest < ApplicationSystemTestCase
+  # test "visiting the index" do
+  #   visit books_url
+  #
+  #   assert_selector "h1", text: "Book"
+  # end
+end

data/examples/rails_example/test/system/libraries_test.rb

@@ -0,0 +1,9 @@
+require "application_system_test_case"
+
+class LibrariesTest < ApplicationSystemTestCase
+  # test "visiting the index" do
+  #   visit libraries_url
+  #
+  #   assert_selector "h1", text: "Library"
+  # end
+end

data/lib/generators/sandboxy_generator.rb

@@ -7,8 +7,6 @@ class SandboxyGenerator < Rails::Generators::Base
 
     source_root File.join File.dirname(__FILE__), 'templates'
     desc 'Install sandboxy'
-    class_option :default, desc: 'Set to default environment. Accepts either `live` or `sandbox`.', type: :boolean, default: false, aliases: '-d'
-    class_option :retain_environment, desc: "Whether your app should retain it's environment at runtime on new requests.", type: :boolean, default: false, aliases: '-re'
 
     def self.next_migration_number dirname
         if ActiveRecord::Base.timestamped_migrations
@@ -18,12 +16,12 @@ class SandboxyGenerator < Rails::Generators::Base
         end
     end
 
-    def create_migration_file
-        migration_template 'migration.rb.erb', 'db/migrate/sandboxy_migration.rb', migration_version: migration_version
+    def create_initializer
+        template 'initializer.rb', 'config/initializers/sandboxy.rb'
     end
 
-    def create_configuration
-        template 'configuration.yml.erb', 'config/sandboxy.yml'
+    def create_migration_file
+        migration_template 'migration.rb.erb', 'db/migrate/sandboxy_migration.rb', migration_version: migration_version
     end
 
     def create_model

data/lib/generators/templates/initializer.rb

@@ -0,0 +1,13 @@
+Sandboxy.configure do |config|
+
+    # Set your environment default: Must be either `live` or `sandbox`.
+    # This is the environment that your app boots with.
+    # By default it gets refreshed with every new request to your server.
+    # config.environment = 'live'
+
+    # Specify whether to retain your current app environment on new requests.
+    # If set to true, your app will only load your environment default when starting.
+    # Every additional switch of your environment at runtime will then not be automatically resolved to your environment default on a new request.
+    # config.retain_environment = false
+
+end

data/lib/sandboxy/configuration.rb

@@ -1,44 +1,21 @@
 module Sandboxy
+    class Configuration
 
-    def self.environment
-        config = get_config
-        if config&.key(:environment)
-            config[:environment]
-        else
-            'live'
-        end
-    end
-
-    def self.sandbox?
-        Sandboxy.environment == 'sandbox' ? true : false
-    end
-
-    def self.live?
-        !Sandboxy.sandbox?
-    end
+        attr_accessor :environment
+        attr_accessor :retain_environment
 
-    def self.retain_environment
-        config = get_config
-        if config&.key(:retain_environment)
-            config[:retain_environment]
-        else
-            false
+        def initialize
+            @environment = 'live'
+            @retain_environment = false
         end
-    end
-
-
-    private
 
+        def sandbox?
+            self.environment == 'sandbox' ? true : false
+        end
 
-    def self.get_config
-        require 'yaml'
-
-        begin
-            config = YAML.load_file 'config/sandboxy.yml'
-        rescue Exception
+        def live?
+            !self.sandbox?
         end
 
-        return config if config
     end
-
 end

data/lib/sandboxy/middleware.rb

@@ -9,9 +9,9 @@ module Sandboxy
             require 'sandboxy'
 
             previous_sandbox = $sandbox
-            $sandbox = Sandboxy.environment == 'sandbox' ? true : false
-            
-            puts 'Sandbox: Moved to ' + Sandboxy.environment.to_s + ' environment' if $sandbox != previous_sandbox
+            $sandbox = Sandboxy.configuration.environment == 'sandbox' ? true : false
+
+            puts 'Sandbox: Moved to ' + Sandboxy.configuration.environment.to_s + ' environment' if $sandbox != previous_sandbox
         end
 
     end

data/lib/sandboxy/railtie.rb

@@ -12,10 +12,10 @@ module Sandboxy
 
         initializer 'sandboxy.configure_rails_initialization' do |app|
             require 'sandboxy'
-            puts 'Sandboxy: Using ' + Sandboxy.environment.to_s + ' environment'
+            puts 'Sandboxy: Using ' + Sandboxy.configuration.environment + ' environment'
 
-            $sandbox = Sandboxy.environment == 'sandbox' ? true : false
-            app.middleware.use(Sandboxy::Middleware) unless Sandboxy.retain_environment
+            $sandbox = Sandboxy.configuration.environment == 'sandbox' ? true : false
+            app.middleware.use(Sandboxy::Middleware) unless Sandboxy.configuration.retain_environment
         end
 
     end

data/lib/sandboxy/version.rb

@@ -1,5 +1,5 @@
 module Sandboxy
 
-    VERSION = '1.1.1'
+    VERSION = '2.0.0'
 
 end

data/lib/sandboxy.rb

@@ -1,12 +1,21 @@
 require 'sandboxy/version'
 
-
 module Sandboxy
 
+    autoload :Configuration, 'sandboxy/configuration'
+
+    class << self
+        attr_accessor :configuration
+    end
+
+    def self.configure
+        self.configuration ||= Configuration.new
+        yield configuration
+    end
+
     autoload :Sandboxed, 'sandboxy/sandboxed'
 
-    require 'sandboxy/configuration'
     require 'sandboxy/middleware'
-    require 'sandboxy/railtie' # if defined?(Rails)
+    require 'sandboxy/railtie'
 
 end

data/sandboxy.gemspec

@@ -7,9 +7,9 @@ Gem::Specification.new do |gem|
     gem.platform              = Gem::Platform::RUBY
     gem.summary               = 'Virtual data-oriented environments for Rails'
     gem.description           = 'Sandboxy allows you to use virtual data-oriented environments inside a Rails application while being able to switch in between at runtime. It achieves that by using a combination of Rack Middleware and ActiveRecord.'
-    gem.authors               = 'Slooob'
-    gem.email                 = 'developer@slooob.com'
-    gem.homepage              = 'https://developer.slooob.com/open-source'
+    gem.authors               = 'Jonas Hübotter'
+    gem.email                 = 'jonas.huebotter@gmail.com'
+    gem.homepage              = 'https://github.com/jonhue/sandboxy'
     gem.license               = 'MIT'
 
     gem.files                 = `git ls-files`.split("\n")
@@ -19,12 +19,10 @@ Gem::Specification.new do |gem|
 
     gem.required_ruby_version = '>= 2.3'
 
-    gem.add_dependency 'activerecord', '>= 4.0'
+    gem.add_dependency 'rails', '>= 5.0'
 
     gem.add_development_dependency 'sqlite3', '~> 1.3'
     gem.add_development_dependency 'shoulda', '~> 3.5'
-    gem.add_development_dependency 'shoulda_create', '~> 0.0'
     gem.add_development_dependency 'factory_girl', '~> 4.8'
-    gem.add_development_dependency 'rails', '>= 4.0'
     gem.add_development_dependency 'tzinfo-data', '~> 1.2017'
 end

data/test/dummy30/config/initializers/sandboxy.rb

@@ -0,0 +1,13 @@
+Sandboxy.configure do |config|
+
+    # Set your environment default: Must be either `live` or `sandbox`.
+    # This is the environment that your app boots with.
+    # By default it gets refreshed with every new request to your server.
+    # config.environment = 'live'
+
+    # Specify whether to retain your current app environment on new requests.
+    # If set to true, your app will only load your environment default when starting.
+    # Every additional switch of your environment at runtime will then not be automatically resolved to your environment default on a new request.
+    # config.retain_environment = false
+
+end

data/test/test_helper.rb

@@ -16,7 +16,5 @@ load File.dirname(__FILE__) + '/schema.rb'
 require File.dirname(__FILE__) + '/../lib/generators/templates/model.rb'
 
 require 'shoulda'
-require 'shoulda_create'
 require 'factory_girl'
-ActiveSupport::TestCase.extend ShouldaCreate
 FactoryGirl.find_definitions