rom-rails 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcd720e54472ff49bc3e0a5e2617367b96b759fc
-  data.tar.gz: 3424b02330e29163e1620478c5e19bfbafd85a3e
+  metadata.gz: e3973d28b785258452fa186c82b218bb7d49b2e5
+  data.tar.gz: 7cb178d38de10564cd0c2a33e5968e907774b6d3
 SHA512:
-  metadata.gz: f978665c485c1c8560919c20e5860e1de6d657e4e9d4182a649d53f2a92cbb229328da9c785789456e8f8b2a5e5a562a49287361cbdfca418dd1bf4c6fea1b23
-  data.tar.gz: e4e3388d5632740461b15f1e4d772d5925784aad4b154c261fb9bc9227c4a7ca2c12204bc9c442fe0c4132673d53c8a7d1e13de81abd5c61e2696bc7c5bb9fb5
+  metadata.gz: a4708a692ac5821630b2f4459cb3a8b7e3b6c31aa2f4ef79d19d509e4e11a12f751a044bcfc9be4aeb1313c7a00f6723dca94bb09b952586db36ef5a8e544bd2
+  data.tar.gz: b4650efa04ae9afb73f49dc96a4e0f814563b8e2f6e1bc52e11297ec837471fcc303930b6984ea5254811fbf2c5c34354c54aeea6a811aca987215f4fc2e1477

data/.gitignore

@@ -15,3 +15,6 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+spec/dummy/db/*.sqlite3
+spec/dummy/tmp
+spec/dummy/log

data/.travis.yml

@@ -1,6 +1,8 @@
 language: ruby
 bundler_args: --without yard guard benchmarks
-script: "RAILS_ENV=test rake app:spec"
+env:
+  - CODECLIMATE_REPO_TOKEN=87c9080bda25bce8e63a294f99312345c144c0f6d5eedf400fd753356fbf7dcf
+script: "RAILS_ENV=test rake app:db:schema:load app:spec"
 rvm:
   - 2.0
   - 2.1

data/CHANGELOG.md

@@ -1,3 +1,17 @@
-# v0.0.1 2014-11-24
+# Change log
+
+All notable changes to this project will be documented in this file.
+
+## v0.0.2 2014-11-25
+
+### Added
+
+  * Support for username and password in database.yml (solnic)
+  * Support for more db schemes (solnic)
+  * Missing runtime dep on rom gem (solnic)
+
+[Compare v0.0.1...v0.0.2](https://github.com/rom-rb/rom-rails/compare/v0.0.1...v0.0.2)
+
+## v0.0.1 2014-11-24
 
 First public release

data/Gemfile

@@ -7,11 +7,10 @@ gem 'rails', '4.1.7'
 gem 'sqlite3', platforms: [:mri, :rbx]
 gem 'jdbc-sqlite3', platforms: :jruby
 
-gem 'rom', git: 'https://github.com/rom-rb/rom.git', branch: 'master'
-gem 'rom-sql', git: 'https://github.com/rom-rb/rom-sql.git', branch: 'master'
-
 group :test do
+  gem 'rom-sql'
   gem 'rspec-rails', '~> 3.1'
+  gem 'codeclimate-test-reporter', require: nil
   gem 'database_cleaner'
   gem 'capybara'
 end

data/README.md

@@ -1,5 +1,74 @@
-[![Build Status](https://travis-ci.org/rom-rb/rom-rails.svg?branch=master)](https://travis-ci.org/rom-rb/rom-rails)
+[![Gem Version](https://badge.fury.io/rb/rom-rails.svg)][gem]
+[![Build Status](https://travis-ci.org/rom-rb/rom-rails.svg?branch=master)][travis]
+[![Dependency Status](https://gemnasium.com/rom-rb/rom-rails.png)][gemnasium]
+[![Code Climate](https://codeclimate.com/github/rom-rb/rom-rails/badges/gpa.svg)][codeclimate]
+[![Test Coverage](https://codeclimate.com/github/rom-rb/rom-rails/badges/coverage.svg)][codeclimate]
+[![Inline docs](http://inch-ci.org/github/rom-rb/rom-rails.svg?branch=master)][inchpages]
+
+[gem]: https://rubygems.org/gems/rom-rails
+[travis]: https://travis-ci.org/rom-rb/rom-rails
+[gemnasium]: https://gemnasium.com/rom-rb/rom-rails
+[codeclimate]: https://codeclimate.com/github/rom-rb/rom-rails
+[coveralls]: https://coveralls.io/r/rom-rb/rom-rails
+[inchpages]: http://inch-ci.org/github/rom-rb/rom-rails
 
 # rom-rails
 
-Rails integration for Ruby Object Mapper
+Rails integration for [Ruby Object Mapper](https://github.com/rom-rb/rom).
+
+## Installation and setup
+
+In your Gemfile:
+
+```
+gem 'rom'
+gem 'rom-rails'
+```
+
+## Schema
+
+Defining schema is only required for adapters that don't support inferring schema
+automatically. This means if you're using `rom-sql` you don't have to define the schema.
+In other cases the railtie expects the schema to be in `db/rom/schema.rb` which
+is loaded before relations and mappers.
+
+## Relations and mappers
+
+The railtie automatically loads relations and mappers from `app/relations` and
+`app/mappers` and finalizes the environment afterwards. During the booting process
+rom's setup object is available via `Rails.application.config.rom.setup`.
+
+## Relations in controllers
+
+Currently the railtie simply adds `#rom` method to your controllers which returns
+the whole environment. This is **a temporary solution** which is not meant to be final.
+
+Eventually ROM will expose relations to the controller layer (thus view layer too)
+that are already loaded into memory and **there will be no database interactions**
+taking place in those layers. This means that effectively database **query interface
+will not be available in controllers, views, helpers or anywhere outside of the
+relation definitions**.
+
+This means your Rails application will work with arrays of domain objects rather
+than ad-hoc database queries scattered across your entire codebase and there will
+be *a single place* where you define all the relations and object mapping.
+
+## Status
+
+This project is still in alpha state. For examples of usage please take a look
+at `spec/dummy` app.
+
+Proper documentation will be added once the interface is stable.
+
+## Roadmap
+
+Please refer to [issues](https://github.com/rom-rb/rom-rails/issues).
+
+## Community
+
+* [![Gitter chat](https://badges.gitter.im/rom-rb/chat.png)](https://gitter.im/rom-rb/chat)
+* [Ruby Object Mapper](https://groups.google.com/forum/#!forum/rom-rb) mailing list
+
+## License
+
+See `LICENSE` file.

data/lib/rom/rails/railtie.rb

@@ -5,21 +5,37 @@ module ROM
       attr_reader :config, :setup, :env
 
       def self.build(app)
-        config = rewrite_config(app)
+        root = app.config.root
+        db_config = app.config.database_configuration[::Rails.env].symbolize_keys
+
+        config = rewrite_config(root, db_config)
 
         new(config)
       end
 
-      def self.rewrite_config(app)
-        root = app.config.root
-        config = app.config.database_configuration[::Rails.env].symbolize_keys
-
+      def self.rewrite_config(root, config)
         adapter = config[:adapter]
         database = config[:database]
+        password = config[:password]
+        username = config[:username]
+        hostname = config.fetch(:hostname) { 'localhost' }
 
         adapter = "sqlite" if adapter == "sqlite3"
 
-        { default: "#{adapter}://#{root}/#{database}" }
+        path =
+          if adapter == "sqlite"
+            "#{root}/#{database}"
+          else
+            db_path = [hostname, database].join('/')
+
+            if username && password
+              [[username, password].join(':'), db_path].join('@')
+            else
+              db_path
+            end
+          end
+
+        { default: "#{adapter}://#{path}" }
       end
 
       def initialize(config)

data/lib/rom/rails/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module Rails
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/rom-rails.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency 'rom', '~> 0.3', '>= 0.3.1'
   spec.add_runtime_dependency 'railties', ['>= 3.0', '< 5.0']
 
   spec.add_development_dependency "bundler"

data/spec/spec_helper.rb

@@ -1,6 +1,11 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
 
+if RUBY_ENGINE == 'rbx'
+  require "codeclimate-test-reporter"
+  CodeClimate::TestReporter.start
+end
+
 require Pathname(__FILE__).dirname.join("dummy/config/environment")
 
 require 'rspec/rails'

data/spec/unit/configuration_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe ROM::Rails::Configuration do
+  let(:root) { '/somewhere' }
+
+  describe '.rewrite_config' do
+    it 'rewrites database config hash to a URI for sqlite' do
+      db_config = { adapter: 'sqlite', database: 'testing.sqlite' }
+
+      config = ROM::Rails::Configuration.rewrite_config(root, db_config)
+
+      expect(config).to eql(default: "sqlite:///somewhere/testing.sqlite")
+    end
+
+    it 'rewrites database config hash to a URI for postgres' do
+      db_config = {
+        adapter: 'postgres',
+        database: 'testing',
+        username: 'piotr',
+        hostname: 'localhost',
+        password: 'secret'
+      }
+
+      config = ROM::Rails::Configuration.rewrite_config(root, db_config)
+
+      expect(config).to eql(default: "postgres://piotr:secret@localhost/testing")
+
+      db_config = {
+        adapter: 'postgres',
+        database: 'testing'
+      }
+
+      config = ROM::Rails::Configuration.rewrite_config(root, db_config)
+
+      expect(config).to eql(default: "postgres://localhost/testing")
+    end
+  end
+
+end

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: rom-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-24 00:00:00.000000000 Z
+date: 2014-11-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rom
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -115,11 +135,9 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/20141110205016_add_users.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
-- spec/dummy/db/test.sqlite3
 - spec/dummy/lib/assets/.keep
 - spec/dummy/lib/tasks/.keep
 - spec/dummy/log/.keep
@@ -133,6 +151,7 @@ files:
 - spec/dummy/vendor/assets/javascripts/.keep
 - spec/dummy/vendor/assets/stylesheets/.keep
 - spec/spec_helper.rb
+- spec/unit/configuration_spec.rb
 homepage: ''
 licenses:
 - MIT
@@ -192,11 +211,9 @@ test_files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/20141110205016_add_users.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
-- spec/dummy/db/test.sqlite3
 - spec/dummy/lib/assets/.keep
 - spec/dummy/lib/tasks/.keep
 - spec/dummy/log/.keep
@@ -210,3 +227,4 @@ test_files:
 - spec/dummy/vendor/assets/javascripts/.keep
 - spec/dummy/vendor/assets/stylesheets/.keep
 - spec/spec_helper.rb
+- spec/unit/configuration_spec.rb