qor_cache 0.0.3 → 0.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: bc807528ff2bb7368865ff5d2e557386b911a0cc
+  data.tar.gz: 1ff4e8f15c89802543ce6f95e9c183aff6584dc5
+SHA512:
+  metadata.gz: d6d3e4c7d23cacab412bdf9873a28b0188df71af5f4271632f43d303b9ddf9de0d8afc483a442f4a11214e91c343e88502b81118c805fef3269bc14c762d138f
+  data.tar.gz: dcac4d1f1baa594d8cdea17d2ea5c7f6ad0dbdd7a2e73c70f8f93a77dfed204999ca5cc4f67325b70175898c8e6e950d70473049487e5406054f64304e26b85d

data/Gemfile

@@ -2,7 +2,5 @@ source 'https://rubygems.org'
 
 gem 'qor_dsl'
 gem 'factory_girl_rails'
-gem 'pry'
-gem "timecop"
 
 gemspec

data/README.md

@@ -29,11 +29,6 @@ Qor Cache
       cache_field :product_code, :from => [:product, :code]
     end
 
-    cache_includes "filename", :no_cache => true, :expires_in => 5.minutes do |app|
-      ...
-    end
-    cache_includes "filename", "cache_key..."
-
 
     # app/models/color_variation.rb
     def heavy_method_related_to_products
@@ -61,15 +56,6 @@ Qor Cache
       xxxxx
     end
 
-    qor_cache_includes "filename"
-
-## TODO
-
-    Support render :file, :url for render_qor_cache_includes
-      :partial => "filename"
-      :filename => "filename"
-      :url => "http://xxx" -> SSI ? Rewrite ?
-
 ## Contributing
 
 1. Fork it

data/config/qor/cache.rb

@@ -29,10 +29,3 @@ scope :color_variation do
 
   cache_field :product_code, :from => [:product, :code]
 end
-
-cache_includes "nocache_time", :no_cache => true
-cache_includes "expires_in_time", :expires_in => 2.days
-cache_includes "products_time", "product", "color_variation"
-cache_includes "helper_time" do
-  current_user
-end

data/lib/qor_cache.rb

@@ -1,6 +1,6 @@
 require "qor_cache/configuration"
 require "qor_cache/active_record"
-require "qor_cache/engine"
+require "qor_cache/railtie"
 require "qor_cache/kernel"
 require "digest/md5"
 

data/lib/qor_cache/configuration.rb

@@ -7,9 +7,7 @@ module Qor
 
       default_configs ["config/qor/cache.rb"]
 
-      node :cache_includes
       node :cache_key
-
       node :scope do
         node :cache_class_method
         node :cache_method

data/lib/qor_cache/kernel.rb

@@ -1,13 +1,12 @@
 require "digest/md5"
-require 'uri'
 
 module Kernel
   def qor_cache_key(*names, &blk)
     objs = names.map { |name| Qor::Cache::Configuration.first(:cache_key, name).block.call }
-    objs << instance_eval(&blk) if block_given?
+    objs << blk.call if block_given?
 
-    results = objs.flatten.map do |obj|
-      obj.respond_to?(:cache_key) ? obj.cache_key : obj.inspect
+    results = objs.map do |obj|
+      Array(obj).map {|x| x.respond_to?(:cache_key) ? x.cache_key : x.inspect }.join("-")
     end
 
     Digest::MD5.hexdigest(results.join("-"))

data/lib/qor_cache/{engine.rb → railtie.rb}

@@ -1,6 +1,6 @@
 module Qor
   module Cache
-    class Railtie < Rails::Engine
+    class Railtie < Rails::Railtie
 
       initializer "insert_active_record_methods_for_qor_cache" do
         ActiveSupport.on_load(:active_record) do

data/lib/qor_cache/version.rb

@@ -1,5 +1,5 @@
 module Qor
   module Cache
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/qor_cache.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "qor_test"
   gem.add_dependency "qor_dsl"
   gem.add_dependency "rails"
   gem.add_development_dependency "sqlite3"
+  gem.add_development_dependency "qor_test"
 end

data/test/dummy/app/controllers/application_controller.rb

@@ -1,27 +1,3 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
-
-  def index
-    render :index
-  end
-
-  def nocache
-    render :nocache
-  end
-
-  def expires_in
-    render :expires_in
-  end
-
-  def products
-    render :products
-  end
-
-  def helpers
-    render :helpers
-  end
-
-  def with_block
-    render :with_block
-  end
 end

data/test/dummy/app/helpers/application_helper.rb

@@ -1,5 +1,2 @@
 module ApplicationHelper
-  def current_user
-    request.env["CURRENT_USER_ID"]
-  end
 end

data/test/dummy/app/views/layouts/application.html.erb

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Dummy</title>
+  <%= stylesheet_link_tag    "application", :media => "all" %>
+  <%= javascript_include_tag "application" %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>

data/test/dummy/config/application.rb

@@ -47,13 +47,13 @@ module Dummy
     # This will create an empty whitelist of attributes available for mass-assignment for all models
     # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
     # parameters by using an attr_accessible or attr_protected declaration.
-    # config.active_record.whitelist_attributes = true
+    config.active_record.whitelist_attributes = true
 
     # Enable the asset pipeline
-    # config.assets.enabled = true
+    config.assets.enabled = true
 
     # Version of your assets, change this if you want to expire all your assets
-    # config.assets.version = '1.0'
+    config.assets.version = '1.0'
   end
 end
 

data/test/dummy/config/initializers/wrap_parameters.rb

@@ -4,11 +4,11 @@
 # is enabled by default.
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
-# ActiveSupport.on_load(:action_controller) do
-#   wrap_parameters :format => [:json]
-# end
+ActiveSupport.on_load(:action_controller) do
+  wrap_parameters :format => [:json]
+end
 
 # Disable root element in JSON by default.
-# ActiveSupport.on_load(:active_record) do
-#   self.include_root_in_json = false
-# end
+ActiveSupport.on_load(:active_record) do
+  self.include_root_in_json = false
+end

data/test/dummy/config/qor/cache.rb

@@ -1,33 +1,11 @@
-cache_key :product do
-  Product
-end
-
-cache_key :color_variation do
-  [ColorVariation]
-end
-
-cache_key :product_and_color_variation do
-  [Product, ColorVariation]
-end
-
 scope :product do
   cache_method :slow_method
-  cache_method :slow_method_with_args
+  cache_method :slow_method1
 
   cache_class_method :slow_class_method
-  cache_class_method :slow_class_method_with_args
+  cache_class_method :slow_class_method1
 end
 
-scope :color_variation do
-  cache_method :slow_method, 'product'
-
-  cache_method :slow_method_with_product do |s|
-    s.product
-  end
-
-  cache_class_method :slow_class_method, 'product'
-
+scope :product do
   cache_field :product_code, :from => [:product, :code]
 end
-
-cache_includes "nocache_time", :no_cache => true

data/test/dummy/config/routes.rb

@@ -1,8 +1,58 @@
 Dummy::Application.routes.draw do
-  match "/" => "application#index"
-  match "/nocache" => "application#nocache"
-  match "/expires_in" => "application#expires_in"
-  match "/products" => "application#products"
-  match "/helpers" => "application#helpers"
-  match "/with_block" => "application#with_block"
+  # The priority is based upon order of creation:
+  # first created -> highest priority.
+
+  # Sample of regular route:
+  #   match 'products/:id' => 'catalog#view'
+  # Keep in mind you can assign values other than :controller and :action
+
+  # Sample of named route:
+  #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
+  # This route can be invoked with purchase_url(:id => product.id)
+
+  # Sample resource route (maps HTTP verbs to controller actions automatically):
+  #   resources :products
+
+  # Sample resource route with options:
+  #   resources :products do
+  #     member do
+  #       get 'short'
+  #       post 'toggle'
+  #     end
+  #
+  #     collection do
+  #       get 'sold'
+  #     end
+  #   end
+
+  # Sample resource route with sub-resources:
+  #   resources :products do
+  #     resources :comments, :sales
+  #     resource :seller
+  #   end
+
+  # Sample resource route with more complex sub-resources
+  #   resources :products do
+  #     resources :comments
+  #     resources :sales do
+  #       get 'recent', :on => :collection
+  #     end
+  #   end
+
+  # Sample resource route within a namespace:
+  #   namespace :admin do
+  #     # Directs /admin/products/* to Admin::ProductsController
+  #     # (app/controllers/admin/products_controller.rb)
+  #     resources :products
+  #   end
+
+  # You can have the root of your site routed with "root"
+  # just remember to delete public/index.html.
+  # root :to => 'welcome#index'
+
+  # See how all your routes lay out with "rake routes"
+
+  # This is a legacy wild controller route that's not recommended for RESTful applications.
+  # Note: This route will make all actions in every controller accessible via GET requests.
+  # match ':controller(/:action(/:id))(.:format)'
 end

metadata

@@ -1,78 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: qor_cache
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.0.4
 platform: ruby
 authors:
 - Jinzhu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-04 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: qor_test
+  name: qor_dsl
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: qor_dsl
+  name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: qor_test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Qor Cache
@@ -82,21 +73,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- app/controllers/qor/cache_controller.rb
-- app/helpers/qor/cache_helper.rb
 - config/qor/cache.rb
 - config/qor/test.rb
-- config/routes.rb
 - lib/qor_cache.rb
 - lib/qor_cache/active_record.rb
 - lib/qor_cache/configuration.rb
-- lib/qor_cache/engine.rb
 - lib/qor_cache/kernel.rb
+- lib/qor_cache/railtie.rb
 - lib/qor_cache/version.rb
 - qor_cache.gemspec
 - test/dummy/.gitignore
@@ -110,17 +98,7 @@ files:
 - test/dummy/app/models/.gitkeep
 - test/dummy/app/models/color_variation.rb
 - test/dummy/app/models/product.rb
-- test/dummy/app/views/application/expires_in.html.erb
-- test/dummy/app/views/application/helpers.html.erb
-- test/dummy/app/views/application/index.html.erb
-- test/dummy/app/views/application/nocache.html.erb
-- test/dummy/app/views/application/products.html.erb
-- test/dummy/app/views/application/with_block.html.erb
-- test/dummy/app/views/qor_cache_includes/expires_in_time.html.erb
-- test/dummy/app/views/qor_cache_includes/helper_time.html.erb
-- test/dummy/app/views/qor_cache_includes/nocache_time.html.erb
-- test/dummy/app/views/qor_cache_includes/products_time.html.erb
-- test/dummy/app/views/qor_cache_includes/time.html.erb
+- test/dummy/app/views/layouts/application.html.erb
 - test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
@@ -151,36 +129,33 @@ files:
 - test/dummy/test/fixtures/products.yml
 - test/dummy/test/unit/color_variation_test.rb
 - test/dummy/test/unit/product_test.rb
-- test/dummy/tmp/cache/.gitkeep
 - test/factories.rb
-- test/integration_test.rb
 - test/qor_cache_fields_test.rb
 - test/qor_cache_key_test.rb
 - test/qor_cache_methods_test.rb
 - test/test_helper.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Qor Cache
 test_files:
 - test/dummy/.gitignore
@@ -194,17 +169,7 @@ test_files:
 - test/dummy/app/models/.gitkeep
 - test/dummy/app/models/color_variation.rb
 - test/dummy/app/models/product.rb
-- test/dummy/app/views/application/expires_in.html.erb
-- test/dummy/app/views/application/helpers.html.erb
-- test/dummy/app/views/application/index.html.erb
-- test/dummy/app/views/application/nocache.html.erb
-- test/dummy/app/views/application/products.html.erb
-- test/dummy/app/views/application/with_block.html.erb
-- test/dummy/app/views/qor_cache_includes/expires_in_time.html.erb
-- test/dummy/app/views/qor_cache_includes/helper_time.html.erb
-- test/dummy/app/views/qor_cache_includes/nocache_time.html.erb
-- test/dummy/app/views/qor_cache_includes/products_time.html.erb
-- test/dummy/app/views/qor_cache_includes/time.html.erb
+- test/dummy/app/views/layouts/application.html.erb
 - test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
@@ -235,11 +200,8 @@ test_files:
 - test/dummy/test/fixtures/products.yml
 - test/dummy/test/unit/color_variation_test.rb
 - test/dummy/test/unit/product_test.rb
-- test/dummy/tmp/cache/.gitkeep
 - test/factories.rb
-- test/integration_test.rb
 - test/qor_cache_fields_test.rb
 - test/qor_cache_key_test.rb
 - test/qor_cache_methods_test.rb
 - test/test_helper.rb
-has_rdoc: 

data/app/controllers/qor/cache_controller.rb

@@ -1,9 +0,0 @@
-module Qor
-  class CacheController < ActionController::Base
-    include Qor::CacheHelper
-
-    def includes
-      render :text => render_qor_cache_includes(params[:path], request.fullpath)
-    end
-  end
-end

data/app/helpers/qor/cache_helper.rb

@@ -1,34 +0,0 @@
-module Qor
-  module CacheHelper
-    def qor_cache_includes(filename, &blk)
-      env = respond_to?(:request) && request.respond_to?(:env) ? request.env : {}
-      path = URI.parse(filename).path rescue filename
-      node = Qor::Cache::Configuration.deep_find(:cache_includes, path)[0]
-
-      cache_key = node.nil? ? "" : qor_cache_key(*node.data.select {|x| x.is_a? String }, &node.block)
-      cache_key += qor_cache_key(&blk) if block_given?
-      key = "/qor_cache_includes/#{filename}?#{cache_key}"
-
-      if env['QOR_CACHE_SSI_ENABLED']
-        %Q[<!--# include virtual="#{key}" -->]
-      elsif env['QOR_CACHE_ESI_ENABLED']
-        %Q[<esi:include src="#{key}"/>]
-      else
-        render_qor_cache_includes(path, key)
-      end.html_safe
-    end
-
-    def render_qor_cache_includes(path, cache_key)
-      options = Qor::Cache::Configuration.first(:cache_includes, path).try(:options) || {}
-
-      format = params["format"] || "html" rescue "html"
-      file = Dir[File.join(Rails.root, "app/views/qor_cache_includes", "#{path}.#{format}*")][0]
-
-      if options.delete(:no_cache) == true
-        Erubis::Eruby.new(File.read(file)).result(binding)
-      else
-        Rails.cache.fetch(cache_key, options) { Erubis::Eruby.new(File.read(file)).result(binding) }
-      end
-    end
-  end
-end

data/config/routes.rb

@@ -1,3 +0,0 @@
-Rails.application.routes.draw do
-  match "/qor_cache_includes/*path" => "Qor::Cache#includes"
-end

data/test/dummy/app/views/application/expires_in.html.erb

@@ -1,3 +0,0 @@
-Hello World!
-
-<%= qor_cache_includes "expires_in_time" %>

data/test/dummy/app/views/application/helpers.html.erb

@@ -1,3 +0,0 @@
-Hello World!
-
-<%= qor_cache_includes "helper_time" %>

data/test/dummy/app/views/application/index.html.erb

@@ -1,3 +0,0 @@
-Hello World!
-
-<%= qor_cache_includes "time" %>

data/test/dummy/app/views/application/nocache.html.erb

@@ -1,3 +0,0 @@
-Hello World!
-
-<%= qor_cache_includes "nocache_time" %>

data/test/dummy/app/views/application/products.html.erb

@@ -1,3 +0,0 @@
-Hello World!
-
-<%= qor_cache_includes "products_time" %>

data/test/dummy/app/views/application/with_block.html.erb

@@ -1,9 +0,0 @@
-Hello World!
-
-<%=
-  @current_user = current_user
-  qor_cache_includes "time" do
-    @current_user
-  end
-%>
-

data/test/dummy/app/views/qor_cache_includes/expires_in_time.html.erb

@@ -1,2 +0,0 @@
-<%= Time.now.strftime("%Y-%m-%d") %>
-

data/test/dummy/app/views/qor_cache_includes/helper_time.html.erb

@@ -1 +0,0 @@
-<%= Time.now.strftime("%Y-%m-%d") %>

data/test/dummy/app/views/qor_cache_includes/nocache_time.html.erb

@@ -1 +0,0 @@
-<%= Time.now.strftime("%Y-%m-%d") %>

data/test/dummy/app/views/qor_cache_includes/products_time.html.erb

@@ -1 +0,0 @@
-<%= Time.now.strftime("%Y-%m-%d") %>

data/test/dummy/app/views/qor_cache_includes/time.html.erb

@@ -1 +0,0 @@
-<%= Time.now.strftime("%Y-%m-%d") %>

data/test/integration_test.rb

@@ -1,135 +0,0 @@
-require File.expand_path("../test_helper",  __FILE__)
-
-class IntegrationTest < ActionDispatch::IntegrationTest
-  def setup
-    Rails.cache.clear
-    Timecop.freeze("2012-10-10")
-  end
-
-  test "Normal mode" do
-    get "/"
-    assert_response 200
-    assert response.body.include?('2012-10-10')
-
-    Timecop.freeze("2012-10-11")
-    get "/"
-    assert_response 200
-    assert response.body.include?('2012-10-10')
-  end
-
-  test "SSI mode" do
-    get "/", {}, {"QOR_CACHE_SSI_ENABLED" => 1}
-    assert_response 200
-    assert response.body.include?(%Q[<!--# include virtual="/qor_cache_includes/time])
-  end
-
-  test "ESI mode" do
-    get "/", {}, {"QOR_CACHE_ESI_ENABLED" => 1}
-    assert_response 200
-    assert response.body.include?(%Q[<esi:include src="/qor_cache_includes/time])
-  end
-
-  test "request qor_cache_includes partial" do
-    get "/qor_cache_includes/time"
-    assert_response 200
-    assert response.body.include?('2012-10-10')
-
-    Timecop.freeze("2012-10-11")
-    get "/qor_cache_includes/time"
-    assert_response 200
-    assert response.body.include?('2012-10-10')
-
-    get "/qor_cache_includes/time?hello"
-    assert_response 200
-    assert response.body.include?('2012-10-11')
-  end
-
-  test "qor_cache_includes no_cache option" do
-    get "/nocache"
-    assert_response 200
-    assert response.body.include?('2012-10-10')
-
-    Timecop.freeze("2012-10-11")
-    get "/nocache"
-    assert_response 200
-    assert response.body.include?('2012-10-11')
-  end
-
-  test "qor_cache_includes expires_in option" do
-    get "/expires_in"
-    assert_response 200
-    assert response.body.include?('2012-10-10')
-
-    Timecop.freeze("2012-10-11")
-    get "/expires_in"
-    assert_response 200
-    assert response.body.include?('2012-10-10')
-
-    Timecop.freeze("2012-10-13")
-    get "/expires_in"
-    assert_response 200
-    assert response.body.include?('2012-10-13')
-  end
-
-  test "qor_cache_includes with qor_cache_key" do
-    get "/products"
-    assert_response 200
-    assert response.body.include?('2012-10-10')
-
-    Timecop.freeze("2012-10-11")
-    get "/products"
-    assert_response 200
-    assert response.body.include?('2012-10-10')
-
-    FactoryGirl.create(:product)
-    get "/products"
-    assert_response 200
-    assert response.body.include?('2012-10-11')
-
-    Timecop.freeze("2012-10-12")
-    get "/products"
-    assert_response 200
-    assert response.body.include?('2012-10-11')
-
-    FactoryGirl.create(:color_variation)
-    get "/products"
-    assert_response 200
-    assert response.body.include?('2012-10-12')
-
-    Timecop.freeze("2012-10-13")
-    get "/products"
-    assert_response 200
-    assert response.body.include?('2012-10-12')
-  end
-
-  test "qor_cache_includes with helpers current_user" do
-    get "/helpers", {}, {"CURRENT_USER_ID" => 1}
-    assert_response 200
-    assert response.body.include?('2012-10-10')
-
-    Timecop.freeze("2012-10-11")
-    get "/helpers", {}, {"CURRENT_USER_ID" => 1}
-    assert_response 200
-    assert response.body.include?('2012-10-10')
-
-    get "/helpers", {}, {"CURRENT_USER_ID" => 2}
-    assert_response 200
-    assert response.body.include?('2012-10-11')
-  end
-
-  test "qor_cache_includes with block" do
-    FactoryGirl.create(:product)
-    get "/with_block", {}, {"CURRENT_USER_ID" => 1}
-    assert_response 200
-    assert response.body.include?('2012-10-10')
-
-    Timecop.freeze("2012-10-11")
-    get "/with_block", {}, {"CURRENT_USER_ID" => 1}
-    assert_response 200
-    assert response.body.include?('2012-10-10')
-
-    get "/with_block", {}, {"CURRENT_USER_ID" => 2}
-    assert_response 200
-    assert response.body.include?('2012-10-11')
-  end
-end