merb_signupto 0.0.4 → 0.0.5

Sign up to get free protection for your applications and to get access to all the features.
data/Rakefile CHANGED
@@ -15,6 +15,7 @@ spec = Gem::Specification.new do |s|
15
15
  s.platform = Gem::Platform::RUBY
16
16
  s.has_rdoc = true
17
17
  s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
18
+ s.rdoc_options << '--title' << SUMMARY << '--line-numbers' << '--main' << 'README' << '--template' << 'jamis'
18
19
  s.summary = SUMMARY
19
20
  s.description = s.summary
20
21
  s.author = AUTHOR
@@ -30,7 +30,7 @@ module Merb
30
30
 
31
31
  self._template_root = File.expand_path(self._template_root / "../messages/views")
32
32
  class_inheritable_accessor :_sms_klass
33
- self._sms_klass = Signupto::Action::Sender
33
+ self._sms_klass = ::Signupto::Action::Sender
34
34
 
35
35
  attr_accessor :params, :mailer, :mail
36
36
  attr_reader :session, :base_controller
@@ -63,9 +63,9 @@ module Merb
63
63
  # take ther result and merge it with the options passed
64
64
  # in from the application controller subclass
65
65
  @message_options.merge!(sms_params)
66
- sms_message = Signupto::Message.new(@message_options[:to], @message_options[:body], @message_options[:from])
66
+ sms_message = ::Signupto::Message.new(@message_options[:to], @message_options[:body], @message_options[:from])
67
67
  global_config = Merb::Plugins.config[:merb_signupto]
68
- sms_account = Signupto::Account.new(global_config[:account_hash], global_config[:customer_number])
68
+ sms_account = ::Signupto::Account.new(global_config[:account_hash], global_config[:customer_number])
69
69
  if sms_message
70
70
  begin
71
71
  self.class._sms_klass.new(sms_account, sms_message)
@@ -13,16 +13,19 @@ if defined?(Merb::Plugins)
13
13
  require 'merb/sms_controller'
14
14
  require 'merb_signupto/configurator'
15
15
 
16
- Merb::Controller.class_eval do
17
- include MerbSignupto::ControllerExtension
16
+ if defined?(Merb::Controller)
17
+ Merb::Controller.class_eval do
18
+ include MerbSignupto::ControllerExtension
19
+ end
18
20
  end
19
21
 
20
22
  # load in the configuration from the YAML file
21
23
  merb_comfig = MerbSignupto::Configurator.load_config_from_file()
22
- Merb::Plugins.config[:merb_signupto] = {
23
- :account_hash => merb_comfig['account_hash'],
24
- :customer_number => merb_comfig['customer_number']
25
- }
26
-
24
+ unless merb_comfig.nil?
25
+ Merb::Plugins.config[:merb_signupto] = {
26
+ :account_hash => merb_comfig['account_hash'],
27
+ :customer_number => merb_comfig['customer_number']
28
+ }
29
+ end
27
30
  Merb::Plugins.add_rakefiles "merb_signupto/tasks/merbtasks"
28
31
  end
@@ -2,7 +2,7 @@ module MerbSignupto
2
2
  module Version #:nodoc:
3
3
  MAJOR = 0
4
4
  MINOR = 0
5
- TINY = 4
5
+ TINY = 5
6
6
 
7
7
  STRING = [MAJOR, MINOR, TINY].join('.')
8
8
  end
metadata CHANGED
@@ -1,33 +1,45 @@
1
1
  --- !ruby/object:Gem::Specification
2
- rubygems_version: 0.9.4
3
- specification_version: 1
4
2
  name: merb_signupto
5
3
  version: !ruby/object:Gem::Version
6
- version: 0.0.4
7
- date: 2008-01-04 00:00:00 +00:00
8
- summary: Merb plugin that provides intergrated connectivity to the signupto SMS gateway
9
- require_paths:
10
- - lib
11
- email: hello@timperrett.com
12
- homepage: http://blog.timperrett.com
13
- rubyforge_project:
14
- description: Merb plugin that provides intergrated connectivity to the signupto SMS gateway
15
- autorequire: merb_signupto
16
- default_executable:
17
- bindir: bin
18
- has_rdoc: true
19
- required_ruby_version: !ruby/object:Gem::Version::Requirement
20
- requirements:
21
- - - ">"
22
- - !ruby/object:Gem::Version
23
- version: 0.0.0
24
- version:
4
+ version: 0.0.5
25
5
  platform: ruby
26
- signing_key:
27
- cert_chain:
28
- post_install_message:
29
6
  authors:
30
7
  - Tim Perrett
8
+ autorequire: merb_signupto
9
+ bindir: bin
10
+ cert_chain: []
11
+
12
+ date: 2008-01-10 00:00:00 +00:00
13
+ default_executable:
14
+ dependencies:
15
+ - !ruby/object:Gem::Dependency
16
+ name: merb
17
+ version_requirement:
18
+ version_requirements: !ruby/object:Gem::Requirement
19
+ requirements:
20
+ - - ">="
21
+ - !ruby/object:Gem::Version
22
+ version: 0.4.0
23
+ version:
24
+ - !ruby/object:Gem::Dependency
25
+ name: signupto
26
+ version_requirement:
27
+ version_requirements: !ruby/object:Gem::Requirement
28
+ requirements:
29
+ - - ">="
30
+ - !ruby/object:Gem::Version
31
+ version: 0.0.2
32
+ version:
33
+ description: Merb plugin that provides intergrated connectivity to the signupto SMS gateway
34
+ email: hello@timperrett.com
35
+ executables: []
36
+
37
+ extensions: []
38
+
39
+ extra_rdoc_files:
40
+ - README
41
+ - LICENSE
42
+ - TODO
31
43
  files:
32
44
  - LICENSE
33
45
  - README
@@ -50,36 +62,37 @@ files:
50
62
  - merb_generators/signupto_controller/templates/signupto_controller_template.rb
51
63
  - merb_generators/signupto_controller/templates/sms_message_template.text.erb
52
64
  - merb_generators/signupto_controller/USAGE
53
- test_files: []
54
-
55
- rdoc_options: []
56
-
57
- extra_rdoc_files:
65
+ has_rdoc: true
66
+ homepage: http://blog.timperrett.com
67
+ post_install_message:
68
+ rdoc_options:
69
+ - --title
70
+ - Merb plugin that provides intergrated connectivity to the signupto SMS gateway
71
+ - --line-numbers
72
+ - --main
58
73
  - README
59
- - LICENSE
60
- - TODO
61
- executables: []
62
-
63
- extensions: []
64
-
74
+ - --template
75
+ - jamis
76
+ require_paths:
77
+ - lib
78
+ required_ruby_version: !ruby/object:Gem::Requirement
79
+ requirements:
80
+ - - ">="
81
+ - !ruby/object:Gem::Version
82
+ version: "0"
83
+ version:
84
+ required_rubygems_version: !ruby/object:Gem::Requirement
85
+ requirements:
86
+ - - ">="
87
+ - !ruby/object:Gem::Version
88
+ version: "0"
89
+ version:
65
90
  requirements: []
66
91
 
67
- dependencies:
68
- - !ruby/object:Gem::Dependency
69
- name: merb
70
- version_requirement:
71
- version_requirements: !ruby/object:Gem::Version::Requirement
72
- requirements:
73
- - - ">="
74
- - !ruby/object:Gem::Version
75
- version: 0.4.0
76
- version:
77
- - !ruby/object:Gem::Dependency
78
- name: signupto
79
- version_requirement:
80
- version_requirements: !ruby/object:Gem::Version::Requirement
81
- requirements:
82
- - - ">="
83
- - !ruby/object:Gem::Version
84
- version: 0.0.2
85
- version:
92
+ rubyforge_project:
93
+ rubygems_version: 1.0.1
94
+ signing_key:
95
+ specification_version: 2
96
+ summary: Merb plugin that provides intergrated connectivity to the signupto SMS gateway
97
+ test_files: []
98
+