dry-initializer-rails 0.0.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a03ce642b62084cdd71ebf49a364c1a52c5a379
-  data.tar.gz: 0c7a1e0c449d91e78c4a0037baed519121fe7426
+  metadata.gz: 9ccebd9d7adeb8e25c29b0327989ffaf58117c43
+  data.tar.gz: ffc23d3c5a6a1b12dd67ffdab61454d8305b1a7e
 SHA512:
-  metadata.gz: f9692a897b1f972dba52f679980c25140543ed8ab0b6926b5f872cc3314e8f6f364ecc0d578085c09c45efee2595e71fbe1c88a85f5dce11068da2b18e6f1916
-  data.tar.gz: 6eec63cf5b01347a95c0f64944501728d9cd2a0081eaa95490769b7486ce2c46fd8bfb8dc60e6bb88ad3870246439830463729ea803965ba1b121916643bf8a4
+  metadata.gz: 6075002cc04d3bbb779a7002ab91d8cc9ee364a757cf9d335c7ce14e4641e549326144e68135384fdf0da87c1ad1357c0e1f13734e4d9b834c24940bc49fb240
+  data.tar.gz: 4f73db23fc8ebca08db64e51dba85a1b3de11a10ebb7e0fd2f779b60c4c2f5d8e5a55aa223632d477ef067c077f3b1e16d0398112186eaf9110f1f4e3c14f604

data/.rubocop.yml

@@ -5,87 +5,46 @@ AllCops:
   StyleGuideCopsOnly: true
   TargetRubyVersion:  2.2
 
-Lint/HandleExceptions:
-  Exclude:
-    - '**/*_spec.rb'
-
-Lint/RescueException:
-  Exclude:
-    - '**/*_spec.rb'
-
 Metrics/LineLength:
-  Max: 80
   Exclude:
-    - 'spec/**/*.rb'
-
-Style/AccessorMethodName:
-  Exclude:
-    - '**/*_spec.rb'
-
-Style/Alias:
-  EnforcedStyle: prefer_alias_method
-
-Style/AsciiComments:
-  Enabled: false
+    - spec/dummy/db/schema.rb
 
 Style/CaseEquality:
   Enabled: false
 
-Style/ClassAndModuleChildren:
-  Enabled: false
-
-Style/Documentation:
+Style/ClassVars:
   Enabled: false
 
 Style/DoubleNegation:
   Enabled: false
 
-Style/EmptyLinesAroundClassBody:
-  Enabled: false
-
-Style/EmptyLinesAroundModuleBody:
-  Enabled: false
-
-Style/EmptyLineBetweenDefs:
-  Enabled: false
-
 Style/FileName:
-  Enabled: false
+  Exclude:
+    - 'lib/dry-initializer-rails.rb'
+
+Style/Lambda:
+  Exclude:
+    - spec/**/*_spec.rb
 
-Style/ModuleFunction:
+Style/LambdaCall:
   Enabled: false
 
+Style/NumericLiterals:
+  Exclude:
+    - spec/dummy/db/schema.rb
+  
 Style/RaiseArgs:
   EnforcedStyle: compact
 
 Style/Semicolon:
   Exclude:
-    - '**/*_spec.rb'
+    - spec/**/*_spec.rb
 
 Style/SignalException:
   EnforcedStyle: semantic
 
-Style/SingleLineBlockParams:
-  Enabled: false
-
-Style/SingleLineMethods:
-  Exclude:
-    - '**/*_spec.rb'
-
-Style/SpaceBeforeFirstArg:
-  Enabled: false
-
-Style/SpecialGlobalVars:
-  Exclude:
-    - '**/Gemfile'
-    - '**/*.gemspec'
-
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
 Style/StringLiteralsInInterpolation:
   EnforcedStyle: double_quotes
-
-Style/TrivialAccessors:
-  Exclude:
-    - '**/*_spec.rb'

data/.travis.yml

@@ -1,11 +1,15 @@
 ---
 language: ruby
-before_install: gem install bundler -v 1.11.2
-cache:    bundler
-script:   bundle exec rake
+sudo: false
+cache: bundler
+before_install: gem install bundler --no-ri --no-rdoc
+bundler_args: --without benchmarks tools
+script:
+  - bundle exec rake
+  - bundle exec rubocop
 rvm:
-  - '2.2'
-  - '2.3.0'
+  - 2.2.2
+  - 2.3.0
   - ruby-head
 matrix:
   allow_failures:

data/CHANGELOG.md

@@ -1,12 +1,14 @@
+## v1.0.0 2017-01-28
+
+Update dependency to dry-initializer v1.1+ (nepalez)
+
 ## v0.0.3 2016-07-17
 
-Support dry-initializer v0.4+ (@nepalez)
+Support dry-initializer v0.4+ (nepalez)
 
 ## v0.0.2 2016-05-19
 
-Switch the gem to using dry-initializer v0.3+ (@nepalez)
-
-[Compare v0.0.1...v0.0.2](https://github.com/dry-rb/dry-initializer/compare/v0.0.1..v0.0.2)
+Update dependency to dry-initializer v0.3+ (nepalez)
 
 ## v0.0.1 2016-05-16
 

data/README.md

@@ -49,8 +49,7 @@ require 'dry-initializer'
 require 'dry-initializer-rails'
 
 class CreateOrder
-  extend Dry::Initializer::Mixin
-  extend Dry::Initializer::Rails
+  extend Dry::Initializer
 
   # Params and options
   param  :customer, model: 'Customer' # use either a name
@@ -96,8 +95,7 @@ You can specify custom `key` for searching model instance:
 require 'dry-initializer-rails'
 
 class CreateOrder
-  extend Dry::Initializer::Mixin
-  extend Dry::Initializer::Rails
+  extend Dry::Initializer
 
   param  :customer, model: 'User', find_by: 'name'
   option :product,  model: Item,   find_by: :name

data/dry-initializer-rails.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name     = "dry-initializer-rails"
-  gem.version  = "0.0.3"
+  gem.version  = "1.0.0"
   gem.author   = ["Vladimir Kochnev (marshall-lee)", "Andrew Kozin (nepalez)"]
   gem.email    = ["hashtable@yandex.ru", "andrew.kozin@gmail.com"]
   gem.homepage = "https://github.com/nepalez/dry-initializer-rails"
@@ -11,13 +11,14 @@ Gem::Specification.new do |gem|
   gem.test_files       = gem.files.grep(/^spec/)
   gem.extra_rdoc_files = Dir["README.md", "LICENSE", "CHANGELOG.md"]
 
-  gem.required_ruby_version = ">= 2.2"
+  gem.required_ruby_version = ">= 2.2.2"
 
-  gem.add_runtime_dependency "rails", "> 3.0", "< 5.0"
-  gem.add_runtime_dependency "dry-initializer", ">= 0.3.0"
+  gem.add_runtime_dependency "rails", "> 3.0"
+  gem.add_runtime_dependency "dry-initializer", "~> 1.1"
 
   gem.add_development_dependency "rspec", "~> 3.0"
   gem.add_development_dependency "rake", "> 10.0"
   gem.add_development_dependency "sqlite3", "~> 1.3"
   gem.add_development_dependency "database_cleaner", "~> 1.5"
+  gem.add_development_dependency "rubocop", "~> 0.44"
 end

data/lib/dry/initializer/rails.rb

@@ -1,13 +1,18 @@
 require "dry-initializer"
 require "rails"
 
-# Rails plugin to dry-initializer gem
-module Dry::Initializer::Rails
-  extend Dry::Initializer::Mixin
+# Define a dispatcher for `:model` and `:find_by` options
+rails_dispatcher = lambda do |model: nil, find_by: :id, **options|
+  return options unless model
 
-  require_relative "rails/model"
-
-  def self.extended(klass)
-    klass.register_initializer_plugin Model
+  model   = model.constantize if model.is_a? String
+  coercer = lambda do |value|
+    return value if value.instance_of? model
+    model.find_by(find_by => value)
   end
+
+  options.merge(type: coercer)
 end
+
+# Register a dispatcher
+Dry::Initializer::Attribute.dispatchers << rails_dispatcher

data/spec/dry/initializer/assignment_by_custom_key_spec.rb

@@ -2,8 +2,7 @@ describe "assignment by custom key" do
   context "with mixin syntax" do
     before do
       class Test::Order
-        extend Dry::Initializer::Mixin
-        extend Dry::Initializer::Rails
+        extend Dry::Initializer
 
         param  :user,    model: "User", find_by: "name"
         option :product, model: Item,   find_by: :name
@@ -32,8 +31,6 @@ describe "assignment by custom key" do
     before do
       class Test::Order
         include Dry::Initializer.define -> do
-          extend Dry::Initializer::Rails
-
           param  :user,    model: "User", find_by: "name"
           option :product, model: Item,   find_by: :name
         end

data/spec/dry/initializer/assignment_by_id_spec.rb

@@ -1,8 +1,7 @@
 describe "assignment by id" do
   before do
     class Test::Order
-      extend Dry::Initializer::Mixin
-      extend Dry::Initializer::Rails
+      extend Dry::Initializer
 
       param  :user,    model: "User"
       option :product, model: Item

data/spec/dry/initializer/assignment_by_model_spec.rb

@@ -1,8 +1,7 @@
 describe "assignment by model" do
   before do
     class Test::Order
-      extend Dry::Initializer::Mixin
-      extend Dry::Initializer::Rails
+      extend Dry::Initializer
 
       param  :user,    model: "User"
       option :product, model: Item

data/spec/dry/initializer/base_syntax_spec.rb

@@ -1,8 +1,7 @@
 describe "base syntax" do
   before do
     class Test::Foo
-      extend Dry::Initializer::Mixin
-      extend Dry::Initializer::Rails
+      extend Dry::Initializer
 
       param  :foo
       param  :bar

data/spec/dummy/db/schema.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -15,14 +14,12 @@ ActiveRecord::Schema.define(version: 20160509134900) do
 
   create_table "items", force: :cascade do |t|
     t.string "name"
+    t.index ["name"], name: "index_items_on_name"
   end
 
-  add_index "items", ["name"], name: "index_items_on_name"
-
   create_table "users", force: :cascade do |t|
     t.string "name"
+    t.index ["name"], name: "index_users_on_name"
   end
 
-  add_index "users", ["name"], name: "index_users_on_name"
-
 end

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-require "dry/initializer/rails"
+require "dry-initializer-rails"
 require "pry"
 require "database_cleaner"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-initializer-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Vladimir Kochnev (marshall-lee)
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-17 00:00:00.000000000 Z
+date: 2017-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,9 +18,6 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,23 +25,20 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: dry-initializer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -101,6 +95,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.44'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.44'
 description: 
 email:
 - hashtable@yandex.ru
@@ -125,7 +133,6 @@ files:
 - dry-initializer-rails.gemspec
 - lib/dry-initializer-rails.rb
 - lib/dry/initializer/rails.rb
-- lib/dry/initializer/rails/model.rb
 - spec/dry/initializer/assignment_by_custom_key_spec.rb
 - spec/dry/initializer/assignment_by_id_spec.rb
 - spec/dry/initializer/assignment_by_model_spec.rb
@@ -153,7 +160,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -161,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Adds ActiveRecord-specific methods to Dry::Initializer
@@ -181,4 +188,3 @@ test_files:
 - spec/dummy/lib/dummy.rb
 - spec/dummy/lib/dummy/application.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/lib/dry/initializer/rails/model.rb

@@ -1,25 +0,0 @@
-module Dry::Initializer::Rails
-  # The plugin provides chunk of code to find rails model instance by key
-  class Model < Dry::Initializer::Plugins::Base
-    def call
-      return unless settings.key? :model
-
-      "@#{name} = #{model}.find_by(#{model_key}: @#{name})" \
-      " unless @#{name} == #{undefined} || #{model} === @#{name}"
-    end
-
-    private
-
-    def model
-      @model ||= settings[:model]
-    end
-
-    def model_key
-      @key ||= settings.fetch(:find_by, :id)
-    end
-
-    def undefined
-      "Dry::Initializer::UNDEFINED"
-    end
-  end
-end