enju_library 0.1.2 → 0.2.0.beta.1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_library
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0.beta.1
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2016-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: geocoder
@@ -25,21 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cancancan
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.14'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.14'
-- !ruby/object:Gem::Dependency
-  name: mime-types
+  name: cocoon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,27 +39,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: paperclip-meta
+  name: globalize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 5.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 5.0.1
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: globalize-accessors
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -81,21 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.20
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.20
-- !ruby/object:Gem::Dependency
-  name: pg
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,21 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: paperclip
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,89 +109,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: enju_leaf
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.3
-- !ruby/object:Gem::Dependency
-  name: enju_ndl
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: enju_manifestation_viewer
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: enju_event
+  name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.19
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.19
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: enju_circulation
+  name: paperclip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '4.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '4.3'
 - !ruby/object:Gem::Dependency
-  name: enju_inter_library_loan
+  name: enju_leaf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 1.2.0.beta.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 1.2.0.beta.1
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
   requirement: !ruby/object:Gem::Requirement
@@ -319,7 +249,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -346,6 +276,7 @@ files:
 - app/controllers/baskets_controller.rb
 - app/controllers/bookstores_controller.rb
 - app/controllers/budget_types_controller.rb
+- app/controllers/concerns/enju_library/controller.rb
 - app/controllers/libraries_controller.rb
 - app/controllers/library_groups_controller.rb
 - app/controllers/request_status_types_controller.rb
@@ -361,7 +292,7 @@ files:
 - app/models/bookstore.rb
 - app/models/budget_type.rb
 - app/models/color.rb
-- app/models/enju_library/ability.rb
+- app/models/concerns/enju_library/enju_item.rb
 - app/models/library.rb
 - app/models/library_group.rb
 - app/models/request_status_type.rb
@@ -371,6 +302,19 @@ files:
 - app/models/subscribe.rb
 - app/models/subscription.rb
 - app/models/withdraw.rb
+- app/policies/accept_policy.rb
+- app/policies/basket_policy.rb
+- app/policies/bookstore_policy.rb
+- app/policies/budget_type_policy.rb
+- app/policies/library_group_policy.rb
+- app/policies/library_policy.rb
+- app/policies/request_status_type_policy.rb
+- app/policies/request_type_policy.rb
+- app/policies/search_engine_policy.rb
+- app/policies/shelf_policy.rb
+- app/policies/subscribe_policy.rb
+- app/policies/subscription_policy.rb
+- app/policies/withdraw_policy.rb
 - app/views/accepts/_form.html.erb
 - app/views/accepts/_list.html.erb
 - app/views/accepts/edit.html.erb
@@ -395,14 +339,15 @@ files:
 - app/views/budget_types/show.html.erb
 - app/views/libraries/_calendar.html.erb
 - app/views/libraries/_form.html.erb
+- app/views/libraries/_map.html+phone.erb
 - app/views/libraries/_map.html.erb
-- app/views/libraries/_map.mobile.erb
 - app/views/libraries/edit.html.erb
 - app/views/libraries/index.html.erb
 - app/views/libraries/new.html.erb
+- app/views/libraries/show.html+phone.erb
 - app/views/libraries/show.html.erb
 - app/views/libraries/show.js.erb
-- app/views/libraries/show.mobile.erb
+- app/views/library_groups/_color_fields.html.erb
 - app/views/library_groups/_form.html.erb
 - app/views/library_groups/edit.html.erb
 - app/views/library_groups/index.html.erb
@@ -430,8 +375,8 @@ files:
 - app/views/shelves/edit.html.erb
 - app/views/shelves/index.html.erb
 - app/views/shelves/new.html.erb
+- app/views/shelves/show.html+phone.erb
 - app/views/shelves/show.html.erb
-- app/views/shelves/show.mobile.erb
 - app/views/subscribes/edit.html.erb
 - app/views/subscribes/index.html.erb
 - app/views/subscribes/new.html.erb
@@ -472,15 +417,17 @@ files:
 - db/migrate/20140821151023_create_colors.rb
 - db/migrate/20150221063719_add_settings_to_library_group.rb
 - db/migrate/20150924115059_create_withdraws.rb
+- db/migrate/20151213070943_add_translation_table_to_library_group.rb
+- db/migrate/20151213072705_add_footer_banner_to_library_group.rb
 - lib/enju_library.rb
 - lib/enju_library/engine.rb
-- lib/enju_library/item.rb
 - lib/enju_library/version.rb
 - lib/generators/enju_library/setup/USAGE
 - lib/generators/enju_library/setup/setup_generator.rb
 - lib/generators/enju_library/setup/templates/db/fixtures/bookstores.yml
 - lib/generators/enju_library/setup/templates/db/fixtures/colors.yml
 - lib/generators/enju_library/setup/templates/db/fixtures/libraries.yml
+- lib/generators/enju_library/setup/templates/db/fixtures/library_group/translations.yml
 - lib/generators/enju_library/setup/templates/db/fixtures/library_groups.yml
 - lib/generators/enju_library/setup/templates/db/fixtures/request_status_types.yml
 - lib/generators/enju_library/setup/templates/db/fixtures/request_types.yml
@@ -506,7 +453,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
@@ -524,6 +470,7 @@ files:
 - spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/devise.rb
+- spec/dummy/config/initializers/enju_leaf.rb
 - spec/dummy/config/initializers/friendly_id.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
@@ -829,9 +776,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1
@@ -856,7 +803,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
@@ -873,6 +819,7 @@ test_files:
 - spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/devise.rb
+- spec/dummy/config/initializers/enju_leaf.rb
 - spec/dummy/config/initializers/friendly_id.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb

data/app/models/enju_library/ability.rb

@@ -1,72 +0,0 @@
-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 [:delete, :destroy], Bookstore do |bookstore|
-          bookstore.items.empty?
-        end
-        can [:read, :create, :update], Library
-        can [:delete, :destroy], Library do |library|
-          if library.profiles.empty?
-            true if library.shelves.empty? && !library.web?
-          end
-        end
-        can [:read, :create, :update], Shelf
-        can [:delete, :destroy], Shelf do |shelf|
-          shelf.items.empty? && !shelf.web_shelf?
-        end
-        can :manage, [
-          Accept,
-          BudgetType,
-          SearchEngine,
-          Subscribe,
-          Subscription,
-          Withdraw
-        ]
-        can :update, [
-          LibraryGroup,
-          RequestStatusType,
-          RequestType
-        ] if LibraryGroup.site_config.network_access_allowed?(ip_address, network_type: :admin)
-        can :read, [
-          LibraryGroup,
-          RequestStatusType,
-          RequestType
-        ]
-      when 'Librarian'
-        can :manage, [
-          Accept,
-          Subscribe,
-          Subscription,
-          Withdraw
-        ]
-        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/lib/enju_library/item.rb

@@ -1,39 +0,0 @@
-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 shelf.library == library
-        false
-      end
-
-      def library_url
-        "#{LibraryGroup.site_config.url}libraries/#{shelf.library.name}"
-      end
-    end
-  end
-end

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

@@ -1,68 +0,0 @@
-#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 [:delete, :destroy], Bookstore do |bookstore|
-          bookstore.items.empty?
-        end
-        can [:read, :create, :update], Library
-        can [:delete, :destroy], Library do |library|
-          library.shelves.empty? and !library.web?
-        end
-        can [:read, :create, :update], Shelf
-        can [:delete, :destroy], Shelf do |shelf|
-          shelf.items.empty? and !shelf.web_shelf?
-        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