enju_bookmark 0.2.0.beta.2 → 0.2.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 487ff118417cb4d67d7e145328937e9548da920d
-  data.tar.gz: e63aa5cafde269a3a78755e27df5987aa32d7cac
+  metadata.gz: 190e7dbdc66ee197be07f3f623d8a7655c6cda09
+  data.tar.gz: 7756a42345b8db40bd1e87b546f369ef687c7d43
 SHA512:
-  metadata.gz: d062fccaa0e70d84f44913b5016b50a19de84eef7f4673d7edf9b1ba458e98027543519eeb01efba3f61d47223e57581464595ff4c3d579a29b00fca08155e6d
-  data.tar.gz: fda7463f3a155e5ff182fd6ac2d9b454503bc6eba3afc6c0cbdfd03f4c9c22af6eb7256be38d13eea342343344a2c3c79aaa819bdc3997a73d1afdbe7107c3cd
+  metadata.gz: aac0b75e0062e0ac74fe1439504642c574ed7bf862e9a50260d192782b74e6a6ffd271288a02b834a62ddfd00df13efcd93408b04fb0e5ad755efb4f2fbd49ad
+  data.tar.gz: 85318d980248618a1cf08492dc88c4a233f920a607a2bec301db300b27aebfb02725dba2332ff81163d5b1c1f5d1ac4eeade169f084dd437e09720830977c673

data/app/models/bookmark.rb

@@ -191,10 +191,9 @@ end
 #  user_id          :integer          not null
 #  manifestation_id :integer
 #  title            :text
-#  url              :string(255)
+#  url              :string
 #  note             :text
 #  shared           :boolean
-#  created_at       :datetime         not null
-#  updated_at       :datetime         not null
+#  created_at       :datetime
+#  updated_at       :datetime
 #
-

data/app/models/bookmark_stat.rb

@@ -54,7 +54,6 @@ end
 #  started_at   :datetime
 #  completed_at :datetime
 #  note         :text
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  created_at   :datetime
+#  updated_at   :datetime
 #
-

data/app/models/bookmark_stat_has_manifestation.rb

@@ -16,7 +16,6 @@ end
 #  bookmark_stat_id :integer          not null
 #  manifestation_id :integer          not null
 #  bookmarks_count  :integer
-#  created_at       :datetime         not null
-#  updated_at       :datetime         not null
+#  created_at       :datetime
+#  updated_at       :datetime
 #
-

data/app/models/bookmark_stat_transition.rb

@@ -11,10 +11,10 @@ end
 # Table name: bookmark_stat_transitions
 #
 #  id               :integer          not null, primary key
-#  to_state         :string(255)
-#  metadata         :text             default("{}")
+#  to_state         :string
+#  metadata         :text             default({})
 #  sort_key         :integer
 #  bookmark_stat_id :integer
-#  created_at       :datetime         not null
-#  updated_at       :datetime         not null
+#  created_at       :datetime
+#  updated_at       :datetime
 #

data/app/models/tag.rb

@@ -48,9 +48,9 @@ end
 # Table name: tags
 #
 #  id                 :integer          not null, primary key
-#  name               :string(255)
-#  name_transcription :string(255)
-#  created_at         :datetime         not null
-#  updated_at         :datetime         not null
+#  name               :string
+#  name_transcription :string
+#  created_at         :datetime
+#  updated_at         :datetime
 #  taggings_count     :integer          default(0)
 #

data/lib/enju_bookmark/version.rb

@@ -1,3 +1,3 @@
 module EnjuBookmark
-  VERSION = "0.2.0.beta.2"
+  VERSION = "0.2.0.beta.3"
 end

data/spec/dummy/app/models/user.rb

@@ -4,6 +4,6 @@ class User < ActiveRecord::Base
     :recoverable, :rememberable, :trackable, #, :validatable
     :lockable, :lock_strategy => :none, :unlock_strategy => :none
 
-  include EnjuLeaf::EnjuUser
+  include EnjuSeed::EnjuUser
   include EnjuBookmark::EnjuUser
 end

data/spec/dummy/config/application.rb

@@ -5,6 +5,8 @@ require 'rails/all'
 Bundler.require(*Rails.groups)
 require 'enju_bookmark'
 require 'enju_leaf'
+require 'globalize'
+require 'globalize-accessors'
 
 module Dummy
   class Application < Rails::Application

data/spec/dummy/db/migrate/20140110122216_create_user_import_files.rb

@@ -6,7 +6,7 @@ class CreateUserImportFiles < ActiveRecord::Migration
       t.datetime :executed_at
       t.string :user_import_file_name
       t.string :user_import_content_type
-      t.string :user_import_file_size
+      t.integer :user_import_file_size
       t.datetime :user_import_updated_at
       t.string :user_import_fingerprint
       t.string :edit_mode

data/spec/dummy/db/migrate/20150506105356_add_error_message_to_user_import_result.rb

@@ -0,0 +1,5 @@
+class AddErrorMessageToUserImportResult < ActiveRecord::Migration
+  def change
+    add_column :user_import_results, :error_message, :text
+  end
+end

data/spec/dummy/db/migrate/20160610093229_add_html_snippet_to_library_group.rb

@@ -0,0 +1,5 @@
+class AddHtmlSnippetToLibraryGroup < ActiveRecord::Migration
+  def change
+    add_column :library_groups, :html_snippet, :text
+  end
+end

data/spec/dummy/db/migrate/20160627232219_add_most_recent_to_user_import_file_transitions.rb

@@ -0,0 +1,9 @@
+class AddMostRecentToUserImportFileTransitions < ActiveRecord::Migration
+  def up
+    add_column :user_import_file_transitions, :most_recent, :boolean, null: true
+  end
+
+  def down
+    remove_column :user_import_file_transitions, :most_recent
+  end
+end

data/spec/dummy/db/migrate/20160627232316_add_most_recent_to_user_export_file_transitions.rb

@@ -0,0 +1,9 @@
+class AddMostRecentToUserExportFileTransitions < ActiveRecord::Migration
+  def up
+    add_column :user_export_file_transitions, :most_recent, :boolean, null: true
+  end
+
+  def down
+    remove_column :user_export_file_transitions, :most_recent
+  end
+end

data/spec/dummy/db/migrate/20160813191647_add_max_number_of_results_to_library_group.rb

@@ -0,0 +1,5 @@
+class AddMaxNumberOfResultsToLibraryGroup < ActiveRecord::Migration
+  def change
+    add_column :library_groups, :max_number_of_results, :integer, default: 500
+  end
+end

data/spec/dummy/db/migrate/20160813191733_add_family_name_first_to_library_group.rb

@@ -0,0 +1,5 @@
+class AddFamilyNameFirstToLibraryGroup < ActiveRecord::Migration
+  def change
+    add_column :library_groups, :family_name_first, :boolean, default: true
+  end
+end

data/spec/dummy/db/migrate/20160813192542_add_pub_year_facet_range_interval_to_library_group.rb

@@ -0,0 +1,5 @@
+class AddPubYearFacetRangeIntervalToLibraryGroup < ActiveRecord::Migration
+  def change
+    add_column :library_groups, :pub_year_facet_range_interval, :integer, default: 10
+  end
+end

data/spec/dummy/db/migrate/20160813203039_add_user_id_to_library_group.rb

@@ -0,0 +1,5 @@
+class AddUserIdToLibraryGroup < ActiveRecord::Migration
+  def change
+    add_reference :library_groups, :user, index: true, foreign_key: true
+  end
+end

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: 20151213072705) do
+ActiveRecord::Schema.define(version: 20160813203039) do
 
   create_table "accepts", force: :cascade do |t|
     t.integer  "basket_id"
@@ -693,9 +693,9 @@ ActiveRecord::Schema.define(version: 20151213072705) do
   add_index "library_group_translations", ["locale"], name: "index_library_group_translations_on_locale"
 
   create_table "library_groups", force: :cascade do |t|
-    t.string   "name",                                                           null: false
+    t.string   "name",                                                             null: false
     t.text     "display_name"
-    t.string   "short_name",                                                     null: false
+    t.string   "short_name",                                                       null: false
     t.text     "my_networks"
     t.text     "login_banner"
     t.text     "note"
@@ -704,12 +704,18 @@ ActiveRecord::Schema.define(version: 20151213072705) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.text     "admin_networks"
-    t.boolean  "allow_bookmark_external_url", default: false,                    null: false
-    t.string   "url",                         default: "http://localhost:3000/"
+    t.boolean  "allow_bookmark_external_url",   default: false,                    null: false
+    t.string   "url",                           default: "http://localhost:3000/"
     t.text     "settings"
+    t.text     "html_snippet"
+    t.integer  "max_number_of_results",         default: 500
+    t.boolean  "family_name_first",             default: true
+    t.integer  "pub_year_facet_range_interval", default: 10
+    t.integer  "user_id"
   end
 
   add_index "library_groups", ["short_name"], name: "index_library_groups_on_short_name"
+  add_index "library_groups", ["user_id"], name: "index_library_groups_on_user_id"
 
   create_table "licenses", force: :cascade do |t|
     t.string   "name",         null: false
@@ -1413,6 +1419,7 @@ ActiveRecord::Schema.define(version: 20151213072705) do
     t.integer  "user_export_file_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "most_recent"
   end
 
   add_index "user_export_file_transitions", ["sort_key", "user_export_file_id"], name: "index_user_export_file_transitions_on_sort_key_and_file_id", unique: true
@@ -1481,6 +1488,7 @@ ActiveRecord::Schema.define(version: 20151213072705) do
     t.integer  "user_import_file_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "most_recent"
   end
 
   add_index "user_import_file_transitions", ["sort_key", "user_import_file_id"], name: "index_user_import_file_transitions_on_sort_key_and_file_id", unique: true
@@ -1492,7 +1500,7 @@ ActiveRecord::Schema.define(version: 20151213072705) do
     t.datetime "executed_at"
     t.string   "user_import_file_name"
     t.string   "user_import_content_type"
-    t.string   "user_import_file_size"
+    t.integer  "user_import_file_size"
     t.datetime "user_import_updated_at"
     t.string   "user_import_fingerprint"
     t.string   "edit_mode"
@@ -1510,6 +1518,7 @@ ActiveRecord::Schema.define(version: 20151213072705) do
     t.text     "body"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.text     "error_message"
   end
 
   create_table "user_reserve_stat_transitions", force: :cascade do |t|

data/spec/fixtures/bookmark_stat_has_manifestations.yml

@@ -18,7 +18,6 @@ two:
 #  bookmark_stat_id :integer          not null
 #  manifestation_id :integer          not null
 #  bookmarks_count  :integer
-#  created_at       :datetime         not null
-#  updated_at       :datetime         not null
+#  created_at       :datetime
+#  updated_at       :datetime
 #
-

data/spec/fixtures/bookmark_stats.yml

@@ -22,6 +22,6 @@ bookmark_stat_00002:
 #  started_at   :datetime
 #  completed_at :datetime
 #  note         :text
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  created_at   :datetime
+#  updated_at   :datetime
 #

data/spec/fixtures/bookmarks.yml

@@ -50,10 +50,9 @@ bookmark_00005:
 #  user_id          :integer          not null
 #  manifestation_id :integer
 #  title            :text
-#  url              :string(255)
+#  url              :string
 #  note             :text
 #  shared           :boolean
-#  created_at       :datetime         not null
-#  updated_at       :datetime         not null
+#  created_at       :datetime
+#  updated_at       :datetime
 #
-

data/spec/fixtures/library_groups.yml

@@ -8,12 +8,7 @@ one:
   my_networks: 0.0.0.0/0
   url: "http://localhost:3000/"
   admin_networks: 0.0.0.0/0
-  settings: <% if Rails::VERSION::MAJOR > 3 %>
-    "{\"max_number_of_results\":200,\"family_name_first\":true,\"book_jacket_source\":\"google\",\"screenshot_generator\":\"mozshot\"}"
-  <% else %>
-    "---\n:max_number_of_results: 200\n:family_name_first: true\n:book_jacket_source: \"google\"\n:screenshot_generator: \"mozshot\""
-  <% end %>
-
+  user_id: 1
 
 # == Schema Information
 #

data/spec/models/bookmark_spec.rb

@@ -48,10 +48,9 @@ end
 #  user_id          :integer          not null
 #  manifestation_id :integer
 #  title            :text
-#  url              :string(255)
+#  url              :string
 #  note             :text
 #  shared           :boolean
-#  created_at       :datetime         not null
-#  updated_at       :datetime         not null
+#  created_at       :datetime
+#  updated_at       :datetime
 #
-

data/spec/models/bookmark_stat_has_manifestation_spec.rb

@@ -14,7 +14,6 @@ end
 #  bookmark_stat_id :integer          not null
 #  manifestation_id :integer          not null
 #  bookmarks_count  :integer
-#  created_at       :datetime         not null
-#  updated_at       :datetime         not null
+#  created_at       :datetime
+#  updated_at       :datetime
 #
-

data/spec/models/bookmark_stat_spec.rb

@@ -19,6 +19,6 @@ end
 #  started_at   :datetime
 #  completed_at :datetime
 #  note         :text
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  created_at   :datetime
+#  updated_at   :datetime
 #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_bookmark
 version: !ruby/object:Gem::Version
-  version: 0.2.0.beta.2
+  version: 0.2.0.beta.3
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-12 00:00:00.000000000 Z
+date: 2016-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_biblio
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0.beta.2
+        version: 0.2.0.beta.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0.beta.2
+        version: 0.2.0.beta.3
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0.beta.2
+- !ruby/object:Gem::Dependency
+  name: globalize
+  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: globalize-accessors
+  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: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -272,7 +300,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
@@ -497,9 +524,17 @@ files:
 - 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/20150506105356_add_error_message_to_user_import_result.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/migrate/20160610093229_add_html_snippet_to_library_group.rb
+- spec/dummy/db/migrate/20160627232219_add_most_recent_to_user_import_file_transitions.rb
+- spec/dummy/db/migrate/20160627232316_add_most_recent_to_user_export_file_transitions.rb
+- spec/dummy/db/migrate/20160813191647_add_max_number_of_results_to_library_group.rb
+- spec/dummy/db/migrate/20160813191733_add_family_name_first_to_library_group.rb
+- spec/dummy/db/migrate/20160813192542_add_pub_year_facet_range_interval_to_library_group.rb
+- spec/dummy/db/migrate/20160813203039_add_user_id_to_library_group.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -576,7 +611,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
@@ -801,9 +835,17 @@ test_files:
 - 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/20150506105356_add_error_message_to_user_import_result.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/migrate/20160610093229_add_html_snippet_to_library_group.rb
+- spec/dummy/db/migrate/20160627232219_add_most_recent_to_user_import_file_transitions.rb
+- spec/dummy/db/migrate/20160627232316_add_most_recent_to_user_export_file_transitions.rb
+- spec/dummy/db/migrate/20160813191647_add_max_number_of_results_to_library_group.rb
+- spec/dummy/db/migrate/20160813191733_add_family_name_first_to_library_group.rb
+- spec/dummy/db/migrate/20160813192542_add_pub_year_facet_range_interval_to_library_group.rb
+- spec/dummy/db/migrate/20160813203039_add_user_id_to_library_group.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html

data/spec/dummy/app/models/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.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