rom-rails 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ad7fe254e8fd3118cbdac07bf9bc51d0b686e32
-  data.tar.gz: 73527dafdfb2542cbc1dc30559dc56d66cfb5c08
+  metadata.gz: d53fad0999e88095261c12196674bf05ef9754eb
+  data.tar.gz: 134a8100ee7b0b4967315b3ce342a1526b9280e8
 SHA512:
-  metadata.gz: d5968c5f300b0e336727b13919b9a7204f2fb40dc541bf6818c7eb05eb913ee3c82b78375d07ea16aec8fdbe2834a914dc034966ff28d7f45716c2fe44c52cb8
-  data.tar.gz: fe6ab28f3f240bdba00fe1282ee9aa34a42f5f51230b1329b17fdb39ae3352ece725cbf89a97e39ff29754b61e0fdf67e5038f302d40dd8c22e872755327f0b3
+  metadata.gz: ff2d1b07af8d3e2ad0263ea1f7fa1d433dc1f3da4c801710f51daa778dc9b903224747bdd55a9ca9bb232103a4561ef332161a6db12bd367a9ffe6e130fd127b
+  data.tar.gz: ebf50d904cd43b7be7addd0c9167921e4ae9924250b8e69aea2bbd8f9f705020f80865fc5336b8a1ee67480b8b6833d241250cb3c732afc4ed2138d2bf67c571

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## v0.3.3 2015-05-22
+
+### Added
+
+* `db:setup` task which works OOTB with rom-sql tasks (solnic)
+
+### Changed
+
+* `MissingRepositoryConfigError` is raised when repositories are not configured (solnic)
+
+### Fixed
+
+* The railitie no longer set `nil` as default repository when ActiveRecord is not present (solnic)
+
+[Compare v0.3.2...v0.3.3](https://github.com/rom-rb/rom-rails/compare/v0.3.2...v0.3.3)
+
 ## v0.3.2 2015-05-17
 
 ### Fixed

data/Gemfile

@@ -4,11 +4,12 @@ gemspec
 
 RAILS_VERSION = '4.2.1'
 
-%w(railties activemodel actionview actionpack).each do |name|
+%w(railties activemodel actionview actionpack activerecord).each do |name|
   gem name, RAILS_VERSION
 end
 
 gem 'sqlite3', platforms: [:mri, :rbx]
+gem 'byebug', platforms: :mri
 
 platforms :jruby do
   gem 'jdbc-sqlite3'
@@ -18,7 +19,6 @@ group :test do
   gem 'rack-test'
   gem 'rom', github: 'rom-rb/rom', branch: 'master'
   gem 'rom-sql', github: 'rom-rb/rom-sql', branch: 'master'
-  gem 'byebug', platforms: :mri
   gem 'rspec-rails', '~> 3.1'
   gem 'codeclimate-test-reporter', require: nil
   gem 'database_cleaner'

data/Rakefile

@@ -1,7 +1,7 @@
 require 'bundler/setup'
 require 'rubocop/rake_task'
 
-task default: %w(app:db:schema:load app:spec rubocop)
+task default: %w(app:spec rubocop)
 
 APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'

data/lib/rom/rails/railtie.rb

@@ -10,6 +10,47 @@ Spring.after_fork { ROM::Rails::Railtie.disconnect } if defined?(Spring)
 module ROM
   module Rails
     class Railtie < ::Rails::Railtie
+      COMPONENT_DIRS = %w(relations mappers commands).freeze
+
+      MissingRepositoryConfigError = Class.new(StandardError)
+
+      # @api public
+      def self.setup_repositories
+        raise(
+          MissingRepositoryConfigError,
+          "seems like you didn't configure any repositories"
+        ) unless config.rom.repositories.any?
+
+        ROM.setup(config.rom.repositories)
+        self
+      end
+
+      # @api public
+      def self.finalize
+        ROM.finalize
+        self
+      end
+
+      # If there's no default repository configured, try to infer it from
+      # other sources, e.g. ActiveRecord.
+      #
+      # @api private
+      def self.infer_default_repository
+        return unless active_record?
+        spec = ROM::Rails::ActiveRecord::Configuration.call
+        [:sql, spec[:uri], spec[:options]]
+      end
+
+      # @api private
+      def self.active_record?
+        defined?(::ActiveRecord)
+      end
+
+      # @api private
+      def before_initialize
+        config.rom = Configuration.new
+      end
+
       initializer 'rom.configure_action_controller' do
         ActiveSupport.on_load(:action_controller) do
           ActionController::Base.send(:include, ControllerExtension)
@@ -17,17 +58,21 @@ module ROM
       end
 
       initializer 'rom.adjust_eager_load_paths' do |app|
-        paths = %w(commands mappers relations).map do |directory|
+        paths = COMPONENT_DIRS.map do |directory|
           ::Rails.root.join('app', directory).to_s
         end
 
         app.config.eager_load_paths -=  paths
       end
 
+      rake_tasks do
+        load "rom/rails/tasks/db.rake" unless self.class.active_record?
+      end
+
       # Make `ROM::Rails::Configuration` instance available to the user via
       # `Rails.application.config` before other initializers run.
       config.before_initialize do |_app|
-        config.rom = Configuration.new
+        before_initialize
       end
 
       # Reload ROM-related application code on each request.
@@ -40,7 +85,7 @@ module ROM
       #
       # @example
       #   ROM::Rails::Railtie.configure do |config|
-      #     config.repositories[:yaml] = {uri: 'yaml:///data'}
+      #     config.repositories[:default] = [:yaml, 'yaml:///data']
       #   end
       #
       # @api public
@@ -52,45 +97,45 @@ module ROM
         end
       end
 
+      # TODO: Add `ROM.env.disconnect` to core.
+      #
+      # @api private
       def disconnect
-        # TODO: Add `ROM.env.disconnect` to core.
         ROM.env.repositories.each_value(&:disconnect)
       end
 
+      # @api private
       def setup
         if ROM.env
           ROM.setup(ROM.env.repositories)
         else
           repositories = config.rom.repositories
 
-          # If there's no default repository configured, try to infer it from
-          # other sources, e.g. ActiveRecord.
-          repositories[:default] ||= infer_default_repository
+          if self.class.active_record?
+            repositories[:default] ||= self.class.infer_default_repository
+          end
 
-          ROM.setup(repositories.symbolize_keys)
+          self.class.setup_repositories
         end
         load_all
-        ROM.finalize
-      end
-
-      def infer_default_repository
-        return unless defined?(::ActiveRecord)
-        spec = ActiveRecord::Configuration.call
-        [:sql, spec[:uri], spec[:options]]
+        self.class.finalize
       end
 
+      # @api private
       def load_all
-        %w(relations mappers commands).each do |type|
+        COMPONENT_DIRS.each do |type|
           load_files(type)
         end
       end
 
+      # @api private
       def load_files(type)
         Dir[root.join("app/#{type}/**/*.rb").to_s].each do |path|
           require_dependency(path)
         end
       end
 
+      # @api private
       def root
         ::Rails.root
       end

data/lib/rom/rails/tasks/db.rake

@@ -0,0 +1,11 @@
+namespace :db do
+  desc 'Set up ROM repositories'
+  task :setup do
+    railtie = ROM::Rails::Railtie
+    railtie.before_initialize
+
+    require "#{Rails.root}/config/initializers/rom"
+
+    railtie.setup_repositories.finalize
+  end
+end

data/lib/rom/rails/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module Rails
-    VERSION = '0.3.2'.freeze
+    VERSION = '0.3.3'.freeze
   end
 end

data/spec/dummy/Rakefile

@@ -6,11 +6,3 @@ require File.expand_path('../config/application', __FILE__)
 Dummy::Application.load_tasks
 
 require 'rom/sql/rake_task'
-
-namespace :db do
-  task :setup do
-    scheme = RUBY_ENGINE == 'jruby' ? 'jdbc:sqlite' : 'sqlite'
-    ROM.setup(:sql, "#{scheme}://#{Rails.root}/db/#{Rails.env}.sqlite3")
-    ROM.finalize
-  end
-end

data/spec/dummy/app/forms/update_user_form.rb

@@ -6,6 +6,6 @@ class UpdateUserForm < UserForm
   end
 
   def commit!
-    users.try { users.update.by_id(id).set(attributes) }
+    users.try { users.update.by_id(id).call(attributes) }
   end
 end

data/spec/dummy/config/application.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../boot', __FILE__)
 
-require "action_controller/railtie"
+require 'action_controller/railtie'
 
 Bundler.setup(:default, Rails.env)
 

data/spec/dummy/config/database.yml

@@ -1,7 +1,3 @@
-development:
-  adapter: sqlite3
-  database: "db/development.sqlite3"
-
 test:
   adapter: sqlite3
-  database: "db/test.sqlite3"
+  database: "db/test-ar.sqlite3"

data/spec/dummy/config/initializers/rom.rb

@@ -1,10 +1,5 @@
 ROM::Rails::Railtie.configure do |config|
-  db_config = ROM::Rails::ActiveRecord::Configuration.build(
-    Rails.application.config.database_configuration[Rails.env].symbolize_keys
-    .merge(root: Rails.root)
-  )
-
-  config.repositories[:default] = [:sql, db_config[:uri], db_config[:options]]
-
+  scheme = RUBY_ENGINE == 'jruby' ? 'jdbc:sqlite' : 'sqlite'
+  config.repositories[:default] = [:sql, "#{scheme}://#{Rails.root}/db/#{Rails.env}.sqlite3"]
   config.repositories[:test] = [:test_adapter, foo: :bar]
 end

data/spec/dummy/spec/integration/activerecord_setup.rb

@@ -0,0 +1,6 @@
+describe 'Connects to repositories using database.yml' do
+  it 'works' do
+    pending 'I have no idea how to load AR in isolation'
+    raise 'database.yml must go'
+  end
+end

data/spec/unit/form_spec.rb

@@ -213,6 +213,7 @@ describe 'Form' do
     it "recovers from database errors" do
       form = Class.new(ROM::Model::Form) do
         commands users: :create
+
         input do
           set_model_name 'User'
 
@@ -220,24 +221,16 @@ describe 'Form' do
         end
 
         def commit!(*args)
-
           users.try {
             raise ROM::SQL::ConstraintError.new(RuntimeError.new("duplicate key"))
           }
-
         end
       end
 
-      result = form.build(email: 'test@example.com').save
-
-      expect(result).not_to be_success
-
-      expect(result.errors[:email]).to eq []
-      expect(result.errors[:base]).to eq ["a database error prevented saving this form"]
+      expect {
+        form.build(email: 'test@example.com').save
+      }.to raise_error(ROM::SQL::ConstraintError)
     end
-
-
-
   end
 
   describe "#attributes" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-17 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rom
@@ -182,6 +182,7 @@ files:
 - lib/rom/rails/model/validator.rb
 - lib/rom/rails/model/validator/uniqueness_validator.rb
 - lib/rom/rails/railtie.rb
+- lib/rom/rails/tasks/db.rake
 - lib/rom/rails/version.rb
 - rom-rails.gemspec
 - spec/dummy/.rspec
@@ -241,6 +242,7 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/public/robots.txt
 - spec/dummy/spec/features/users_spec.rb
+- spec/dummy/spec/integration/activerecord_setup.rb
 - spec/dummy/spec/integration/form_with_injected_commands_spec.rb
 - spec/dummy/spec/integration/initializer_spec.rb
 - spec/dummy/spec/integration/logger_spec.rb
@@ -340,6 +342,7 @@ test_files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/public/robots.txt
 - spec/dummy/spec/features/users_spec.rb
+- spec/dummy/spec/integration/activerecord_setup.rb
 - spec/dummy/spec/integration/form_with_injected_commands_spec.rb
 - spec/dummy/spec/integration/initializer_spec.rb
 - spec/dummy/spec/integration/logger_spec.rb