garb 0.9.8 → 0.9.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (44) hide show
  1. checksums.yaml +5 -5
  2. data/.github/dependabot.yml +17 -0
  3. data/.github/workflows/ci.yml +30 -0
  4. data/.github/workflows/codeql-analysis.yml +46 -0
  5. data/.gitignore +1 -1
  6. data/CHANGELOG.md +72 -38
  7. data/Gemfile +5 -6
  8. data/LICENSE +22 -0
  9. data/README.md +125 -92
  10. data/Rakefile +2 -4
  11. data/garb.gemspec +4 -3
  12. data/lib/garb/attributes.rb +2 -1
  13. data/lib/garb/core_ext/string.rb +6 -6
  14. data/lib/garb/core_ext/symbol.rb +30 -19
  15. data/lib/garb/destination.rb +1 -1
  16. data/lib/garb/errors.rb +5 -3
  17. data/lib/garb/filter_parameters.rb +10 -5
  18. data/lib/garb/management/feed.rb +2 -2
  19. data/lib/garb/management/goal.rb +1 -1
  20. data/lib/garb/management/segment.rb +1 -1
  21. data/lib/garb/model.rb +41 -16
  22. data/lib/garb/profile_reports.rb +9 -1
  23. data/lib/garb/report_parameter.rb +2 -3
  24. data/lib/garb/report_response.rb +3 -4
  25. data/lib/garb/reports/visits.rb +1 -1
  26. data/lib/garb/request/authentication.rb +1 -1
  27. data/lib/garb/request/data.rb +13 -10
  28. data/lib/garb/result_set.rb +9 -7
  29. data/lib/garb/support.rb +1 -1
  30. data/lib/garb/version.rb +1 -3
  31. data/lib/garb.rb +7 -7
  32. data/test/test_helper.rb +6 -6
  33. data/test/unit/garb/management/account_test.rb +1 -1
  34. data/test/unit/garb/management/feed_test.rb +2 -2
  35. data/test/unit/garb/management/goal_test.rb +1 -1
  36. data/test/unit/garb/management/profile_test.rb +1 -1
  37. data/test/unit/garb/management/segment_test.rb +1 -9
  38. data/test/unit/garb/management/web_property_test.rb +1 -1
  39. data/test/unit/garb/model_test.rb +121 -6
  40. data/test/unit/garb/report_response_test.rb +1 -1
  41. data/test/unit/garb/result_set_test.rb +29 -0
  42. data/test/unit/symbol_operator_test.rb +21 -19
  43. metadata +23 -19
  44. data/.travis.yml +0 -7
data/Rakefile CHANGED
@@ -1,13 +1,13 @@
1
1
  #!/usr/bin/env rake
2
2
 
3
- require 'rubygems/package_task'
3
+ require 'rubygems/package_task'
4
4
  require 'bundler/gem_tasks'
5
5
  require 'rake/testtask'
6
6
 
7
7
  $:.unshift File.expand_path('../lib', __FILE__)
8
8
  require 'garb'
9
9
 
10
- task :default => :test
10
+ task default: :test
11
11
 
12
12
  Rake::TestTask.new do |t|
13
13
  t.libs << 'test'
@@ -27,5 +27,3 @@ begin
27
27
  rescue LoadError
28
28
  nil
29
29
  end
30
-
31
- # EOF
data/garb.gemspec CHANGED
@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
6
6
  gem.email = ['tony.pitale@viget.com', 'sija@sija.pl']
7
7
  gem.homepage = 'http://github.com/Sija/garb'
8
8
  gem.license = 'MIT'
9
-
9
+
10
10
  gem.summary = 'Google Analytics API Ruby Wrapper'
11
11
  gem.description = ''
12
12
 
@@ -15,8 +15,9 @@ Gem::Specification.new do |gem|
15
15
  gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
16
16
  gem.name = 'garb'
17
17
  gem.require_paths = ['lib']
18
+ gem.required_ruby_version = '>= 3.2'
18
19
  gem.version = Garb::VERSION
19
-
20
+
20
21
  gem.add_dependency 'activesupport', '>= 2.2'
21
- gem.add_dependency 'multi_json', '>= 1.3'
22
+ gem.add_dependency 'ostruct', '~> 0.6'
22
23
  end
@@ -12,6 +12,7 @@ module Garb
12
12
  end
13
13
 
14
14
  private
15
+
15
16
  def define_a_method_for(key, custom_key = nil)
16
17
  custom_key ||= key.to_s.camelize(:lower)
17
18
  define_method(key) do
@@ -22,7 +23,7 @@ module Garb
22
23
  hash_key = (custom_key || key).to_s
23
24
  instance_variable_set var, @entry[hash_key]
24
25
  end
25
- end #unless method_defined?(key)
26
+ end # unless method_defined?(key)
26
27
  end
27
28
 
28
29
  def map_values_for(hash)
@@ -3,11 +3,11 @@ unless Object.const_defined?('ActiveSupport')
3
3
  class String
4
4
  def camelize(first_letter = :upper)
5
5
  case first_letter
6
- when :upper then Garb::Inflector.camelize(self, true)
7
- when :lower then Garb::Inflector.camelize(self, false)
6
+ when :upper then Garb::Inflector.camelize(self, true)
7
+ when :lower then Garb::Inflector.camelize(self, false)
8
8
  end
9
9
  end
10
- alias_method :camelcase, :camelize
10
+ alias camelcase camelize
11
11
 
12
12
  def underscore
13
13
  Garb::Inflector.underscore(self)
@@ -33,9 +33,9 @@ unless Object.const_defined?('ActiveSupport')
33
33
  def underscore(camel_cased_word)
34
34
  word = camel_cased_word.to_s.dup
35
35
  word.gsub!(/::/, '/')
36
- word.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
37
- word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
38
- word.tr!("-", "_")
36
+ word.gsub!(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
37
+ word.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
38
+ word.tr!('-', '_')
39
39
  word.downcase!
40
40
  word
41
41
  end
@@ -1,38 +1,49 @@
1
1
  module SymbolOperatorMethods
2
2
  OPERATORS = {
3
- :eql => '==',
4
- :not_eql => '!=',
5
- :gt => '>',
6
- :gte => '>=',
7
- :lt => '<',
8
- :lte => '<=',
9
- :matches => '==',
10
-
11
- :does_not_match => '!=',
12
- :contains => '=~',
13
- :does_not_contain => '!~',
14
- :substring => '=@',
15
- :not_substring => '!@',
16
-
17
- :desc => '-',
18
- :descending => '-'
19
- }
3
+ eql: '==',
4
+ not_eql: '!=',
5
+ gt: '>',
6
+ gte: '>=',
7
+ lt: '<',
8
+ lte: '<=',
9
+ matches: '==',
10
+
11
+ does_not_match: '!=',
12
+ contains: '=~',
13
+ does_not_contain: '!~',
14
+ substring: '=@',
15
+ not_substring: '!@',
16
+
17
+ desc: '-',
18
+ descending: '-'
19
+ }.freeze
20
20
  SLUGS = OPERATORS.keys.freeze
21
21
 
22
22
  def to_google_analytics
23
23
  t = Garb.to_google_analytics @field || @target
24
24
  o = OPERATORS[@operator]
25
25
 
26
- [:desc, :descending].include?(@operator) ? "#{o}#{t}" : "#{t}#{o}"
26
+ %i[desc descending].include?(@operator) ? "#{o}#{t}" : "#{t}#{o}"
27
27
  end
28
28
  end
29
29
 
30
30
  class SymbolOperator
31
31
  include SymbolOperatorMethods
32
-
32
+
33
+ attr_reader :field, :operator
34
+
33
35
  def initialize(field, operator)
34
36
  @field, @operator = field, operator
35
37
  end unless method_defined? :initialize
38
+
39
+ def ==(other)
40
+ field == other.field && operator == other.operator
41
+ end
42
+ alias eql? ==
43
+
44
+ def hash
45
+ [field, operator].hash
46
+ end
36
47
  end
37
48
 
38
49
  symbol_slugs = if Object.const_defined?('DataMapper')
@@ -2,7 +2,7 @@ module Garb
2
2
  class Destination
3
3
  attr_reader :match_type, :url, :steps, :case_sensitive
4
4
 
5
- alias :case_sensitive? :case_sensitive
5
+ alias case_sensitive? case_sensitive
6
6
 
7
7
  def initialize(attributes)
8
8
  return unless attributes.is_a? Hash
data/lib/garb/errors.rb CHANGED
@@ -2,19 +2,21 @@ module Garb
2
2
  class Error < StandardError; end
3
3
  class MissingCertFileError < Error; end
4
4
  class AuthError < Error; end
5
+
5
6
  class ClientError < Error
6
7
  attr_reader :code, :message, :errors, :uri
7
-
8
+
8
9
  def initialize(uri, message, code = nil, errors = [])
9
10
  @code, @message, @errors, @uri = code, message, errors, uri
10
11
  end
11
-
12
+
12
13
  def to_s
13
14
  "#{code ? "[#{code}] #{message}" : message} : #{uri}"
14
15
  end
15
16
  end
17
+
16
18
  class BadRequestError < ClientError; end
17
19
  class InvalidCredentialsError < ClientError; end
18
20
  class InsufficientPermissionsError < ClientError; end
19
21
  class BackendError < ClientError; end
20
- end
22
+ end
@@ -7,11 +7,12 @@ module Garb
7
7
  end
8
8
 
9
9
  def to_params
10
- value = array_to_params(self.parameters)
11
- value.empty? ? {} : {'filters' => value}
10
+ value = array_to_params(parameters)
11
+ value.empty? ? {} : { 'filters' => value }
12
12
  end
13
13
 
14
14
  private
15
+
15
16
  def array_to_params(arr)
16
17
  arr.map do |param|
17
18
  case param
@@ -22,12 +23,16 @@ module Garb
22
23
  end
23
24
 
24
25
  def hash_to_params(hsh)
25
- hsh.map do |k, v|
26
+ hsh = hsh.map do |k, v|
26
27
  next unless k.is_a?(SymbolOperatorMethods)
27
28
 
29
+ escaped_k = k.to_google_analytics.gsub(/([<>=])/) { |c| CGI.escape(c) }
28
30
  escaped_v = v.to_s.gsub(/([,;])/) { |c| '\\' + c }
29
- "#{URI.encode(k.to_google_analytics, /[=<>]/)}#{CGI::escape(escaped_v)}"
30
- end.join('%3B') # Hash AND (no duplicate keys), escape char for ';' fixes oauth
31
+
32
+ "#{escaped_k}#{CGI.escape(escaped_v)}"
33
+ end
34
+ # Hash AND (no duplicate keys), escape char for ';' fixes oauth
35
+ hsh.join('%3B')
31
36
  end
32
37
  end
33
38
  end
@@ -1,7 +1,7 @@
1
1
  module Garb
2
2
  module Management
3
3
  class Feed
4
- BASE_URL = 'https://www.googleapis.com/analytics/v3/management'
4
+ BASE_URL = 'https://www.googleapis.com/analytics/v3/management'.freeze
5
5
 
6
6
  attr_reader :request
7
7
 
@@ -10,7 +10,7 @@ module Garb
10
10
  end
11
11
 
12
12
  def parsed_response
13
- @parsed_response ||= MultiJson.load(response.body)
13
+ @parsed_response ||= JSON.parse(response.body)
14
14
  end
15
15
 
16
16
  def entries
@@ -7,7 +7,7 @@ module Garb
7
7
  attr_reader :session
8
8
  ga_attribute :name, :number, :value, :active
9
9
 
10
- alias :active? :active
10
+ alias active? active
11
11
 
12
12
  def self.all(session = Session, path = '/accounts/~all/webproperties/~all/profiles/~all/goals')
13
13
  feed = Feed.new(session, path)
@@ -5,7 +5,7 @@ module Garb
5
5
  include PathAttribute
6
6
 
7
7
  attr_reader :session
8
- ga_attribute :name, :definition, :id => 'segmentId'
8
+ ga_attribute :name, :definition, id: 'segmentId'
9
9
 
10
10
  def self.all(session = Session)
11
11
  feed = Feed.new(session, '/segments')
data/lib/garb/model.rb CHANGED
@@ -1,7 +1,8 @@
1
1
  module Garb
2
2
  module Model
3
- MONTH = 2592000
4
- URL = 'https://www.googleapis.com/analytics/v3/data/ga'
3
+ MONTH = (60 * 60 * 24 * 30).freeze
4
+ URL = 'https://www.googleapis.com/analytics/v3/data/ga'.freeze
5
+ MAX_RESULTS = 10_000 # maximum allowed per request
5
6
 
6
7
  def self.extended(base)
7
8
  ProfileReports.add_report_method(base)
@@ -27,7 +28,9 @@ module Garb
27
28
  end
28
29
 
29
30
  def results(profile, options = {})
30
- return all_results(profile, options) if options.delete(:all)
31
+ if options[:all]
32
+ return all_results(profile, options.reject { |key, _| key == :all })
33
+ end
31
34
 
32
35
  start_date = options[:start_date] || Time.now - MONTH
33
36
  end_date = options[:end_date] || Time.now
@@ -40,6 +43,7 @@ module Garb
40
43
  parse_filters(options).to_params,
41
44
  parse_segment(options),
42
45
  parse_sort(options).to_params,
46
+ parse_sampling_level(options),
43
47
  build_page_params(options)
44
48
  ]
45
49
  data = send_request_for_data(profile, build_params(param_set))
@@ -49,19 +53,36 @@ module Garb
49
53
  def all_results(profile, options = {})
50
54
  options = options.dup
51
55
  limit = options.delete(:limit)
52
- options[:limit] = 10_000 # maximum allowed
56
+ limit &&= Integer(limit)
57
+ raise ArgumentError, ':limit must be greater than or equal to 1' if limit && limit < 1
58
+ offset = Integer(options[:offset] || 1) # start-index is 1-based
59
+ raise ArgumentError, ':offset must be greater than or equal to 1' if offset < 1
60
+ options[:offset] = offset if options[:offset]
61
+
62
+ options[:limit] = page_size(limit, 0)
53
63
  results = nil
54
64
  while ((rs = results(profile, options)) && !rs.empty?)
55
65
  results = results ? results + rs : rs
56
- options[:offset] = results.size + 1
57
-
66
+ next_offset = offset + results.size
67
+ options[:offset] = next_offset
68
+
58
69
  break if limit && results.size >= limit
59
- break if results.size >= results.total_results
70
+ # without a known total, a short page means there is nothing more to fetch
71
+ total = results.total_results
72
+ break if total ? next_offset > total : rs.size < options[:limit]
73
+
74
+ options[:limit] = page_size(limit, results.size)
60
75
  end
61
- limit && results ? results[0...limit] : results
76
+ results ||= rs # empty result set when nothing was fetched
77
+ limit ? results[0...limit] : results
62
78
  end
63
-
79
+
64
80
  private
81
+
82
+ def page_size(limit, fetched)
83
+ limit ? [limit - fetched, MAX_RESULTS].min : MAX_RESULTS
84
+ end
85
+
65
86
  def send_request_for_data(profile, params)
66
87
  request = Request::Data.new(profile.session, URL, params)
67
88
  response = request.send_request
@@ -69,7 +90,7 @@ module Garb
69
90
  end
70
91
 
71
92
  def build_params(param_set)
72
- param_set.inject({}) { |p,i| p.merge i }.reject { |k,v| v.nil? }
93
+ param_set.inject({}) { |p, i| p.merge i }.reject { |_, v| v.nil? }
73
94
  end
74
95
 
75
96
  def parse_filters(options)
@@ -78,21 +99,25 @@ module Garb
78
99
 
79
100
  def parse_segment(options)
80
101
  # dirty hack to support dynamic segments
81
- if options.has_key?(:segment_id)
102
+ if options.key?(:segment_id)
82
103
  segment = "gaid::#{options[:segment_id]}"
83
- elsif options.has_key?(:dynamic_segment)
104
+ elsif options.key?(:dynamic_segment)
84
105
  filters = FilterParameters.new(options[:dynamic_segment])
85
106
  segment = "dynamic::#{filters.to_params['filters']}"
86
107
  end
87
- {'segment' => segment}
108
+ { 'segment' => segment }
88
109
  end
89
110
 
90
111
  def parse_sort(options)
91
112
  sort = ReportParameter.new(:sort)
92
- sort << options[:sort] if options.has_key?(:sort)
113
+ sort << options[:sort] if options.key?(:sort)
93
114
  sort
94
115
  end
95
116
 
117
+ def parse_sampling_level(options)
118
+ { 'samplingLevel' => (options[:sampling_level] || :default).to_s }
119
+ end
120
+
96
121
  def build_default_params(profile, start_date, end_date)
97
122
  {
98
123
  'ids' => Garb.to_ga(profile.id),
@@ -103,8 +128,8 @@ module Garb
103
128
 
104
129
  def build_page_params(options)
105
130
  params = {}
106
- params['max-results'] = options[:limit] if options.has_key? :limit
107
- params['start-index'] = options[:offset] if options.has_key? :offset
131
+ params['max-results'] = options[:limit] if options.key? :limit
132
+ params['start-index'] = options[:offset] if options.key? :offset
108
133
  params
109
134
  end
110
135
 
@@ -4,7 +4,15 @@ module Garb
4
4
  # demodulize leaves potential to redefine
5
5
  # these methods given different namespaces
6
6
  method_name = klass.name.to_s.demodulize.underscore
7
- return unless method_name.length > 0
7
+ return if method_name.empty?
8
+
9
+ # silence "method redefined" warnings without leaving a window where
10
+ # the method is undefined: aliasing marks the current definition as
11
+ # referenced, and removing the alias leaves the original in place
12
+ if method_defined?(method_name, false)
13
+ alias_method :__garb_redefine, method_name
14
+ remove_method :__garb_redefine
15
+ end
8
16
 
9
17
  class_eval <<-CODE
10
18
  def #{method_name}(opts = {}, &block)
@@ -1,6 +1,5 @@
1
1
  module Garb
2
2
  class ReportParameter
3
-
4
3
  attr_reader :elements
5
4
 
6
5
  def initialize(name)
@@ -18,8 +17,8 @@ module Garb
18
17
  end
19
18
 
20
19
  def to_params
21
- value = self.elements.map { |param| Garb.to_google_analytics(param) }.join(',')
22
- value.empty? ? {} : {self.name => value}
20
+ value = elements.map { |param| Garb.to_google_analytics(param) }.join(',')
21
+ value.empty? ? {} : { name => value }
23
22
  end
24
23
  end
25
24
  end
@@ -1,6 +1,5 @@
1
1
  module Garb
2
2
  class ReportResponse
3
-
4
3
  def initialize(response_body, instance_klass = OpenStruct)
5
4
  @response_body = response_body
6
5
  @instance_klass = instance_klass
@@ -24,6 +23,7 @@ module Garb
24
23
  end
25
24
 
26
25
  private
26
+
27
27
  def keys
28
28
  @keys ||= column_headers.map { |header| Garb.from_ga header['name'] }
29
29
  end
@@ -44,11 +44,10 @@ module Garb
44
44
 
45
45
  def data
46
46
  unless @data
47
- @data = MultiJson.load @response_body
48
- @data = @data.inject({}) do |data, pair|
47
+ @data = JSON.parse @response_body
48
+ @data = @data.each_with_object({}) do |pair, data|
49
49
  key, value = pair
50
50
  data[key.underscore.to_sym] = value
51
- data
52
51
  end
53
52
  end
54
53
  @data
@@ -2,4 +2,4 @@ class Visits
2
2
  extend Garb::Model
3
3
 
4
4
  metrics :visits
5
- end
5
+ end
@@ -1,7 +1,7 @@
1
1
  module Garb
2
2
  module Request
3
3
  class Authentication
4
- URL = 'https://www.google.com/accounts/ClientLogin'
4
+ URL = 'https://www.google.com/accounts/ClientLogin'.freeze
5
5
 
6
6
  def initialize(email, password, opts = {})
7
7
  @email = email
@@ -30,7 +30,7 @@ module Garb
30
30
 
31
31
  def send_request
32
32
  Garb.log "Garb::Request -> #{relative_uri}"
33
-
33
+
34
34
  response = if @session.single_user?
35
35
  if Garb.use_fibers
36
36
  single_user_request_evented
@@ -40,15 +40,15 @@ module Garb
40
40
  elsif @session.oauth_user?
41
41
  oauth_user_request
42
42
  end
43
-
43
+
44
44
  Garb.log "Garb::Response -> #{response.inspect}"
45
45
  handle_response response
46
46
  end
47
47
 
48
48
  def handle_response(response)
49
49
  unless response.kind_of?(Net::HTTPSuccess) || (response.respond_to?(:status) && response.status == 200)
50
- body, parsed = response.body, MultiJson.load(response.body) rescue nil
51
- if parsed and error = parsed['error']
50
+ body, parsed = response.body, JSON.parse(response.body) rescue nil
51
+ if parsed && (error = parsed['error'])
52
52
  klass = case error['code']
53
53
  when 400 then BadRequestError
54
54
  when 401 then InvalidCredentialsError
@@ -80,18 +80,21 @@ module Garb
80
80
  http.use_ssl = true
81
81
  http.verify_mode = OpenSSL::SSL::VERIFY_NONE
82
82
 
83
- unless @session.access_token.nil?
84
- http.request_get(relative_uri, {'Authorization' => "Bearer #{@session.access_token.token}"})
85
- else
86
- http.request_get(relative_uri, {
83
+ options = if @session.access_token.nil?
84
+ {
87
85
  'Authorization' => "GoogleLogin auth=#{@session.auth_token}",
88
86
  'GData-Version' => '3'
89
- })
87
+ }
88
+ else
89
+ {
90
+ 'Authorization' => "Bearer #{@session.access_token.token}"
91
+ }
90
92
  end
93
+ http.request_get(relative_uri, options)
91
94
  end
92
95
 
93
96
  def oauth_user_request
94
- @session.access_token.get(absolute_uri, {'GData-Version' => '3'})
97
+ @session.access_token.get(absolute_uri, { 'GData-Version' => '3' })
95
98
  end
96
99
  end
97
100
  end
@@ -7,27 +7,29 @@ module Garb
7
7
  extend Forwardable
8
8
 
9
9
  attr_accessor :results, :total_results, :sampled
10
- alias_method :sampled?, :sampled
11
-
10
+ alias sampled? sampled
11
+
12
12
  def_delegators :results, :each, :to_a, :count, :size, :empty?
13
13
 
14
14
  def initialize(results)
15
15
  @results = results
16
16
  end
17
-
17
+
18
18
  def <=>(other)
19
+ return nil unless other.is_a?(Garb::ResultSet)
19
20
  results <=> other.results
20
21
  end
21
-
22
+
22
23
  def +(other)
23
- copy = self.dup
24
+ copy = dup
24
25
  copy.results = @results + other.to_a
26
+ copy.sampled = sampled || (other.respond_to?(:sampled) && other.sampled)
25
27
  copy
26
28
  end
27
-
29
+
28
30
  def [](*args)
29
31
  return @results[*args] if args.size == 1 && args.first.is_a?(Integer)
30
- copy = self.dup
32
+ copy = dup
31
33
  copy.results = @results[*args]
32
34
  copy
33
35
  end
data/lib/garb/support.rb CHANGED
@@ -3,4 +3,4 @@ unless Object.const_defined? 'ActiveSupport'
3
3
  require 'garb/core_ext/array'
4
4
  end
5
5
 
6
- require 'garb/core_ext/symbol'
6
+ require 'garb/core_ext/symbol'
data/lib/garb/version.rb CHANGED
@@ -1,13 +1,11 @@
1
1
  module Garb
2
2
  module VERSION
3
-
4
3
  MAJOR = 0
5
4
  MINOR = 9
6
- TINY = 8
5
+ TINY = 9
7
6
 
8
7
  def self.to_s # :nodoc:
9
8
  [MAJOR, MINOR, TINY].join '.'
10
9
  end
11
-
12
10
  end
13
11
  end
data/lib/garb.rb CHANGED
@@ -6,11 +6,11 @@ require 'net/https'
6
6
  require 'cgi'
7
7
  require 'ostruct'
8
8
 
9
- require 'multi_json'
9
+ require 'json'
10
10
 
11
11
  module Garb
12
12
  autoload :VERSION, 'garb/version'
13
-
13
+
14
14
  autoload :Attributes, 'garb/attributes'
15
15
  autoload :PathAttribute, 'garb/path_attribute'
16
16
  autoload :Destination, 'garb/destination'
@@ -36,7 +36,7 @@ module Garb
36
36
  autoload :Authentication, 'garb/request/authentication'
37
37
  autoload :Data, 'garb/request/data'
38
38
  end
39
- end
39
+ end
40
40
 
41
41
  module Garb
42
42
  extend self
@@ -47,7 +47,7 @@ module Garb
47
47
  end
48
48
 
49
49
  def use_fibers=(val)
50
- if val and (!defined?(EM) || !defined?(Fiber))
50
+ if val && (!defined?(EM) || !defined?(Fiber))
51
51
  raise ArgumentError, 'Eventmachine and Fibers required (Ruby 1.9+ only)'
52
52
  end
53
53
  require 'em-net-http' if val
@@ -78,14 +78,14 @@ module Garb
78
78
  def to_google_analytics(thing)
79
79
  return thing.to_google_analytics if thing.respond_to? :to_google_analytics
80
80
 
81
- "#{$1}ga:#{$2}" if "#{thing.to_s.camelize(:lower)}" =~ /^(-)?(.*)$/
81
+ "#{$1}ga:#{$2}" if thing.to_s.camelize(:lower) =~ /^(-)?(.*)$/
82
82
  end
83
- alias :to_ga :to_google_analytics
83
+ alias to_ga to_google_analytics
84
84
 
85
85
  def from_google_analytics(thing)
86
86
  thing.to_s.gsub(/^ga\:/, '').underscore
87
87
  end
88
- alias :from_ga :from_google_analytics
88
+ alias from_ga from_google_analytics
89
89
  end
90
90
 
91
91
  require 'garb/support'