enju_message 0.0.23 → 0.0.24

data/app/views/message_requests/index.html.erb

@@ -31,7 +31,7 @@
     <td>
       <%= link_to t('page.show'), message_request -%>
       <%= link_to t('page.edit'), edit_message_request_path(message_request) -%>
-      <%= link_to t('page.destroy'), message_request, :confirm => t('page.are_you_sure'), :method => :delete -%>
+      <%= link_to t('page.destroy'), message_request, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
     </td>
   </tr>
 <%- end -%>

data/app/views/message_templates/index.html.erb

@@ -26,7 +26,7 @@
         <%= link_to t('page.edit'), edit_message_template_path(message_template) -%>
       <% end %>
       <%- if can? :destroy, message_template -%>
-        <%= link_to t('page.destroy'), message_template, :confirm => t('page.are_you_sure'), :method => :delete -%>
+        <%= link_to t('page.destroy'), message_template, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>
     </td>
   </tr>

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

@@ -42,7 +42,7 @@
     <% end %>
     <li><%= link_to t('message.reply'), new_message_path(:parent_id => @message.id) -%></li>
     <% if can? :destroy, :message %>
-      <li><%= link_to t('page.destroy'), @message, :confirm => t('page.are_you_sure'), :method => :delete -%></li>
+      <li><%= link_to t('page.destroy'), @message, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%></li>
     <% end %>
   </ul>
 </div>

data/lib/enju_message/engine.rb

@@ -1,16 +1,9 @@
+require 'enju_core'
 require 'configatron'
 require 'delayed_job_active_record'
-require 'devise'
-require 'cancan'
 require 'state_machine'
 require 'inherited_resources'
-require 'attribute_normalizer'
-require 'addressable/uri'
-require 'friendly_id'
 require 'awesome_nested_set'
-require 'will_paginate'
-require 'sunspot_rails'
-require 'acts_as_list'
 
 module EnjuMessage
   class Engine < ::Rails::Engine

data/lib/enju_message/user.rb

@@ -0,0 +1,28 @@
+module EnjuMessage
+  module MessageUser
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
+    module ClassMethods
+      def enju_message_user
+        include InstanceMethods
+        has_many :sent_messages, :foreign_key => 'sender_id', :class_name => 'Message'
+        has_many :received_messages, :foreign_key => 'receiver_id', :class_name => 'Message'
+      end
+    end
+
+    module InstanceMethods
+      def send_message(status, options = {})
+        MessageRequest.transaction do
+          request = MessageRequest.new
+          request.sender = self.class.find(1)
+          request.receiver = self
+          request.message_template = MessageTemplate.localized_template(status, self.locale)
+          request.save_message_body(options)
+          request.sm_send_message!
+        end
+      end
+    end
+  end
+end

data/lib/enju_message/version.rb

@@ -1,3 +1,3 @@
 module EnjuMessage
-  VERSION = "0.0.23"
+  VERSION = "0.0.24"
 end

data/lib/enju_message.rb

@@ -1,4 +1,7 @@
 require "enju_message/engine"
+require "enju_message/user"
 
 module EnjuMessage
 end
+
+ActiveRecord::Base.send :include, EnjuMessage::MessageUser

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

@@ -12,10 +12,10 @@ class User < ActiveRecord::Base
   has_one :patron
   belongs_to :user_group
   belongs_to :required_role, :class_name => 'Role', :foreign_key => 'required_role_id'
-  has_many :sent_messages, :foreign_key => 'sender_id', :class_name => 'Message'
-  has_many :received_messages, :foreign_key => 'receiver_id', :class_name => 'Message'
   before_create :set_role_and_patron
 
+  enju_message_user
+
   extend FriendlyId
   friendly_id :username
 
@@ -39,15 +39,4 @@ class User < ActiveRecord::Base
       false
     end
   end
-
-  def send_message(status, options = {})
-    MessageRequest.transaction do
-      request = MessageRequest.new
-      request.sender = User.find(1)
-      request.receiver = self
-      request.message_template = MessageTemplate.localized_template(status, self.locale)
-      request.save_message_body(options)
-      request.sm_send_message!
-    end
-  end
 end

data/spec/dummy/config/application.rb

@@ -42,5 +42,3 @@ module Dummy
     config.assets.version = '1.0'
   end
 end
-
-require 'enju_leaf'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_message
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-28 00:00:00.000000000 Z
+date: 2012-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -91,70 +91,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: friendly_id
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: will_paginate
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: devise
-  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: cancan
-  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: state_machine
   requirement: !ruby/object:Gem::Requirement
@@ -188,39 +124,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: addressable
-  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: attribute_normalizer
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: sunspot_rails
+  name: enju_core
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -235,38 +139,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sunspot_solr
-  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: acts_as_list
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -316,7 +188,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sunspot-rails-tester
+  name: sunspot_solr
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -493,6 +365,7 @@ files:
 - db/migrate/20110913115320_add_lft_and_rgt_to_message.rb
 - db/migrate/20120125050502_add_depth_to_message.rb
 - lib/enju_message/engine.rb
+- lib/enju_message/user.rb
 - lib/enju_message/version.rb
 - lib/enju_message.rb
 - lib/tasks/enju_message_tasks.rake
@@ -559,10 +432,6 @@ files:
 - spec/dummy/db/production.sqlite3
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
-- spec/dummy/lib/enju_leaf/localized_name.rb
-- spec/dummy/lib/enju_leaf/master_model.rb
-- spec/dummy/lib/enju_leaf/url_validator.rb
-- spec/dummy/lib/enju_leaf.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -696,10 +565,6 @@ test_files:
 - spec/dummy/db/production.sqlite3
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
-- spec/dummy/lib/enju_leaf/localized_name.rb
-- spec/dummy/lib/enju_leaf/master_model.rb
-- spec/dummy/lib/enju_leaf/url_validator.rb
-- spec/dummy/lib/enju_leaf.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html

data/spec/dummy/lib/enju_leaf/localized_name.rb

@@ -1,13 +0,0 @@
-module LocalizedName
-  def localize(locale = I18n.locale.to_s)
-    values = Hash[*self.strip.split("\n").map{|n| n.split(':', 2)}.flatten]
-    name = values[locale.to_s] || self
-    name.strip
-  rescue ArgumentError
-    self
-  end
-end
-
-class String
-  include LocalizedName
-end

data/spec/dummy/lib/enju_leaf/master_model.rb

@@ -1,41 +0,0 @@
-module MasterModel
-  def self.included(base)
-    #base.extend ClassMethods
-    base.send :include, InstanceMethods
-    base.class_eval do
-      acts_as_list
-      validates_uniqueness_of :name, :case_sensitive => false
-      validates_presence_of :name, :display_name
-      before_validation :set_display_name, :on => :create
-      normalize_attributes :name
-    end
-  end
-
-  module InstanceMethods
-    def set_display_name
-      self.display_name = self.name if self.display_name.blank?
-    end
-
-    def check_creatable
-      if creatable?
-        raise NotModifiableError
-      end
-    end
-
-    def check_deletable
-      if deletable?
-        raise NotModifiableError
-      end
-    end
-
-    def creatable?
-      false
-    end
-
-    def deletable?
-      false
-    end
-  end
-
-  class NotModifiableError < StandardError; end
-end

data/spec/dummy/lib/enju_leaf/url_validator.rb

@@ -1,10 +0,0 @@
-class UrlValidator < ActiveModel::EachValidator
-  def validate_each(record, attribute, value)
-    url = ::Addressable::URI.parse(value)
-    if url
-      unless ['http', 'https'].include?(url.scheme)
-        record.errors.add(attribute.to_sym)
-      end
-    end
-  end
-end

data/spec/dummy/lib/enju_leaf.rb

@@ -1,4 +0,0 @@
-require 'addressable/uri'
-require 'enju_leaf/localized_name'
-require 'enju_leaf/master_model'
-require 'enju_leaf/url_validator'