rom-rails 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d49f16f68f6a53465583cf3be3306680c2b19965da7d43506a14ec4d94def7ac
-  data.tar.gz: 967352fe1005f0ca23e02f47e29890d17aea45e1d45f007b99135b6786cf94e0
+  metadata.gz: d4eaf43b4a1e3674b9796df9c03afefe43e571d2fa9f27f12474b99e472ff636
+  data.tar.gz: f320d87054de5000318c5f5426778d1cba4057ec8331cf0a6861a2713fe84628
 SHA512:
-  metadata.gz: ef4005945fd02a77d01e40f4130b50fe01f12ae8cab5271d213db595c660abe9e9fdea3edb54e1961bc2688f491406bd85a28d35a2232e61c44cc115450dcc5a
-  data.tar.gz: 237d4dfd69c682fcc7b4180f70cf66e4a91b4a55e1941fe2225cd1726313bb7d524c1a5c4ebab3237364853f0b56057038e15d9c4d17a151537dd47413e33b64
+  metadata.gz: 84e3f5fbf22a37294507e14d8de2bc2673091f4a8fe2e5b1a0b9eeba84ead0f967bbb7e08d9a805cd97d30a2c8ff5caba70a601ca88fcdabdd1614a67c424110
+  data.tar.gz: f77380599becffba851cba0a2c4572a03edc968f21dcc83012df701342d4cd64f7825b275b5768fcbd55094c01e163847b67aafa555562431bcc2b1158378134

data/CHANGELOG.md

@@ -1,9 +1,24 @@
+## v1.1.0 2018-03-18
+
+### Added
+
+* Add a new `rom:install` generator (cflipse)
+
+### Changed
+
+* Stop breaking rails loading when not yet configured. (cflipse)
+* Repository generator prefers `struct_namespace` over mapper (radar, cflipse)
+
+[Compare v1.0.1...v1.1.0](https://github.com/rom-rb/rom-rails/compare/v1.0.1...v1.1.0)
+
 ## v1.0.1  2017-12-22
 
 ### Changed
 
 * Loosen ROM dependency
 
+[Compare v1.0.0...v1.0.1](https://github.com/rom-rb/rom-rails/compare/v1.0.0...v1.0.1)
+
 ## v1.0.0  2017-10-18
 
 ### Changed
@@ -19,6 +34,8 @@
 * No longer depends on `rom-model` gem (cflipse)
 * No longer depends on `charlatan` gem (artofhuman)
 
+[Compare v0.9.0...v1.0.0](https://github.com/rom-rb/rom-rails/compare/v0.9.0...v1.0.0)
+
 ## v0.9.0  2017-01-30
 
 ### Added
@@ -37,6 +54,9 @@
 
 * [`rom-support`](https://github.com/rom-rb/rom-support) dependency was replaced with [`dry-core`](https://github.com/dry-rb/dry-core) (solnic + flash-gordon)
 
+
+[Compare v0.8.0...v0.9.0](https://github.com/rom-rb/rom-rails/compare/v0.8.0...v0.9.0)
+
 ## v0.8.0 2016-08-08
 ### Changed
 
@@ -47,6 +67,8 @@
 ### Deprecated
 * Dropping support for ruby 2.1 and below
 
+[Compare v0.7.0...v0.8.0](https://github.com/rom-rb/rom-rails/compare/v0.7.0...v0.8.0)
+
 ## v0.7.0 2016-07-27
 
 ### Changed

data/lib/generators/rom/install/templates/application_model.rb

@@ -0,0 +1,20 @@
+require 'types'
+
+class ApplicationModel < ROM::Struct
+  def self.inherited(base)
+    super
+
+    base.constructor_type :schema
+
+    base.extend ActiveModel::Naming
+    base.include ActiveModel::Conversion
+
+    base.include Dry::Equalizer(:id)
+
+    base.attribute :id, Types::ID
+  end
+
+  def persisted?
+    id.present?
+  end
+end

data/lib/generators/rom/install/templates/initializer.rb.erb

@@ -0,0 +1,3 @@
+ROM::Rails::Railtie.configure do |config|
+  config.gateways[:default] = [:<%= adapter %>, ENV.fetch('DATABASE_URL')]
+end

data/lib/generators/rom/install/templates/types.rb

@@ -0,0 +1,10 @@
+require 'dry/types'
+
+module Types
+  include Dry::Types.module
+
+  ID = Coercible::Int.optional.meta(primary_key: true)
+
+  # Include your own type definitions and coersions here.
+  # See http://dry-rb.org/gems/dry-types
+end

data/lib/generators/rom/install_generator.rb

@@ -0,0 +1,42 @@
+require 'generators/rom'
+
+module ROM
+  module Generators
+    class InstallGenerator < ::Rails::Generators::Base
+      def self.namespace
+        "rom:#{generator_name}"
+      end
+
+      def self.source_root
+        File.expand_path("../install/templates", __FILE__)
+      end
+
+      class_option :adapter,
+        banner: '--adapter=adapter',
+        desc: "specify an adapter to use", required: true,
+        default: "sql"
+
+      def create_initializer
+        template 'initializer.rb.erb',
+          File.join('config', 'initializers', 'rom.rb')
+      end
+
+      def add_types_module
+        copy_file "types.rb", "lib/types.rb"
+      end
+
+      def add_application_model
+        copy_file "application_model.rb", "app/models/application_model.rb"
+      end
+
+
+
+    private
+
+      def adapter
+        options[:adapter].to_sym
+      end
+
+    end
+  end
+end

data/lib/generators/rom/repository/templates/repository.rb.erb

@@ -1,5 +1,7 @@
 class <%= model_name %>Repository < ROM::Repository::Root
   root <%= ":#{relation}" %>
 
-  commands :create, update: :by_pk, delete: :by_pk, mapper: :<%= mapper %>
+  commands :create, update: :by_pk, delete: :by_pk
+
+  struct_namespace <%= struct_namespace %>
 end

data/lib/generators/rom/repository_generator.rb

@@ -4,6 +4,12 @@ if defined? ROM::Repository
   module ROM
     module Generators
       class RepositoryGenerator < Base
+
+        class_option :namespace,
+          banner: '--namespace=namespace',
+          desc: "specify a struct namespace for the relation", required: true,
+          default: ::Rails.application.class.name.split("::").first 
+
         def create_repository_file
           template(
             'repository.rb.erb',
@@ -11,7 +17,11 @@ if defined? ROM::Repository
           )
         end
 
-        private
+      private
+
+        def struct_namespace
+          options[:namespace]
+        end
 
         def relation
           class_name.pluralize.underscore

data/lib/rom/rails/railtie.rb

@@ -83,10 +83,11 @@ module ROM
       def gateways
         config.rom.gateways[:default] ||= infer_default_gateway if active_record?
 
-        raise(
-          MissingGatewayConfigError,
-          "seems like you didn't configure any gateways"
-        ) unless config.rom.gateways.any?
+        if config.rom.gateways.empty?
+          Rails.logger.warn "It seems that you have not configured any gateways"
+
+          config.rom.gateways[:default] = [ :memory, "memory://test" ]
+        end
 
         config.rom.gateways
       end

data/lib/rom/rails/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module Rails
-    VERSION = '1.0.1'.freeze
+    VERSION = '1.1.0'.freeze
   end
 end

data/rom-rails.gemspec

@@ -26,5 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rom-repository"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rubocop", "~> 0.28"
+  spec.add_development_dependency "rubocop", "~> 0.50"
 end

data/spec/lib/generators/install_generator_spec.rb

@@ -0,0 +1,95 @@
+require 'generators/rom/install_generator'
+
+RSpec.describe ROM::Generators::InstallGenerator, type: :generator do
+  destination File.expand_path('../../../../tmp', __FILE__)
+
+  before(:each) do
+    prepare_destination
+  end
+
+  it "installs a setup initializer" do
+    run_generator ['install']
+
+    expect(destination_root).to have_structure {
+      directory 'config' do
+        directory 'initializers' do
+          file 'rom.rb' do
+            contains <<-CONTENT.strip_heredoc
+              ROM::Rails::Railtie.configure do |config|
+                config.gateways[:default] = [:sql, ENV.fetch('DATABASE_URL')]
+              end
+            CONTENT
+          end
+        end
+      end
+    }
+  end
+
+  it "allows overriding the adapter type" do
+    run_generator ["install", "--adapter=yaml"]
+    initializer = File.read(File.join(destination_root, "config", "initializers", "rom.rb"))
+
+    expect(initializer).to include("config.gateways[:default] = [:yaml, ENV.fetch('DATABASE_URL')]")
+  end
+
+  it "sets up lib/types" do
+    run_generator ["install"]
+
+    expect(destination_root).to have_structure {
+      directory "lib" do
+        file "types.rb" do
+          contains <<-CONTENT.strip_heredoc
+            require 'dry/types'
+
+            module Types
+              include Dry::Types.module
+
+              ID = Coercible::Int.optional.meta(primary_key: true)
+
+              # Include your own type definitions and coersions here.
+              # See http://dry-rb.org/gems/dry-types
+            end
+          CONTENT
+        end
+      end
+    }
+  end
+
+  it "sets up ApplicationModel" do
+    run_generator ["install"]
+
+    expect(destination_root).to have_structure {
+      directory "app" do
+        directory "models" do
+          file "application_model.rb" do
+            contains <<-CONTENT.strip_heredoc
+              require 'types'
+
+              class ApplicationModel < ROM::Struct
+                def self.inherited(base)
+                  super
+
+                  base.constructor_type :schema
+
+                  base.extend ActiveModel::Naming
+                  base.include ActiveModel::Conversion
+
+                  base.include Dry::Equalizer(:id)
+
+                  base.attribute :id, Types::ID
+                end
+
+                def persisted?
+                  id.present?
+                end
+              end
+            CONTENT
+          end
+
+        end
+      end
+    }
+  end
+
+
+end

data/spec/lib/generators/repository_generator_spec.rb

@@ -19,7 +19,9 @@ RSpec.describe ROM::Generators::RepositoryGenerator, type: :generator do
               class UserRepository < ROM::Repository::Root
                 root :users
 
-                commands :create, update: :by_pk, delete: :by_pk, mapper: :user
+                commands :create, update: :by_pk, delete: :by_pk
+
+                struct_namespace Dummy
               end
             CONTENT
           end
@@ -39,7 +41,9 @@ RSpec.describe ROM::Generators::RepositoryGenerator, type: :generator do
               class UserProfileRepository < ROM::Repository::Root
                 root :user_profiles
 
-                commands :create, update: :by_pk, delete: :by_pk, mapper: :user_profile
+                commands :create, update: :by_pk, delete: :by_pk
+
+                struct_namespace Dummy
               end
             CONTENT
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-22 00:00:00.000000000 Z
+date: 2018-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rom
@@ -134,14 +134,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.28'
+        version: '0.50'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.28'
+        version: '0.50'
 description: 
 email:
 - piotr.solnica@gmail.com
@@ -164,6 +164,10 @@ files:
 - lib/generators/rom/commands/templates/delete.rb.erb
 - lib/generators/rom/commands/templates/update.rb.erb
 - lib/generators/rom/commands_generator.rb
+- lib/generators/rom/install/templates/application_model.rb
+- lib/generators/rom/install/templates/initializer.rb.erb
+- lib/generators/rom/install/templates/types.rb
+- lib/generators/rom/install_generator.rb
 - lib/generators/rom/mapper/templates/mapper.rb.erb
 - lib/generators/rom/mapper_generator.rb
 - lib/generators/rom/relation/templates/relation.rb.erb
@@ -247,6 +251,7 @@ files:
 - spec/integration/user_model_mapping_spec.rb
 - spec/lib/active_record/configuration_spec.rb
 - spec/lib/generators/commands_generator_spec.rb
+- spec/lib/generators/install_generator_spec.rb
 - spec/lib/generators/mapper_generator_spec.rb
 - spec/lib/generators/relation_generator_spec.rb
 - spec/lib/generators/repository_generator_spec.rb
@@ -271,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Integrate Ruby Object Mapper with Rails
@@ -343,6 +348,7 @@ test_files:
 - spec/integration/user_model_mapping_spec.rb
 - spec/lib/active_record/configuration_spec.rb
 - spec/lib/generators/commands_generator_spec.rb
+- spec/lib/generators/install_generator_spec.rb
 - spec/lib/generators/mapper_generator_spec.rb
 - spec/lib/generators/relation_generator_spec.rb
 - spec/lib/generators/repository_generator_spec.rb