enju_subject 0.1.1 → 0.2.0.beta.1

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

@@ -1,30 +1,41 @@
-Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+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
+  # 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
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  # Do not eager load code on boot.
+  config.eager_load = false
 
-  # Show full error reports and disable caching
+  # 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
+  # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
-  # Print deprecation notices to the Rails logger
+  # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
-  # Only use best-standards-support built into browsers
-  config.action_dispatch.best_standards_support = :builtin
+  # Raise an error on page load if there are pending migrations.
+  config.active_record.migration_error = :page_load
 
-  # Do not compress assets
-  config.assets.compress = false
-
-  # Expands the lines which load the assets
+  # 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

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

@@ -1,60 +1,79 @@
-Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
 
-  # Code is not reloaded between requests
+  # Code is not reloaded between requests.
   config.cache_classes = true
 
-  # Full error reports are disabled and caching is turned on
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both threaded web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+
+  # Full error reports are disabled and caching is turned on.
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
-  # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = false
+  # Enable Rack::Cache to put a simple HTTP cache in front of your application
+  # Add `rack-cache` to your Gemfile before enabling this.
+  # For large-scale production use, consider using a caching reverse proxy like
+  # NGINX, varnish or squid.
+  # config.action_dispatch.rack_cache = true
+
+  # Disable serving static files from the `/public` folder by default since
+  # Apache or NGINX already handles this.
+  config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
-  # Compress JavaScripts and CSS
-  config.assets.compress = true
+  # Compress JavaScripts and CSS.
+  config.assets.js_compressor = :uglifier
+  # config.assets.css_compressor = :sass
 
-  # Don't fallback to assets pipeline if a precompiled asset is missed
+  # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
 
-  # Generate digests for assets URLs
+  # 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
 
-  # Defaults to Rails.root.join("public/assets")
-  # config.assets.manifest = YOUR_PATH
+  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
 
-  # Specifies the header that your server uses for sending files
-  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+  # Specifies the header that your server uses for sending files.
+  # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
 
-  # See everything in the log (default is :info)
-  # config.log_level = :debug
+  # Use the lowest log level to ensure availability of diagnostic information
+  # when problems arise.
+  config.log_level = :debug
 
-  # Use a different logger for distributed setups
-  # config.logger = SyslogLogger.new
+  # Prepend all log lines with the following tags.
+  # config.log_tags = [ :subdomain, :uuid ]
 
-  # Use a different cache store in production
-  # config.cache_store = :mem_cache_store
+  # Use a different logger for distributed setups.
+  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
-  # Enable serving of images, stylesheets, and JavaScripts from an asset server
-  # config.action_controller.asset_host = "http://assets.example.com"
+  # Use a different cache store in production.
+  # config.cache_store = :mem_cache_store
 
-  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
-  # config.assets.precompile += %w( search.js )
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+  # config.action_controller.asset_host = 'http://assets.example.com'
 
-  # Disable delivery errors, bad email addresses will be ignored
+  # Ignore bad email addresses and do not raise email delivery errors.
+  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false
 
-  # Enable threaded mode
-  # config.threadsafe!
-
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found)
+  # the I18n.default_locale when a translation cannot be found).
   config.i18n.fallbacks = true
 
-  # Send deprecation notices to registered listeners
+  # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
+
+  # Use default logging formatter so that PID and timestamp are not suppressed.
+  config.log_formatter = ::Logger::Formatter.new
+
+  # Do not dump schema after migrations.
+  config.active_record.dump_schema_after_migration = false
 end

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

@@ -1,39 +1,44 @@
-Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
 
   # The test environment is used exclusively to run your application's
-  # test suite.  You never need to work with it otherwise.  Remember that
+  # test suite. You never need to work with it otherwise. Remember that
   # your test database is "scratch space" for the test suite and is wiped
-  # and recreated between test runs.  Don't rely on the data there!
+  # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 
-  # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
-  config.static_cache_control = "public, max-age=3600"
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
 
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
+  # Configure static file server for tests with Cache-Control for performance.
+  config.serve_static_files   = true
+  config.static_cache_control = 'public, max-age=3600'
 
-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # Raise exceptions instead of rendering exception templates
+  # Raise exceptions instead of rendering exception templates.
   config.action_dispatch.show_exceptions = false
 
-  # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  # Disable request forgery protection in test environment.
+  config.action_controller.allow_forgery_protection = false
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Use SQL instead of Active Record's schema dumper when creating the test database.
-  # This is necessary if your schema can't be completely dumped by the schema dumper,
-  # like if you have constraints or database-specific column types
-  # config.active_record.schema_format = :sql
+  # Randomize the order test cases are executed.
+  config.active_support.test_order = :random
 
-  # Print deprecation notices to the stderr
+  # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
+
+  config.action_mailer.default_url_options = {:host => 'localhost:3000'}
 end

data/spec/dummy/config/initializers/enju_leaf.rb

@@ -0,0 +1 @@
+Manifestation.include(EnjuSubject::EnjuManifestation)

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150923173139) do
+ActiveRecord::Schema.define(version: 20150925092505) do
 
   create_table "accepts", force: :cascade do |t|
     t.integer  "basket_id"
@@ -228,6 +228,7 @@ ActiveRecord::Schema.define(version: 20150923173139) do
     t.integer  "rgt"
     t.integer  "manifestation_id"
     t.string   "url"
+    t.string   "label"
   end
 
   add_index "classifications", ["category"], name: "index_classifications_on_category"

data/spec/lib/generators/enju_subject/setup/setup_generator_spec.rb

@@ -0,0 +1,34 @@
+require "spec_helper.rb"
+require "generator_spec"
+require 'generator_spec/test_case'
+require 'generators/enju_subject/setup/setup_generator'
+
+describe EnjuSubject::SetupGenerator, type: :generator do
+  destination File.expand_path("tmp", Rails.root)
+  before(:each) do
+    prepare_destination
+    %w( app/controllers/application_controller.rb config/initializers/enju_leaf.rb ).each do |f|
+      dist_file = "#{Rails.root}/tmp/#{f}"
+      dist_dir = File.dirname(dist_file)
+      mkdir_p dist_dir
+      touch dist_file
+    end
+    run_generator
+  end
+  it "does work" do
+    expect(destination_root).to have_structure do
+      directory "config" do
+        directory "initializers" do
+          file "enju_leaf.rb" do
+            contains "Manifestation.include(EnjuSubject::EnjuManifestation)"
+          end
+        end
+      end
+      directory "app" do
+        directory "controllers" do
+          file "application_controller.rb"
+        end
+      end
+    end
+  end
+end

data/spec/support/devise.rb

@@ -1,3 +1,4 @@
 RSpec.configure do |config|
-  config.include Devise::TestHelpers, :type => :controller
+  config.include Devise::Test::ControllerHelpers, type: :controller
+  config.include Devise::Test::ControllerHelpers, type: :view
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_subject
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0.beta.1
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-25 00:00:00.000000000 Z
+date: 2016-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynamic_form
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cocoon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  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
@@ -42,16 +56,16 @@ dependencies:
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.20
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.20
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +128,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.2.0.beta.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.2.0.beta.1
+- !ruby/object:Gem::Dependency
+  name: enju_library
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0.beta.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0.beta.1
+- !ruby/object:Gem::Dependency
+  name: enju_biblio
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0.beta.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0.beta.1
+- !ruby/object:Gem::Dependency
+  name: enju_manifestation_viewer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0.beta.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0.beta.1
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
   requirement: !ruby/object:Gem::Requirement
@@ -165,7 +221,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: coveralls
+  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: generator_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -190,15 +260,21 @@ files:
 - Rakefile
 - app/controllers/classification_types_controller.rb
 - app/controllers/classifications_controller.rb
+- app/controllers/concerns/enju_subject/controller.rb
 - app/controllers/subject_heading_types_controller.rb
 - app/controllers/subject_types_controller.rb
 - app/controllers/subjects_controller.rb
 - app/models/classification.rb
 - app/models/classification_type.rb
-- app/models/enju_subject/ability.rb
+- app/models/concerns/enju_subject/enju_manifestation.rb
 - app/models/subject.rb
 - app/models/subject_heading_type.rb
 - app/models/subject_type.rb
+- app/policies/classification_policy.rb
+- app/policies/classification_type_policy.rb
+- app/policies/subject_heading_type_policy.rb
+- app/policies/subject_policy.rb
+- app/policies/subject_type_policy.rb
 - app/views/classification_types/_form.html.erb
 - app/views/classification_types/edit.html.erb
 - app/views/classification_types/index.html.erb
@@ -210,8 +286,10 @@ files:
 - app/views/classifications/new.html.erb
 - app/views/classifications/show.html.erb
 - app/views/manifestations/_classification_detail.html.erb
+- app/views/manifestations/_classification_fields.html.erb
 - app/views/manifestations/_subject_detail.html.erb
 - app/views/manifestations/_subject_facet.html.erb
+- app/views/manifestations/_subject_fields.html.erb
 - app/views/manifestations/_subject_form.html.erb
 - app/views/subject_heading_types/_form.html.erb
 - app/views/subject_heading_types/edit.html.erb
@@ -250,7 +328,6 @@ files:
 - lib/enju_subject.rb
 - lib/enju_subject/engine.rb
 - lib/enju_subject/expire_editable_fragment.rb
-- lib/enju_subject/manifestation.rb
 - lib/enju_subject/master_model.rb
 - lib/enju_subject/page_sweeper.rb
 - lib/enju_subject/version.rb
@@ -272,7 +349,6 @@ files:
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/models/ability.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/bin/bundle
@@ -281,16 +357,15 @@ files:
 - spec/dummy/bin/setup
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
-- spec/dummy/config/application.yml
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml
 - spec/dummy/config/environment.rb
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/devise.rb
+- spec/dummy/config/initializers/enju_leaf.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/secret_token.rb
@@ -462,6 +537,7 @@ files:
 - spec/fixtures/user_groups.yml
 - spec/fixtures/user_has_roles.yml
 - spec/fixtures/users.yml
+- spec/lib/generators/enju_subject/setup/setup_generator_spec.rb
 - spec/models/classification_spec.rb
 - spec/models/classification_type_spec.rb
 - spec/models/subject_heading_type_spec.rb
@@ -488,12 +564,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: enju_subject plugin
@@ -507,7 +583,6 @@ test_files:
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/models/ability.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/bin/bundle
@@ -515,16 +590,15 @@ test_files:
 - spec/dummy/bin/rake
 - spec/dummy/bin/setup
 - spec/dummy/config/application.rb
-- spec/dummy/config/application.yml
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml
 - spec/dummy/config/environment.rb
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/devise.rb
+- spec/dummy/config/initializers/enju_leaf.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/secret_token.rb
@@ -698,6 +772,7 @@ test_files:
 - spec/fixtures/user_groups.yml
 - spec/fixtures/user_has_roles.yml
 - spec/fixtures/users.yml
+- spec/lib/generators/enju_subject/setup/setup_generator_spec.rb
 - spec/models/classification_spec.rb
 - spec/models/classification_type_spec.rb
 - spec/models/subject_heading_type_spec.rb

data/app/models/enju_subject/ability.rb

@@ -1,58 +0,0 @@
-module EnjuSubject
-  class Ability
-    include CanCan::Ability
-        
-    def initialize(user, ip_address = nil)
-      case user.try(:role).try(:name)
-      when 'Administrator'
-        can :manage, [
-          Classification,
-          Subject
-        ]
-        if LibraryGroup.site_config.network_access_allowed?(ip_address)
-          can [:read, :create, :update], ClassificationType
-          can [:destroy, :delete], ClassificationType do |classification_type|
-            classification_type.classifications.empty?
-          end
-          can [:read, :create, :update], SubjectHeadingType
-          can [:destroy, :delete], SubjectHeadingType do |subject_heading_type|
-            subject_heading_type.subjects.empty?
-          end
-          can :manage, [
-            Classification,
-            Subject,
-            SubjectType
-          ]
-        else
-          can :read, [
-            ClassificationType,
-            SubjectHeadingType,
-            SubjectType
-          ]
-        end
-      when 'Librarian'
-        can :read, [
-          Classification,
-          ClassificationType,
-          Subject,
-          SubjectType,
-          SubjectHeadingType
-        ]
-      when 'User'
-        can :read, [
-          Classification,
-          ClassificationType,
-          Subject,
-          SubjectHeadingType
-        ]
-      else
-        can :read, [
-          Classification,
-          ClassificationType,
-          Subject,
-          SubjectHeadingType
-        ]
-      end
-    end
-  end
-end

data/lib/enju_subject/manifestation.rb

@@ -1,44 +0,0 @@
-module EnjuSubject
-  module EnjuManifestation
-    def self.included(base)
-      base.extend ClassMethods
-    end
-
-    module ClassMethods
-      def enju_subject_manifestation_model
-        include InstanceMethods
-        has_many :subjects
-        has_many :classifications
-        accepts_nested_attributes_for :subjects, :allow_destroy => true, :reject_if => :all_blank
-        accepts_nested_attributes_for :classifications, :allow_destroy => true, :reject_if => :all_blank
-        after_save do
-          subject_index!
-        end
-        after_destroy do
-          subject_index!
-        end
-
-        searchable do
-          text :subject do
-            subjects.map{|s| [s.term, s.term_transcription]}.flatten.compact
-          end
-          string :subject, :multiple => true do
-            subjects.map{|s| [s.term, s.term_transcription]}.flatten.compact
-          end
-          string :classification, :multiple => true do
-            classifications.map{|c| "#{c.classification_type.name}_#{c.category}"}
-          end
-          integer :subject_ids, :multiple => true
-        end
-      end
-
-      module InstanceMethods
-        def subject_index!
-          subjects.map{|subject| subject.index}
-          classifications.map{|classification| classification.index}
-          Sunspot.commit
-        end
-      end
-    end
-  end
-end