enju_bookmark 0.1.2.pre17 → 0.1.2.pre18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4031e53377a5b374cae891279b2acb473bac213b
-  data.tar.gz: 9aa31c3842d048200b82b536d08fbc824d1edf3e
+  metadata.gz: db479211c5aa5bcee491d61771df0b9b65534259
+  data.tar.gz: 3e33b0aae96bed63858a2cec5c308dc5a854fa00
 SHA512:
-  metadata.gz: cdfeee9e63f02d0e4c7f8d95a9029bd45b561daddae34fc80f6707578cf2ab4781eafd538b4ad736d4bb48c080b3f0574b54f7c5e4f5ca787ce88cb3680d44c2
-  data.tar.gz: 8fb4108f903b0560d15e4e24dbfe3f81e090613d4926fdeb26e4be93c6c86f0f79e19f4ab2b12ba1cdbd99bf09b6e3f08891ca69af9d4bb85e476722f9e2d7fa
+  metadata.gz: fa7fa8ff67ff51148cf927b5da4cbbff9f9dc5d9f99407b2fe25c5c0b4ce385f53f283c59b2cdc023cbedbcb3f36235e21be47655701cea953dfa867f346a8af
+  data.tar.gz: 6814f8e114f61b0867df640ab89b5eae1683f8594b91dd182cda2a9d4c79e9c4af94db6b4c862bf349311d5eceea2a710b3acf24ed4ec022fd773f139857b6ad

data/app/models/bookmark.rb

@@ -1,21 +1,21 @@
 # -*- encoding: utf-8 -*-
 class Bookmark < ActiveRecord::Base
   attr_accessible :title, :url, :note, :shared, :tag_list
-  scope :bookmarked, lambda {|start_date, end_date| {:conditions => ['created_at >= ? AND created_at < ?', start_date, end_date]}}
-  scope :user_bookmarks, lambda {|user| where(:user_id => user.id)}
-  scope :shared, where(:shared => true)
+  scope :bookmarked, lambda {|start_date, end_date| where('created_at >= ? AND created_at < ?', start_date, end_date)}
+  scope :user_bookmarks, lambda {|user| where(user_id: user.id)}
+  scope :shared, where(shared: true)
   belongs_to :manifestation, touch: true
-  belongs_to :user #, :counter_cache => true, validate: true
+  belongs_to :user #, counter_cache: true, validate: true
 
   validates_presence_of :user, :title
   validates_presence_of :url, on: :create
   validates_presence_of :manifestation_id, on: :update
   validates_associated :user, :manifestation
   validates_uniqueness_of :manifestation_id, scope: :user_id
-  validates :url, url: true, presence: true, length: {:maximum => 255}
+  validates :url, url: true, presence: true, length: {maximum: 255}
   validate :bookmarkable_url?
-  validate :already_bookmarked?, :if => :url_changed?
-  before_save :create_manifestation, :if => :url_changed?
+  validate :already_bookmarked?, if: :url_changed?
+  before_save :create_manifestation, if: :url_changed?
   before_save :replace_space_in_tags
 
   acts_as_taggable_on :tags
@@ -76,7 +76,7 @@ class Bookmark < ActiveRecord::Base
     end
     unless manifestation
       normalized_url = Addressable::URI.parse(url).normalize.to_s
-      doc = Nokogiri::HTML(open(normalized_url).read)
+      doc = Nokogiri::HTML(Faraday.get(normalized_url).body)
       # TODO: 日本語以外
       #charsets = ['iso-2022-jp', 'euc-jp', 'shift_jis', 'iso-8859-1']
       #if charsets.include?(page.charset.downcase)
@@ -96,7 +96,7 @@ class Bookmark < ActiveRecord::Base
   end
 
   def self.get_canonical_url(url)
-    doc = Nokogiri::HTML(open(url))
+    doc = Nokogiri::HTML(Faraday.get(url).body)
     canonical_url = doc.search("/html/head/link[@rel='canonical']").first['href']
     # TODO: URLを相対指定している時
     Addressable::URI.parse(canonical_url).normalize.to_s
@@ -126,7 +126,7 @@ class Bookmark < ActiveRecord::Base
     if url.try(:my_host?)
       manifestation = self.my_host_resource
     else
-      manifestation = Manifestation.where(:access_address => url).first if url.present?
+      manifestation = Manifestation.where(access_address: url).first if url.present?
     end
   end
 
@@ -144,7 +144,7 @@ class Bookmark < ActiveRecord::Base
       self.manifestation_id = manifestation.id
       return
     end
-    manifestation = Manifestation.new(:access_address => url)
+    manifestation = Manifestation.new(access_address: url)
     manifestation.carrier_type = CarrierType.where(name: 'file').first
     if title.present?
       manifestation.original_title = title
@@ -170,7 +170,7 @@ class Bookmark < ActiveRecord::Base
 
   def self.manifestations_count(start_date, end_date, manifestation)
     if manifestation
-      self.bookmarked(start_date, end_date).where(:manifestation_id => manifestation.id).count
+      self.bookmarked(start_date, end_date).where(manifestation_id: manifestation.id).count
     else
       0
     end

data/lib/enju_bookmark/engine.rb

@@ -2,6 +2,7 @@ require 'enju_seed'
 require 'acts-as-taggable-on'
 require 'statesman'
 require 'addressable/uri'
+require 'faraday'
 require 'nkf'
 
 module EnjuBookmark

data/lib/enju_bookmark/manifestation.rb

@@ -7,11 +7,11 @@ module EnjuBookmark
     module ClassMethods
       def enju_bookmark_manifestation_model
         include InstanceMethods
-        has_many :bookmarks, :include => :tags, :dependent => :destroy, :foreign_key => :manifestation_id
-        has_many :users, :through => :bookmarks
+        has_many :bookmarks, dependent: :destroy, foreign_key: :manifestation_id
+        has_many :users, through: :bookmarks
 
         searchable do
-          string :tag, :multiple => true do
+          string :tag, multiple: true do
             bookmarks.map{|bookmark| bookmark.tag_list}.flatten
           end
           text :tag do
@@ -23,7 +23,7 @@ module EnjuBookmark
 
     module InstanceMethods
       def bookmarked?(user)
-        return true if user.bookmarks.where(:url => url).first
+        return true if user.bookmarks.where(url: url).first
         false
       end
 

data/lib/enju_bookmark/version.rb

@@ -1,3 +1,3 @@
 module EnjuBookmark
-  VERSION = "0.1.2.pre17"
+  VERSION = "0.1.2.pre18"
 end

data/spec/controllers/bookmark_stats_controller_spec.rb

@@ -15,7 +15,7 @@ describe BookmarkStatsController do
 
       it "assigns all bookmark_stats as @bookmark_stats" do
         get :index
-        expect(assigns(:bookmark_stats)).to eq(BookmarkStat.all)
+        expect(assigns(:bookmark_stats)).to eq(BookmarkStat.page(1))
       end
     end
 
@@ -24,7 +24,7 @@ describe BookmarkStatsController do
 
       it "assigns all bookmark_stats as @bookmark_stats" do
         get :index
-        expect(assigns(:bookmark_stats)).to eq(BookmarkStat.all)
+        expect(assigns(:bookmark_stats)).to eq(BookmarkStat.page(1))
       end
     end
 
@@ -33,14 +33,14 @@ describe BookmarkStatsController do
 
       it "assigns all bookmark_stats as @bookmark_stats" do
         get :index
-        expect(assigns(:bookmark_stats)).to eq(BookmarkStat.all)
+        expect(assigns(:bookmark_stats)).to eq(BookmarkStat.page(1))
       end
     end
 
     describe "When not logged in" do
       it "should not assign bookmark_stats as @bookmark_stats" do
         get :index
-        expect(assigns(:bookmark_stats)).to eq(BookmarkStat.all)
+        expect(assigns(:bookmark_stats)).to eq(BookmarkStat.page(1))
       end
     end
   end

data/spec/dummy/config/boot.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-gemfile = File.expand_path('../../../../Gemfile', __FILE__)
+gemfile = ENV['BUNDLE_GEMFILE'] || File.expand_path('../../../../Gemfile', __FILE__)
 
 if File.exist?(gemfile)
   ENV['BUNDLE_GEMFILE'] = gemfile
@@ -7,4 +7,4 @@ if File.exist?(gemfile)
   Bundler.setup
 end
 
-$:.unshift File.expand_path('../../../../lib', __FILE__)
+$:.unshift File.expand_path('../../../../lib', __FILE__)

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

@@ -0,0 +1,90 @@
+# FriendlyId Global Configuration
+#
+# Use this to set up shared configuration options for your entire application.
+# Any of the configuration options shown here can also be applied to single
+# models by passing arguments to the `friendly_id` class method or defining
+# methods in your model.
+#
+# To learn more, check out the guide:
+#
+# http://norman.github.io/friendly_id/file.Guide.html
+
+if Rails::VERSION::MAJOR == 4
+FriendlyId.defaults do |config|
+  # ## Reserved Words
+  #
+  # Some words could conflict with Rails's routes when used as slugs, or are
+  # undesirable to allow as slugs. Edit this list as needed for your app.
+  config.use :reserved
+
+  config.reserved_words = %w(new edit index session login logout users admin
+    stylesheets assets javascripts images)
+
+  #  ## Friendly Finders
+  #
+  # Uncomment this to use friendly finders in all models. By default, if
+  # you wish to find a record by its friendly id, you must do:
+  #
+  #    MyModel.friendly.find('foo')
+  #
+  # If you uncomment this, you can do:
+  #
+  #    MyModel.find('foo')
+  #
+  # This is significantly more convenient but may not be appropriate for
+  # all applications, so you must explicity opt-in to this behavior. You can
+  # always also configure it on a per-model basis if you prefer.
+  #
+  # Something else to consider is that using the :finders addon boosts
+  # performance because it will avoid Rails-internal code that makes runtime
+  # calls to `Module.extend`.
+  #
+  config.use :finders
+  #
+  # ## Slugs
+  #
+  # Most applications will use the :slugged module everywhere. If you wish
+  # to do so, uncomment the following line.
+  #
+  # config.use :slugged
+  #
+  # By default, FriendlyId's :slugged addon expects the slug column to be named
+  # 'slug', but you can change it if you wish.
+  #
+  # config.slug_column = 'slug'
+  #
+  # When FriendlyId can not generate a unique ID from your base method, it appends
+  # a UUID, separated by a single dash. You can configure the character used as the
+  # separator. If you're upgrading from FriendlyId 4, you may wish to replace this
+  # with two dashes.
+  #
+  # config.sequence_separator = '-'
+  #
+  #  ## Tips and Tricks
+  #
+  #  ### Controlling when slugs are generated
+  #
+  # As of FriendlyId 5.0, new slugs are generated only when the slug field is
+  # nil, but if you're using a column as your base method can change this
+  # behavior by overriding the `should_generate_new_friendly_id` method that
+  # FriendlyId adds to your model. The change below makes FriendlyId 5.0 behave
+  # more like 4.0.
+  #
+  # config.use Module.new {
+  #   def should_generate_new_friendly_id?
+  #     slug.blank? || <your_column_name_here>_changed?
+  #   end
+  # }
+  #
+  # FriendlyId uses Rails's `parameterize` method to generate slugs, but for
+  # languages that don't use the Roman alphabet, that's not usually suffient. Here
+  # we use the Babosa library to transliterate Russian Cyrillic slugs to ASCII. If
+  # you use this, don't forget to add "babosa" to your Gemfile.
+  #
+  # config.use Module.new {
+  #   def normalize_friendly_id(text)
+  #     text.to_slug.normalize! :transliterations => [:russian, :latin]
+  #   end
+  # }
+end
+end

data/spec/dummy/db/migrate/005_create_manifestations.rb

@@ -13,7 +13,6 @@ class CreateManifestations < ActiveRecord::Migration
       t.string :access_address
       t.integer :language_id, :default => 1, :null => false
       t.integer :carrier_type_id, :default => 1, :null => false
-      t.integer :extent_id, :default => 1, :null => false
       t.integer :start_page
       t.integer :end_page
       t.integer :height

data/spec/dummy/db/migrate/029_create_subjects.rb

@@ -0,0 +1,27 @@
+class CreateSubjects < ActiveRecord::Migration
+  def self.up
+    create_table :subjects do |t|
+      t.integer :parent_id
+      t.integer :use_term_id
+      t.string :term
+      t.text :term_transcription
+      t.integer :subject_type_id, :null => false
+      t.text :scope_note
+      t.text :note
+      t.integer :required_role_id, :default => 1, :null => false
+      t.integer :lock_version, :default => 0, :null => false
+      t.datetime :created_at
+      t.datetime :updated_at
+      t.datetime :deleted_at
+    end
+    add_index :subjects, :term
+    add_index :subjects, :parent_id
+    add_index :subjects, :use_term_id
+    add_index :subjects, :subject_type_id
+    add_index :subjects, :required_role_id
+  end
+
+  def self.down
+    drop_table :subjects
+  end
+end

data/spec/dummy/db/migrate/035_create_reserves.rb

@@ -10,8 +10,7 @@ class CreateReserves < ActiveRecord::Migration
       t.datetime :canceled_at
       t.datetime :expired_at
       t.datetime :deleted_at
-      t.string :state
-      t.boolean :expiration_notice_to_agent, :default => false
+      t.boolean :expiration_notice_to_patron, :default => false
       t.boolean :expiration_notice_to_library, :default => false
     end
 

data/spec/dummy/db/migrate/059_create_libraries.rb

@@ -1,5 +1,5 @@
 class CreateLibraries < ActiveRecord::Migration
-  def change
+  def self.up
     create_table :libraries do |t|
       t.string :name, :null => false
       t.text :display_name
@@ -25,4 +25,8 @@ class CreateLibraries < ActiveRecord::Migration
     add_index :libraries, :library_group_id
     add_index :libraries, :name, :unique => true
   end
+
+  def self.down
+    drop_table :libraries
+  end
 end

data/spec/dummy/db/migrate/069_create_shelves.rb

@@ -1,5 +1,5 @@
 class CreateShelves < ActiveRecord::Migration
-  def change
+  def self.up
     create_table :shelves do |t|
       t.string :name, :null => false
       t.text :display_name
@@ -12,4 +12,8 @@ class CreateShelves < ActiveRecord::Migration
     end
     add_index :shelves, :library_id
   end
+
+  def self.down
+    drop_table :shelves
+  end
 end

data/spec/dummy/db/migrate/077_create_user_groups.rb

@@ -1,12 +1,16 @@
 class CreateUserGroups < ActiveRecord::Migration
-  def change
+  def self.up
     create_table :user_groups do |t|
-      t.string :name, :not_null => true
-      t.text :display_name
+      t.string :name, :string, :not_null => true
+      t.text :display_name, :string
       t.text :note
       t.integer :position
       t.timestamps
       t.datetime :deleted_at
     end
   end
+
+  def self.down
+    drop_table :user_groups
+  end
 end

data/spec/dummy/db/migrate/080_create_library_groups.rb

@@ -1,5 +1,5 @@
 class CreateLibraryGroups < ActiveRecord::Migration
-  def change
+  def self.up
     create_table :library_groups do |t|
       t.string :name, :null => false
       t.text :display_name
@@ -11,10 +11,15 @@ class CreateLibraryGroups < ActiveRecord::Migration
       t.text :login_banner
       t.text :note
       t.integer :valid_period_for_new_user, :default => 365, :null => false
+      t.boolean :post_to_union_catalog, :default => false, :null => false
       t.integer :country_id
 
       t.timestamps
     end
     add_index :library_groups, :short_name
   end
+
+  def self.down
+    drop_table :library_groups
+  end
 end

data/spec/dummy/db/migrate/113_create_events.rb

@@ -0,0 +1,23 @@
+class CreateEvents < ActiveRecord::Migration
+  def self.up
+    create_table :events do |t|
+      t.integer :library_id, :default => 1, :null => false
+      t.integer :event_category_id, :default => 1, :null => false
+      t.string :name
+      t.text :note
+      t.datetime :start_at
+      t.datetime :end_at
+      t.boolean :all_day, :default => false, :null => false
+      t.datetime :deleted_at
+      t.text :display_name
+
+      t.timestamps
+    end
+    add_index :events, :library_id
+    add_index :events, :event_category_id
+  end
+
+  def self.down
+    drop_table :events
+  end
+end

data/spec/dummy/db/migrate/114_create_event_categories.rb

@@ -0,0 +1,16 @@
+class CreateEventCategories < ActiveRecord::Migration
+  def self.up
+    create_table :event_categories do |t|
+      t.string :name, :null => false
+      t.text :display_name
+      t.text :note
+      t.integer :position
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :event_categories
+  end
+end

data/spec/dummy/db/migrate/130_create_request_status_types.rb

@@ -1,5 +1,5 @@
 class CreateRequestStatusTypes < ActiveRecord::Migration
-  def change
+  def self.up
     create_table :request_status_types do |t|
       t.string :name, :null => false
       t.text :display_name
@@ -9,4 +9,8 @@ class CreateRequestStatusTypes < ActiveRecord::Migration
       t.timestamps
     end
   end
+
+  def self.down
+    drop_table :request_status_types
+  end
 end

data/spec/dummy/db/migrate/131_create_request_types.rb

@@ -1,5 +1,5 @@
 class CreateRequestTypes < ActiveRecord::Migration
-  def change
+  def self.up
     create_table :request_types do |t|
       t.string :name, :null => false
       t.text :display_name
@@ -9,4 +9,8 @@ class CreateRequestTypes < ActiveRecord::Migration
       t.timestamps
     end
   end
+
+  def self.down
+    drop_table :request_types
+  end
 end

data/spec/dummy/db/migrate/133_create_agent_merges.rb

@@ -0,0 +1,15 @@
+class CreateAgentMerges < ActiveRecord::Migration
+  def self.up
+    create_table :agent_merges do |t|
+      t.integer :agent_id, :agent_merge_list_id, :null => false
+
+      t.timestamps
+    end
+    add_index :agent_merges, :agent_id
+    add_index :agent_merges, :agent_merge_list_id
+  end
+
+  def self.down
+    drop_table :agent_merges
+  end
+end

data/spec/dummy/db/migrate/134_create_agent_merge_lists.rb

@@ -0,0 +1,13 @@
+class CreateAgentMergeLists < ActiveRecord::Migration
+  def self.up
+    create_table :agent_merge_lists do |t|
+      t.string :title
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :agent_merge_lists
+  end
+end

data/spec/dummy/db/migrate/142_create_classifications.rb

@@ -0,0 +1,19 @@
+class CreateClassifications < ActiveRecord::Migration
+  def self.up
+    create_table :classifications do |t|
+      t.integer :parent_id
+      t.string :category, :null => false
+      t.text :note
+      t.integer :classification_type_id, :null => false
+
+      t.timestamps
+    end
+    add_index :classifications, :parent_id
+    add_index :classifications, :category
+    add_index :classifications, :classification_type_id
+  end
+
+  def self.down
+    drop_table :classifications
+  end
+end

data/spec/dummy/db/migrate/144_create_classification_types.rb

@@ -0,0 +1,16 @@
+class CreateClassificationTypes < ActiveRecord::Migration
+  def self.up
+    create_table :classification_types do |t|
+      t.string :name, :null => false
+      t.text :display_name
+      t.text :note
+      t.integer :position
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :classification_types
+  end
+end

data/spec/dummy/db/migrate/145_create_subject_heading_types.rb

@@ -0,0 +1,16 @@
+class CreateSubjectHeadingTypes < ActiveRecord::Migration
+  def self.up
+    create_table :subject_heading_types do |t|
+      t.string :name, :null => false
+      t.text :display_name
+      t.text :note
+      t.integer :position
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :subject_heading_types
+  end
+end

data/spec/dummy/db/migrate/146_create_subject_types.rb

@@ -0,0 +1,16 @@
+class CreateSubjectTypes < ActiveRecord::Migration
+  def self.up
+    create_table :subject_types do |t|
+      t.string :name, :null => false
+      t.text :display_name
+      t.text :note
+      t.integer :position
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :subject_types
+  end
+end

data/spec/dummy/db/migrate/149_create_message_templates.rb

@@ -0,0 +1,18 @@
+class CreateMessageTemplates < ActiveRecord::Migration
+  def self.up
+    create_table :message_templates do |t|
+      t.string :status, :null => false
+      t.text :title, :null => false
+      t.text :body, :null => false
+      t.integer :position
+      t.string :locale, :default => I18n.default_locale.to_s
+
+      t.timestamps
+    end
+    add_index :message_templates, :status, :unique => true
+  end
+
+  def self.down
+    drop_table :message_templates
+  end
+end

data/spec/dummy/db/migrate/154_create_messages.rb

@@ -0,0 +1,23 @@
+class CreateMessages < ActiveRecord::Migration
+  def self.up
+    create_table :messages, :force => true do |t|
+      t.datetime :read_at
+      t.integer  :receiver_id, :sender_id
+      t.string   :subject, :null => false
+      t.text     :body
+      t.integer :message_request_id
+      t.integer :parent_id
+
+      t.timestamps
+    end
+
+    add_index :messages, :sender_id
+    add_index :messages, :receiver_id
+    add_index :messages, :message_request_id
+    add_index :messages, :parent_id
+  end
+
+  def self.down
+    drop_table :messages
+  end
+end

data/spec/dummy/db/migrate/20080819181903_create_message_requests.rb

@@ -0,0 +1,18 @@
+class CreateMessageRequests < ActiveRecord::Migration
+  def self.up
+    create_table :message_requests do |t|
+      t.integer :sender_id
+      t.integer :receiver_id
+      t.integer :message_template_id
+      t.datetime :sent_at
+      t.datetime :deleted_at
+      t.text :body
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :message_requests
+  end
+end

data/spec/dummy/db/migrate/20081212080038_create_manifestation_checkout_stats.rb

@@ -4,7 +4,6 @@ class CreateManifestationCheckoutStats < ActiveRecord::Migration
       t.datetime :start_date
       t.datetime :end_date
       t.text :note
-      t.string :state
 
       t.timestamps
     end

data/spec/dummy/db/migrate/20081215094302_create_user_checkout_stats.rb

@@ -4,7 +4,6 @@ class CreateUserCheckoutStats < ActiveRecord::Migration
       t.datetime :start_date
       t.datetime :end_date
       t.text :note
-      t.string :state
 
       t.timestamps
     end

data/spec/dummy/db/migrate/20081216190724_create_manifestation_reserve_stats.rb

@@ -4,7 +4,6 @@ class CreateManifestationReserveStats < ActiveRecord::Migration
       t.datetime :start_date
       t.datetime :end_date
       t.text :note
-      t.string :state
 
       t.timestamps
     end

data/spec/dummy/db/migrate/20081220023628_create_user_reserve_stats.rb

@@ -4,7 +4,6 @@ class CreateUserReserveStats < ActiveRecord::Migration
       t.datetime :start_date
       t.datetime :end_date
       t.text :note
-      t.string :state
 
       t.timestamps
     end