enju_subject 0.1.1 → 0.2.0.beta.1

data/app/views/subjects/index.rss.builder

@@ -4,11 +4,11 @@ xml.rss('version' => "2.0",
         'xmlns:atom' => "http://www.w3.org/2005/Atom"){
   xml.channel{
     xml.title t('page.listing', model: t('activerecord.models.subject')) + " (#{@library_group.display_name.localize})"
-    xml.link "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(format: nil, only_path: true))}"
+    xml.link "#{request.protocol}#{request.host_with_port}#{url_for(params.permit.merge(format: nil, only_path: true))}"
     xml.description "Next-L Enju, an open source integrated library system developed by Project Next-L"
     xml.language @locale.to_s
     xml.ttl "60"
-    xml.tag! "atom:link", rel: 'self', href: "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(format: :rss, only_path: true))}"
+    xml.tag! "atom:link", rel: 'self', href: "#{request.protocol}#{request.host_with_port}#{url_for(params.permit.merge(format: :rss, only_path: true))}"
     xml.tag! "atom:link", rel: 'alternate', href: subjects_url
     xml.tag! "atom:link", rel: 'search', type: 'application/opensearchdescription+xml', href: page_opensearch_url
     unless params[:query].blank?

data/app/views/subjects/show.html.erb

@@ -32,11 +32,11 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= back_to_index(flash[:page_info]) -%></li>
-    <% if can? :update, @subject %>
+    <li><%= link_to t('page.back'), :back -%></li>
+    <% if policy(@subject).update? %>
       <li><%= link_to t('page.edit'), edit_subject_path(@subject) -%></li>
     <% end %>
-    <% if can? :delete, @subject %>
+    <% if policy(@subject).destroy? %>
       <li><%= link_to t('page.destroy'), subject_path(@subject), data: {confirm: t('page.are_you_sure')}, method: :delete -%></li>
     <% end %>
   </ul>

data/db/fixtures/subject_types.yml

@@ -1,28 +1,28 @@
 --- 
 subject_type_00001:
   id: 1
-  name: Concept  
+  name: concept  
   display_name: Concept
   note: 
   position: 1
 
 subject_type_00002:
   id: 2
-  name: Event  
+  name: event  
   display_name: Event
   note: 
   position: 2
 
 subject_type_00003:
   id: 3
-  name: Object  
+  name: object  
   display_name: Object
   note: 
   position: 3
 
 subject_type_00004:
   id: 4
-  name: Place  
+  name: place  
   display_name: Place
   note: 
   position: 4

data/lib/enju_subject/master_model.rb

@@ -4,10 +4,10 @@ module MasterModel
     base.send :include, InstanceMethods
     base.class_eval do
       acts_as_list
-      validates_uniqueness_of :name, :case_sensitive => false
+      validates_uniqueness_of :name, case_sensitive: false
       validates_presence_of :name, :display_name
-      before_validation :set_display_name, :on => :create
-      normalize_attributes :name
+      before_validation :set_display_name, on: :create
+      stirp_attributes only: :name
     end
   end
 

data/lib/enju_subject/version.rb

@@ -1,3 +1,3 @@
 module EnjuSubject
-  VERSION = "0.1.1"
+  VERSION = "0.2.0.beta.1"
 end

data/lib/enju_subject.rb

@@ -1,33 +1,4 @@
 require "enju_subject/engine"
-require "enju_subject/manifestation"
 
 module EnjuSubject
-  def self.included(base)
-    base.extend(ClassMethods)
-  end
-
-  module ClassMethods
-    def enju_subject
-      include EnjuSubject::InstanceMethods
-    end
-  end
-
-  module InstanceMethods
-    private
-
-    def get_subject_heading_type
-      @subject_heading_type = SubjectHeadingType.find(params[:subject_heading_type_id]) if params[:subject_heading_type_id]
-    end
-
-    def get_subject
-      @subject = Subject.find(params[:subject_id]) if params[:subject_id]
-    end
-
-    def get_classification
-      @classification = Classification.find(params[:classification_id]) if params[:classification_id]
-    end
-  end
 end
-
-ActionController::Base.send :include, EnjuSubject
-ActiveRecord::Base.send :include, EnjuSubject::EnjuManifestation

data/lib/generators/enju_subject/setup/setup_generator.rb

@@ -5,6 +5,11 @@ class EnjuSubject::SetupGenerator < Rails::Generators::Base
     directory("db/fixtures", "db/fixtures/enju_subject")
     rake("enju_subject_engine:install:migrations")
     inject_into_file 'app/controllers/application_controller.rb',
-      "  enju_subject\n", :after => "enju_library\n"
+      "  include EnjuSubject::Controller\n", after: "EnjuLibrary::Controller\n"
+    append_to_file("config/initializers/enju_leaf.rb") do
+      <<"EOS"
+Manifestation.include(EnjuSubject::EnjuManifestation)
+EOS
+    end
   end
 end

data/lib/generators/enju_subject/setup/templates/db/fixtures/classification_types.yml

@@ -11,3 +11,9 @@ classification_type_00002:
   id: 2
   note: ""
   position: 2
+classification_type_00003: 
+  name: ndc8
+  display_name: NDC8
+  id: 3
+  note: ""
+  position: 3

data/lib/generators/enju_subject/setup/templates/db/fixtures/subject_heading_types.yml

@@ -2,27 +2,27 @@
 subject_heading_type_00001: 
   name: unknown
   display_name: unknown
-  updated_at: 2008-03-03 00:44:49.850140 +09:00
   id: 1
   note: ""
-  created_at: 2008-03-03 00:44:34.260739 +09:00
   position: 1
 subject_heading_type_00002: 
   name: ndlsh
   display_name: NDLSH
-  updated_at: 2008-03-03 00:44:49.850140 +09:00
   id: 2
   note: ""
-  created_at: 2008-03-03 00:44:34.260739 +09:00
   position: 2
 subject_heading_type_00003: 
   name: bsh
   display_name: BSH
-  updated_at: 2008-03-03 00:44:58.685360 +09:00
   id: 3
   note: ""
-  created_at: 2008-03-03 00:44:58.685360 +09:00
   position: 3
+subject_heading_type_00004: 
+  name: lcsh
+  display_name: LCSH
+  id: 4
+  note: ""
+  position: 4
 
 # == Schema Information
 #

data/lib/tasks/enju_subject_tasks.rake

@@ -6,7 +6,7 @@ desc "create initial records for enju_subject"
 namespace :enju_subject do
   task :setup => :environment do
     Dir.glob(Rails.root.to_s + '/db/fixtures/enju_subject/*.yml').each do |file|
-      ActiveRecord::Fixtures.create_fixtures('db/fixtures/enju_subject', File.basename(file, '.*'))
+      ActiveRecord::FixtureSet.create_fixtures('db/fixtures/enju_subject', File.basename(file, '.*'))
     end
 
     puts 'initial fixture files loaded.'

data/spec/controllers/classification_types_controller_spec.rb

@@ -19,7 +19,7 @@ describe ClassificationTypesController do
 
       it "assigns all classification_types as @classification_types" do
         get :index
-        expect(assigns(:classification_types)).to eq(ClassificationType.all)
+        expect(assigns(:classification_types)).to eq(ClassificationType.order(:position))
       end
     end
 
@@ -28,7 +28,7 @@ describe ClassificationTypesController do
 
       it "assigns all classification_types as @classification_types" do
         get :index
-        expect(assigns(:classification_types)).to eq(ClassificationType.all)
+        expect(assigns(:classification_types)).to eq(ClassificationType.order(:position))
       end
     end
 
@@ -37,14 +37,14 @@ describe ClassificationTypesController do
 
       it "assigns all classification_types as @classification_types" do
         get :index
-        expect(assigns(:classification_types)).to eq(ClassificationType.all)
+        expect(assigns(:classification_types)).to eq(ClassificationType.order(:position))
       end
     end
 
     describe "When not logged in" do
       it "assigns all classification_types as @classification_types" do
         get :index
-        expect(assigns(:classification_types)).to eq(ClassificationType.all)
+        expect(assigns(:classification_types)).to eq(ClassificationType.order(:position))
       end
     end
   end
@@ -105,7 +105,7 @@ describe ClassificationTypesController do
 
       it "should not assign the requested classification_type as @classification_type" do
         get :new
-        expect(assigns(:classification_type)).not_to be_valid
+        expect(assigns(:classification_type)).to be_nil
         expect(response).to be_forbidden
       end
     end
@@ -115,7 +115,7 @@ describe ClassificationTypesController do
 
       it "should not assign the requested classification_type as @classification_type" do
         get :new
-        expect(assigns(:classification_type)).not_to be_valid
+        expect(assigns(:classification_type)).to be_nil
         expect(response).to be_forbidden
       end
     end
@@ -123,7 +123,7 @@ describe ClassificationTypesController do
     describe "When not logged in" do
       it "should not assign the requested classification_type as @classification_type" do
         get :new
-        expect(assigns(:classification_type)).not_to be_valid
+        expect(assigns(:classification_type)).to be_nil
         expect(response).to redirect_to(new_user_session_url)
       end
     end
@@ -209,7 +209,7 @@ describe ClassificationTypesController do
       describe "with valid params" do
         it "assigns a newly created classification_type as @classification_type" do
           post :create, :classification_type => @attrs
-          expect(assigns(:classification_type)).to be_valid
+          expect(assigns(:classification_type)).to be_nil
         end
 
         it "should be forbidden" do
@@ -221,7 +221,7 @@ describe ClassificationTypesController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved classification_type as @classification_type" do
           post :create, :classification_type => @invalid_attrs
-          expect(assigns(:classification_type)).not_to be_valid
+          expect(assigns(:classification_type)).to be_nil
         end
 
         it "should be forbidden" do
@@ -237,7 +237,7 @@ describe ClassificationTypesController do
       describe "with valid params" do
         it "assigns a newly created classification_type as @classification_type" do
           post :create, :classification_type => @attrs
-          expect(assigns(:classification_type)).to be_valid
+          expect(assigns(:classification_type)).to be_nil
         end
 
         it "should be forbidden" do
@@ -249,7 +249,7 @@ describe ClassificationTypesController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved classification_type as @classification_type" do
           post :create, :classification_type => @invalid_attrs
-          expect(assigns(:classification_type)).not_to be_valid
+          expect(assigns(:classification_type)).to be_nil
         end
 
         it "should be forbidden" do
@@ -263,7 +263,7 @@ describe ClassificationTypesController do
       describe "with valid params" do
         it "assigns a newly created classification_type as @classification_type" do
           post :create, :classification_type => @attrs
-          expect(assigns(:classification_type)).to be_valid
+          expect(assigns(:classification_type)).to be_nil
         end
 
         it "should be forbidden" do
@@ -275,7 +275,7 @@ describe ClassificationTypesController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved classification_type as @classification_type" do
           post :create, :classification_type => @invalid_attrs
-          expect(assigns(:classification_type)).not_to be_valid
+          expect(assigns(:classification_type)).to be_nil
         end
 
         it "should be forbidden" do

data/spec/controllers/classifications_controller_spec.rb

@@ -108,7 +108,7 @@ describe ClassificationsController do
 
       it "assigns the requested classification as @classification" do
         get :new
-        expect(assigns(:classification)).not_to be_valid
+        expect(assigns(:classification)).to be_nil
       end
     end
 
@@ -117,14 +117,14 @@ describe ClassificationsController do
 
       it "should assign the requested classification as @classification" do
         get :new
-        expect(assigns(:classification)).not_to be_valid
+        expect(assigns(:classification)).to be_nil
       end
     end
 
     describe "When not logged in" do
       it "should not assign the requested classification as @classification" do
         get :new
-        expect(assigns(:classification)).not_to be_valid
+        expect(assigns(:classification)).to be_nil
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -210,7 +210,7 @@ describe ClassificationsController do
       describe "with valid params" do
         it "assigns a newly created classification as @classification" do
           post :create, :classification => @attrs
-          expect(assigns(:classification)).to be_valid
+          expect(assigns(:classification)).to be_nil
         end
 
         it "should be forbidden" do
@@ -222,7 +222,7 @@ describe ClassificationsController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved classification as @classification" do
           post :create, :classification => @invalid_attrs
-          expect(assigns(:classification)).not_to be_valid
+          expect(assigns(:classification)).to be_nil
         end
 
         it "should be forbidden" do
@@ -238,7 +238,7 @@ describe ClassificationsController do
       describe "with valid params" do
         it "assigns a newly created classification as @classification" do
           post :create, :classification => @attrs
-          expect(assigns(:classification)).to be_valid
+          expect(assigns(:classification)).to be_nil
         end
 
         it "should be forbidden" do
@@ -250,7 +250,7 @@ describe ClassificationsController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved classification as @classification" do
           post :create, :classification => @invalid_attrs
-          expect(assigns(:classification)).not_to be_valid
+          expect(assigns(:classification)).to be_nil
         end
 
         it "should be forbidden" do
@@ -264,7 +264,7 @@ describe ClassificationsController do
       describe "with valid params" do
         it "assigns a newly created classification as @classification" do
           post :create, :classification => @attrs
-          expect(assigns(:classification)).to be_valid
+          expect(assigns(:classification)).to be_nil
         end
 
         it "should be forbidden" do
@@ -276,7 +276,7 @@ describe ClassificationsController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved classification as @classification" do
           post :create, :classification => @invalid_attrs
-          expect(assigns(:classification)).not_to be_valid
+          expect(assigns(:classification)).to be_nil
         end
 
         it "should be forbidden" do