enju_circulation 0.1.0.pre44 → 0.1.0.pre45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7648a074cc898144643cbab96d3d664d760506b1
-  data.tar.gz: b2d9ab19bc015b1a6ce2044d28c26b07c0bf09e0
+  metadata.gz: 221ca150ecf674e9c773798930e314dd4f36feac
+  data.tar.gz: c7a4e4a14dfa75488958e2885572e0e2d4bc1f66
 SHA512:
-  metadata.gz: 87471784b3d21d517f770c328ec7023e1ddb96259631e39c169abb55bbbbd727c9d7f5152be2e725defab7ac543291da3461d58b1638dab789cce0573feff73c
-  data.tar.gz: e8e8113309203a392ecf14227769265f678ffe98091a18272c93ede1258029f510dd8c55a1dd6f2982a2e464f649093ae57d9a68fcd16263a853dd72ea9a622e
+  metadata.gz: 3ea15535e7b36df2154fc75ac3172521cec3fb0d10279803a248a162ccf9afec5efca684ae899bb277e6cb952427b21cd9fd9d7297e48e61d68c8942680f40bf
+  data.tar.gz: 53068cdc6785ee212ef0473bd7e4bded77f623b94050d0f5ac0f5ebf55a48b9b1e82e7f4d40f65c4f4bc0ccf72561011b8e4fcf8359d89150a1b643e89aa921b

data/app/models/user_group_has_checkout_type.rb

@@ -8,7 +8,6 @@ class UserGroupHasCheckoutType < ActiveRecord::Base
   validates_presence_of :user_group, :checkout_type
   validates_associated :user_group, :checkout_type
   validates_uniqueness_of :checkout_type_id, scope: :user_group_id
-  after_create :create_lending_policy
   after_update :update_lending_policy
 
   acts_as_list scope: :user_group_id

data/lib/enju_circulation/item.rb

@@ -50,8 +50,7 @@ module EnjuCirculation
         end
         accepts_nested_attributes_for :item_has_use_restriction
 
-        after_create :create_lending_policy
-        before_update :update_lending_policy
+        before_update :delete_lending_policy
       end
     end
 
@@ -124,31 +123,33 @@ module EnjuCirculation
       end
 
       def lending_rule(user)
-        lending_policies.where(user_group_id: user.profile.user_group.id).first
+        policy = lending_policies.where(user_group_id: user.profile.user_group.id).first
+        if policy
+          policy
+        else
+          create_lending_policy(user)
+        end
       end
 
       def not_for_loan?
         !manifestation.items.for_checkout.include?(self)
       end
 
-      def create_lending_policy
-        UserGroupHasCheckoutType.available_for_item(self).each do |rule|
-          LendingPolicy.create!(
-            item_id: id,
-            user_group_id: rule.user_group_id,
-            fixed_due_date: rule.fixed_due_date,
-            loan_period: rule.checkout_period,
-            renewal: rule.checkout_renewal_limit
-          )
-        end
+      def create_lending_policy(user)
+        rule = user.profile.user_group.user_group_has_checkout_types.where(checkout_type_id: checkout_type_id).first
+        return nil unless rule
+        LendingPolicy.create!(
+          item_id: id,
+          user_group_id: rule.user_group_id,
+          fixed_due_date: rule.fixed_due_date,
+          loan_period: rule.checkout_period,
+          renewal: rule.checkout_renewal_limit
+        )
       end
 
-      def update_lending_policy
+      def delete_lending_policy
         return nil unless changes[:checkout_type_id]
-        self.transaction do
-          lending_policies.delete_all
-          create_lending_policy
-        end
+        lending_policies.delete_all
       end
 
       def next_reservation

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.1.0.pre44"
+  VERSION = "0.1.0.pre45"
 end

data/spec/fixtures/library_groups.yml

@@ -7,6 +7,11 @@ one:
   note: 
   my_networks: 0.0.0.0/0
   url: "http://localhost:3000/"
+  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 %>
 
 
 # == Schema Information

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre44
+  version: 0.1.0.pre45
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-09 00:00:00.000000000 Z
+date: 2015-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_biblio
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre65
+        version: 0.1.0.pre66
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre65
+        version: 0.1.0.pre66
 - !ruby/object:Gem::Dependency
   name: enju_library
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre40
+        version: 0.1.0.pre41
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre40
+        version: 0.1.0.pre41
 - !ruby/object:Gem::Dependency
   name: enju_message
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc17
+        version: 1.1.0.rc18
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc17
+        version: 1.1.0.rc18
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement