mappd 6.0.3 → 6.1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73509008d1f69630213ef7ff108e05d399bc13d52ee18990f235824bb728b67a
-  data.tar.gz: 6c442fa2ec2717b8793a815d9a7c731bd4697ff56ca0b14b1a0a52e7f8a61ea7
+  metadata.gz: 836816d08a636e161503d6e68e7b7eda29c3d59b6c975207e33777ac38910a13
+  data.tar.gz: d15e29aaec58bd74b4191a626348ad39f316643d76f23a86de22ad6b34fa9b02
 SHA512:
-  metadata.gz: f05e810ac98cc0057153a5a2bd7e20725daf6ad0afe6a4b1c5b47e44e4bb254152b6c4872688658381aeca59a4922992f10f5ab5897576ca3cd91a7ab1d523e5
-  data.tar.gz: c1834535ea92341072e5a50db40c0211969af1730c367d50f431e7f336c4df0a5e1ebdfba67617c1b55f03745bdbd398b8700a15ebdfac01ae8617d2ecdab38c
+  metadata.gz: 6116d8c74334178959a8fb6487dfe4c047f0d95394418af536ea5b9702cf34e2ae671e47f0823989f1c19fc637c631f231b4e5efc05d5487c1340c4ff3c43bba
+  data.tar.gz: c4d85789a22f30ab1bc7ae10b6207878ad0c2f434b2ec6f39bdd74ac25888dc2cf9424475f99f40e3c6765f2f657a049c221871c68da1c8de1557bf4119368d5

data/.rubocop.yml

@@ -1,5 +1,6 @@
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.6
+  NewCops: enable
   Exclude:
       - 'Guardfile'
 Style/Documentation:

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.5-slim
+FROM ruby:2.6-slim
 MAINTAINER dan@paz.am
 ENV REFRESHED_AT 2018-05-14
 

data/Gemfile

@@ -1,6 +1,5 @@
 source 'http://rubygems.org'
 
-gem 'activerecord', '>= 6.0.1'
 gem 'rake'
 gem 'sqlite3', '~> 1.4.0'
 

data/Gemfile.lock

@@ -1,37 +1,37 @@
 PATH
   remote: .
   specs:
-    mappd (6.0.3)
-      activerecord (>= 6.0.3)
+    mappd (6.1.4.2)
+      activerecord (~> 6.1.4.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (6.0.3.2)
-      activesupport (= 6.0.3.2)
-    activerecord (6.0.3.2)
-      activemodel (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-    activesupport (6.0.3.2)
+    activemodel (6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activerecord (6.1.4.1)
+      activemodel (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    ast (2.4.1)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    ast (2.4.2)
     byebug (11.1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.1.6)
-    diff-lcs (1.3)
-    ffi (1.13.1)
-    formatador (0.2.5)
-    guard (2.16.2)
+    concurrent-ruby (1.1.9)
+    diff-lcs (1.4.4)
+    ffi (1.15.4)
+    formatador (0.3.0)
+    guard (2.18.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
-      pry (>= 0.9.12)
+      pry (>= 0.13.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
@@ -39,75 +39,73 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    guard-rubocop (1.3.0)
+    guard-rubocop (1.5.0)
       guard (~> 2.0)
-      rubocop (~> 0.20)
-    i18n (1.8.3)
+      rubocop (< 2.0)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
-    listen (3.2.1)
+    listen (3.7.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    lumberjack (1.2.5)
+    lumberjack (1.2.8)
     method_source (1.0.0)
-    minitest (5.14.1)
+    minitest (5.14.4)
     nenv (0.3.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.19.2)
-    parser (2.7.1.3)
-      ast (~> 2.4.0)
-    pry (0.13.1)
+    parallel (1.21.0)
+    parser (3.0.2.0)
+      ast (~> 2.4.1)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     rainbow (3.0.0)
-    rake (13.0.1)
-    rb-fsevent (0.10.4)
+    rake (13.0.6)
+    rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    regexp_parser (1.7.1)
-    rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    rubocop (0.85.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
+    rubocop (1.23.0)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.0.3)
+      rubocop-ast (>= 1.12.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.0.3)
-      parser (>= 2.7.0.1)
-    ruby-progressbar (1.10.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.13.0)
+      parser (>= 3.0.1.1)
+    ruby-progressbar (1.11.0)
     shellany (0.0.1)
-    shoulda-matchers (4.3.0)
-      activesupport (>= 4.2.0)
+    shoulda-matchers (5.0.0)
+      activesupport (>= 5.2.0)
     sqlite3 (1.4.2)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.7.0)
-    zeitwerk (2.3.0)
+    thor (1.1.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.1.0)
+    zeitwerk (2.5.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (>= 6.0.1)
   byebug
   guard-rspec
   guard-rubocop
@@ -119,4 +117,4 @@ DEPENDENCIES
   sqlite3 (~> 1.4.0)
 
 BUNDLED WITH
-   1.17.3
+   1.17.2

data/Makefile

@@ -6,5 +6,7 @@ rspec:
 	docker-compose run ruby rspec
 lint:
 	docker-compose run ruby rubocop
+sh:
+	docker-compose run ruby bash
 release:
 

data/README.md

@@ -30,9 +30,9 @@ class Person < ActiveRecord::Base
 
   # Rename a field - the old field and rename could be removed after
   # migrate! is called
-  field :external_id, :string, length: 10
+  field :external_id, :string, limit: 10
   rename :external_id, :e_id
-  field :e_id, :string, length: 10
+  field :e_id, :string, limit: 10
   # Delete a field - the old field and drop could be removed after
   # migrate! is called
   drop :name
@@ -99,7 +99,7 @@ You may use a type not in this list as long as it is supported by your database
 
 Available options are (none of these exists by default):
 
-```:limit``` - Requests a maximum column length. This is the number of characters for a :string column and number of bytes for :text, :binary and :integer columns. This option is ignored by some backends.
+```:limit``` - Requests a maximum column limit. This is the number of characters for a :string column and number of bytes for :text, :binary and :integer columns. This option is ignored by some backends.
 
 ```:default``` - The column's default value. Use nil for NULL.
 
@@ -123,3 +123,9 @@ Create a `mappd.rb` initializer inside `config/initializers` and add the followi
     clazz.migrate! if clazz.ancestors.include?(ActiveRecord::Base)
   end
 ```
+
+## Donations
+
+Mappd is free to all, but donations are welcome.
+
+Bitcoin: 3EQRmXmkuje2Ww75Tp47RdinsPusCTLavx

data/lib/mappd/mappd.rb

@@ -1,3 +1,5 @@
+require 'active_record'
+
 module Mappd
   def self.included(base)
     base.extend(ClassMethods)
@@ -5,7 +7,7 @@ module Mappd
 
   module ClassMethods
     def index(name, options = {})
-      commands << [:add_index, [table_name, name, options]]
+      commands << [:add_index, [table_name, name, { **options }]]
     end
 
     def rename(from, to)
@@ -17,11 +19,11 @@ module Mappd
     end
 
     def field(name, type = :string, options = {})
-      commands << [:add_column, [table_name, name, type, options]]
+      commands << [:add_column, [table_name, name, type, { **options }]]
     end
 
     def timestamps
-      commands << [:add_timestamps, [table_name, null: true]]
+      commands << [:add_timestamps, [table_name, { null: true }]]
     end
 
     def associations!

data/lib/mappd/version.rb

@@ -1,3 +1,3 @@
 module Mappd
-  VERSION = '6.0.3'.freeze
+  VERSION = '6.1.4.3'.freeze
 end

data/lib/mappd.rb

@@ -1,6 +1,6 @@
 require 'rubygems' unless defined?(Gem)
 require 'active_record'
-require 'mappd/mappd'
+require_relative 'mappd/mappd'
 
 module ActiveRecord
   class Base

data/mappd.gemspec

@@ -22,5 +22,10 @@ at you just know in others projects like  DataMapper or MongoMapper.
                     .split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_dependency 'activerecord', '>=6.0.3'
+  s.add_dependency 'activerecord', '~>6.1.4.1'
+
+  s.required_ruby_version = '>= 2.6.0'
+  s.metadata = {
+    'rubygems_mfa_required' => 'true'
+  }
 end

data/spec/mappd_spec.rb

@@ -9,6 +9,7 @@ context '#create table' do
 end
 
 RSpec.describe Person, type: :model do
+  it { should have_db_column(:title).of_type(:string) }
   it { should have_db_column(:name).of_type(:string) }
   it { should have_db_column(:age).of_type(:integer) }
   it {
@@ -20,7 +21,7 @@ RSpec.describe Person, type: :model do
   it { should_not have_db_column(:external_id) }
   it {
     should have_db_column(:e_id).of_type(:string)
-                                .with_options(length: 10)
+                                .with_options(limit: 10)
   }
 
   it { should have_db_column(:country_id).of_type(:integer) }

data/spec/models.rb

@@ -1,13 +1,14 @@
 require 'active_record'
 
 class Person < ActiveRecord::Base
+  field :title, :string
   field :name, :string, null: false, default: ''
   field :age, :integer
   field :score, :decimal, precision: 10, scale: 10, null: true
 
-  field :external_id, :string, length: 10
+  field :external_id, :string, limit: 10
   rename :external_id, :e_id
-  field :e_id, :string, length: 10
+  field :e_id, :string, limit: 10
 
   belongs_to :country
   has_many :pictures, as: :imageable

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: mappd
 version: !ruby/object:Gem::Version
-  version: 6.0.3
+  version: 6.1.4.3
 platform: ruby
 authors:
 - Dan Watson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-17 00:00:00.000000000 Z
+date: 2021-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.3
+        version: 6.1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.3
+        version: 6.1.4.1
 description: "With it you can add the ability to create columns\noutside the default
   schema, directly in your model in a similar way t\nat you just know in others projects
   like  DataMapper or MongoMapper.\n  "
@@ -55,7 +55,8 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/dan-watson/mappd
 licenses: []
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -64,14 +65,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Mappd is a micro gem that allow you to write schema inside your model as