record_collection 0.10.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e447d692e69db528f32f29de1a0532b893b1e686
-  data.tar.gz: 06d7b54baeff7b9787328dcebe3e21b4c0e40d81
+SHA256:
+  metadata.gz: 358430811e33ee498a102a67e6eedb74648a2877ae6f63be3197550aba98f6fb
+  data.tar.gz: 5a8977c74bdd35e712f32817394fc221113f155a85ed27cfaa6d7a4a9197607b
 SHA512:
-  metadata.gz: de192342a3af0d2b7688b84ce772d073a211aca22577a4c02ff3ba2294c0bd167cd42936407b53ceb87fc04ca632074a688636c1bf4184d3dbfae299138174e1
-  data.tar.gz: 9b91e33a7a272c081dc69a0c0bd6a1bb7f3395c12e47f862db563d3792facdea73d84d6307ec2d4b1b97edf1e7cba4f31ac88587722a242159842d66dd042373
+  metadata.gz: 1ba4c8d3ae3a99231ed48696468f0bac14e71f57a1423150b03971e27ef403833df6d0baed2d39d221a3ea84b62eebff4aca9431e72e1f855df44bde05a7a94c
+  data.tar.gz: 11d8edda2f8fa3ab3c7a71db49f61d1e6e6efe7ae3bc938c3204eed48cd80842d7fc3c52fc912f45bb2f95960fd4ad5ff9d6f2fc18d8f4a3f75c22f1817c5844

data/.travis.yml

@@ -1,11 +1,15 @@
 language: ruby
+gemfile:
+- gemfiles/Gemfile.rails-4.2.x
+- gemfiles/Gemfile.rails-5.0.x
 rvm:
-  - 2.1.6
-  - 2.2.3
-env:
-  - RAILS_VERSION=4.1.14
-  - RAILS_VERSION=4.2.5
-  #- RAILS_VERSION=master
+- 2.1.9
+- 2.2.5
+- 2.3.1
+matrix:
+  exclude:
+    rvm: 2.1.9
+    gemfile: gemfiles/Gemfile.rails-5.0.x
 addons:
   code_climate:
     repo_token: 22819b10ef9110a7fef884ab105239fc16fd0562ac79ae54c2204b5e07343919

data/CHANGELOG.md

@@ -1,6 +1,17 @@
 CHANGELOG
 =========
 
+2025-10-04 - v1.0.0
+--------------------
+### Changed
+* Make it Rails 8.0.3 compatible. Might break older versions
+
+2015-12-28 - v0.10.4
+--------------------
+### Added
+* Allow #find(ids) on collection instance that could be the result of a
+  `joins` or an `includes` scope setup call
+
 2015-12-26 - v0.10.3
 --------------------
 ### Added

data/Gemfile

@@ -3,19 +3,13 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in record_collection.gemspec
 gemspec
 
-#http://aaronmiler.com/blog/testing-your-rails-engine-with-multiple-versions-of-rails/
-rails_version = ENV["RAILS_VERSION"] || "default"
-rails = case rails_version
-  when "master" then {github: "rails/rails"}
-  when "default" then ">= 3.2.0"
-  else "~> #{rails_version}"
-end
-gem "rails", rails
-if rails_version == 'master'
-  gem 'arel', github: 'rails/arel'
-  gem 'rack', github: 'rack/rack'
+gem "rails", "~> 8.0"
+
+group :development, :test do
+  gem 'puma'
 end
 
 group :test do
   gem "codeclimate-test-reporter", require: nil
+  gem 'selenium-webdriver'
 end

data/bin/rails

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 4 gems installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path('../..', __FILE__)
+ENGINE_PATH = File.expand_path('../../lib/record_collection/engine', __FILE__)
+APP_PATH    = File.expand_path("../spec/dummy/config/application", __dir__)
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+
+require 'rails/all'
+require 'rails/engine/commands'

data/config/environment.rb

@@ -0,0 +1 @@
+#NOTE: this file is only for vim-rails to recognize this as a rails project

data/gemfiles/Gemfile.rails-4.2.x

@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in record_collection.gemspec
+gemspec path: '../'
+
+gem "rails", "~> 4.2.7"
+
+group :test do
+  gem "codeclimate-test-reporter", require: nil
+end

data/gemfiles/Gemfile.rails-5.0.x

@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in record_collection.gemspec
+gemspec path: '../'
+
+gem "rails", "~> 5.0.0"
+
+group :test do
+  gem "codeclimate-test-reporter", require: nil
+end

data/gemfiles/Gemfile.rails-master

@@ -0,0 +1,13 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in record_collection.gemspec
+gemspec path: '../'
+
+gem "rails", github: 'rails/rails'
+
+gem 'arel', github: 'rails/arel'
+gem 'rack', github: 'rack/rack'
+
+group :test do
+  gem "codeclimate-test-reporter", require: nil
+end

data/lib/record_collection/base.rb

@@ -46,7 +46,7 @@ module RecordCollection
       alias_method :old_validates, :validates
       def validates(attr, options)
         # Collection nil attributes mean they do not play a role for the collection.
-        # So validating when the value is nil is not the default behaviour. I to be turned on explicitly
+        # So validating when the value is nil is not the default behaviour. I to be used explicitly
         # by specifying allow_nil: false
         options[:allow_nil] = true unless options.has_key?(:allow_nil)
         old_validates attr, options
@@ -63,23 +63,15 @@ module RecordCollection
         self.new(collection)
       end
 
-      # Create a new collection with the scope set to the result of the query on the record_class
-      def where(*args)
-        self.new(record_class.where(*args))
-      end
-
-      # Create a new collection with the scope set to the result of the query on the record_class
-      def joins(*args)
-        self.new(record_class.joins(*args))
-      end
-
-      # Create a new collection with the scope set to the result of the query on the record_class
-      def includes(*args)
-        self.new(record_class.includes(*args))
-      end
-
-      def all(*args)
-        self.new(record_class.all(*args))
+      # instantiate a new instance of the collection with the
+      # scope set to the received argument:
+      #   Collection.joins(:project).where(projects: {state: 'active'})
+      # The joins returns the instance, the second where is handled by
+      # the instance itself as an instance delegate method
+      %i[where joins includes all].each do |delegate_method|
+        define_method delegate_method do |*args|
+          self.new(record_class.public_send(delegate_method, *args))
+        end
       end
     end
 
@@ -143,7 +135,7 @@ module RecordCollection
     end
 
     def persisted?
-      # Behave like an update in forms, this triggers plural routes
+      # Behave like a non persisted record in forms, this triggers plural (collection) routes
       false
     end
 
@@ -200,27 +192,17 @@ module RecordCollection
       self
     end
 
-    # update existing scope with new one having applied where clause if possible
-    def where(*args)
-      @collection = @collection.where(*args)
-      self
-    end
-
-    # update existing scope with new one having applied joins clause if possible
-    def joins(*args)
-      @collection = @collection.joins(*args)
-      self
-    end
-
-    # update existing scope with new one having applied includes clause if possible
-    def includes(*args)
-      @collection = @collection.includes(*args)
-      self
+    # delegate methods to the collection returning self
+    %i[joins includes where not].each do |delegate_method|
+      define_method delegate_method do |*args|
+        @collection = @collection.public_send(delegate_method, *args)
+        self
+      end
     end
 
-    # update existing scope with new one having applied not clause if possible
-    def not(*args)
-      @collection = @collection.not(*args)
+    def find(ids)
+      ids = ids.split(RecordCollection.ids_separator) if ids.is_a?(String)
+      @collection = @collection.find(Array.wrap(ids))
       self
     end
   end

data/lib/record_collection/rails/form_helper.rb

@@ -7,13 +7,15 @@ ActionView::Helpers::FormHelper.class_eval do
   #   = form_for @collection do |f|
   #     = f.text_field :name
   alias_method :old_apply_form_for_options!, :apply_form_for_options!
-  def apply_form_for_options!(record, object, options) #:nodoc:
-    if record.is_a?(RecordCollection::Base)
+  def apply_form_for_options!(object, options) #:nodoc:
+    #binding.pry if object.is_a?(RecordCollection::Base)
+    if object.is_a?(RecordCollection::Base)
         object = convert_to_model(object)
 
         as = options[:as]
         namespace = options[:namespace]
         action, method = [:collection_update, :post]
+        options[:html] ||= {}
         options[:html].reverse_merge!(
           class:  as ? "#{action}_#{as}" : dom_class(object, action),
           id:     (as ? [namespace, action, as] : [namespace, dom_id(object, action)]).compact.join("_").presence,
@@ -21,12 +23,12 @@ ActionView::Helpers::FormHelper.class_eval do
         )
 
         options[:url] ||= if options.key?(:format)
-                            polymorphic_path([action, record], format: options.delete(:format))
+                            polymorphic_path([action, object], format: options.delete(:format))
                           else
-                            polymorphic_path([action, record], {})
+                            polymorphic_path([action, object], {})
                           end
     else
-      old_apply_form_for_options!(record, object, options)
+      old_apply_form_for_options!(object, options)
     end
   end
 end

data/lib/record_collection/version.rb

@@ -1,3 +1,3 @@
 module RecordCollection
-  VERSION = "0.10.3"
+  VERSION = "1.0.0"
 end

data/record_collection.gemspec

@@ -18,13 +18,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
+  #spec.add_development_dependency "bundler", "~> 1.7"
+  #spec.add_development_dependency "rake", "~> 10.0"
   #spec.add_development_dependency "rspec", ">= 3.1.0"
-  spec.add_development_dependency "rspec-rails", "~> 3.1"
+  spec.add_development_dependency "rspec-rails" #, "~> 3.1"
   spec.add_development_dependency "rspec-its"
   spec.add_development_dependency "pry", ">= 0.1"
-  spec.add_development_dependency "rails", "~> 4.1"
+  spec.add_development_dependency "rails" #, "~> 4.1"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "slim-rails"
   spec.add_development_dependency "coffee-rails"
@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "database_cleaner"
   spec.add_development_dependency "spring"
   spec.add_development_dependency "spring-commands-rspec"
-  spec.add_development_dependency "quiet_assets"
+  #spec.add_development_dependency "quiet_assets"
   spec.add_development_dependency "simple_form"
   spec.add_development_dependency "rspec-html-matchers"
 

data/spec/base/finding_records_spec.rb

@@ -23,6 +23,26 @@ RSpec.describe Employee::Collection do
         employee2 = Employee.create name: 'E2', section: 'QNP', admin: false, vegan: false
         described_class.find([employee1.id, employee2.id]).collection.should match_array [employee1, employee2]
       end
+
+      it "works with an includes statement (find on instance)" do
+        employee1 = Employee.create name: 'E1', section: 'ABC', admin: true, vegan: false
+        described_class.includes(:project).find([employee1.id]).should be_a RecordCollection::Base
+      end
+
+      it "works with an includes statement (find on instance) and string argument" do
+        employee1 = Employee.create name: 'E1', section: 'ABC', admin: true, vegan: false
+        employee2 = Employee.create name: 'E2', section: 'QNP', admin: false, vegan: false
+        result = described_class.includes(:project).find("#{employee1.id}~#{employee2.id}")
+        result.should be_a RecordCollection::Base
+        result.collection.should match_array [employee1, employee2]
+      end
+
+      it "works with an includes statement (find on instance) and integer id argument" do
+        employee1 = Employee.create name: 'E1', section: 'ABC', admin: true, vegan: false
+        result = described_class.includes(:project).find(employee1.id)
+        result.should be_a RecordCollection::Base
+        result.collection.should eq [employee1]
+      end
     end
 
     it "finds single id as string as collection" do

data/spec/dummy/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+  //= link_tree ../images
+  //= link_directory ../javascripts .js
+  //= link_directory ../stylesheets .css

data/spec/dummy/app/assets/javascripts/application.js.coffee

@@ -1,6 +1,6 @@
 #= require jquery
 #= require jquery_ujs
-#= require js-routes
+# require js-routes
 #= require record_collection/all
 #= require foundation.min
 #= require_tree .
@@ -12,4 +12,12 @@ $ ->
     $('#selected-records-action').click ->
       ids = selector.selected_ids()
       return alert "No records selected" unless ids.length
-      window.location = "/employees/collection_edit?#{$.param(ids: ids)}"
+      window.location.href = "/employees/collection_edit?#{$.param(ids: ids)}"
+
+window.Routes =
+  collection_edit_projects_path: ({ids}) ->
+    param = ids.map((id) -> encodeURI("ids[]=#{id}")).join('&')
+    "/projects/collection_edit?#{param}"
+  collection_edit_employees_path: ({ids}) ->
+    param = ids.map((id) -> encodeURI("ids[]=#{id}")).join('&')
+    "/employees/collection_edit?#{param}"

data/spec/dummy/app/views/employees/index.html.slim

@@ -23,6 +23,6 @@ table.with-selection
         button#selected-records-action Actions
 br
 .page-actions
-  button.actions-button.button.warning onclick="window.location = Routes.collection_edit_employees_path({ids: MultiSelect.selected_ids()})" Actions
+  button.actions-button.button.warning onclick="window.location.href = 'http://'+window.location.host+Routes.collection_edit_employees_path({ids: MultiSelect.selected_ids()})" Actions
   span.devider
   = link_to 'New Employee', new_employee_path, class: 'info button'

data/spec/dummy/app/views/projects/collection_edit.html.slim

@@ -7,6 +7,5 @@ h1 Edit multiple projects
   .form-inputs= f.optional_input :description, hint: "Hint normal display for other attributes, use .optional-attribute-hint with data-hint='abc' in your simple_form config to use the record_collection styling"
   .form-actions= f.submit
 .page-actions
-  = link_to 'Back', employees_path
-
+  = link_to 'Back', projects_path
 

data/spec/dummy/config/application.rb

@@ -20,7 +20,7 @@ module Dummy
     # config.i18n.default_locale = :de
 
     # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true if Gem::Requirement.new(">= 4.2").satisfied_by?(Gem::Version.new(Rails.version))
+    # config.active_record.raise_in_transactional_callbacks = true if Gem::Requirement.new(">= 4.2").satisfied_by?(Gem::Version.new(Rails.version))
   end
 end
 

data/spec/dummy/config/environments/development.rb

@@ -25,7 +25,7 @@ Rails.application.configure do
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large
   # number of complex assets.
-  config.assets.debug = true
+  config.assets.debug = false
 
   # Asset digests allow you to set far-future HTTP expiration dates on all assets,
   # yet still be able to expire them through the digest params.

data/spec/dummy/config/environments/test.rb

@@ -13,8 +13,14 @@ Rails.application.configure do
   config.eager_load = false
 
   # Configure static file server for tests with Cache-Control for performance.
-  config.serve_static_files   = true
-  config.static_cache_control = 'public, max-age=3600'
+  if Rails.version.start_with?('4')
+    config.serve_static_files   = true # rails < 5
+    config.static_cache_control = 'public, max-age=3600' # rails < 5
+  else
+    config.public_file_server.enabled = true
+    config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
+  end
+
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 ENV["RAILS_ENV"] = "test"
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
+#require 'simplecov'
+#SimpleCov.start
 
 require 'pry'
 require File.expand_path("../../spec/dummy/config/environment.rb",  __FILE__)
@@ -13,9 +13,9 @@ require 'record_collection'
 require 'database_cleaner'
 require 'capybara/rails'
 require 'capybara/rspec'
-require 'capybara/poltergeist'
+#require 'capybara/poltergeist'
 
-Capybara.javascript_driver = :poltergeist
+Capybara.javascript_driver = :selenium
 DatabaseCleaner.clean_with :truncation
 RSpec.configure do |config|
   config.mock_with :rspec

metadata

@@ -1,57 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: record_collection
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Benjamin ter Kuile
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-26 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +55,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -290,20 +261,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: quiet_assets
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
@@ -377,7 +334,8 @@ dependencies:
 description: This gem helps you to work on subsets or rails models
 email:
 - bterkuile@gmail.com
-executables: []
+executables:
+- rails
 extensions: []
 extra_rdoc_files: []
 files:
@@ -399,7 +357,12 @@ files:
 - app/controllers/record_collection/application_controller.rb
 - app/helpers/record_collection/application_helper.rb
 - app/views/layouts/record_collection/application.html.erb
+- bin/rails
+- config/environment.rb
 - config/spring.rb
+- gemfiles/Gemfile.rails-4.2.x
+- gemfiles/Gemfile.rails-5.0.x
+- gemfiles/Gemfile.rails-master
 - lib/generators/collection_scaffold/collection_scaffold_generator.rb
 - lib/generators/collection_scaffold/templates/_form.html.haml
 - lib/generators/collection_scaffold/templates/_form.html.slim
@@ -438,6 +401,7 @@ files:
 - spec/base/validations_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/images/.keep
 - spec/dummy/app/assets/javascripts/application.js.coffee
 - spec/dummy/app/assets/javascripts/foundation.min.js
@@ -531,7 +495,6 @@ homepage: https://github.com/bterkuile/record_collection
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -546,9 +509,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Manage collections of records in Ruby on Rails
 test_files:
@@ -564,6 +525,7 @@ test_files:
 - spec/base/validations_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/images/.keep
 - spec/dummy/app/assets/javascripts/application.js.coffee
 - spec/dummy/app/assets/javascripts/foundation.min.js
@@ -653,4 +615,3 @@ test_files:
 - spec/record_selection/base_spec.rb
 - spec/record_selection/name_spec.rb
 - spec/spec_helper.rb
-has_rdoc: