enju_bookmark 0.1.2.pre20 → 0.1.2.pre21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c706947c13a96014a1a05ed98e330f2ed6513d56
-  data.tar.gz: 7b02c40716559fcbc2bcbc7f7f7e6bb2e90aa746
+  metadata.gz: e245045469bf6b6bb54d0542d61978f6a7a48732
+  data.tar.gz: bb75f0e0507d21dc4ce7f7893a72572bbdb0f543
 SHA512:
-  metadata.gz: 9d28319813f59f50f47c9c995bc689fc1ac3747e586bf0f37d8e35adaa132ca679396e0e4270ca638ee7857b6a54b8a670e8f80df77f7a3746eaee3cb01265e1
-  data.tar.gz: 1f82adc490a4a0822ca13f600d8d874506f5dbbbe03272f94dac016b06ce0e2cafcd6dcd4930a9bf7dc6e0de2d2246b57125c5500c81aedd626121468b28ba9c
+  metadata.gz: c7e658cf65d0b2dee7b376b25f6f3fd435659a1322f8f7b03e7fce6825e3b2d1cf81074bae98af9c81cbfff5328bfc2dab33c97b0f8d6807f138ab56c8f4bc02
+  data.tar.gz: c9ae05c6b1b276195386be0f053ff540be267366fabd42a88c36c770531342e496b666e05fb76a96f145d36e3184103d5ab4328476c005d4cc2b6e54f397b47d

data/README.rdoc

@@ -1,3 +1,10 @@
-= EnjuBookmark {<img src="https://secure.travis-ci.org/nabeta/enju_bookmark.png?branch=master" alt="Build Status" />}[http://travis-ci.org/nabeta/enju_bookmark]
+= EnjuBookmark
+{<img src="https://secure.travis-ci.org/next-l/enju_bookmark.png?branch=1.1" alt="Build Status" />}[http://travis-ci.org/next-l/enju_bookmark]
+{<img src="https://coveralls.io/repos/next-l/enju_bookmark/badge.png?branch=1.1" alt="Coverage Status" />}[https://coveralls.io/r/next-l/enju_bookmark?branch=1.1]
+{<img src="https://hakiri.io/github/next-l/enju_bookmark/1.1.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_bookmark/1.1]
 
 This project rocks and uses MIT-LICENSE.
+
+== 製作者・貢献者 (Authors and contributors)
+* {TANABE, Kosuke}[https://github.com/nabeta] ({@nabeta}[https://twitter.com/nabeta])
+* {Project Next-L}[http://www.next-l.jp] ({@ProjectNextL}[https://twitter.com/ProjectNextL])

data/Rakefile

@@ -23,7 +23,6 @@ end
 APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
-
 Bundler::GemHelper.install_tasks
 
 require 'rspec/core'
@@ -33,15 +32,4 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
     spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-task :default => :spec
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-
-
 task :default => :spec

data/app/controllers/bookmark_stat_has_manifestations_controller.rb

@@ -78,4 +78,11 @@ class BookmarkStatHasManifestationsController < ApplicationController
       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/controllers/bookmark_stats_controller.rb

@@ -48,7 +48,7 @@ class BookmarkStatsController < ApplicationController
   # POST /bookmark_stats
   # POST /bookmark_stats.json
   def create
-    @bookmark_stat = BookmarkStat.new(params[:bookmark_stat])
+    @bookmark_stat = BookmarkStat.new(bookmark_stat_params)
 
     respond_to do |format|
       if @bookmark_stat.save
@@ -65,7 +65,7 @@ class BookmarkStatsController < ApplicationController
   # PUT /bookmark_stats/1.json
   def update
     respond_to do |format|
-      if @bookmark_stat.update_attributes(params[:bookmark_stat])
+      if @bookmark_stat.update_attributes(bookmark_stat_params)
         format.html { redirect_to @bookmark_stat, notice: t('controller.successfully_updated', model: t('activerecord.models.bookmark_stat')) }
         format.json { head :no_content }
       else
@@ -85,4 +85,9 @@ class BookmarkStatsController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def bookmark_stat_params
+    params.require(:bookmark_stat).permit(:start_date, :end_date, :note)
+  end
 end

data/app/controllers/bookmarks_controller.rb

@@ -56,7 +56,7 @@ class BookmarksController < ApplicationController
 
   # GET /bookmarks/new
   def new
-    @bookmark = current_user.bookmarks.new(params[:bookmark])
+    @bookmark = current_user.bookmarks.new(bookmark_params)
     manifestation = @bookmark.get_manifestation
     if manifestation
       if manifestation.bookmarked?(current_user)
@@ -77,7 +77,7 @@ class BookmarksController < ApplicationController
   # POST /bookmarks
   # POST /bookmarks.json
   def create
-    @bookmark = current_user.bookmarks.new(params[:bookmark])
+    @bookmark = current_user.bookmarks.new(bookmark_params)
 
     respond_to do |format|
       if @bookmark.save
@@ -109,7 +109,7 @@ class BookmarksController < ApplicationController
     @bookmark.taggings.where(:tagger_id => @bookmark.user.id).map{|t| t.destroy}
 
     respond_to do |format|
-      if @bookmark.update_attributes(params[:bookmark])
+      if @bookmark.update_attributes(bookmark_params)
         @bookmark.tag_index!
         case params[:mode]
         when 'tag_edit'
@@ -143,4 +143,9 @@ class BookmarksController < ApplicationController
       end
     end
   end
+
+  private
+  def bookmark_params
+    params.require(:bookmark).permit(:title, :url, :note, :shared, :tag_list)
+  end
 end

data/app/controllers/tags_controller.rb

@@ -48,7 +48,7 @@ class TagsController < ApplicationController
     #@tag = Tag.find(params[:id])
 
     respond_to do |format|
-      if @tag.update_attributes(params[:tag])
+      if @tag.update_attributes(tag_params)
         format.html { redirect_to @tag, notice: t('controller.successfully_updated', model: t('activerecord.models.tag')) }
         format.json { head :no_content }
       else
@@ -69,4 +69,9 @@ class TagsController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def tag_params
+    params.require(:tag).permit(:name, :name_transcription)
+  end
 end

data/app/models/bookmark.rb

@@ -1,9 +1,8 @@
 # -*- encoding: utf-8 -*-
 class Bookmark < ActiveRecord::Base
-  attr_accessible :title, :url, :note, :shared, :tag_list
   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)
+  scope :shared, -> {where(shared: true)}
   belongs_to :manifestation, touch: true
   belongs_to :user #, counter_cache: true, validate: true
 

data/app/models/bookmark_stat.rb

@@ -1,7 +1,6 @@
 class BookmarkStat < ActiveRecord::Base
-  include Statesman::Adapters::ActiveRecordModel
+  include Statesman::Adapters::ActiveRecordQueries
   include CalculateStat
-  attr_accessible :start_date, :end_date, :note
   default_scope { order('bookmark_stats.id DESC') }
   scope :not_calculated, -> {in_state(:pending)}
   has_many :bookmark_stat_has_manifestations
@@ -39,6 +38,10 @@ class BookmarkStat < ActiveRecord::Base
   def self.transition_class
     BookmarkStatTransition
   end
+
+  def self.initial_state
+    :pending
+  end
 end
 
 # == Schema Information

data/app/models/bookmark_stat_has_manifestation.rb

@@ -1,6 +1,4 @@
 class BookmarkStatHasManifestation < ActiveRecord::Base
-  attr_accessible
-  attr_accessible :bookmark_stat_id, :manifestation_id, as: :admin
   belongs_to :bookmark_stat
   belongs_to :manifestation
 

data/app/models/bookmark_stat_transition.rb

@@ -3,7 +3,7 @@ class BookmarkStatTransition < ActiveRecord::Base
 
   
   belongs_to :bookmark_stat, inverse_of: :bookmark_stat_transitions
-  attr_accessible :to_state, :sort_key, :metadata
+  #attr_accessible :to_state, :sort_key, :metadata
 end
 
 # == Schema Information

data/app/models/tag.rb

@@ -1,5 +1,4 @@
 class Tag < ActiveRecord::Base
-  attr_accessible :name, :name_transcription
   has_many :taggings, dependent: :destroy, class_name: 'ActsAsTaggableOn::Tagging'
   validates :name, presence: true
   after_save :save_taggings

data/db/migrate/20140524135607_create_bookmark_stat_transitions.rb

@@ -2,7 +2,11 @@ class CreateBookmarkStatTransitions < ActiveRecord::Migration
   def change
     create_table :bookmark_stat_transitions do |t|
       t.string :to_state
-      t.text :metadata, default: "{}"
+      if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
+        t.text :metadata
+      else
+        t.text :metadata, default: "{}"
+      end
       t.integer :sort_key
       t.integer :bookmark_stat_id
       t.timestamps

data/lib/enju_bookmark/engine.rb

@@ -1,4 +1,3 @@
-require 'enju_seed'
 require 'acts-as-taggable-on'
 require 'statesman'
 require 'addressable/uri'

data/lib/enju_bookmark/expire_tag_cloud.rb

@@ -2,7 +2,7 @@ module ExpireTagCloud
   def expire_tag_cloud(bookmark)
     I18n.available_locales.each do |locale|
       Role.all_cache.each do |role|
-        expire_fragment(:controller => :tags, :action => :index, :page => 'user_tag_cloud', :user_id => bookmark.user.username, :locale => locale, :role => role.name, :user_id => nil)
+        expire_fragment(:controller => :tags, :action => :index, :page => 'user_tag_cloud', :user_id => bookmark.user.username, :locale => locale, :role => role.name)
         expire_fragment(:controller => :tags, :action => :index, :page => 'public_tag_cloud', :locale => locale, :role => role.name, :user_id => nil)
       end
     end

data/lib/enju_bookmark/user.rb

@@ -10,7 +10,7 @@ module EnjuBookmark
         has_many :bookmarks, :dependent => :destroy
         acts_as_tagger
 
-        attr_accessible :share_bookmarks, as: :admin
+        #attr_accessible :share_bookmarks, as: :admin
       end
     end
 

data/lib/enju_bookmark/version.rb

@@ -1,3 +1,3 @@
 module EnjuBookmark
-  VERSION = "0.1.2.pre20"
+  VERSION = "0.1.2.pre21"
 end

data/spec/controllers/bookmarks_controller_spec.rb

@@ -134,7 +134,7 @@ describe BookmarksController do
       login_fixture_admin
 
       it "assigns the requested bookmark as @bookmark" do
-        get :new
+        get :new, bookmark: { title: 'test' }
         expect(assigns(:bookmark)).not_to be_valid
         expect(response).to be_success
       end
@@ -144,7 +144,7 @@ describe BookmarksController do
       login_fixture_librarian
 
       it "assigns the requested bookmark as @bookmark" do
-        get :new
+        get :new, bookmark: { title: 'test' }
         expect(assigns(:bookmark)).not_to be_valid
         expect(response).to be_success
       end
@@ -154,7 +154,7 @@ describe BookmarksController do
       login_fixture_user
 
       it "should get my new template without url" do
-        get :new
+        get :new, bookmark: { title: 'test' }
         expect(assigns(:bookmark)).not_to be_valid
         expect(response).to be_success
       end
@@ -395,7 +395,7 @@ describe BookmarksController do
       end
 
       it "should update bookmark" do
-        put :update, :id => 3, :bookmark => { }
+        put :update, :id => 3, :bookmark => { title: 'test' }
         expect(response).to redirect_to bookmark_url(assigns(:bookmark))
       end
   

data/spec/dummy/bin/bundle

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')

data/spec/dummy/bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'

data/spec/dummy/bin/rake

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run

data/spec/dummy/bin/setup

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+
+Dir.chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file:
+
+  puts "== Installing dependencies =="
+  system "gem install bundler --conservative"
+  system "bundle check || bundle install"
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?("config/database.yml")
+  #   system "cp config/database.yml.sample config/database.yml"
+  # end
+
+  puts "\n== Preparing database =="
+  system "bin/rake db:setup"
+
+  puts "\n== Removing old logs and tempfiles =="
+  system "rm -f log/*"
+  system "rm -rf tmp/cache"
+
+  puts "\n== Restarting application server =="
+  system "touch tmp/restart.txt"
+end

data/spec/dummy/config/application.yml

@@ -1,7 +1,8 @@
 defaults: &defaults
   enju:
-    web_hostname: localhost
-    web_port_number: 3000
+    erms_url: 
+    skip_mobile_agents:
+      - ipad
 
   family_name_first: true
   max_number_of_results: 500
@@ -19,7 +20,7 @@ defaults: &defaults
 # :google, :amazon
   book_jacket:
     source: :google
-    unknown_resource:
+    unknown_resource: 
 
 # :mozshot, :simpleapi, :heartrails, :thumbalizr
   screenshot:
@@ -28,6 +29,14 @@ defaults: &defaults
   uploaded_file:
     storage: :local
 
+  manifestation:
+    facet:
+      pub_year_range_interval: 10
+
+  news_post:
+    number:
+      top_page: 3
+
 development:
   <<: *defaults
 

data/spec/dummy/config/database.yml

@@ -1,25 +1,30 @@
-# SQLite version 3.x
-#   gem install sqlite3
-#
-#   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem 'sqlite3'
-development:
+sqlite: &sqlite
   adapter: sqlite3
-  database: db/development.sqlite3
+  database: db/<%= Rails.env %>.sqlite3
+
+mysql: &mysql
+  adapter: mysql2
+  username: root
+  password:
+  database: enju_<%= Rails.env %>
+
+postgresql: &postgresql
+  adapter: postgresql
+  username: postgres
+  password:
+  database: enju_<%= Rails.env %>
+
+defaults: &defaults
   pool: 5
   timeout: 5000
+  host: localhost
+  <<: *<%= ENV['DB'] || "sqlite" %>
+
+development:
+  <<: *defaults
 
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
 test:
-  adapter: sqlite3
-  database: db/test.sqlite3
-  pool: 5
-  timeout: 5000
+  <<: *defaults
 
 production:
-  adapter: sqlite3
-  database: db/production.sqlite3
-  pool: 5
-  timeout: 5000
+  <<: *defaults

data/spec/dummy/db/migrate/041_create_roles.rb

@@ -0,0 +1,13 @@
+class CreateRoles < ActiveRecord::Migration
+  def change
+    create_table "roles" do |t|
+      t.column :name, :string, :null => false
+      t.column :display_name, :string
+      t.column :note, :text
+      t.column :created_at, :datetime
+      t.column :updated_at, :datetime
+      t.integer :score, :default => 0, :null => false
+      t.integer :position
+    end
+  end
+end

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

@@ -1,5 +1,5 @@
 class CreateLibraries < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :libraries do |t|
       t.string :name, :null => false
       t.text :display_name
@@ -25,8 +25,4 @@ 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 self.up
+  def change
     create_table :shelves do |t|
       t.string :name, :null => false
       t.text :display_name
@@ -12,8 +12,4 @@ 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,16 +1,12 @@
 class CreateUserGroups < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :user_groups do |t|
-      t.string :name, :string, :not_null => true
-      t.text :display_name, :string
+      t.string :name, :not_null => true
+      t.text :display_name
       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,25 +1,17 @@
 class CreateLibraryGroups < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :library_groups do |t|
       t.string :name, :null => false
       t.text :display_name
       t.string :short_name, :null => false
-      t.string :email
       t.text :my_networks
-      t.boolean :use_dsbl, :default => false, :null => false
-      t.text :dsbl_list
       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.integer :position
 
       t.timestamps
     end
     add_index :library_groups, :short_name
   end
-
-  def self.down
-    drop_table :library_groups
-  end
 end

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

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

data/spec/dummy/db/migrate/20100314190054_add_opening_hour_to_library.rb

@@ -0,0 +1,9 @@
+class AddOpeningHourToLibrary < ActiveRecord::Migration
+  def self.up
+    add_column :libraries, :opening_hour, :text
+  end
+
+  def self.down
+    remove_column :libraries, :opening_hour
+  end
+end

data/spec/dummy/db/migrate/{20111201163718_create_user_has_roles.rb → 20100606065209_create_user_has_roles.rb}

@@ -6,5 +6,7 @@ class CreateUserHasRoles < ActiveRecord::Migration
 
       t.timestamps
     end
+    add_index :user_has_roles, :user_id
+    add_index :user_has_roles, :role_id
   end
 end

data/spec/dummy/db/migrate/20130412083556_add_latitude_and_longitude_to_library.rb

@@ -0,0 +1,6 @@
+class AddLatitudeAndLongitudeToLibrary < ActiveRecord::Migration
+  def change
+    add_column :libraries, :latitude, :float
+    add_column :libraries, :longitude, :float
+  end
+end

data/spec/dummy/db/migrate/20140122054321_create_profiles.rb

@@ -15,6 +15,6 @@ class CreateProfiles < ActiveRecord::Migration
     end
 
     add_index :profiles, :user_id
-    add_index :profiles, :user_number
+    add_index :profiles, :user_number, :unique => true
   end
 end

data/spec/dummy/db/migrate/20140518050147_create_reserve_transitions.rb

@@ -2,7 +2,11 @@ class CreateReserveTransitions < ActiveRecord::Migration
   def change
     create_table :reserve_transitions do |t|
       t.string :to_state
-      t.text :metadata, default: "{}"
+      if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
+        t.text :metadata
+      else
+        t.text :metadata, default: "{}"
+      end
       t.integer :sort_key
       t.integer :reserve_id
       t.timestamps

data/spec/dummy/db/migrate/20140518111006_create_message_transitions.rb

@@ -2,7 +2,11 @@ class CreateMessageTransitions < ActiveRecord::Migration
   def change
     create_table :message_transitions do |t|
       t.string :to_state
-      t.text :metadata, default: "{}"
+      if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
+        t.text :metadata
+      else
+        t.text :metadata, default: "{}"
+      end
       t.integer :sort_key
       t.integer :message_id
       t.timestamps

data/spec/dummy/db/migrate/20140518135713_create_message_request_transitions.rb

@@ -2,7 +2,11 @@ class CreateMessageRequestTransitions < ActiveRecord::Migration
   def change
     create_table :message_request_transitions do |t|
       t.string :to_state
-      t.text :metadata, default: "{}"
+      if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
+        t.text :metadata
+      else
+        t.text :metadata, default: "{}"
+      end
       t.integer :sort_key
       t.integer :message_request_id
       t.timestamps

data/spec/dummy/db/migrate/20140519170214_create_resource_import_file_transitions.rb

@@ -2,7 +2,11 @@ class CreateResourceImportFileTransitions < ActiveRecord::Migration
   def change
     create_table :resource_import_file_transitions do |t|
       t.string :to_state
-      t.text :metadata, default: "{}"
+      if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
+        t.text :metadata
+      else
+        t.text :metadata, default: "{}"
+      end
       t.integer :sort_key
       t.integer :resource_import_file_id
       t.timestamps

data/spec/dummy/db/migrate/20140519171220_create_import_request_transitions.rb

@@ -2,7 +2,11 @@ class CreateImportRequestTransitions < ActiveRecord::Migration
   def change
     create_table :import_request_transitions do |t|
       t.string :to_state
-      t.text :metadata, default: "{}"
+      if ActiveRecord::Base.configurations[Rails.env]["adapter"].try(:match, /mysql/)
+        t.text :metadata
+      else
+        t.text :metadata, default: "{}"
+      end
       t.integer :sort_key
       t.integer :import_request_id
       t.timestamps