enju_library 0.1.0.pre11 → 0.1.0.pre12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a14805fe9f166bc06831076d834b814084db7cb
-  data.tar.gz: 397e3beb9db4446d1edb6ee0f3fdbf2ca1884cf5
+  metadata.gz: 6a3ef9da22975202b557d2becaaf3147de2d76d9
+  data.tar.gz: ee7bb96dc1bf7c80cafdc9d4ef7b8041c3b551f9
 SHA512:
-  metadata.gz: b4e089e4db9c8df37e920cb667d9e465eef31ba1980c4ae03bc966d3e74cc60ea220b11763ef32ade4b3ae1a3358db99884890438c116e1e91e39d26d2665fac
-  data.tar.gz: c4f9095346acce0566622ae31104e61ad9dded0abbc8bafec948aae0549543967a64b6d557e8cd4458e922c39df585d6f66c4f5ace11b77b1987b334af2f1134
+  metadata.gz: 7e9357bf1c2be74b050661ec02725aff65f8573d85eedc69bb24c1b66a536930ab22d36ce5f9aecf67010a355d12a80c232611f3cfa9bd525c02742e7d18f0e5
+  data.tar.gz: 69f69e69b573b95f119011a35f57ddf720ee758826d695616f72e8e45ead8bd4948fcb50dd68f260f04e8fb1bc988f43e8a49999cc9a6a2ed6402542259d7773

data/app/models/enju_library/ability.rb

@@ -0,0 +1,68 @@
+module EnjuLibrary
+  class Ability
+    include CanCan::Ability
+  
+    def initialize(user, ip_address = nil)
+      case user.try(:role).try(:name)
+      when 'Administrator'
+        can [:read, :create, :update], Bookstore
+        can :destroy, Bookstore do |bookstore|
+          bookstore.items.empty?
+        end
+        can [:read, :create, :update], Library
+        can :destroy, Library do |library|
+          library.shelves.empty? and !library.web?
+        end
+        can [:read, :create, :update], Shelf
+        can :destroy, Shelf do |shelf|
+          shelf.items.empty?
+        end
+        can :manage, [
+          Accept,
+          BudgetType,
+          SearchEngine,
+          Subscribe,
+          Subscription
+        ]
+        can :update, [
+          LibraryGroup,
+          RequestStatusType,
+          RequestType
+        ] if LibraryGroup.site_config.network_access_allowed?(ip_address)
+        can :read, [
+          LibraryGroup,
+          RequestStatusType,
+          RequestType
+        ]
+      when 'Librarian'
+        can :manage, [
+          Accept,
+          Subscribe,
+          Subscription
+        ]
+        can :read, [
+          Bookstore,
+          BudgetType,
+          Library,
+          LibraryGroup,
+          RequestStatusType,
+          RequestType,
+          SearchEngine,
+          Shelf
+        ]
+      when 'User'
+        can :read, [
+          Library,
+          LibraryGroup,
+          Shelf
+        ]
+      else
+        can :read, [
+          Library,
+          LibraryGroup,
+          Shelf
+        ]
+      end
+    end
+  end
+end

data/app/views/library_groups/_form.html.erb

@@ -1,5 +1,5 @@
 <%= simple_form_for(@library_group, :validate => true) do |f| -%>
-  <%= f.error_notification -%>
+  <%= f.error_messages -%>
 
   <div class="field">
     <%= f.label :name -%><br />

data/app/views/library_groups/show.html.erb

@@ -18,6 +18,11 @@
   <%= @library_group.email -%>
 </p>
 
+<p>
+  <strong><%= t('activerecord.attributes.library_group.url') -%>:</strong>
+  <%= @library_group.url -%>
+</p>
+
 <div>
   <strong><%= t('activerecord.attributes.library_group.login_banner') -%>:</strong>
   <%= markdown_helper(@library_group.login_banner) -%>

data/config/locales/{en.yml → translation_en.yml}

@@ -51,6 +51,7 @@ en:
         note: Note
         login_banner: Login banner
         post_to_union_catalog: Post to union catalog
+        url: URL
       bookstore:
         name: Name
         zip_code: Zip code

data/config/locales/{ja.yml → translation_ja.yml}

@@ -51,6 +51,7 @@ ja:
         note: 注記
         login_banner: ログイン画面でのメッセージ
         post_to_union_catalog: 総合目録に登録する
+        url: URL
       bookstore:
         name: 名前
         zip_code: 郵便番号

data/lib/enju_library/item.rb

@@ -0,0 +1,39 @@
+module EnjuLibrary
+  module LibraryItem
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
+    module ClassMethods
+      def enju_library_item_model
+        include InstanceMethods
+        has_one :accept
+        scope :accepted_between, lambda{|from, to| includes(:accept).where('items.created_at BETWEEN ? AND ?', Time.zone.parse(from).beginning_of_day, Time.zone.parse(to).end_of_day)}
+
+        belongs_to :shelf, :counter_cache => true, :validate => true
+        validates_associated :shelf
+
+        searchable do
+          string :library do
+            shelf.library.name if shelf
+          end
+        end
+      end
+    end
+
+    module InstanceMethods
+      def shelf_name
+        shelf.name
+      end
+
+      def hold?(library)
+        return true if self.shelf.library == library
+        false
+      end
+
+      def library_url
+        "#{LibraryGroup.site_config.url}libraries/#{self.shelf.library.name}"
+      end
+    end
+  end
+end

data/lib/enju_library/version.rb

@@ -1,3 +1,3 @@
 module EnjuLibrary
-  VERSION = "0.1.0.pre11"
+  VERSION = "0.1.0.pre12"
 end

data/lib/enju_library.rb

@@ -1,4 +1,5 @@
 require "enju_library/engine"
+require "enju_library/item"
 
 module EnjuLibrary
   def self.included(base)
@@ -44,4 +45,5 @@ module EnjuLibrary
   end
 end
 
+ActiveRecord::Base.send :include, EnjuLibrary::LibraryItem
 ActionController::Base.send(:include, EnjuLibrary)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_library
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre11
+  version: 0.1.0.pre12
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-06 00:00:00.000000000 Z
+date: 2013-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre21
+        version: 0.1.0.pre22
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre21
+        version: 0.1.0.pre22
 - !ruby/object:Gem::Dependency
   name: enju_event
   requirement: !ruby/object:Gem::Requirement
@@ -212,14 +212,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre12
+        version: 0.1.0.pre13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre12
+        version: 0.1.0.pre13
 - !ruby/object:Gem::Dependency
   name: enju_inter_library_loan
   requirement: !ruby/object:Gem::Requirement
@@ -313,6 +313,7 @@ files:
 - app/models/basket.rb
 - app/models/bookstore.rb
 - app/models/budget_type.rb
+- app/models/enju_library/ability.rb
 - app/models/library.rb
 - app/models/library_group.rb
 - app/models/library_group_sweeper.rb
@@ -385,8 +386,8 @@ files:
 - app/views/subscriptions/index.html.erb
 - app/views/subscriptions/new.html.erb
 - app/views/subscriptions/show.html.erb
-- config/locales/en.yml
-- config/locales/ja.yml
+- config/locales/translation_en.yml
+- config/locales/translation_ja.yml
 - config/routes.rb
 - db/migrate/059_create_libraries.rb
 - db/migrate/069_create_shelves.rb
@@ -406,6 +407,7 @@ files:
 - db/migrate/20120319173203_create_accepts.rb
 - db/migrate/20120510140958_add_closed_to_shelf.rb
 - lib/enju_library/engine.rb
+- lib/enju_library/item.rb
 - lib/enju_library/version.rb
 - lib/enju_library.rb
 - lib/generators/enju_library/views_generator.rb
@@ -538,16 +540,16 @@ files:
 - spec/dummy/solr/conf/spellings.txt
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
-- spec/dummy/solr/data/test/index/_1n.fdt
-- spec/dummy/solr/data/test/index/_1n.fdx
-- spec/dummy/solr/data/test/index/_1n.fnm
-- spec/dummy/solr/data/test/index/_1n.frq
-- spec/dummy/solr/data/test/index/_1n.nrm
-- spec/dummy/solr/data/test/index/_1n.prx
-- spec/dummy/solr/data/test/index/_1n.tii
-- spec/dummy/solr/data/test/index/_1n.tis
+- spec/dummy/solr/data/test/index/_3b.fdt
+- spec/dummy/solr/data/test/index/_3b.fdx
+- spec/dummy/solr/data/test/index/_3b.fnm
+- spec/dummy/solr/data/test/index/_3b.frq
+- spec/dummy/solr/data/test/index/_3b.nrm
+- spec/dummy/solr/data/test/index/_3b.prx
+- spec/dummy/solr/data/test/index/_3b.tii
+- spec/dummy/solr/data/test/index/_3b.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_3x
+- spec/dummy/solr/data/test/index/segments_7t
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/dummy/tmp/cache/4AD/470/country_all
@@ -767,16 +769,16 @@ test_files:
 - spec/dummy/solr/conf/spellings.txt
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
-- spec/dummy/solr/data/test/index/_1n.fdt
-- spec/dummy/solr/data/test/index/_1n.fdx
-- spec/dummy/solr/data/test/index/_1n.fnm
-- spec/dummy/solr/data/test/index/_1n.frq
-- spec/dummy/solr/data/test/index/_1n.nrm
-- spec/dummy/solr/data/test/index/_1n.prx
-- spec/dummy/solr/data/test/index/_1n.tii
-- spec/dummy/solr/data/test/index/_1n.tis
+- spec/dummy/solr/data/test/index/_3b.fdt
+- spec/dummy/solr/data/test/index/_3b.fdx
+- spec/dummy/solr/data/test/index/_3b.fnm
+- spec/dummy/solr/data/test/index/_3b.frq
+- spec/dummy/solr/data/test/index/_3b.nrm
+- spec/dummy/solr/data/test/index/_3b.prx
+- spec/dummy/solr/data/test/index/_3b.tii
+- spec/dummy/solr/data/test/index/_3b.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_3x
+- spec/dummy/solr/data/test/index/segments_7t
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/dummy/tmp/cache/4AD/470/country_all