enju_leaf 1.1.4 → 1.2.0.beta.1

data/spec/models/user_import_file_spec.rb

@@ -13,16 +13,14 @@ describe UserImportFile do
       @file.save
     end
 
-    it "should be imported", solr: true do
+    it "should be imported" do
       old_users_count = User.count
       old_import_results_count = UserImportResult.count
-      old_profiles_solr_count = Profile.search.total
       @file.current_state.should eq 'pending'
       @file.import_start.should eq({:user_imported => 5, :user_found => 0, :failed => 0, error: 3})
       User.order('id DESC')[1].username.should eq 'user005'
       User.order('id DESC')[2].username.should eq 'user003'
       User.count.should eq old_users_count + 5
-      Profile.search.total.should eq old_profiles_solr_count + 5
 
       user001 = User.where(username: 'user001').first
       user001.profile.keyword_list.should eq "日本史\n地理"
@@ -94,6 +92,7 @@ describe UserImportFile do
       @file.import_start.should eq({:user_imported => 4, :user_found => 0, :failed => 1, error: 3})
       User.order('id DESC')[1].username.should eq 'user005'
       User.count.should eq old_users_count + 4
+      UserImportResult.count.should eq old_import_results_count + 10
     end
   end
 
@@ -177,11 +176,12 @@ describe UserImportFile do
 
     it "should not remove users if there are checkouts" do
       user001 = User.where(username: 'user001').first
-      checkout = FactoryGirl.create(:checkout, user: user001, item: FactoryGirl.create(:item))
+      FactoryGirl.create(:checkout, user: user001, item: FactoryGirl.create(:item))
       old_count = User.count
       @file = UserImportFile.create user_import: File.new("#{Rails.root}/../../examples/user_delete_file.tsv"), user: users(:admin)
       @file.remove
       User.where(username: 'user001').should_not be_blank
+      User.count.should eq old_count - 2
     end
   end
 
@@ -191,7 +191,7 @@ describe UserImportFile do
     file.default_user_group = UserGroup.find(2)
     file.default_library = Library.find(3)
     file.save
-    UserImportFileQueue.perform(file.id).should be_truthy
+    UserImportFileJob.perform_later(file).should be_truthy
   end
 end
 

data/spec/rails_helper.rb

@@ -13,10 +13,10 @@ require 'rspec/rails'
 # Add additional requires below this line. Rails is not loaded until this point!
 require 'vcr'
 require 'factory_girl'
-require 'sunspot-rails-tester'
+require 'sunspot_matchers'
 require 'rspec/active_model/mocks'
 require 'capybara/rspec'
-require 'cancan/matchers'
+require 'pundit/rspec'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 # Requires supporting ruby files with custom matchers and macros, etc, in
@@ -64,17 +64,10 @@ RSpec.configure do |config|
 
   config.extend ControllerMacros, :type => :controller
 
-  $original_sunspot_session = Sunspot.session
-
   config.before do
-    Sunspot.session = Sunspot::Rails::StubSessionProxy.new($original_sunspot_session)
-  end
-
-  config.before :each, :solr => true do
-    Sunspot::Rails::Tester.start_original_sunspot_session
-    Sunspot.session = $original_sunspot_session
-    Sunspot.remove_all!
+    Sunspot.session = SunspotMatchers::SunspotSessionSpy.new(Sunspot.session)
   end
+  config.include SunspotMatchers
 end
 
 FactoryGirl.definition_file_paths << "#{::Rails.root}/../../spec/factories"

data/spec/routing/users_spec.rb

@@ -0,0 +1,14 @@
+require "spec_helper"
+
+describe ProfilesController do
+  describe "routing" do
+
+    it "recognizes and generates #new" do
+      { get: "/users/sign_in" }.should route_to(controller: "devise/sessions", action: "new")
+    end
+
+    it "recognizes and generates #destroy" do
+      { delete: "/users/sign_out" }.should route_to(controller: "devise/sessions", action: "destroy")
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -37,7 +37,7 @@ RSpec.configure do |config|
     # Prevents you from mocking or stubbing a method that does not exist on
     # a real object. This is generally recommended, and will default to
     # `true` in RSpec 4.
-    mocks.verify_partial_doubles = true
+    mocks.verify_partial_doubles = false
   end
 
 # The settings below are suggested to provide a good initial experience

data/spec/support/devise.rb

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

data/spec/views/my_accounts/show.html.erb_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+describe "my_accounts/show" do
+  fixtures :all
+
+  before(:each) do
+    @profile = assign(:profile, profiles(:admin))
+  end
+
+  describe "when logged in as Librarian" do
+    before(:each) do
+      @profile = assign(:profile, profiles(:librarian2))
+      user = users(:librarian1)
+      view.stub(:current_user).and_return(user)
+    end
+
+    it "renders attributes in <p>" do
+      allow(view).to receive(:policy).and_return double(update?: true, destroy?: true)
+      render
+      # Run the generator again with the --webrat flag if you want to use webrat matchers
+      rendered.should match(/Checkout/)
+    end
+
+    it "cannot be deletable by other librarian" do
+      allow(view).to receive(:policy).and_return double(update?: true, destroy?: true)
+      render
+    end
+  end
+
+  describe "when logged in as User" do
+    before(:each) do
+      @profile = assign(:profile, profiles(:user2))
+      user = users(:librarian1)
+      view.stub(:current_user).and_return(user)
+    end
+
+    it "renders attributes in <p>" do
+      allow(view).to receive(:policy).and_return double(update?: true, destroy?: true)
+      render
+      rendered.should match(/Checkout/)
+    end
+  end
+end

data/spec/views/page/about.html.erb_spec.rb

@@ -6,9 +6,6 @@ describe "page/about" do
 
   before(:each) do
     view.stub(:current_user).and_return(User.find('enjuadmin'))
-    @ability = Object.new
-    @ability.extend(CanCan::Ability)
-    controller.stub(:current_ability) { @ability }
   end
 
   it "renders attributes in <p>" do

data/spec/views/page/advanced_search.html.erb_spec.rb

@@ -6,10 +6,7 @@ describe "page/advanced_search" do
 
   before(:each) do
     assign(:libraries, Library.all)
-    view.stub(:current_user).and_return(User.find('enjuadmin'))
-    @ability = Object.new
-    @ability.extend(CanCan::Ability)
-    controller.stub(:current_ability) { @ability }
+    view.stub(:current_user).and_return(User.friendly.find('enjuadmin'))
   end
 
   it "renders attributes in <p>" do

data/spec/views/page/configuration.html.erb_spec.rb

@@ -6,9 +6,6 @@ describe "page/configuration" do
 
   before(:each) do
     view.stub(:current_user).and_return(User.find('enjuadmin'))
-    @ability = Object.new
-    @ability.extend(CanCan::Ability)
-    controller.stub(:current_ability) { @ability }
   end
 
   it "renders attributes in <p>" do

data/spec/views/page/export.html.erb_spec.rb

@@ -6,9 +6,6 @@ describe "page/export" do
 
   before(:each) do
     view.stub(:current_user).and_return(User.find('enjuadmin'))
-    @ability = Object.new
-    @ability.extend(CanCan::Ability)
-    controller.stub(:current_ability) { @ability }
   end
 
   it "renders attributes in <p>" do

data/spec/views/page/import.html.erb_spec.rb

@@ -6,9 +6,6 @@ describe "page/import" do
 
   before(:each) do
     view.stub(:current_user).and_return(User.find('enjuadmin'))
-    @ability = Object.new
-    @ability.extend(CanCan::Ability)
-    controller.stub(:current_ability) { @ability }
   end
 
   it "renders attributes in <p>" do

data/spec/views/page/index.html.erb_spec.rb

@@ -6,10 +6,7 @@ describe "page/index" do
 
   before(:each) do
     assign(:tags, Tag.all)
-    view.stub(:current_user).and_return(User.find('enjuadmin'))
-    @ability = Object.new
-    @ability.extend(CanCan::Ability)
-    controller.stub(:current_ability) { @ability }
+    view.stub(:current_user).and_return(User.friendly.find('enjuadmin'))
   end
 
   it "renders attributes in <p>" do

data/spec/views/page/opensearch.xml.builder_spec.rb

@@ -6,10 +6,7 @@ describe "page/opensearch" do
 
   before(:each) do
     assign(:library_group, LibraryGroup.site_config)
-    view.stub(:current_user).and_return(User.find('enjuadmin'))
-    @ability = Object.new
-    @ability.extend(CanCan::Ability)
-    controller.stub(:current_ability) { @ability }
+    view.stub(:current_user).and_return(User.friendly.find('enjuadmin'))
   end
 
   it "renders the XML template" do

data/spec/views/page/statistics.html.erb_spec.rb

@@ -7,9 +7,6 @@ describe "page/statistics" do
   before(:each) do
     @profile = assign(:profile, profiles(:admin))
     view.stub(:current_user).and_return(User.find('enjuadmin'))
-    @ability = Object.new
-    @ability.extend(CanCan::Ability)
-    controller.stub(:current_ability) { @ability }
   end
 
   it "renders attributes in <p>" do

data/spec/views/profiles/edit.html.erb_spec.rb

@@ -9,17 +9,7 @@ describe "profiles/edit" do
     assign(:libraries, Library.all)
     assign(:roles, Role.all)
     assign(:available_languages, Language.available_languages)
-    view.stub(:current_user).and_return(User.find('enjuadmin'))
-    @ability = Object.new
-    @ability.extend(CanCan::Ability)
-    controller.stub(:current_ability) { @ability }
-  end
-
-  it "renders the edit user form" do
-    render
-    assert_select "form", :action => profiles_path(@profile), :method => "post" do
-      assert_select "input#profile_user_number", :name => "profile[user_number]"
-    end
+    view.stub(:current_user).and_return(User.friendly.find('enjuadmin'))
   end
 
   describe "when logged in as librarian" do
@@ -27,17 +17,24 @@ describe "profiles/edit" do
       @profile = assign(:profile, profiles(:librarian2))
       user = users(:librarian1)
       view.stub(:current_user).and_return(user)
-      @ability = EnjuLeaf::Ability.new(user, '0.0.0.0')
-      @ability.extend(CanCan::Ability)
-      controller.stub(:current_ability) { @ability }
+    end
+
+    it "renders the edit user form" do
+      allow(view).to receive(:policy).and_return double(destroy?: true)
+      render
+      assert_select "form", action: profiles_path(@profile), method: "post" do
+        assert_select "input#profile_user_number", name: "profile[user_number]"
+      end
     end
 
     it "should not display 'delete' link" do
+      allow(view).to receive(:policy).and_return double(destroy?: false)
       render
       expect(rendered).not_to have_selector("a[href='#{profile_path(@profile.id)}'][data-method='delete']") 
     end
 
     it "should disable role selection" do
+      allow(view).to receive(:policy).and_return double(destroy?: true)
       render
       expect(rendered).to have_selector("select#profile_user_attributes_user_has_role_attributes_role_id[disabled='disabled']")
     end

data/spec/views/profiles/index.html.erb_spec.rb

@@ -5,14 +5,13 @@ describe "profiles/index" do
 
   before(:each) do
     assign(:profiles, Profile.page(1))
-    admin = User.find('enjuadmin')
+    admin = User.friendly.find('enjuadmin')
     view.stub(:current_user).and_return(admin)
-    @ability = EnjuLeaf::Ability.new(admin, '0.0.0.0')
-    @ability.extend(CanCan::Ability)
-    controller.stub(:current_ability) { @ability }
+    view.stub(:params).and_return(ActionController::Parameters.new)
   end
 
   it "renders a list of profiles" do
+    allow(view).to receive(:policy).and_return double(create?: true, update?: true, destroy?: true)
     render
     # Run the generator again with the --webrat flag if you want to use webrat matchers
     assert_select "tr>td", :text => 'enjuadmin'

data/spec/views/profiles/show.html.erb_spec.rb

@@ -6,13 +6,11 @@ describe "profiles/show" do
 
   before(:each) do
     @profile = assign(:profile, profiles(:admin))
-    view.stub(:current_user).and_return(User.find('enjuadmin'))
-    @ability = Object.new
-    @ability.extend(CanCan::Ability)
-    controller.stub(:current_ability) { @ability }
+    view.stub(:current_user).and_return(User.friendly.find('enjuadmin'))
   end
 
   it "renders attributes in <p>" do
+    allow(view).to receive(:policy).and_return double(update?: true, destroy?: true)
     render
     # Run the generator again with the --webrat flag if you want to use webrat matchers
     rendered.should match(/Checkout/)
@@ -23,14 +21,11 @@ describe "profiles/show" do
       @profile = assign(:profile, profiles(:librarian2))
       user = users(:librarian1)
       view.stub(:current_user).and_return(user)
-      @ability = EnjuLeaf::Ability.new(user, '0.0.0.0')
-      @ability.extend(CanCan::Ability)
-      controller.stub(:current_ability) { @ability }
     end
 
     it "cannot be deletable by other librarian" do
+      allow(view).to receive(:policy).and_return double(update?: true, destroy?: true)
       render
-      @ability.should_not be_able_to( :destroy, @profile )
     end
   end
 end

data/spec/views/user_import_results/index.html.erb_spec.rb

@@ -7,9 +7,6 @@ describe "user_import_results/index" do
     assign(:user_import_results, UserImportResult.page(1))
     admin = User.find('enjuadmin')
     view.stub(:current_user).and_return(admin)
-    @ability = EnjuLeaf::Ability.new(admin, '0.0.0.0')
-    @ability.extend(CanCan::Ability)
-    controller.stub(:current_ability) { @ability }
   end
 
   it "renders a list of user_import_results" do

data/vendor/assets/javascripts/jquery.highlight.js

@@ -23,6 +23,11 @@
  *   // search only for entire word 'lorem'
  *   $('#content').highlight('lorem', { wordsOnly: true });
  *
+ *   // search only for the entire word 'C#'
+ *   // and make sure that the word boundary can also
+ *   // be a 'non-word' character, as well as a regex latin1 only boundary:
+ *   $('#content').highlight('C#', { wordsOnly: true , wordsBoundary: '[\\b\\W]' });
+ *
  *   // don't ignore case during search of term 'lorem'
  *   $('#content').highlight('lorem', { caseSensitive: true });
  *
@@ -43,66 +48,102 @@
  *
  */
 
-jQuery.extend({
-    highlight: function (node, re, nodeName, className) {
-        if (node.nodeType === 3) {
-            var match = node.data.match(re);
-            if (match) {
-                var highlight = document.createElement(nodeName || 'span');
-                highlight.className = className || 'highlight';
-                var wordNode = node.splitText(match.index);
-                wordNode.splitText(match[0].length);
-                var wordClone = wordNode.cloneNode(true);
-                highlight.appendChild(wordClone);
-                wordNode.parentNode.replaceChild(highlight, wordNode);
-                return 1; //skip added node in parent
-            }
-        } else if ((node.nodeType === 1 && node.childNodes) && // only element nodes that have children
-                !/(script|style)/i.test(node.tagName) && // ignore script and style nodes
-                !(node.tagName === nodeName.toUpperCase() && node.className === className)) { // skip if already highlighted
-            for (var i = 0; i < node.childNodes.length; i++) {
-                i += jQuery.highlight(node.childNodes[i], re, nodeName, className);
+(function (factory) {
+    if (typeof define === 'function' && define.amd) {
+        // AMD. Register as an anonymous module.
+        define(['jquery'], factory);
+    } else if (typeof exports === 'object') {
+        // Node/CommonJS
+        factory(require('jquery'));
+    } else {
+        // Browser globals
+        factory(jQuery);
+    }
+}(function (jQuery) {
+    jQuery.extend({
+        highlight: function (node, re, nodeName, className) {
+            if (node.nodeType === 3) {
+                var match = node.data.match(re);
+                if (match) {
+                    // The new highlight Element Node
+                    var highlight = document.createElement(nodeName || 'span');
+                    highlight.className = className || 'highlight';
+                    // Note that we use the captured value to find the real index
+                    // of the match. This is because we do not want to include the matching word boundaries
+                    var capturePos = node.data.indexOf( match[1] , match.index );
+
+                    // Split the node and replace the matching wordnode
+                    // with the highlighted node
+                    var wordNode = node.splitText(capturePos);
+                    wordNode.splitText(match[1].length);
+
+                    var wordClone = wordNode.cloneNode(true);                    
+                    highlight.appendChild(wordClone);
+                    wordNode.parentNode.replaceChild(highlight, wordNode);
+                    return 1; //skip added node in parent
+                }
+            } else if ((node.nodeType === 1 && node.childNodes) && // only element nodes that have children
+                    !/(script|style)/i.test(node.tagName) && // ignore script and style nodes
+                    !(node.tagName === nodeName.toUpperCase() && node.className === className)) { // skip if already highlighted
+                for (var i = 0; i < node.childNodes.length; i++) {
+                    i += jQuery.highlight(node.childNodes[i], re, nodeName, className);
+                }
             }
+            return 0;
         }
-        return 0;
-    }
-});
+    });
 
-jQuery.fn.unhighlight = function (options) {
-    var settings = { className: 'highlight', element: 'span' };
-    jQuery.extend(settings, options);
+    jQuery.fn.unhighlight = function (options) {
+        var settings = {
+          className: 'highlight',
+          element: 'span'
+        };
 
-    return this.find(settings.element + "." + settings.className).each(function () {
-        var parent = this.parentNode;
-        parent.replaceChild(this.firstChild, this);
-        parent.normalize();
-    }).end();
-};
+        jQuery.extend(settings, options);
 
-jQuery.fn.highlight = function (words, options) {
-    var settings = { className: 'highlight', element: 'span', caseSensitive: false, wordsOnly: false };
-    jQuery.extend(settings, options);
-    
-    if (words.constructor === String) {
-        words = [words];
-    }
-    words = jQuery.grep(words, function(word, i){
-      return word != '';
-    });
-    words = jQuery.map(words, function(word, i) {
-      return word.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
-    });
-    if (words.length == 0) { return this; };
+        return this.find(settings.element + '.' + settings.className).each(function () {
+            var parent = this.parentNode;
+            parent.replaceChild(this.firstChild, this);
+            parent.normalize();
+        }).end();
+    };
 
-    var flag = settings.caseSensitive ? "" : "i";
-    var pattern = "(" + words.join("|") + ")";
-    if (settings.wordsOnly) {
-        pattern = "\\b" + pattern + "\\b";
-    }
-    var re = new RegExp(pattern, flag);
-    
-    return this.each(function () {
-        jQuery.highlight(this, re, settings.element, settings.className);
-    });
-};
+    jQuery.fn.highlight = function (words, options) {
+        var settings = {
+          className: 'highlight',
+          element: 'span',
+          caseSensitive: false,
+          wordsOnly: false,
+          wordsBoundary: '\\b'
+        };
 
+        jQuery.extend(settings, options);
+        
+        if (typeof words === 'string') {
+          words = [words];
+        }
+        words = jQuery.grep(words, function(word, i){
+          return word != '';
+        });
+        words = jQuery.map(words, function(word, i) {
+          return word.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
+        });
+
+        if (words.length === 0) {
+          return this;
+        };
+
+        var flag = settings.caseSensitive ? '' : 'i';
+        // The capture parenthesis will make sure we can match
+        // only the matching word
+        var pattern = '(' + words.join('|') + ')';
+        if (settings.wordsOnly) {
+            pattern = settings.wordsBoundary + pattern + settings.wordsBoundary;
+        }
+        var re = new RegExp(pattern, flag);
+        
+        return this.each(function () {
+            jQuery.highlight(this, re, settings.element, settings.className);
+        });
+    };
+}));