rugalytics 0.1.3 → 0.1.4

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.1.4. now use fastercsv to parse table row data
+
 v0.1.3. fixed bug due to change in google's graph csv date labels
 
 v0.1.2. added profile.report_names method; handle '.' or '/' in graph column names without failing

data/README

@@ -47,7 +47,11 @@ If account name and profile name are the same:
 At present your language setting for your Google Analytics account
 must be set to English for Rugalytics to work.
 
- Google: Settings -> Language: choose UK English or US English
+ Google: Settings -> Language: choose UK English
+
+ OR
+
+ Google: Settings -> Language: choose US English
 
 
 == Get Profile Summary Statistics

data/README.rdoc

@@ -47,7 +47,11 @@ If account name and profile name are the same:
 At present your language setting for your Google Analytics account
 must be set to English for Rugalytics to work.
 
- Google: Settings -> Language: choose UK English or US English
+ Google: Settings -> Language: choose UK English
+
+ OR
+
+ Google: Settings -> Language: choose US English
 
 
 == Get Profile Summary Statistics

data/Rakefile

@@ -10,7 +10,7 @@ begin
     m.rubyforge_name = "rugalytics"
     m.rdoc_options << '--inline-source'
     m.rdoc_pattern = ["README", "CHANGELOG", "LICENSE"]
-    m.dependencies = ["hpricot >=0.6", "activesupport >=2.0.2", "googlebase >=0.2.0", "morph >=0.2.0"]
+    m.dependencies = ["hpricot >=0.6", "activesupport >=2.0.2", "googlebase >=0.2.0", "morph >=0.2.0", "fastercsv >=1.4.0"]
     m.executable_pattern = 'bin/rugalytics'
   end
 

data/lib/rugalytics/report.rb

@@ -94,8 +94,9 @@ module Rugalytics
         items_attribute = (type && type.size > 0) ? "#{type.gsub(/([a-z])([A-Z])/, '\1_\2').downcase}_items" : 'items'
         morph(items_attribute, items)
 
-        while (values = lines[index]) && values[/^# -/].nil? && values.strip.size > 0
-          items << Item.new(attributes, values.split(','), base_url)
+        while (values_line = lines[index]) && values_line[/^# -/].nil? && values_line.strip.size > 0
+          values = FasterCSV.parse_line(values_line)
+          items << Item.new(attributes, values, base_url)
           index = index.next
         end
       end

data/lib/rugalytics/server.rb

@@ -1,4 +1,3 @@
-require 'yaml'
 require 'webrick'
 include WEBrick
 
@@ -13,6 +12,13 @@ module Rugalytics
 
   class Server
     def initialize
+      begin
+        require 'webrick'
+        self.class.send(:include, WEBrick)
+      rescue LoadError
+        puts "You need to have webrick installed to run a rugalytics server"
+      end
+
       @profile = Rugalytics.default_profile
 
       server = HTTPServer.new :Port => 8888

data/lib/rugalytics.rb

@@ -8,10 +8,11 @@ require 'activesupport'
 require 'google/base'
 require 'morph'
 require 'yaml'
+require 'fastercsv'
 
 # See README for usage documentation.
 module Rugalytics
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 
   FORMAT_PDF = '0' unless defined? FORMAT_PDF
   FORMAT_XML = '1' unless defined? FORMAT_XML

data/rugalytics.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rugalytics}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rob McKinnon"]
@@ -30,12 +30,14 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activesupport>, [">= 2.0.2"])
       s.add_runtime_dependency(%q<googlebase>, [">= 0.2.0"])
       s.add_runtime_dependency(%q<morph>, [">= 0.2.0"])
+      s.add_runtime_dependency(%q<fastercsv>, [">= 1.4.0"])
       s.add_development_dependency(%q<echoe>, [">= 0"])
     else
       s.add_dependency(%q<hpricot>, [">= 0.6"])
       s.add_dependency(%q<activesupport>, [">= 2.0.2"])
       s.add_dependency(%q<googlebase>, [">= 0.2.0"])
       s.add_dependency(%q<morph>, [">= 0.2.0"])
+      s.add_dependency(%q<fastercsv>, [">= 1.4.0"])
       s.add_dependency(%q<echoe>, [">= 0"])
     end
   else
@@ -43,6 +45,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activesupport>, [">= 2.0.2"])
     s.add_dependency(%q<googlebase>, [">= 0.2.0"])
     s.add_dependency(%q<morph>, [">= 0.2.0"])
+    s.add_dependency(%q<fastercsv>, [">= 1.4.0"])
     s.add_dependency(%q<echoe>, [">= 0"])
   end
 end

data/spec/lib/rugalytics/report_spec.rb

@@ -98,9 +98,9 @@ describe Report do
     describe "when creating items from 'Table'" do
       before :all do
         @base_url = %Q|your_site.com|
-        @attributes = %Q|URL,Page Views,Unique Page Views,Time on Page,Bounce Rate,% Exit,$ Index|
-        @values1 = %Q|/,189,157,54.94957983193277,0.4862385392189026,0.37037035822868347,0.0|
-        @values2 = %Q|/bills,60,38,54.17307692307692,0.0,0.13333334028720856,0.0|
+        @attributes = %Q|URL,Page Views,Unique Page Views,Time on Page,Bounce Rate,% Exit,$ Index, Keyword|
+        @values1 = %Q|/,189,157,54.94957983193277,0.4862385392189026,0.37037035822868347,0.0,"ABC, Project"|
+        @values2 = %Q|/bills,60,38,54.17307692307692,0.0,0.13333334028720856,0.0,shoes|
         @csv = ['# ----------------------------------------',
                 @base_url,
                 'Top Content,',
@@ -118,8 +118,10 @@ describe Report do
       it 'should create item for each data row in "Table"' do
         item1 = mock('item1')
         item2 = mock('item2')
-        Item.should_receive(:new).with(@attributes.split(','), @values1.split(','), @base_url).and_return item1
-        Item.should_receive(:new).with(@attributes.split(','), @values2.split(','), @base_url).and_return item2
+        array1 = ['/','189','157','54.94957983193277','0.4862385392189026','0.37037035822868347','0.0',"ABC, Project"]
+        array2 = ['/bills','60','38','54.17307692307692','0.0','0.13333334028720856','0.0','shoes']
+        Item.should_receive(:new).with(@attributes.split(','), array1, @base_url).and_return item1
+        Item.should_receive(:new).with(@attributes.split(','), array2, @base_url).and_return item2
 
         report = Report.new(@csv.join("\n"))
         report.items.should == [item1, item2]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rugalytics
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Rob McKinnon
@@ -52,6 +52,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.2.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: fastercsv
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.4.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: echoe
   type: :development