pusherable 1.0.4 → 1.1.0

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.DS_Store

data/.travis.yml

@@ -1,7 +1,9 @@
 language: ruby
 script: "bundle install && bundle exec rake"
 rvm:
-  - 1.9.2
   - 1.9.3
+  - 2.0.0
 env:
   - DB=sqlite3
+services:
+  - mongodb

data/Gemfile

@@ -1,8 +1,8 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-# Specify your gem's dependencies in pusherable.gemspec
+# Specify your gem"s dependencies in pusherable.gemspec
 gemspec
 
 group :test do
-  gem 'rake'
+  gem "rake"
 end

data/README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/tonycoco/pusherable.png)](https://travis-ci.org/tonycoco/pusherable)
 
-Adds callback hooks for your _ActiveRecord_ models for sending messages to a _Pusher_ channel.
+Adds callback hooks for your _ActiveModel_ models for sending messages to a _Pusher_ channel.
 
 ## Installation
 
@@ -10,7 +10,7 @@ Install and configure _Pusher_ to work on your application by following the [pus
 
 Then, add this line to your application's _Gemfile_:
 
-    gem 'pusherable'
+    gem "pusherable"
 
 And then execute:
 
@@ -22,17 +22,17 @@ Or install it yourself as:
 
 ## Usage
 
-Add in the following lines to any _ActiveRecord_ model class:
+Add in the following lines to any _ActiveModel_ model class:
 
-    pusherable('some_channel')
+    pusherable("some_channel")
 
 _Pusherable_ has a default channel of `test_channel`, just like the _Pusher_ example docs, that it will publish to.
 
-On your subscribed client(s), events will be triggered by _Pusher_ reflecting your _ActiveRecord_ create/update/destroy actions.
+On your subscribed client(s), events will be triggered by _Pusher_ reflecting your ActiveModel_ create/update/destroy actions.
 
-Here is a list of the _ActiveRecord_ callbacks that trigger _Pusher_ events...
+Here is a list of the _ActiveModel_ callbacks that trigger _Pusher_ events...
 
-    ActiveRecord Callback => Triggered Event
+    ActiveModel Callback => Triggered Event
     ----------------------------------------
     after_create => "model.create"
     after_update => "model.update"
@@ -40,17 +40,23 @@ Here is a list of the _ActiveRecord_ callbacks that trigger _Pusher_ events...
 
 ### Example
 
-If you have an _ActiveRecord_ model called, _Post_, and you create a new record, _Pusher_ will receive an event called, "post.create".
+If you have an _ActiveModel_ model called, _Post_, and you create a new record, _Pusher_ will receive an event called, "post.create".
 It will also carry a payload of data containing a _JSON_ representation of the record (literally calling `to_json` on the record).
 
 The following callbacks that trigger _Pusher_ events in this _Post_ example will then be...
 
-    ActiveRecord Callback => Triggered Event
+    ActiveModel Callback => Triggered Event
     ----------------------------------------
     after_create => "post.create"
     after_update => "post.update"
     before_destroy => "post.destroy"
 
+Currently this gem extends `ActiveRecord::Base` and `Mongoid::Document` if defined.
+
+`ActiveRecord::Base.extend Pusherable`
+
+For any other `ActiveModel` compliant "Data store", simply mirror this statement.
+
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -1,5 +1,5 @@
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new
 

data/lib/pusherable/version.rb

@@ -1,3 +1,3 @@
 module Pusherable
-  VERSION = '1.0.4'
+  VERSION = "1.1.0"
 end

data/lib/pusherable.rb

@@ -1,46 +1,54 @@
-require 'pusherable/version'
+require "pusherable/version"
 
 module Pusherable
-  def pusherable?
-    false
-  end
+  extend ActiveSupport::Concern
 
-  def pusherable(pusherable_channel='test_channel')
-    raise "Please `gem install pusher` and configure it to run in your app!" if Pusher.app_id.blank? || Pusher.key.blank? || Pusher.secret.blank?
+  module ClassMethods
+    def pusherable?
+      false
+    end
 
-    class_attribute :pusherable_channel
-    self.pusherable_channel = pusherable_channel
+    def pusherable(pusherable_channel = "test_channel")
+      raise "Please `gem install pusher` and configure it to run in your app!" if Pusher.app_id.blank? || Pusher.key.blank? || Pusher.secret.blank?
 
-    class_eval do
-      after_create :pusherable_trigger_create
-      after_update :pusherable_trigger_update
-      before_destroy :pusherable_trigger_destroy
+      class_attribute :pusherable_channel
+      self.pusherable_channel = pusherable_channel
 
-      def self.pusherable?
-        true
-      end
+      class_eval do
+        after_create :pusherable_trigger_create
+        after_update :pusherable_trigger_update
+        before_destroy :pusherable_trigger_destroy
 
-      private
+        def self.pusherable?
+          true
+        end
 
-      def pusherable_class_name
-        self.class.name.underscore
-      end
+        private
 
-      def pusherable_trigger_create
-        Pusher.trigger(pusherable_channel, "#{pusherable_class_name}.create", self.to_json)
-      end
+        def pusherable_class_name
+          self.class.name.underscore
+        end
 
-      def pusherable_trigger_update
-        Pusher.trigger(pusherable_channel, "#{pusherable_class_name}.update", self.to_json)
-      end
+        def pusherable_trigger_create
+          Pusher.trigger(pusherable_channel, "#{pusherable_class_name}.create", self.to_json)
+        end
+
+        def pusherable_trigger_update
+          Pusher.trigger(pusherable_channel, "#{pusherable_class_name}.update", self.to_json)
+        end
 
-      def pusherable_trigger_destroy
-        Pusher.trigger(pusherable_channel, "#{pusherable_class_name}.destroy", self.to_json)
+        def pusherable_trigger_destroy
+          Pusher.trigger(pusherable_channel, "#{pusherable_class_name}.destroy", self.to_json)
+        end
       end
     end
   end
 end
 
-if defined?(ActiveRecord::Base)
-  ActiveRecord::Base.extend Pusherable
+if defined?(ActiveRecord) && defined?(ActiveRecord::Base)
+  ActiveRecord::Base.send :include, Pusherable
+end
+
+if defined?(Mongoid) && defined?(Mongoid::Document)
+  Mongoid::Document.send :include, Pusherable
 end

data/pusherable.gemspec

@@ -1,27 +1,28 @@
 # -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'pusherable/version'
+require "pusherable/version"
 
 Gem::Specification.new do |gem|
-  gem.name          = 'pusherable'
+  gem.name          = "pusherable"
   gem.version       = Pusherable::VERSION
-  gem.authors       = ['Tony Coconate']
-  gem.email         = ['me@tonycoconate.com']
-  gem.description   = %q{Adds callback hooks for your ActiveRecord models for sending messages to a Pusher channel.}
-  gem.summary       = %q{Adds callback hooks for your ActiveRecord models for sending messages to a Pusher channel.}
-  gem.homepage      = 'https://github.com/tonycoco/pusherable'
+  gem.authors       = ["Tony Coconate"]
+  gem.email         = ["me@tonycoconate.com"]
+  gem.description   = %q{Adds callback hooks for your ActiveModel models for sending messages to a Pusher channel.}
+  gem.summary       = %q{Adds callback hooks to your models for sending messages to a Pusher channel.}
+  gem.homepage      = "https://github.com/tonycoco/pusherable"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ['lib']
+  gem.require_paths = ["lib"]
 
-  gem.add_development_dependency 'activerecord', '~> 3.2.0'
-  gem.add_development_dependency 'pusher', '~> 0.11.0'
-  gem.add_development_dependency 'sqlite3'
-  gem.add_development_dependency 'rspec', '~> 2.13.0'
-  gem.add_development_dependency 'acts_as_fu'
-  gem.add_development_dependency 'database_cleaner'
-  gem.add_development_dependency 'rake'
+  gem.add_development_dependency "activerecord", ">= 3.2.0"
+  gem.add_development_dependency "activesupport", ">= 3.2.0"
+  gem.add_development_dependency "mongoid", ">= 3"
+  gem.add_development_dependency "mongoid-rspec", ">= 1.6"
+  gem.add_development_dependency "pusher", "~> 0.11.0"
+  gem.add_development_dependency "rake"
+  gem.add_development_dependency "rspec", ">= 2.12.0"
+  gem.add_development_dependency "sqlite3"
 end

data/spec/mongoid_pusherable_spec.rb

@@ -0,0 +1,60 @@
+require "spec_helper"
+
+describe Pusherable do
+  before do
+    Pusher.stub(:trigger).and_return true
+  end
+
+  describe "mongoid setup" do
+    it "should make Mongoid::Document models pusherable" do
+      expect(MongoidNonPusherableModel.pusherable?).to be_false
+      expect(MongoidPusherableModel.pusherable?).to be_true
+    end
+  end
+
+  describe "callbacks" do
+    let(:pusherable_model) { MongoidPusherableModel.new }
+    let(:non_pusherable_model) { MongoidNonPusherableModel.new }
+
+    it "should trigger after create" do
+      pusherable_model.should_receive(:pusherable_trigger_create).once
+      pusherable_model.save
+    end
+
+    it "should trigger after update" do
+      pusherable_model.should_receive(:pusherable_trigger_create).once
+      pusherable_model.save
+      pusherable_model.should_receive(:pusherable_trigger_update).once
+      pusherable_model.save!
+    end
+
+    it "should trigger after update" do
+      pusherable_model.should_receive(:pusherable_trigger_create).once
+      pusherable_model.save
+      pusherable_model.should_receive(:pusherable_trigger_destroy).once
+      pusherable_model.destroy
+    end
+
+    it "should not trigger events on a regular Mongoid model" do
+      non_pusherable_model.should_not_receive(:pusherable_trigger_create)
+      non_pusherable_model.save
+      non_pusherable_model.should_not_receive(:pusherable_trigger_update)
+      non_pusherable_model.save
+      non_pusherable_model.should_not_receive(:pusherable_trigger_destroy)
+      non_pusherable_model.destroy
+    end
+  end
+
+  describe "channels" do
+    let(:default_model) { MongoidDefaultedPusherableModel.new }
+    let(:setup_model) { MongoidPusherableModel.new }
+
+    it "should get and set the channel to push to" do
+      expect(MongoidDefaultedPusherableModel.pusherable_channel).to eq("test_channel")
+      expect(MongoidPusherableModel.pusherable_channel).to eq("our_channel")
+
+      expect(default_model.pusherable_channel).to eq("test_channel")
+      expect(setup_model.pusherable_channel).to eq("our_channel")
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,31 +1,21 @@
-require 'rubygems'
-require 'bundler/setup'
-require 'active_record'
-require 'database_cleaner'
-require 'pusher'
+require "rubygems"
+require "bundler/setup"
+require "pusher"
+require "mongoid"
+require "mongoid-rspec"
+require "active_record"
 
-Pusher.app_id = '123456'
-Pusher.secret = 'FAKE'
-Pusher.key    = 'FAKE'
+Pusher.app_id = "123456"
+Pusher.secret = "FAKE"
+Pusher.key = "FAKE"
 
-require 'pusherable'
+require "pusherable"
 
-ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
-
-load File.dirname(__FILE__) + '/support/schema.rb'
-load File.dirname(__FILE__) + '/support/models.rb'
-
-RSpec.configure do |config|
-  config.before(:suite) do
-    DatabaseCleaner.strategy = :transaction
-    DatabaseCleaner.clean_with(:truncation)
-  end
-
-  config.before(:each) do
-    DatabaseCleaner.start
-  end
-
-  config.after(:each) do
-    DatabaseCleaner.clean
-  end
+Mongoid.configure do |config|
+  config.connect_to("pusherable_test")
 end
+load File.dirname(__FILE__) + "/support/models/mongoid.rb"
+
+ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: ":memory:")
+load File.dirname(__FILE__) + "/support/schema.rb"
+load File.dirname(__FILE__) + "/support/models/sqlite.rb"

data/spec/sqlite_pusherable_spec.rb

@@ -0,0 +1,60 @@
+require "spec_helper"
+
+describe Pusherable do
+  before do
+    Pusher.stub(:trigger).and_return true
+  end
+
+  describe "setup" do
+    it "should make ActiveRecord models pusherable" do
+      expect(NonPusherableModel.pusherable?).to be_false
+      expect(PusherableModel.pusherable?).to be_true
+    end
+  end
+
+  describe "callbacks" do
+    let(:pusherable_model) { PusherableModel.new }
+    let(:non_pusherable_model) { NonPusherableModel.new }
+
+    it "should trigger after create" do
+      pusherable_model.should_receive(:pusherable_trigger_create).once
+      pusherable_model.save
+    end
+
+    it "should trigger after update" do
+      pusherable_model.should_receive(:pusherable_trigger_create).once
+      pusherable_model.save
+      pusherable_model.should_receive(:pusherable_trigger_update).once
+      pusherable_model.save!
+    end
+
+    it "should trigger after update" do
+      pusherable_model.should_receive(:pusherable_trigger_create).once
+      pusherable_model.save
+      pusherable_model.should_receive(:pusherable_trigger_destroy).once
+      pusherable_model.destroy
+    end
+
+    it "should not trigger events on a regular ActiveRecord model" do
+      non_pusherable_model.should_not_receive(:pusherable_trigger_create)
+      non_pusherable_model.save
+      non_pusherable_model.should_not_receive(:pusherable_trigger_update)
+      non_pusherable_model.save
+      non_pusherable_model.should_not_receive(:pusherable_trigger_destroy)
+      non_pusherable_model.destroy
+    end
+  end
+
+  describe "channels" do
+    let(:default_model) { DefaultedPusherableModel.new }
+    let(:setup_model) { PusherableModel.new }
+
+    it "should get and set the channel to push to" do
+      expect(DefaultedPusherableModel.pusherable_channel).to eq("test_channel")
+      expect(PusherableModel.pusherable_channel).to eq("our_channel")
+
+      expect(default_model.pusherable_channel).to eq("test_channel")
+      expect(setup_model.pusherable_channel).to eq("our_channel")
+    end
+  end
+end

data/spec/support/models/mongoid.rb

@@ -0,0 +1,13 @@
+class MongoidNonPusherableModel
+  include Mongoid::Document
+end
+
+class MongoidDefaultedPusherableModel
+  include Mongoid::Document
+  pusherable
+end
+
+class MongoidPusherableModel
+  include Mongoid::Document
+  pusherable("our_channel")
+end

data/spec/support/{models.rb → models/sqlite.rb}

@@ -6,5 +6,5 @@ class DefaultedPusherableModel < ActiveRecord::Base
 end
 
 class PusherableModel < ActiveRecord::Base
-  pusherable('our_channel')
+  pusherable("our_channel")
 end

metadata

@@ -2,128 +2,144 @@
 name: pusherable
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Tony Coconate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
+  type: :development
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
+    none: false
   prerelease: false
 - !ruby/object:Gem::Dependency
-  name: pusher
+  name: activesupport
+  type: :development
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.11.0
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
+        version: 3.2.0
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 3.2.0
+    none: false
   prerelease: false
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: mongoid
+  type: :development
   requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3'
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
+    none: false
+  prerelease: false
+- !ruby/object:Gem::Dependency
+  name: mongoid-rspec
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.6'
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
+    none: false
   prerelease: false
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pusher
+  type: :development
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.0
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
+        version: 0.11.0
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 0.11.0
+    none: false
   prerelease: false
 - !ruby/object:Gem::Dependency
-  name: acts_as_fu
+  name: rake
+  type: :development
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   prerelease: false
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: rspec
+  type: :development
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
+        version: 2.12.0
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.12.0
+    none: false
   prerelease: false
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: sqlite3
+  type: :development
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   prerelease: false
-description: Adds callback hooks for your ActiveRecord models for sending messages
+description: Adds callback hooks for your ActiveModel models for sending messages
   to a Pusher channel.
 email:
 - me@tonycoconate.com
@@ -140,9 +156,11 @@ files:
 - lib/pusherable.rb
 - lib/pusherable/version.rb
 - pusherable.gemspec
-- spec/pusherable_spec.rb
+- spec/mongoid_pusherable_spec.rb
 - spec/spec_helper.rb
-- spec/support/models.rb
+- spec/sqlite_pusherable_spec.rb
+- spec/support/models/mongoid.rb
+- spec/support/models/sqlite.rb
 - spec/support/schema.rb
 homepage: https://github.com/tonycoco/pusherable
 licenses: []
@@ -151,32 +169,33 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 4238303825927332364
+      hash: 3897461447202856770
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 4238303825927332364
+      hash: 3897461447202856770
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Adds callback hooks for your ActiveRecord models for sending messages to
-  a Pusher channel.
+summary: Adds callback hooks to your models for sending messages to a Pusher channel.
 test_files:
-- spec/pusherable_spec.rb
+- spec/mongoid_pusherable_spec.rb
 - spec/spec_helper.rb
-- spec/support/models.rb
+- spec/sqlite_pusherable_spec.rb
+- spec/support/models/mongoid.rb
+- spec/support/models/sqlite.rb
 - spec/support/schema.rb

data/spec/pusherable_spec.rb

@@ -1,62 +0,0 @@
-require 'spec_helper'
-
-describe Pusherable do
-  before do
-    Pusher.stub(:trigger).and_return true
-  end
-
-  describe 'setup' do
-    it 'should make ActiveRecord models pusherable' do
-      NonPusherableModel.pusherable?.should == false
-      PusherableModel.pusherable?.should == true
-    end
-  end
-
-  describe 'callbacks' do
-    before(:each) do
-      @pusherable_model = PusherableModel.new
-      @non_pusherable_model = NonPusherableModel.new
-    end
-
-    it 'should trigger after create' do
-      @pusherable_model.should_receive(:pusherable_trigger_create).once
-      @pusherable_model.save
-    end
-
-    it 'should trigger after update' do
-      @pusherable_model.should_receive(:pusherable_trigger_create).once
-      @pusherable_model.save
-      @pusherable_model.should_receive(:pusherable_trigger_update).once
-      @pusherable_model.save!
-    end
-
-    it 'should trigger after update' do
-      @pusherable_model.should_receive(:pusherable_trigger_create).once
-      @pusherable_model.save
-      @pusherable_model.should_receive(:pusherable_trigger_destroy).once
-      @pusherable_model.destroy
-    end
-
-    it 'should not trigger events on a regular ActiveRecord model' do
-      @non_pusherable_model.should_not_receive(:pusherable_trigger_create)
-      @non_pusherable_model.save
-      @non_pusherable_model.should_not_receive(:pusherable_trigger_update)
-      @non_pusherable_model.save
-      @non_pusherable_model.should_not_receive(:pusherable_trigger_destroy)
-      @non_pusherable_model.destroy
-    end
-  end
-
-  describe 'channels' do
-    it 'should get and set the channel to push to' do
-      DefaultedPusherableModel.pusherable_channel.should == 'test_channel'
-      PusherableModel.pusherable_channel.should == 'our_channel'
-
-      default_model = DefaultedPusherableModel.new
-      setup_model = PusherableModel.new
-
-      default_model.pusherable_channel.should == 'test_channel'
-      setup_model.pusherable_channel.should == 'our_channel'
-    end
-  end
-end