rails_dictionary 0.2.2 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 622dff0abbc1c9f416b4f86b7b962c2b7a394db0c801a836573fefbe537cf2f0
-  data.tar.gz: 24b8e3e1a53a4419a6a84555590b14ea7081d4d208b2033e63c2c11b0fbdf5dc
+  metadata.gz: aa45031164009565fcb220ccce7c96a6482cfb81d8b41225b4008e06d5ea95c9
+  data.tar.gz: 912b98be0d156d8253aa46fad087c387d648afb81e83eb08bf959d007cb96dfc
 SHA512:
-  metadata.gz: f7978afeaa816170a80105168a25990a1a7ebdb1f2aa88e4204097a1afc1e79c3aa591ffc78e73964a2893257b233946706e71dad804c23462cd9608af8c948f
-  data.tar.gz: 46a06cf437d586bf133ee8c9ff8c33d3787317678f7f2a384543f66a9297e70cc88e55e887d97a04fee99ac4599ce90bebf50326079024e909e90e7ed5d080f7
+  metadata.gz: ac1649c7b55cdc093791d6160210e1d09a4d78a5a1a6c44c75722ae4023e42f2c63363233eaf9c9485a358c7ff1671a570e764f1745944dc4c8a3c1e603b76e8
+  data.tar.gz: cb3b2def00bb03ee636eb718699a3586f2b52cd37743e0b45614012af5798bb2e2b5b5a5aa398fdde48e952d5067023630c8239042615fc405e2e0da0ac471be

data/.gitignore

@@ -1,6 +1,6 @@
 pkg/
 .git/
-.gitignore
-Gemfile.lock
 tmp/*
-.idea/
+.idea/
+.byebug_history
+log/

data/CHANGELOG

@@ -1,3 +1,5 @@
+0.2.4
+  Support Rails7
 0.2
   Add Support For Rails4
 

data/Gemfile

@@ -4,8 +4,8 @@ source "http://rubygems.org"
 gemspec
 
 group :development,:test do
-  gem 'rspec', '~> 2.14.0'
-  gem 'byebug'
-  gem "rspec-rails", '2.14.2'
+  gem 'rails', '~> 7.0'
+  gem 'pry-byebug'
+  gem "rspec-rails", '5.1.0'
   gem 'sqlite3'
 end

data/Gemfile.lock

@@ -0,0 +1,193 @@
+PATH
+  remote: .
+  specs:
+    rails_dictionary (0.2.5)
+      rails (> 6.0, < 7.1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actioncable (7.0.2.2)
+      actionpack (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (7.0.2.2)
+      actionpack (= 7.0.2.2)
+      activejob (= 7.0.2.2)
+      activerecord (= 7.0.2.2)
+      activestorage (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
+      mail (>= 2.7.1)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.0.2.2)
+      actionpack (= 7.0.2.2)
+      actionview (= 7.0.2.2)
+      activejob (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
+      mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
+      rails-dom-testing (~> 2.0)
+    actionpack (7.0.2.2)
+      actionview (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
+      rack (~> 2.0, >= 2.2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (7.0.2.2)
+      actionpack (= 7.0.2.2)
+      activerecord (= 7.0.2.2)
+      activestorage (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
+      globalid (>= 0.6.0)
+      nokogiri (>= 1.8.5)
+    actionview (7.0.2.2)
+      activesupport (= 7.0.2.2)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (7.0.2.2)
+      activesupport (= 7.0.2.2)
+      globalid (>= 0.3.6)
+    activemodel (7.0.2.2)
+      activesupport (= 7.0.2.2)
+    activerecord (7.0.2.2)
+      activemodel (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
+    activestorage (7.0.2.2)
+      actionpack (= 7.0.2.2)
+      activejob (= 7.0.2.2)
+      activerecord (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
+    activesupport (7.0.2.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    builder (3.2.4)
+    byebug (11.0.1)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.9)
+    crass (1.0.6)
+    diff-lcs (1.5.0)
+    digest (3.1.0)
+    erubi (1.10.0)
+    globalid (1.0.0)
+      activesupport (>= 5.0)
+    i18n (1.10.0)
+      concurrent-ruby (~> 1.0)
+    io-wait (0.2.1)
+    loofah (2.14.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (1.0.2)
+    method_source (0.9.2)
+    mini_mime (1.1.2)
+    mini_portile2 (2.8.0)
+    minitest (5.15.0)
+    net-imap (0.2.3)
+      digest
+      net-protocol
+      strscan
+    net-pop (0.1.1)
+      digest
+      net-protocol
+      timeout
+    net-protocol (0.1.2)
+      io-wait
+      timeout
+    net-smtp (0.3.1)
+      digest
+      net-protocol
+      timeout
+    nio4r (2.5.8)
+    nokogiri (1.13.4)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
+      pry (~> 0.10)
+    racc (1.6.0)
+    rack (2.2.3)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (7.0.2.2)
+      actioncable (= 7.0.2.2)
+      actionmailbox (= 7.0.2.2)
+      actionmailer (= 7.0.2.2)
+      actionpack (= 7.0.2.2)
+      actiontext (= 7.0.2.2)
+      actionview (= 7.0.2.2)
+      activejob (= 7.0.2.2)
+      activemodel (= 7.0.2.2)
+      activerecord (= 7.0.2.2)
+      activestorage (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
+      bundler (>= 1.15.0)
+      railties (= 7.0.2.2)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.4.2)
+      loofah (~> 2.3)
+    railties (7.0.2.2)
+      actionpack (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
+      method_source
+      rake (>= 12.2)
+      thor (~> 1.0)
+      zeitwerk (~> 2.5)
+    rake (13.0.6)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-rails (5.1.0)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      railties (>= 5.2)
+      rspec-core (~> 3.10)
+      rspec-expectations (~> 3.10)
+      rspec-mocks (~> 3.10)
+      rspec-support (~> 3.10)
+    rspec-support (3.11.0)
+    sqlite3 (1.4.2)
+    strscan (3.0.1)
+    thor (1.2.1)
+    timeout (0.2.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    websocket-driver (0.7.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.5.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  pry-byebug
+  rails (~> 7.0)
+  rails_dictionary!
+  rspec-rails (= 5.1.0)
+  sqlite3
+
+BUNDLED WITH
+   2.2.32

data/lib/rails_dictionary/{models/active_record_extension.rb → active_record_extension.rb}

@@ -22,7 +22,7 @@ module RailsDictionary
         belongs_to :dict_type
         after_save :delete_dicts_cache
         after_destroy :delete_dicts_cache
-        scope :dict_type_name_eq, lambda { |name| joins(:dict_type).where("dict_types.name" => name) }
+        scope :dict_type_name_eq, ->(name) { joins(:dict_type).where({ "dict_types.name" => name }) }
 
         include RailsDictionary::ActsAsDictionary
       end
@@ -34,7 +34,7 @@ module RailsDictionary
       def acts_as_dict_slave(ops={})
         include RailsDictionary::ActsAsDictSlave
         class_attribute :default_dict_locale, :instance_writer => false
-        cattr_accessor :dict_mapping_columns, :instance_writes => false
+        cattr_accessor :dict_mapping_columns, :instance_writer => false
         self.default_dict_locale = ops[:locale] if ops[:locale]
         self.dict_mapping_columns = dict_columns(ops)
         unless dict_mapping_columns.nil?

data/lib/rails_dictionary/{models/acts_as_dictionary.rb → acts_as_dictionary.rb}

@@ -23,7 +23,7 @@ module RailsDictionary
       #   the sort would be failed of ArgumentError: comparison of Array with Array failed
       #   split this method ,make it more short and maintainance
       def method_missing(method_id,options={})
-        if DictType.all_types.include? method_id
+        if ::DictType.all_types.include? method_id
           method_name=method_id.to_s.downcase
           # TODO: If cache engine is failed, then the code will failed with null cant dup
           Rails.cache.fetch("Dictionary.#{method_name}") { dict_type_name_eq(method_name).to_a }
@@ -56,7 +56,7 @@ module RailsDictionary
       end
 
       def respond_to?(name, include_private=false)
-        DictType.all_types.include?(name) || super
+        ::DictType.all_types.include?(name) || super
       end
 
       private
@@ -76,7 +76,7 @@ module RailsDictionary
 
     module InstanceMethods
       def delete_dicts_cache
-        method_name=DictType.revert(self.dict_type_id)
+        method_name = ::DictType.revert(self.dict_type_id)
         Rails.cache.delete("Dictionary.#{method_name}")
         return true
       end

data/lib/rails_dictionary/version.rb

@@ -1,3 +1,3 @@
 module RailsDictionary
-  VERSION = "0.2.2"
+  VERSION = "0.2.5"
 end

data/lib/rails_dictionary.rb

@@ -1,8 +1,8 @@
 require File.join(File.dirname(__FILE__), "rails_dictionary/array_core_ext")
-require File.join(File.dirname(__FILE__), "rails_dictionary/models/active_record_extension")
-require File.join(File.dirname(__FILE__), "rails_dictionary/models/acts_as_dict_type")
-require File.join(File.dirname(__FILE__), "rails_dictionary/models/acts_as_dictionary")
-require File.join(File.dirname(__FILE__), "rails_dictionary/models/acts_as_dict_slave")
+require File.join(File.dirname(__FILE__), "rails_dictionary/active_record_extension")
+require File.join(File.dirname(__FILE__), "rails_dictionary/acts_as_dict_type")
+require File.join(File.dirname(__FILE__), "rails_dictionary/acts_as_dictionary")
+require File.join(File.dirname(__FILE__), "rails_dictionary/acts_as_dict_slave")
 
 # rake tasks not autoload in Rails4
 Dir[File.expand_path('../tasks/**/*.rake',__FILE__)].each { |ext| load ext } if defined?(Rake)

data/rails_dictionary.gemspec

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
 require "rails_dictionary/version"
 
@@ -8,13 +7,12 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Raykin Lee"]
   s.email       = ["raykincoldxiao@campus.com"]
+  s.licenses    = ['MIT']
   s.homepage    = "https://github.com/raykin/rails_dictionary"
   s.summary     = %q{dictionary data for web application}
   s.description = %q{Rails plugin for mapping static data of web application to Dictionary class}
 
-  s.rubyforge_project = "rails_dictionary"
-
-  s.add_runtime_dependency 'rails', '> 3.0'
+  s.add_runtime_dependency 'rails', '> 6.0', '< 7.1'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/fake_app.rb

@@ -1,7 +1,11 @@
-
 # database
 ActiveRecord::Base.configurations = {'test' => {:adapter => 'sqlite3', :database => ':memory:'}}
-ActiveRecord::Base.establish_connection(:test)
+
+if ActiveRecord::VERSION::MAJOR >= 5
+  ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
+else
+  ActiveRecord::Base.establish_connection(:test)
+end
 
 # config
 app = Class.new(Rails::Application)
@@ -22,7 +26,7 @@ class Student < ActiveRecord::Base
 end
 
 #migrations
-class CreateAllTables < ActiveRecord::Migration
+class CreateAllTables < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
   def self.up
     create_table(:dict_types) {|t| t.string :name}
     create_table(:dictionaries) {|t| t.string :name_en; t.string :name_zh ; t.string :name_fr ; t.integer :dict_type_id}

data/spec/rails_dictionary_spec.rb

@@ -1,10 +1,10 @@
-# -*- coding: utf-8 -*-
+# coding: utf-8
 require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe RailsDictionary::ActiveRecordExtension do
   %w[acts_as_dict_type acts_as_dictionary acts_as_dict_slave].each do |method_name|
     it "contains #{method_name}" do
-      ActiveRecord::Base.methods.include?(method_name.to_sym).should be_true
+      expect(ActiveRecord::Base.methods).to include(method_name.to_sym)
     end
   end
 end
@@ -86,14 +86,14 @@ describe RailsDictionary do
     end
 
     it "update city by set city_name to a value" do
-      stu_shanghai.update_attributes city_name: "wuhan"
+      stu_shanghai.update city_name: "wuhan"
       stu_shanghai.reload.city_name.should == "wuhan"
-      Dictionary.student_city.map(&:name_en).include?("wuhan").should be_true
+      Dictionary.student_city.map(&:name_en).include?("wuhan").should be_truthy
     end
 
     it "update city by set city_name to an exist dictionary name" do
       Dictionary.where(name_en: "beijing").count.should eq(1)
-      stu_shanghai.update_attributes city_name: "beijing"
+      stu_shanghai.update city_name: "beijing"
       stu_shanghai.reload.city_name.should eq('beijing')
       Dictionary.where(name_en: "beijing").count.should eq(1)
     end
@@ -108,6 +108,14 @@ describe RailsDictionary do
       Student.acts_as_dict_slave :locale => :fr
       stu_beijing.named_city.should == "Pékin"
     end
+
+    it "create a student with new city(reproduce conflict error with Rails5.2.0)" do
+      s = Student.new
+      s.city_name = 'Sedan'
+      s.save
+      s.reload
+      s.city_name.should == 'Sedan'
+    end
   end
 end
 

data/spec/spec_helper.rb

@@ -12,11 +12,12 @@ require File.join(File.dirname(__FILE__), 'fake_app')
 
 require 'rspec/rails'
 
-$stdout = StringIO.new  # remove the noise output
+require 'pry-byebug'
+
+# $stdout = StringIO.new  # remove the noise output. It can also disable pry debugger. Weird
 
 RSpec.configure do |config|
   config.use_transactional_fixtures = true
+  config.expect_with(:rspec) { |c| c.syntax = [:should, :expect] }
   CreateAllTables.up unless ActiveRecord::Base.connection.table_exists? 'dict_types'
 end
-
-require 'byebug'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_dictionary
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.5
 platform: ruby
 authors:
 - Raykin Lee
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-06-06 00:00:00.000000000 Z
+date: 2022-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '6.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '6.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.1'
 description: Rails plugin for mapping static data of web application to Dictionary
   class
 email:
@@ -35,24 +41,28 @@ files:
 - ".gitignore"
 - CHANGELOG
 - Gemfile
+- Gemfile.lock
 - README.rdoc
 - Rakefile
 - lib/rails_dictionary.rb
+- lib/rails_dictionary/active_record_extension.rb
+- lib/rails_dictionary/acts_as_dict_slave.rb
+- lib/rails_dictionary/acts_as_dict_type.rb
+- lib/rails_dictionary/acts_as_dictionary.rb
 - lib/rails_dictionary/array_core_ext.rb
-- lib/rails_dictionary/models/active_record_extension.rb
-- lib/rails_dictionary/models/acts_as_dict_slave.rb
-- lib/rails_dictionary/models/acts_as_dict_type.rb
-- lib/rails_dictionary/models/acts_as_dictionary.rb
 - lib/rails_dictionary/version.rb
 - lib/tasks/dicts.rake
+- pkg/rails_dictionary-0.2.2.gem
+- pkg/rails_dictionary-0.2.3.gem
 - rails_dictionary.gemspec
 - spec/fake_app.rb
 - spec/rails_dictionary_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/raykin/rails_dictionary
-licenses: []
+licenses:
+- MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -67,9 +77,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: rails_dictionary
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: dictionary data for web application
 test_files: