active_hash_relation 1.1.0 → 1.2.0

data/lib/active_hash_relation/helpers.rb

@@ -1,7 +1,27 @@
 module ActiveHashRelation
   module Helpers
-    def model_class_name(resource)
-      resource.class.to_s.split('::').first.constantize
+    def model_class_name(resource, _engine = false)
+      _class = resource.class.to_s.split('::')
+      if _engine === true
+        "#{_class[0]}::#{_class[1]}".constantize
+      else
+        _class.first.constantize
+      end
+    end
+
+    def engine_name
+      Rails::Engine.subclasses[0].to_s.split('::').first
+    end
+
+    def find_model(model)
+      return model if model
+
+      model = model_class_name(@resource)
+      if model.nil? || engine_name == model.to_s
+        model = model_class_name(@resource, true)
+      end
+
+      return model
     end
   end
 end

data/lib/active_hash_relation/scope_filters.rb

@@ -2,11 +2,18 @@ module ActiveHashRelation::ScopeFilters
   def filter_scopes(resource, params, model = nil)
     unless model
       model = model_class_name(resource)
+      if model.nil? || engine_name == model.to_s
+        model = model_class_name(resource, true)
+      end
     end
 
     model.scope_names.each do |scope|
       if params.include?(scope)
-        resource = resource.send(scope)
+        if params[scope].is_a? Array
+          resource = resource.send(scope, *params[scope])
+        else
+          resource = resource.send(scope)
+        end
       end
     end
 

data/lib/active_hash_relation/sort_filters.rb

@@ -1,5 +1,17 @@
 module ActiveHashRelation::SortFilters
   def apply_sort(resource, params, model = nil)
+    if params.is_a? Array
+      params.each do |param_item|
+        resource = apply_hash_sort(resource, param_item, model)
+      end
+    else
+      resource = apply_hash_sort(resource, params, model)
+    end
+
+    return resource
+  end
+
+  def apply_hash_sort(resource, params, model = nil)
     if model.columns.map(&:name).include?(params[:property].to_s)
       resource = resource.order(params[:property] => (params[:order] || :desc) )
     end

data/lib/active_hash_relation/version.rb

@@ -1,3 +1,3 @@
 module ActiveHashRelation
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/active_record/scope_names.rb

@@ -4,29 +4,14 @@ module ActiveRecord
       module ClassMethods
         attr_reader :scope_names
 
+        alias_method :_scope, :scope
+
         def scope(name, body, &block)
           @scope_names ||= []
-          unless body.respond_to?(:call)
-            raise ArgumentError, 'The scope body needs to be callable.'
-          end
-
-          if dangerous_class_method?(name)
-            raise ArgumentError, "You tried to define a scope named \"#{name}\" " \
-              "on the model \"#{self.name}\", but Active Record already defined " \
-              "a class method with the same name."
-          end
-
-          extension = Module.new(&block) if block
-
-          singleton_class.send(:define_method, name) do |*args|
-            scope = all.scoping { body.call(*args) }
-            scope = scope.extending(extension) if extension
-
-            scope || all
-          end
 
+          _scope(name, body, &block)
 
-          @scope_names << name if body.arity.eql?(0)
+          @scope_names << name
         end
       end
     end

data/lib/generators/active_hash_relation/initialize_generator.rb

@@ -0,0 +1,13 @@
+module ActiveHashRelation
+  module Generators
+    class InitializeGenerator < Rails::Generators::Base
+      desc "This generator creates an initializer file at config/initializers"
+
+      source_root File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
+
+      def create_initializer_file
+        template 'active_hash_relation.rb', 'config/initializers/active_hash_relation.rb'
+      end
+    end
+  end
+end

data/lib/generators/active_hash_relation/templates/active_hash_relation.rb

@@ -0,0 +1,12 @@
+ActiveHashRelation.configure do |config|
+  #override default scope when accessing associations
+  config.use_unscoped = true
+  #set true to be able to filter scopes (with params)
+  #please note that unfortunately (:/) rails does not provide any way
+  #to iterate through scopes so it uses a monkey patch
+  #You need to run `initialize!` to actually include the required files
+  config.filter_active_record_scopes = false
+end
+
+#requires monkeyparched scopes, optional if you don't enable them
+ActiveHashRelation.initialize!

data/spec/config/initializers/active_hash_relation.rb

@@ -0,0 +1,16 @@
+ARH_INITIALIZER = proc{
+  ActiveHashRelation.configure do |config|
+    #override default scope when accessing associations
+    config.use_unscoped = true
+    #set true to be able to filter scopes (with params)
+    #please note that unfortunately (:/) rails does not provide any way
+    #to iterate through scopes so it uses a monkey patch.
+    #The monkey patch is as gentle as it can be by aliasing the method, adds some
+    #sugar and calls it
+    #You need to run `initialize!` to actually include the required files
+    config.filter_active_record_scopes = true
+  end
+
+  #requires monkeyparched scopes, optional if you don't enable them
+  ActiveHashRelation.initialize!
+}

data/spec/db/migrate/001_basic_schema.rb

@@ -0,0 +1,53 @@
+class BasicSchema < ActiveRecord::Migration
+  def change
+    create_table "microposts", force: :cascade do |t|
+      t.text     "content", null: false
+      t.integer  "user_id", null: false
+      t.integer  "likes", null: false, default: 0
+      t.integer  "reposts", null: false, default: 0
+      t.integer  "status", null: false, default: 0
+
+      t.timestamps null: false
+
+      t.index ["user_id"], name: "index_microposts_on_user_id", using: :btree
+    end
+
+    create_table "relationships", force: :cascade do |t|
+      t.integer  "follower_id"
+      t.integer  "followed_id"
+
+      t.timestamps null: false
+
+      t.index ["followed_id"], name: "index_relationships_on_followed_id", using: :btree
+      t.index ["follower_id", "followed_id"], name: "index_relationships_on_follower_id_and_followed_id", unique: true, using: :btree
+      t.index ["follower_id"], name: "index_relationships_on_follower_id", using: :btree
+    end
+
+    create_table "users", force: :cascade do |t|
+      t.string   "name"
+      t.string   "email", null: false
+      t.boolean  "admin", default: false
+      t.boolean  "verified", default: false
+      t.string   "token", null: false
+      t.integer  "microposts_count", default: 0, null: false
+      t.integer  "followers_count", default: 0, null: false
+      t.integer  "followings_count", default: 0, null: false
+
+      t.timestamps null: false
+
+      t.index ["email"], name: "index_users_on_email", unique: true, using: :btree
+    end
+
+    create_table :addresses do |t|
+      t.string :street
+      t.string :city
+      t.string :country
+      t.integer :user_id
+
+      t.timestamps
+      t.index ["user_id"], name: "index_addresses_on_user_id", unique: true, using: :btree
+    end
+
+    add_foreign_key "microposts", "users"
+  end
+end

data/spec/dummy-rails4/.gitignore

@@ -0,0 +1,13 @@
+# See https://help.github.com/articles/ignoring-files for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile '~/.gitignore_global'
+
+# Ignore bundler config.
+/.bundle
+
+# Ignore all logfiles and tempfiles.
+/log/*
+!/log/.keep
+/tmp

data/spec/dummy-rails4/.ruby-version

@@ -0,0 +1 @@
+ruby-2.3.3

data/spec/dummy-rails4/Gemfile

@@ -0,0 +1,18 @@
+source 'https://rubygems.org'
+
+ruby "2.3.3"
+
+
+gem 'rails', '4.2.7'
+gem 'pg', '~> 0.15'
+
+group :development, :test do
+  gem 'rspec-rails', '~> 3.5'
+  gem 'database_cleaner'
+  gem 'factory_girl_rails'
+  gem 'pry-rails'
+  gem 'faker'
+  gem 'listen'
+end
+
+gem 'active_hash_relation', path: '../../'

data/spec/dummy-rails4/README.md

@@ -0,0 +1,3 @@
+# DummyRails4
+
+A Rails 4 repo to test ActiveHasRelation compatibility.

data/spec/dummy-rails4/Rakefile

@@ -0,0 +1,6 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+Rails.application.load_tasks

data/spec/dummy-rails4/app/controllers/application_controller.rb

@@ -0,0 +1,5 @@
+class ApplicationController < ActionController::Base
+  # Prevent CSRF attacks by raising an exception.
+  # For APIs, you may want to use :null_session instead.
+  protect_from_forgery with: :exception
+end

data/spec/dummy-rails4/app/models/address.rb

@@ -0,0 +1 @@
+require_relative '../../../models/address'

data/spec/dummy-rails4/app/models/micropost.rb

@@ -0,0 +1 @@
+require_relative '../../../models/micropost'

data/spec/dummy-rails4/app/models/relationship.rb

@@ -0,0 +1 @@
+require_relative '../../../models/relationship'

data/spec/dummy-rails4/app/models/user.rb

@@ -0,0 +1 @@
+require_relative '../../../models/user'

data/spec/dummy-rails4/bin/bundle

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')

data/spec/dummy-rails4/bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'

data/spec/dummy-rails4/bin/rake

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run

data/spec/dummy-rails4/bin/setup

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+
+Dir.chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file:
+
+  puts "== Installing dependencies =="
+  system "gem install bundler --conservative"
+  system "bundle check || bundle install"
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?("config/database.yml")
+  #   system "cp config/database.yml.sample config/database.yml"
+  # end
+
+  puts "\n== Preparing database =="
+  system "bin/rake db:setup"
+
+  puts "\n== Removing old logs and tempfiles =="
+  system "rm -f log/*"
+  system "rm -rf tmp/cache"
+
+  puts "\n== Restarting application server =="
+  system "touch tmp/restart.txt"
+end

data/spec/dummy-rails4/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment', __FILE__)
+run Rails.application

data/spec/dummy-rails4/config/application.rb

@@ -0,0 +1,35 @@
+require File.expand_path('../boot', __FILE__)
+
+require "rails"
+# Pick the frameworks you want:
+require "active_model/railtie"
+require "active_job/railtie"
+require "active_record/railtie"
+require "action_controller/railtie"
+require "action_mailer/railtie"
+require "action_view/railtie"
+require "sprockets/railtie"
+# require "rails/test_unit/railtie"
+
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(*Rails.groups)
+
+module DummyRails4
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+
+    # Do not swallow errors in after_commit/after_rollback callbacks.
+    config.active_record.raise_in_transactional_callbacks = true
+  end
+end

data/spec/dummy-rails4/config/boot.rb

@@ -0,0 +1,3 @@
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+
+require 'bundler/setup' # Set up gems listed in the Gemfile.

data/spec/dummy-rails4/config/database.yml

@@ -0,0 +1,18 @@
+default: &default
+  adapter: postgresql
+  encoding: unicode
+  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
+
+development:
+  <<: *default
+  database: dummy_rails4_development
+
+test:
+  <<: *default
+  database: dummy_raills4_test
+
+production:
+  <<: *default
+  database: dummy_rails4_production
+  username: dummy
+  password: <%= ENV['DUMMY_DATABASE_PASSWORD'] %>

data/spec/dummy-rails4/config/environment.rb

@@ -0,0 +1,5 @@
+# Load the Rails application.
+require File.expand_path('../application', __FILE__)
+
+# Initialize the Rails application.
+Rails.application.initialize!

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

@@ -0,0 +1,41 @@
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # In the development environment your application's code is reloaded on
+  # every request. This slows down response time but is perfect for development
+  # since you don't have to restart the web server when you make code changes.
+  config.cache_classes = false
+
+  # Do not eager load code on boot.
+  config.eager_load = false
+
+  # Show full error reports and disable caching.
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Don't care if the mailer can't send.
+  config.action_mailer.raise_delivery_errors = false
+
+  # Print deprecation notices to the Rails logger.
+  config.active_support.deprecation = :log
+
+  # Raise an error on page load if there are pending migrations.
+  config.active_record.migration_error = :page_load
+
+  # 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
+
+  # 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.
+  config.assets.digest = true
+
+  # Adds additional error checking when serving assets at runtime.
+  # Checks for improperly declared sprockets dependencies.
+  # Raises helpful error messages.
+  config.assets.raise_runtime_errors = true
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
+end