activerecord-tablefree 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 235704d2ab13e82aade9b7417f37e81a13ebe1bb
-  data.tar.gz: e244be4b68edcb6176795af934b89e3059e9a11d
+  metadata.gz: bcf2aa444df8b82ef32f91818957b4f9deac9ceb
+  data.tar.gz: 5e28ee5eeff06cae3b1119eb1d1bbe5597cc57f6
 SHA512:
-  metadata.gz: c3c0974dae4f04e9b514ee11c7edf2b596da920f1ae4571fa3501fadf3229231105fdb5da77889b5e1d404dfac557bec122d61104c1d1dfb7bddd19e71979e79
-  data.tar.gz: 68a3198d4287dd1c803846fbb99da6fc02f54bf73e19bef8bf4d60a9f5a6c25859cf22a35c9e723688a59f154a672a4304dd5dd4ff9884656fb87f17c9e02dac
+  metadata.gz: 0faddb4c4c110e0b817d3268ea9540c62d3f70d57248562d88fd452dd8dfed3af1c3829a989943ae512ea5fba041a17422c1abbcf691a65469085acd6bd59cb3
+  data.tar.gz: 484fc796ae9253cf37a618df9ee9de352ad45d7fa5cf1751891cdcc6bc40aac411dbfd9800864656594c0a4864e6e17813298a9216b1ade2410b1e9ed4ae6713

data/Appraisals

@@ -1,11 +1,11 @@
 #-*- ruby -*-
 
-appraise "rails50" do
-  gem "rails", "~> 5.0.0"
-  gem "jquery-rails"
+appraise 'rails50' do
+  gem 'rails', '~> 5.0.0'
+  gem 'jquery-rails'
 end
 
-appraise "rails51" do
-  gem "rails", "~> 5.1.0"
-  gem "jquery-rails"
+appraise 'rails51' do
+  gem 'rails', '~> 5.1.0'
+  gem 'jquery-rails'
 end

data/Gemfile

@@ -3,6 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in utf8_enforcer_workaround.gemspec
 gemspec
 
-gem "mime-types", "< 2.0", :platform => :ruby_18
-gem "rubyzip", "< 1.0", :platform => :ruby_18
-gem "byebug"
+gem 'byebug'
+gem 'mime-types', '< 2.0', platform: :ruby_18
+gem 'rubyzip', '< 1.0', platform: :ruby_18

data/README.md

@@ -9,12 +9,11 @@ ActiveRecord Tablefree
 | version                 |  [![Gem Version](https://badge.fury.io/rb/activerecord-tablefree.png)](http://badge.fury.io/rb/activerecord-tablefree) |
 | dependencies            |  [![Dependency Status](https://gemnasium.com/badges/github.com/boltthreads/activerecord-tablefree.svg)](https://gemnasium.com/github.com/boltthreads/activerecord-tablefree) |
 | code quality            |  [![Code Climate](https://codeclimate.com/github/boltthreads/activerecord-tablefree.png)](https://codeclimate.com/github/boltthreads/activerecord-tablefree) |
-| continuous integration  |  [![Build Status](https://travis-ci.org/boltthreads/activerecord-tablefree.png)](http://travis-ci.org/boltthreads/activerecord-tablefree) |
+| continuous integration  |  [![Build Status](https://travis-ci.org/boltthreads/activerecord-tablefree.svg?branch=master)](https://travis-ci.org/boltthreads/activerecord-tablefree) |
 | test coverage           |  [![Coverage Status](https://coveralls.io/repos/github/boltthreads/activerecord-tablefree/badge.png?branch=master)](https://coveralls.io/github/boltthreads/activerecord-tablefree?branch=master) |
-| triage helpers          |  [![Coverage Status](https://www.codetriage.com/boltthreads/activerecord-tablefree/badges/users.png)](https://www.codetriage.com/boltthreads/activerecord-tablefree) |
+| triage helpers          |  [![Issue Triage](https://www.codetriage.com/boltthreads/activerecord-tablefree/badges/users.png)](https://www.codetriage.com/boltthreads/activerecord-tablefree) |
 | homepage                |  [https://github.com/boltthreads/activerecord-tablefree](https://github.com/boltthreads/activerecord-tablefree) |
 | documentation           |  [http://rdoc.info/github/boltthreads/activerecord-tablefree/frames](http://rdoc.info/github/boltthreads/activerecord-tablefree/frames) |
-| readme hit counter      |  [![ghit.me](https://ghit.me/badge.svg?repo=boltthreads/activerecord-tablefree)](https://ghit.me/repo/boltthreads/activerecord-tablefree) |
 
 A simple implementation of the ActiveRecord Tableless pattern for any
 Rails project or other Ruby project that uses ActiveRecord.
@@ -35,7 +34,7 @@ be used in your app.
 
 Include the gem in your Gemfile:
 
-    gem "activerecord-tablefree", "~> 1.0"
+    gem "activerecord-tablefree", "~> 3.0"
 
 
 Supported Versions
@@ -43,33 +42,18 @@ Supported Versions
 
 Supported ruby version are
 
-  * **2.2.x** series higher than 2.2.2
+  * **2.2.x** series higher than 2.2.2 (a Rails 5 requirement)
   * **2.3.x** series
-
-If you are using Ruby version < 2.2.2 you can use the gem version <
-2.0 like this
-
-    gem "activerecord-tablefree", "~> 1.0.0"
+  * **2.4.x** series
 
 Supported ActiveRecord versions are
 
-  * **3.0.x** series
-  * **3.2.x** series
-  * **4.1.x** series
-  * **4.2.x** series
-
-If you are using ActiveRecord 2.3.x series you can use the gem version <
-2.0 like this
-
-    gem "activerecord-tablefree", "~> 1.0.0"
-
-You may be able to make it work with 3.1.x, but you should expect to
-put some time in it.
+  * **5.0.x** series
+  * **5.1.x** series
 
-TODO
-----
+If you are using an older ActiveRecord version you can use the gem [`activerecord-tableless`](https://github.com/softace/activerecord-tableless)
 
-  * Support Rails 5.x series
+This gem tries to maintain the same API as the older `activerecord-tableless` gem.
 
 Usage
 -----

data/Rakefile

@@ -5,16 +5,16 @@ require 'rspec/core/rake_task'
 require 'cucumber/rake/task'
 
 desc 'Default: clean, all.'
-task :default => [:clean, :all]
+task default: %i[clean all]
 
 desc 'Test the activerecord-tablefree on all supported Rails versions.'
-task :all do |t|
+task :all do |_t|
   # TODO: cucumber feature specs appear to be written for Rails 2, and will need an overhaul for Rails 5.
   if ENV['BUNDLE_GEMFILE']
     exec('rake test spec')
     # exec('rake test spec cucumber')
   else
-    Rake::Task["appraisal:install"].execute
+    Rake::Task['appraisal:install'].execute
     exec('rake appraisal test spec')
     # exec('rake appraisal test spec cucumber')
   end
@@ -27,22 +27,22 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = true
 end
 
-desc "Run specs"
+desc 'Run specs'
 RSpec::Core::RakeTask.new do |t|
-  t.pattern = "./spec/**/*_spec.rb" # don't need this, it's default.
+  t.pattern = './spec/**/*_spec.rb' # don't need this, it's default.
   # Put spec opts in a file named .rspec in root
 end
 
 desc 'Run integration test'
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = %w{--format progress}
+  t.cucumber_opts = %w[--format progress]
 end
 
 desc 'Clean up files.'
-task :clean do |t|
-  FileUtils.rm_rf "doc"
-  FileUtils.rm_rf "tmp"
-  FileUtils.rm_rf "pkg"
-  FileUtils.rm_rf "public"
-  Dir.glob("activerecord-tablefree-*.gem").each{|f| FileUtils.rm f }
+task :clean do |_t|
+  FileUtils.rm_rf 'doc'
+  FileUtils.rm_rf 'tmp'
+  FileUtils.rm_rf 'pkg'
+  FileUtils.rm_rf 'public'
+  Dir.glob('activerecord-tablefree-*.gem').each { |f| FileUtils.rm f }
 end

data/activerecord-tablefree.gemspec

@@ -1,47 +1,47 @@
 # -*- ruby -*-
-$LOAD_PATH.push File.expand_path("../lib", __FILE__)
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
 require 'activerecord-tablefree/version'
 
 Gem::Specification.new do |gem|
   gem.name          = 'activerecord-tablefree'
   gem.version       = ActiveRecord::Tablefree::VERSION
   gem.platform      = Gem::Platform::RUBY
-  gem.authors       = ["Jarl Friis", "Kenneth Kalmer", "Michal Zima", "Peter Boling"]
-  gem.email         = ["jarl@softace.dk", "peter.boling@gmail.com"]
-  gem.homepage      = "https://github.com/boltthreads/activerecord-tablefree"
-  gem.summary       = %q{A library for implementing tablefree ActiveRecord models}
-  gem.description   = %q{ActiveRecord Tablefree Models provides a simple mixin for creating models that are not bound to the database. This approach is useful for taking advantage of the features of ActiveRecord such as validation, relationships, etc.}
+  gem.authors       = ['Jarl Friis', 'Kenneth Kalmer', 'Michal Zima', 'Peter Boling']
+  gem.email         = ['jarl@softace.dk', 'peter.boling@gmail.com']
+  gem.homepage      = 'https://github.com/boltthreads/activerecord-tablefree'
+  gem.summary       = 'A library for implementing tablefree ActiveRecord models'
+  gem.description   = 'ActiveRecord Tablefree Models provides a simple mixin for creating models that are not bound to the database. This approach is useful for taking advantage of the features of ActiveRecord such as validation, relationships, etc.'
   gem.license       = 'MIT'
 
-  gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.files         = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
+  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.has_rdoc      = true
 
-  gem.require_paths = ["lib"]
+  gem.require_paths = ['lib']
 
   gem.add_runtime_dependency('activerecord', '>= 3.0.0')
 
   gem.add_development_dependency('bundler', '~> 1.16.0')
-  gem.add_development_dependency('rake', '~> 0', '> 0')
+  gem.add_development_dependency('rake', '~> 12', '> 0')
 
   #  gem.add_development_dependency("rails") # This is in the appraisal gemfiles
   gem.add_development_dependency('sqlite3', '~> 1.3')
 
   gem.add_development_dependency('appraisal', '~> 1.0')
+  gem.add_development_dependency('aruba', '~> 0.5')
   gem.add_development_dependency('cucumber', '~> 1.1')
   gem.add_development_dependency('rspec', '~> 3.1')
   gem.add_development_dependency('rspec-collection_matchers', '~> 1.0')
-  gem.add_development_dependency('aruba', '~> 0.5')
 
-  gem.add_development_dependency('nokogiri', '~> 1.0')
   gem.add_development_dependency('capybara', '~> 0.0')
+  gem.add_development_dependency('coveralls')
   gem.add_development_dependency('gem-release', '~> 0.7.4')
-  gem.add_development_dependency('wwtd')
-  gem.add_development_dependency('rails')
   gem.add_development_dependency('listen')
-  gem.add_development_dependency('coveralls')
+  gem.add_development_dependency('nokogiri', '~> 1.0')
+  gem.add_development_dependency('rails')
+  gem.add_development_dependency('wwtd')
 
-#  gem.add_development_dependency('launchy', '~> 2.1')
-#  gem.add_development_dependency('debugger')
+  #  gem.add_development_dependency('launchy', '~> 2.1')
+  #  gem.add_development_dependency('debugger')
 end

data/features/step_definitions/rails_steps.rb

@@ -1,5 +1,5 @@
 Given /^I generate a new rails application$/ do
-  steps %{
+  steps %(
     When I successfully run `bundle exec #{new_application_command(APP_NAME)}`
     And I cd to "#{APP_NAME}"
     And I turn off class caching
@@ -15,26 +15,26 @@ Given /^I generate a new rails application$/ do
     And I configure the application to use "activerecord-tablefree" from this project
     And I reset Bundler environment variable
     And I successfully run `bundle install --local`
-  }
+  )
 end
 
-Given "I fix the application.rb for 3.0.12" do
-  ##See https://github.com/rails/rails/issues/9619
+Given 'I fix the application.rb for 3.0.12' do
+  # #See https://github.com/rails/rails/issues/9619
   in_current_dir do
-    File.open("config/application.rb", "a") do |f|
+    File.open('config/application.rb', 'a') do |f|
       f << "ActionController::Base.config.relative_url_root = ''"
     end
   end
 end
 
 Given /^I run a "(.*?)" generator to generate a "(.*?)" scaffold with "(.*?)"$/ do |generator_name, model_name, attributes|
-  step %[I successfully run `bundle exec #{generator_command} #{generator_name} #{model_name} #{attributes}`]
+  step %(I successfully run `bundle exec #{generator_command} #{generator_name} #{model_name} #{attributes}`)
 end
 
 Given /^I start the rails application$/ do
   in_current_dir do
-    require "./config/environment"
-    require "capybara/rails"
+    require './config/environment'
+    require 'capybara/rails'
   end
 end
 
@@ -42,44 +42,44 @@ Given /^I reload my application$/ do
   Rails::Application.reload!
 end
 
-When %r{I turn off class caching} do
+When /I turn off class caching/ do
   in_current_dir do
-    file = "config/environments/test.rb"
+    file = 'config/environments/test.rb'
     config = IO.read(file)
-    config.gsub!(%r{^\s*config.cache_classes.*$},
-                 "config.cache_classes = false")
-    File.open(file, "w"){|f| f.write(config) }
+    config.gsub!(/^\s*config.cache_classes.*$/,
+                 'config.cache_classes = false')
+    File.open(file, 'w') { |f| f.write(config) }
   end
 end
 
 Given /^I update my application to use Bundler$/ do
-  if framework_version?("2")
+  if framework_version?('2')
     boot_config_template = File.read('features/support/fixtures/boot_config.txt')
     preinitializer_template = File.read('features/support/fixtures/preinitializer.txt')
     gemfile_template = File.read('features/support/fixtures/gemfile.txt')
     in_current_dir do
-      content = File.read("config/boot.rb").sub(/Rails\.boot!/, boot_config_template)
-      File.open("config/boot.rb", "w") { |file| file.write(content) }
-      File.open("config/preinitializer.rb", "w") { |file| file.write(preinitializer_template) }
-      File.open("Gemfile", "w") { |file| file.write(gemfile_template.sub(/RAILS_VERSION/, framework_version)) }
+      content = File.read('config/boot.rb').sub(/Rails\.boot!/, boot_config_template)
+      File.open('config/boot.rb', 'w') { |file| file.write(content) }
+      File.open('config/preinitializer.rb', 'w') { |file| file.write(preinitializer_template) }
+      File.open('Gemfile', 'w') { |file| file.write(gemfile_template.sub(/RAILS_VERSION/, framework_version)) }
     end
   end
 end
 
 Then /^the file at "([^"]*)" should be the same as "([^"]*)"$/ do |web_file, path|
   expected = IO.binread(path)
-  actual = if web_file.match %r{^https?://}
-    Net::HTTP.get(URI.parse(web_file))
-  else
-    visit(web_file)
-    page.source
+  actual = if web_file =~ %r{^https?://}
+             Net::HTTP.get(URI.parse(web_file))
+           else
+             visit(web_file)
+             page.source
   end
   actual.should == expected
 end
 
 When /^I configure the application to use "([^\"]+)" from this project$/ do |name|
   append_to_gemfile "gem '#{name}', :path => '#{PROJECT_ROOT}'"
-  steps %{And I run `bundle install --local`}
+  steps %(And I run `bundle install --local`)
 end
 
 When /^I configure the application to use "([^\"]+)"$/ do |gem_name|
@@ -88,9 +88,7 @@ end
 
 When /^I append gems from Appraisal Gemfile$/ do
   File.read(ENV['BUNDLE_GEMFILE']).split(/\n/).each do |line|
-    if line =~ /^gem "(?!rails|appraisal)/
-      append_to_gemfile line.strip
-    end
+    append_to_gemfile line.strip if line =~ /^gem "(?!rails|appraisal)/
   end
 end
 
@@ -100,15 +98,14 @@ end
 
 Then /^the result of "(.*?)" should be the same as "(.*?)"$/ do |rails_expr, path|
   expected = IO.binread(path)
-  actual = eval "#{rails_expr}"
+  actual = eval rails_expr.to_s
   actual.should == expected
 end
 
-
 module FileHelpers
   def append_to(path, contents)
     in_current_dir do
-      File.open(path, "a") do |file|
+      File.open(path, 'a') do |file|
         file.puts
         file.puts contents
       end
@@ -121,16 +118,16 @@ module FileHelpers
 
   def comment_out_gem_in_gemfile(gemname)
     in_current_dir do
-      gemfile = File.read("Gemfile")
-      gemfile.sub!(/^(\s*)(gem\s*['"]#{gemname})/, "\\1# \\2")
-      File.open("Gemfile", 'w'){ |file| file.write(gemfile) }
+      gemfile = File.read('Gemfile')
+      gemfile.sub!(/^(\s*)(gem\s*['"]#{gemname})/, '\\1# \\2')
+      File.open('Gemfile', 'w') { |file| file.write(gemfile) }
     end
   end
 
   def transform_file(filename)
-    if File.exists?(filename)
+    if File.exist?(filename)
       content = File.read(filename)
-      File.open(filename, "w") do |f|
+      File.open(filename, 'w') do |f|
         content = yield(content)
         f.write(content)
       end

data/features/step_definitions/tablefree.rb

@@ -1,14 +1,14 @@
 Given /^I delete all migrations$/ do
-  steps %{
+  steps %(
     When I successfully run `bash -c 'rm db/migrate/*.rb'`
-  }
+  )
 end
 
 Given /^I update my new user model to be tablefree$/ do
   in_current_dir do
     file_name = 'app/models/user.rb'
     content = File.read(file_name)
-    if framework_version < "3.0"
+    if framework_version < '3.0'
       content = "require 'activerecord-tablefree'\n" + content
     end
 
@@ -25,11 +25,11 @@ end
 Given /^I update my users controller to render instead of redirect$/ do
   in_current_dir do
     transform_file('app/controllers/users_controller.rb') do |content|
-      ##Changes in #create method
+      # #Changes in #create method
       content.gsub!(/@user = User.new\((.*?)\)/,
                     '@user = User.new(\1); @user.id = 1')
-      content.gsub!("if @user.save",
-                    "if @user.valid?")
+      content.gsub!('if @user.save',
+                    'if @user.valid?')
       content.gsub!(/redirect_to([\( ])@user, .*?([\)]| \}|$)/,
                     "render\\1:action => 'show'\\2")
     end

data/features/step_definitions/web_steps.rb

@@ -18,11 +18,10 @@
 # * http://elabs.se/blog/15-you-re-cuking-it-wrong
 #
 
-
 require 'uri'
 require 'cgi'
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "selectors"))
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'support', 'paths'))
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'support', 'selectors'))
 
 module WithinHelpers
   def with_scope(locator)
@@ -58,11 +57,11 @@ When /^(?:|I )follow "([^"]*)"$/ do |link|
 end
 
 When /^(?:|I )fill in "([^"]*)" with "([^"]*)"$/ do |field, value|
-  fill_in(field, :with => value)
+  fill_in(field, with: value)
 end
 
 When /^(?:|I )fill in "([^"]*)" for "([^"]*)"$/ do |value, field|
-  fill_in(field, :with => value)
+  fill_in(field, with: value)
 end
 
 # Use this to fill in an entire form with data from a table. Example:
@@ -78,12 +77,12 @@ end
 #
 When /^(?:|I )fill in the following:$/ do |fields|
   fields.rows_hash.each do |name, value|
-    When %{I fill in "#{name}" with "#{value}"}
+    When %(I fill in "#{name}" with "#{value}")
   end
 end
 
 When /^(?:|I )select "([^"]*)" from "([^"]*)"$/ do |value, field|
-  select(value, :from => field)
+  select(value, from: field)
 end
 
 When /^(?:|I )check "([^"]*)"$/ do |field|
@@ -115,9 +114,9 @@ Then /^(?:|I )should (not )?see \/([^\/]*)\/$/ do |negate, regexp|
   regexp = Regexp.new(regexp)
   should_name = negate ? :should_not : :should
   if page.respond_to? should_name
-    page.send should_name, have_xpath('//*', :text => regexp)
+    page.send should_name, have_xpath('//*', text: regexp)
   else
-    assert(negate ? page.has_no_xpath?('//*', :text => regexp) : page.has_xpath?('//*', :text => regexp))
+    assert(negate ? page.has_no_xpath?('//*', text: regexp) : page.has_xpath?('//*', text: regexp))
   end
 end
 
@@ -130,7 +129,7 @@ Then /^(?:|I )should have the following query string:$/ do |expected_pairs|
   query = URI.parse(current_url).query
   actual_params = query ? CGI.parse(query) : {}
   expected_params = {}
-  expected_pairs.rows_hash.each_pair{|k,v| expected_params[k] = v.split(',')}
+  expected_pairs.rows_hash.each_pair { |k, v| expected_params[k] = v.split(',') }
 
   expect(actual_params).to eq expected_params
 end