enju_bookmark 0.1.3 → 0.2.0.beta.1

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

metadata

@@ -1,15 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: enju_bookmark
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0.beta.1
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-26 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: enju_leaf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0.beta.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.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: :runtime
+  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_library
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0.beta.1
+  type: :runtime
+  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: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0.beta.1
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +126,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
@@ -122,34 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: enju_leaf
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: enju_circulation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.0.beta.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.0.beta.1
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
   requirement: !ruby/object:Gem::Requirement
@@ -164,20 +206,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.2.0
-- !ruby/object:Gem::Dependency
-  name: mobylette
-  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: annotate
   requirement: !ruby/object:Gem::Requirement
@@ -221,7 +249,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -245,7 +273,6 @@ files:
 - README.rdoc
 - Rakefile
 - app/assets/stylesheets/enju_bookmark/acts_as_taggable_stylesheet.css
-- app/controllers/bookmark_stat_has_manifestations_controller.rb
 - app/controllers/bookmark_stats_controller.rb
 - app/controllers/bookmarks_controller.rb
 - app/controllers/tags_controller.rb
@@ -254,8 +281,11 @@ files:
 - app/models/bookmark_stat_has_manifestation.rb
 - app/models/bookmark_stat_state_machine.rb
 - app/models/bookmark_stat_transition.rb
-- app/models/enju_bookmark/ability.rb
+- app/models/concerns/enju_bookmark/enju_user.rb
 - app/models/tag.rb
+- app/policies/bookmark_policy.rb
+- app/policies/bookmark_stat_policy.rb
+- app/policies/tag_policy.rb
 - app/views/bookmark_stats/_form.html.erb
 - app/views/bookmark_stats/edit.html.erb
 - app/views/bookmark_stats/index.html.erb
@@ -292,13 +322,11 @@ files:
 - lib/enju_bookmark.rb
 - lib/enju_bookmark/bookmark_helper.rb
 - lib/enju_bookmark/bookmark_url.rb
-- lib/enju_bookmark/calculate_stat.rb
 - lib/enju_bookmark/engine.rb
 - lib/enju_bookmark/expire_tag_cloud.rb
 - lib/enju_bookmark/manifestation.rb
 - lib/enju_bookmark/profile.rb
 - lib/enju_bookmark/suggest_tag.rb
-- lib/enju_bookmark/user.rb
 - lib/enju_bookmark/version.rb
 - lib/generators/enju_bookmark/setup/USAGE
 - lib/generators/enju_bookmark/setup/setup_generator.rb
@@ -320,7 +348,6 @@ 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
@@ -329,6 +356,7 @@ files:
 - spec/dummy/config/environments/test.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/friendly_id.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
@@ -537,7 +565,11 @@ files:
 - spec/dummy/db/migrate/20141013152012_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb
 - spec/dummy/db/migrate/20141013152013_add_missing_taggable_index.acts_as_taggable_on_engine.rb
 - spec/dummy/db/migrate/20141014065831_add_shelf_id_to_checkout.rb
+- spec/dummy/db/migrate/20150124152756_add_foreign_key_to_shelves_referencing_libraries.rb
 - spec/dummy/db/migrate/20150221063719_add_settings_to_library_group.rb
+- spec/dummy/db/migrate/20150924115059_create_withdraws.rb
+- spec/dummy/db/migrate/20151213070943_add_translation_table_to_library_group.rb
+- spec/dummy/db/migrate/20151213072705_add_footer_banner_to_library_group.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -594,12 +626,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_bookmark plugin
@@ -619,7 +651,6 @@ 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
@@ -628,6 +659,7 @@ test_files:
 - spec/dummy/config/environments/test.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/friendly_id.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
@@ -837,7 +869,11 @@ test_files:
 - spec/dummy/db/migrate/20141013152012_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb
 - spec/dummy/db/migrate/20141013152013_add_missing_taggable_index.acts_as_taggable_on_engine.rb
 - spec/dummy/db/migrate/20141014065831_add_shelf_id_to_checkout.rb
+- spec/dummy/db/migrate/20150124152756_add_foreign_key_to_shelves_referencing_libraries.rb
 - spec/dummy/db/migrate/20150221063719_add_settings_to_library_group.rb
+- spec/dummy/db/migrate/20150924115059_create_withdraws.rb
+- spec/dummy/db/migrate/20151213070943_add_translation_table_to_library_group.rb
+- spec/dummy/db/migrate/20151213072705_add_footer_banner_to_library_group.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html

data/app/controllers/bookmark_stat_has_manifestations_controller.rb

@@ -1,88 +0,0 @@
-class BookmarkStatHasManifestationsController < ApplicationController
-  load_and_authorize_resource
-
-  # GET /bookmark_stat_has_manifestations
-  # GET /bookmark_stat_has_manifestations.json
-  def index
-    @bookmark_stat_has_manifestations = BookmarkStatHasManifestation.page(params[:page])
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render json: @bookmark_stat_has_manifestations }
-    end
-  end
-
-  # GET /bookmark_stat_has_manifestations/1
-  # GET /bookmark_stat_has_manifestations/1.json
-  def show
-    respond_to do |format|
-      format.html # show.html.erb
-      format.json { render json: @bookmark_stat_has_manifestation }
-    end
-  end
-
-  # GET /bookmark_stat_has_manifestations/new
-  # GET /bookmark_stat_has_manifestations/new.json
-  def new
-    @bookmark_stat_has_manifestation = BookmarkStatHasManifestation.new
-
-    respond_to do |format|
-      format.html # new.html.erb
-      format.json { render json: @bookmark_stat_has_manifestation }
-    end
-  end
-
-  # GET /bookmark_stat_has_manifestations/1/edit
-  def edit
-  end
-
-  # POST /bookmark_stat_has_manifestations
-  # POST /bookmark_stat_has_manifestations.json
-  def create
-    @bookmark_stat_has_manifestation = BookmarkStatHasManifestation.new
-    @bookmark_stat_has_manifestation.assign_attributes(params[:bookmark_stat_has_manifestation], as: :admin)
-
-    respond_to do |format|
-      if @bookmark_stat_has_manifestation.save
-        format.html { redirect_to @bookmark_stat_has_manifestation, notice: t('controller.successfully_created', model: t('activerecord.models.bookmark_stat_has_manifestation')) }
-        format.json { render json: @bookmark_stat_has_manifestation, status: :created, location: @bookmark_stat_has_manifestation }
-      else
-        format.html { render action: "new" }
-        format.json { render json: @bookmark_stat_has_manifestation.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # PUT /bookmark_stat_has_manifestations/1
-  # PUT /bookmark_stat_has_manifestations/1.json
-  def update
-    @bookmark_stat_has_manifestation.assign_attributes(params[:bookmark_stat_has_manifestation], as: :admin)
-    respond_to do |format|
-      if @bookmark_stat_has_manifestation.save
-        format.html { redirect_to @bookmark_stat_has_manifestation, notice: t('controller.successfully_updated', model: t('activerecord.models.bookmark_stat_has_manifestation')) }
-      format.json { head :no_content }
-      else
-        format.html { render action: "edit" }
-        format.json { render json: @bookmark_stat_has_manifestation.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # DELETE /bookmark_stat_has_manifestations/1
-  # DELETE /bookmark_stat_has_manifestations/1.json
-  def destroy
-    @bookmark_stat_has_manifestation.destroy
-
-    respond_to do |format|
-      format.html { redirect_to bookmark_stat_has_manifestations_url }
-      format.json { head :no_content }
-    end
-  end
-
-  private
-  def bookmark_stat_has_manifestation_params
-    params.require(:bookmark_stat_has_manifestation).permit(
-      :bookmark_stat_id, :manifestation_id
-    )
-  end
-end

data/app/models/enju_bookmark/ability.rb

@@ -1,43 +0,0 @@
-module EnjuBookmark
-  class Ability
-    include CanCan::Ability
-
-    def initialize(user, ip_address = nil)
-      case user.try(:role).try(:name)
-      when 'Administrator'
-        can :manage, [
-          Bookmark,
-          BookmarkStat,
-          BookmarkStatHasManifestation,
-          Tag
-        ]
-      when 'Librarian'
-        can [:read, :create, :update], BookmarkStat
-        can :read, BookmarkStatHasManifestation
-        can :manage, [
-          Bookmark,
-          Tag
-        ]
-      when 'User'
-        can [:index, :create], Bookmark
-        can :show, Bookmark do |bookmark|
-          if bookmark.user == user
-            true
-          elsif user.profile.try(:share_bookmarks)
-            true
-          else
-            false
-          end
-        end
-        can [:update, :destroy, :delete], Bookmark do |bookmark|
-          bookmark.user == user
-        end
-        can :read, BookmarkStat
-        can :read, Tag
-      else
-        can :read, BookmarkStat
-        can :read, Tag
-      end
-    end
-  end
-end

data/lib/enju_bookmark/calculate_stat.rb

@@ -1,30 +0,0 @@
-module CalculateStat
-
-  def self.included(base)
-    base.extend ClassMethods
-    base.send :include, InstanceMethods
-    base.class_eval do
-      validates_presence_of :start_date, :end_date
-      validate :check_date
-    end
-  end
-
-  module ClassMethods
-    def calculate_stat
-      self.not_calculated.each do |stat|
-        stat.calculate!
-      end
-    end
-  end
-
-  module InstanceMethods
-    def check_date
-      if self.start_date and self.end_date
-        if self.start_date >= self.end_date
-          errors.add(:start_date)
-          errors.add(:end_date)
-        end
-      end
-    end
-  end
-end

data/lib/enju_bookmark/user.rb

@@ -1,28 +0,0 @@
-module EnjuBookmark
-  module BookmarkUser
-    def self.included(base)
-      base.extend ClassMethods
-    end
-
-    module ClassMethods
-      def enju_bookmark_user_model
-        include InstanceMethods
-        has_many :bookmarks, :dependent => :destroy
-        acts_as_tagger
-
-        #attr_accessible :share_bookmarks, as: :admin
-      end
-    end
-
-    module InstanceMethods
-      def owned_tags_by_solr
-        bookmark_ids = bookmarks.collect(&:id)
-        if bookmark_ids.empty?
-          []
-        else
-          Tag.bookmarked(bookmark_ids)
-        end
-      end
-    end
-  end
-end