activeadmin-ajax_filter 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3388e55ea6dd77ff8bd2a7431a5b4bb4f0c402bc
-  data.tar.gz: b950b9818a0edb6c6d37df9bc104fef3713dfa8e
+  metadata.gz: 9f8daf7f6e6095bf60566d68f47ca57302c833ca
+  data.tar.gz: 130338df6a6cd71c0bf0e24cb05fc7be74f8514c
 SHA512:
-  metadata.gz: d1f2c12fcd0bc4dd43f3f93803296056279284f976779965de57c93650a3a75c693d37ad6a2fdab3b402b0b3891b705a4d61d7f6ca85802c256c282b5aaa35cc
-  data.tar.gz: fa69bf317340e2905118a0f2d9b00e6a701b8c55c73f69e09fba59eebaecf4cdd788e82b1d8fb8ea942ed3dd4c33cd2e26d7c78a165fbee8857f1cbfe7b7b955
+  metadata.gz: 8bcbd3d1f5bd048c5a13a8a2ca9d745791884e795f8b3fae905d0ca5849e584ba64611ed6969ee3ef7788d75419b12f99bd3fa61f55531a275c49bf623c95e59
+  data.tar.gz: 9f82be39e5e06b9288677515bc6d19a08ea8be69777f71d5b560b37bedd5ac9f12a09e7a7ef8e122e6e380d9b7912d0b6474df97460fc77b8dc8c5c321012666

data/.gitignore

@@ -1,9 +1,13 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/
 /pkg/
 /spec/reports/
+/spec/dummy/tmp/
+/spec/dummy/public/assets
+/spec/dummy/.sass-cache
+/spec/dummy/log/*.log
 /tmp/
+*.sqlite3

data/.rspec

@@ -1,2 +1,2 @@
 --color
---require spec_helper
+--require rails_helper

data/.travis.yml

@@ -1,11 +1,22 @@
+sudo: false
 language: ruby
+
 rvm:
   - 2.1.5
   - 2.2.4
-  - 2.3.0
-before_install: gem install bundler -v 1.10.6
+  - 2.3.1
+  - ruby-head
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+  fast_finish: true
 
+before_install: gem update --remote bundler
+install:
+  - bundle install --retry=3
 script:
+  - bundle exec rake dummy:prepare
   - bundle exec rspec
 
 addons:

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in activeadmin-ajax_filter.gemspec
-gemspec
+gemspec

data/Gemfile.lock

@@ -0,0 +1,254 @@
+PATH
+  remote: .
+  specs:
+    activeadmin-ajax_filter (0.3.2)
+      activeadmin (>= 1.0.0.pre1)
+      coffee-rails (>= 4.1.0)
+      selectize-rails (>= 0.11.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.2.5.1)
+      actionpack (= 4.2.5.1)
+      actionview (= 4.2.5.1)
+      activejob (= 4.2.5.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.5.1)
+      actionview (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.5.1)
+      activesupport (= 4.2.5.1)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activeadmin (1.0.0.pre2)
+      arbre (~> 1.0, >= 1.0.2)
+      bourbon
+      coffee-rails
+      formtastic (~> 3.1)
+      formtastic_i18n
+      inherited_resources (~> 1.6)
+      jquery-rails
+      jquery-ui-rails
+      kaminari (~> 0.15)
+      rails (>= 3.2, < 5.0)
+      ransack (~> 1.3)
+      sass-rails
+    activejob (4.2.5.1)
+      activesupport (= 4.2.5.1)
+      globalid (>= 0.3.0)
+    activemodel (4.2.5.1)
+      activesupport (= 4.2.5.1)
+      builder (~> 3.1)
+    activerecord (4.2.5.1)
+      activemodel (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
+      arel (~> 6.0)
+    activesupport (4.2.5.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    addressable (2.4.0)
+    arbre (1.0.3)
+      activesupport (>= 3.0.0)
+    arel (6.0.3)
+    bourbon (4.2.7)
+      sass (~> 3.4)
+      thor (~> 0.19)
+    builder (3.2.2)
+    capybara (2.7.1)
+      addressable
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (~> 2.0)
+    cliver (0.3.2)
+    codeclimate-test-reporter (0.4.8)
+      simplecov (>= 0.7.1, < 1.0.0)
+    coffee-rails (4.1.1)
+      coffee-script (>= 2.2.0)
+      railties (>= 4.0.0, < 5.1.x)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.10.0)
+    concurrent-ruby (1.0.1)
+    database_cleaner (1.5.3)
+    diff-lcs (1.2.5)
+    docile (1.1.5)
+    erubis (2.7.0)
+    execjs (2.6.0)
+    factory_girl (4.5.0)
+      activesupport (>= 3.0.0)
+    factory_girl_rails (4.5.0)
+      factory_girl (~> 4.5.0)
+      railties (>= 3.0.0)
+    formtastic (3.1.3)
+      actionpack (>= 3.2.13)
+    formtastic_i18n (0.6.0)
+    globalid (0.3.6)
+      activesupport (>= 4.1.0)
+    has_scope (0.6.0)
+      actionpack (>= 3.2, < 5)
+      activesupport (>= 3.2, < 5)
+    i18n (0.7.0)
+    inherited_resources (1.6.0)
+      actionpack (>= 3.2, < 5)
+      has_scope (~> 0.6.0.rc)
+      railties (>= 3.2, < 5)
+      responders
+    jquery-rails (4.1.1)
+      rails-dom-testing (>= 1, < 3)
+      railties (>= 4.2.0)
+      thor (>= 0.14, < 2.0)
+    jquery-ui-rails (5.0.5)
+      railties (>= 3.2.16)
+    json (1.8.3)
+    kaminari (0.16.3)
+      actionpack (>= 3.0.0)
+      activesupport (>= 3.0.0)
+    launchy (2.4.3)
+      addressable (~> 2.3)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    mime-types (2.99.1)
+    mini_portile2 (2.1.0)
+    minitest (5.8.4)
+    multi_json (1.12.1)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    phantomjs (1.9.8.0)
+    pkg-config (1.1.7)
+    poltergeist (1.6.0)
+      capybara (~> 2.1)
+      cliver (~> 0.3.1)
+      multi_json (~> 1.0)
+      websocket-driver (>= 0.2.0)
+    polyamorous (1.3.0)
+      activerecord (>= 3.0)
+    rack (1.6.4)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (4.2.5.1)
+      actionmailer (= 4.2.5.1)
+      actionpack (= 4.2.5.1)
+      actionview (= 4.2.5.1)
+      activejob (= 4.2.5.1)
+      activemodel (= 4.2.5.1)
+      activerecord (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.5.1)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (4.2.5.1)
+      actionpack (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.5.0)
+    ransack (1.7.0)
+      actionpack (>= 3.0)
+      activerecord (>= 3.0)
+      activesupport (>= 3.0)
+      i18n
+      polyamorous (~> 1.2)
+    responders (2.1.1)
+      railties (>= 4.2.0, < 5.1)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.2)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-rails (3.3.3)
+      actionpack (>= 3.0, < 4.3)
+      activesupport (>= 3.0, < 4.3)
+      railties (>= 3.0, < 4.3)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
+    sass (3.4.22)
+    sass-rails (5.0.4)
+      railties (>= 4.0.0, < 5.0)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
+    selectize-rails (0.12.1)
+    simplecov (0.11.1)
+      docile (~> 1.1.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    sprockets (3.5.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.0.4)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.3.11)
+    temping (3.3.0)
+      activerecord (>= 3.1)
+      activesupport (>= 3.1)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tilt (2.0.2)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    websocket-driver (0.6.4)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
+    xpath (2.0.0)
+      nokogiri (~> 1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activeadmin-ajax_filter!
+  bundler (~> 1.10)
+  capybara (~> 2.1)
+  codeclimate-test-reporter (~> 0.4)
+  database_cleaner (~> 1.5.0)
+  factory_girl_rails
+  launchy (~> 2.4.3)
+  phantomjs (~> 1.9.8)
+  poltergeist (~> 1.6.0)
+  rake (~> 10.0)
+  rspec (~> 3.3, >= 3.3.0)
+  rspec-rails (~> 3.3)
+  sqlite3 (~> 1.3, >= 1.3.11)
+  temping (~> 3.3, >= 3.3.0)
+
+BUNDLED WITH
+   1.11.2

data/README.md

@@ -7,6 +7,14 @@
 
 This gem extends ActiveAdmin so that your can use filters with AJAX-powered input.
 
+Form input
+
+<img src="https://s31.postimg.org/gvb9y7u9n/ajax_input.gif" width="360" alt="ActiveAdmin AJAX Form input"/>
+
+Filter
+
+<img src="https://s31.postimg.org/qmkboivpn/ajax_filter.gif" width="360" alt="ActiveAdmin AJAX Filter input"/>
+
 ## Prerequisites
 
 This extension assumes that you're using [Active Admin](https://github.com/activeadmin/activeadmin) with [Ransack](https://github.com/activerecord-hackery/ransack). And for AJAX input it uses [selectize-rails](https://github.com/manuelvanrijn/selectize-rails)

data/Rakefile

@@ -1 +1,28 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+task default: ['dummy:prepare', :spec]
+
+require 'rake/clean'
+CLEAN.include 'spec/dummy/db/*sqlite3', 'spec/dummy/log/*', 'spec/dummy/public/assets/*', 'spec/dummy/tmp/**/*'
+
+namespace :dummy do
+  desc 'Setup dummy app database'
+  task :prepare do
+    # File.expand_path is executed directory of generated Rails app
+    rakefile = File.expand_path('Rakefile', dummy_path)
+    command = "rake -f '%s' db:schema:load RAILS_ENV=test" % rakefile
+    sh(command) unless ENV['DISABLE_CREATE']
+  end
+
+  def dummy_path
+    rel_path = ENV['DUMMY_APP_PATH'] || 'spec/dummy'
+    if @current_path.to_s.include?(rel_path)
+      @current_path
+    else
+      @current_path = File.expand_path(rel_path)
+    end
+  end
+end

data/activeadmin-ajax_filter.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   gem.email         = ['aemelyanov@spbtv.com']
 
   gem.summary       = 'AJAX filters for ActiveAdmin'
-  gem.description   = 'Allows to define filter by relation for ActiveAdmin resource pages using Ransacker to dynamicaly load items while user is typing symbols in filter'
+  gem.description   = 'Allows to define form inputs and filters by relation for ActiveAdmin resource pages using Ransacker to dynamicaly load items while user is typing symbols in filter'
   gem.homepage      = 'https://github.com/holyketzer/activeadmin-ajax_filter'
   gem.license       = 'MIT'
 
@@ -25,7 +25,14 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'bundler', '~> 1.10'
   gem.add_development_dependency 'rake', '~> 10.0'
   gem.add_development_dependency 'rspec', '~> 3.3', '>= 3.3.0'
+  gem.add_development_dependency 'rspec-rails', '~> 3.3'
+  gem.add_development_dependency 'factory_girl_rails'
   gem.add_development_dependency 'sqlite3', '~> 1.3', '>= 1.3.11'
   gem.add_development_dependency 'temping', '~> 3.3', '>= 3.3.0'
   gem.add_development_dependency 'codeclimate-test-reporter', '~> 0.4'
+  gem.add_development_dependency 'capybara', '~> 2.1'
+  gem.add_development_dependency 'phantomjs', '~> 1.9.8'
+  gem.add_development_dependency 'poltergeist', '~> 1.6.0'
+  gem.add_development_dependency 'database_cleaner', '~> 1.5.0'
+  gem.add_development_dependency 'launchy', '~> 2.4.3'
 end

data/app/assets/javascripts/activeadmin-ajax_filter.js.coffee

@@ -32,6 +32,12 @@ $ ->
       relatedInput = (field) ->
         $("[name*=#{field}]", select.parents('form'))
 
+      isCircularAjaxSearchLink = (initial_input_id, field) ->
+        input = relatedInput(field)
+        if input.length
+          (input.data('ajax-search-fields') or '').split(' ').some (ajaxField) ->
+            relatedInput(ajaxField).attr('id') == initial_input_id
+
       select.selectize
         valueField: valueField
         labelField: searchFields[0]
@@ -88,8 +94,9 @@ $ ->
             )
 
           ajaxFields.forEach (field) ->
-            relatedInput(field).change ->
-              selectize.clearOptions()
+            if !isCircularAjaxSearchLink(selectize.$input.attr('id'), field)
+              relatedInput(field).change ->
+                selectize.clearOptions()
 
   # apply ajax filter to all static inputs
   apply_filter_ajax_select()

data/lib/active_admin/ajax_filter/version.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
   module AjaxFilter
-    VERSION = '0.3.1'
+    VERSION = '0.3.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-ajax_filter
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Alex Emelyanov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-22 00:00:00.000000000 Z
+date: 2016-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -100,6 +100,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.3.0
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+- !ruby/object:Gem::Dependency
+  name: factory_girl_rails
+  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: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -154,8 +182,79 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
-description: Allows to define filter by relation for ActiveAdmin resource pages using
-  Ransacker to dynamicaly load items while user is typing symbols in filter
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: phantomjs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.9.8
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.9.8
+- !ruby/object:Gem::Dependency
+  name: poltergeist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.3
+description: Allows to define form inputs and filters by relation for ActiveAdmin
+  resource pages using Ransacker to dynamicaly load items while user is typing symbols
+  in filter
 email:
 - aemelyanov@spbtv.com
 executables: []
@@ -167,6 +266,7 @@ files:
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -207,3 +307,4 @@ signing_key:
 specification_version: 4
 summary: AJAX filters for ActiveAdmin
 test_files: []
+has_rdoc: