active_admin_versioning 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f4f86db981176222c54e415778ed9c5ca6b54f5
-  data.tar.gz: 2110587b8f24ca48f6f6958666f737840a71091d
+  metadata.gz: 11654ec0c3302c80446f5ca0dd39a08c81c5f94b
+  data.tar.gz: cf331ead8ab512bd7c0cdd746a03922cd00833ca
 SHA512:
-  metadata.gz: b77a791e13854d58b39adb298297d45e2472eeb5ad5a1c5e0e00c0b474072a92d24a8138b8f4cecea0647cbb28a30ba732904cbc155a44bc3acd5618b1b61df4
-  data.tar.gz: 53db11fd3e9a6da109d2b10b6f42fa3b02e359fa6d178d8f5ba3b08f8d724b26a2bfdc231ea5d3fcee9f3df5f52f14e716bdcf84bb1ca79b8d8ad0487edc461e
+  metadata.gz: 5a25e2018903997202602d7b08a496da5913d90e2e9fc975220938009509a5868ac27dfaea0820ef80f6a662766c47db5191e03e20023db66edf958d9d13c072
+  data.tar.gz: 4bdf15895ef9a7f04aeec611d358ca9895831204a9294d0208ccfdf59ddd8b1ad4d66ffe19e1af6569d7b506c831be30a758f2f697a1a5c1bd1e2d9bcaa787a5

data/.gitignore

@@ -5,5 +5,8 @@
 /coverage/
 /doc/
 /pkg/
+/spec/rails/
 /spec/reports/
 /tmp/
+/gemfiles/*.gemfile.lock
+/gemfiles/vendor/

data/.rubocop.yml

@@ -5,6 +5,8 @@ AllCops:
   Exclude:
     - "bin/*"
     - "vendor/**/*"
+    - "gemfiles/**/*"
+    - "spec/rails/**/*"
     - Gemfile
     - Rakefile
   DisplayCopNames: true

data/Appraisals

@@ -0,0 +1,12 @@
+appraise 'rails42' do
+  gem 'rails',       '~> 4.2.0'
+  gem "paper_trail", "~> 4.2.0"
+  gem 'activeadmin', '1.0.0.pre4'
+end
+
+appraise 'rails50' do
+  gem 'rails',       '~> 5.0.0'
+  gem "paper_trail", "~> 5.2.2"
+  gem 'inherited_resources', github: 'activeadmin/inherited_resources'
+  gem 'activeadmin',         github: 'activeadmin/activeadmin'
+end

data/Gemfile

@@ -1,4 +1,23 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in active_admin_versioning.gemspec
 gemspec
+
+gem "rails",       "~> 5.0.0"
+gem "paper_trail", "~> 5.2.2"
+gem "inherited_resources", github: "activeadmin/inherited_resources"
+gem "activeadmin",         github: "activeadmin/activeadmin"
+gem "pry"
+gem 'appraisal'
+
+group :development do
+  gem "rubocop", "~> 0.40.0"
+end
+
+group :test do
+  gem "capybara"
+  gem "rspec-rails"
+  gem "database_cleaner"
+  gem 'shoulda-matchers'
+  gem "sqlite3", platforms: :mri
+  gem "poltergeist"
+end

data/Rakefile

@@ -1,6 +1,7 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler'
+require 'rake'
 
-RSpec::Core::RakeTask.new(:spec)
+Bundler.setup
+Bundler::GemHelper.install_tasks
 
-task :default => :spec
+FileList['tasks/**/*.rake'].each { |task| import task }

data/active_admin_versioning.gemspec

@@ -1,7 +1,4 @@
-# -*- encoding: utf-8 -*-
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "active_admin_versioning/version"
+require File.join(File.dirname(__FILE__), "lib", "active_admin_versioning", "version")
 
 Gem::Specification.new do |gem|
   gem.name          = "active_admin_versioning"
@@ -21,12 +18,9 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = ">= 2.1.0"
 
-  gem.add_runtime_dependency "activeadmin", ">= 1.0.0.pre4"
-  gem.add_runtime_dependency "paper_trail", ">= 4.2.0"
+  gem.add_dependency "activeadmin", ">= 1.0.0.pre4"
+  gem.add_dependency "paper_trail", ">= 4.2.0"
 
   gem.add_development_dependency "bundler", "~> 1.13"
   gem.add_development_dependency "rake",    "~> 10.0"
-  gem.add_development_dependency "rspec",   "~> 3.0"
-  gem.add_development_dependency "pry",     "~> 0.10.0"
-  gem.add_development_dependency "rubocop", "~> 0.40.0"
 end

data/gemfiles/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_DISABLE_SHARED_GEMS: "true"

data/gemfiles/rails42.gemfile

@@ -0,0 +1,25 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.2.0"
+gem "paper_trail", "~> 4.2.0"
+gem "inherited_resources", :github => "activeadmin/inherited_resources"
+gem "activeadmin", "1.0.0.pre4"
+gem "pry"
+gem "appraisal"
+
+group :development do
+  gem "rubocop", "~> 0.40.0"
+end
+
+group :test do
+  gem "capybara"
+  gem "rspec-rails"
+  gem "database_cleaner"
+  gem "shoulda-matchers"
+  gem "sqlite3", :platforms => :mri
+  gem "poltergeist"
+end
+
+gemspec :path => "../"

data/gemfiles/rails50.gemfile

@@ -0,0 +1,25 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.0.0"
+gem "paper_trail", "~> 5.2.2"
+gem "inherited_resources", :github => "activeadmin/inherited_resources"
+gem "activeadmin", :github => "activeadmin/activeadmin"
+gem "pry"
+gem "appraisal"
+
+group :development do
+  gem "rubocop", "~> 0.40.0"
+end
+
+group :test do
+  gem "capybara"
+  gem "rspec-rails"
+  gem "database_cleaner"
+  gem "shoulda-matchers"
+  gem "sqlite3", :platforms => :mri
+  gem "poltergeist"
+end
+
+gemspec :path => "../"

data/lib/active_admin_versioning.rb

@@ -1,2 +1,11 @@
+require "active_admin"
+require "paper_trail/version_concern"
 require "active_admin_versioning/engine"
-require "active_admin_versioning/version"
+require "active_admin_versioning/active_admin/application"
+require "active_admin_versioning/active_admin/dsl"
+require "active_admin_versioning/active_admin/resource_controller"
+require "active_admin_versioning/paper_trail/version_concern"
+
+::ActiveAdmin::Application.send :prepend, ActiveAdminVersioning::ActiveAdmin::Application
+::ActiveAdmin::DSL.send :include, ActiveAdminVersioning::ActiveAdmin::DSL
+::PaperTrail::VersionConcern.send :include, ActiveAdminVersioning::PaperTrail::VersionConcern

data/lib/active_admin_versioning/{extension → active_admin}/application.rb

@@ -1,5 +1,5 @@
 module ActiveAdminVersioning
-  module Extension
+  module ActiveAdmin
     module Application
       def register(*arg, &block)
         super(*arg) do

data/lib/active_admin_versioning/active_admin/dsl.rb

@@ -0,0 +1,49 @@
+module ActiveAdminVersioning
+  module ActiveAdmin
+    module DSL
+      def versioning
+        return unless enabled_paper_trail?
+
+        controller { include ActiveAdminVersioning::ActiveAdmin::ResourceController }
+
+        member_action(:versions) do
+          @versions   = resource.versions.reorder(id: :desc, created_at: :desc).page(params[:page])
+          @page_title = ::PaperTrail::Version.model_name.human
+          render "versions"
+        end
+
+        with_options only: :show do
+          action_item :version do
+            link_to send("versions_admin_#{resource_instance_name}_path") do
+              ::PaperTrail::Version.model_name.human
+            end
+          end
+
+          sidebar ::PaperTrail::Version.model_name.human do
+            if versions.present?
+              attributes_table_for versions[0] do
+                row ::PaperTrail::Version.model_name.human do |_|
+                  version_number
+                end
+                row :event, &:event_i18n
+                row :whodunnit do |record|
+                  record.whodunnit.presence || span(t("views.version.unknown_user"), class: "empty")
+                end
+                row :created_at
+              end
+              paginate versions, theme: :version
+            else
+              I18n.t("views.version.empty", model_name: ::PaperTrail::Version.model_name.human)
+            end
+          end
+        end
+      end
+
+      private
+
+      def enabled_paper_trail?
+        config.resource_class.try(:paper_trail).try(:enabled?) || config.resource_class.try(:paper_trail_enabled_for_model?)
+      end
+    end
+  end
+end

data/lib/active_admin_versioning/{extension → active_admin}/resource_controller.rb

@@ -1,5 +1,5 @@
 module ActiveAdminVersioning
-  module Extension
+  module ActiveAdmin
     module ResourceController
       def self.included(base)
         base.before_action(:set_paper_trail_whodunnit)
@@ -16,7 +16,7 @@ module ActiveAdminVersioning
       protected
 
       def user_for_paper_trail
-        current_admin_user.try(:id) || t("views.version.unknown_user")
+        respond_to?(:current_admin_user) ? current_admin_user.id : t("views.version.unknown_user")
       end
     end
   end

data/lib/active_admin_versioning/engine.rb

@@ -1,16 +1,6 @@
-require "rails"
+require "rails/engine"
 
 module ActiveAdminVersioning
   class Engine < ::Rails::Engine
-    config.after_initialize do
-      require "active_admin_versioning/extension/application"
-      require "active_admin_versioning/extension/dsl"
-      require "active_admin_versioning/extension/resource_controller"
-      require "active_admin_versioning/extension/paper_trail"
-
-      ::ActiveAdmin::Application.send :prepend, ActiveAdminVersioning::Extension::Application
-      ::ActiveAdmin::DSL.send :include, ActiveAdminVersioning::Extension::DSL
-      ::PaperTrail::Version.send :include, ActiveAdminVersioning::Extension::PaperTrail
-    end
   end
 end

data/lib/active_admin_versioning/{extension/paper_trail.rb → paper_trail/version_concern.rb}

@@ -1,8 +1,8 @@
 require "yaml"
 
 module ActiveAdminVersioning
-  module Extension
-    module PaperTrail
+  module PaperTrail
+    module VersionConcern
       def item_class
         item_type.safe_constantize
       end

data/lib/active_admin_versioning/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdminVersioning
-  VERSION = "0.1.0".freeze
+  VERSION = "0.1.1".freeze
 end

data/tasks/test.rake

@@ -0,0 +1,10 @@
+desc "Creates a test rails app for the specs to run against"
+task :setup do
+  require "rails/version"
+  system("mkdir spec/rails") unless File.exist?("spec/rails")
+  system "bundle exec rails new spec/rails/rails-#{Rails::VERSION::STRING} -m spec/support/rails_template.rb --skip-spring  --skip-turbolinks"
+end
+
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new(:spec)
+task default: :spec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_admin_versioning
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Yoshiyuki Hirano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-23 00:00:00.000000000 Z
+date: 2016-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -66,48 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.0
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.40.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.40.0
 description: Good for auditing or versioning for Active Admin
 email:
 - yhirano@me.com
@@ -122,6 +80,7 @@ files:
 - ".rubocop.yml"
 - ".ruby-style.yml"
 - ".travis.yml"
+- Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -136,13 +95,17 @@ files:
 - bin/setup
 - config/locales/en.yml
 - config/locales/ja.yml
+- gemfiles/.bundle/config
+- gemfiles/rails42.gemfile
+- gemfiles/rails50.gemfile
 - lib/active_admin_versioning.rb
+- lib/active_admin_versioning/active_admin/application.rb
+- lib/active_admin_versioning/active_admin/dsl.rb
+- lib/active_admin_versioning/active_admin/resource_controller.rb
 - lib/active_admin_versioning/engine.rb
-- lib/active_admin_versioning/extension/application.rb
-- lib/active_admin_versioning/extension/dsl.rb
-- lib/active_admin_versioning/extension/paper_trail.rb
-- lib/active_admin_versioning/extension/resource_controller.rb
+- lib/active_admin_versioning/paper_trail/version_concern.rb
 - lib/active_admin_versioning/version.rb
+- tasks/test.rake
 homepage: https://github.com/yhirano55/active_admin_versioning
 licenses:
 - MIT

data/lib/active_admin_versioning/extension/dsl.rb

@@ -1,39 +0,0 @@
-module ActiveAdminVersioning
-  module Extension
-    module DSL
-      def versioning
-        return unless config.resource_class.try(:paper_trail_enabled_for_model?)
-
-        controller { include ActiveAdminVersioning::Extension::ResourceController }
-
-        member_action(:versions) do
-          @versions   = resource.versions.reorder(id: :desc, created_at: :desc).page(params[:page])
-          @page_title = ::PaperTrail::Version.model_name.human
-          render "versions"
-        end
-
-        action_item(:version, only: :show) do
-          link_to send("versions_admin_#{resource_instance_name}_path") do
-            ::PaperTrail::Version.model_name.human
-          end
-        end
-
-        sidebar(::PaperTrail::Version.model_name.human, only: :show) do
-          if versions.present?
-            attributes_table_for versions[0] do
-              row(::PaperTrail::Version.model_name.human) { |_| version_number }
-              row(:event, &:event_i18n)
-              row(:whodunnit) do |record|
-                record.whodunnit.presence || span(t("views.version.unknown_user"), class: "empty")
-              end
-              row(:created_at)
-            end
-            paginate(versions, theme: :version)
-          else
-            I18n.t("views.version.empty", model_name: ::PaperTrail::Version.model_name.human)
-          end
-        end
-      end
-    end
-  end
-end