orange 0.2.9 → 0.2.11

data/README.markdown

@@ -109,6 +109,7 @@ Required Gems
 * hominid
 * mail
 * tlsmail (If Ruby version <= 1.8.6)
+* gattica
 
 All dependencies should be loaded if you install the gem except for the datamapper
 adapter relevant to your set up. If, for example, you want to use a mysql database,

data/lib/orange-core/views/default_resource/list.haml

@@ -2,7 +2,7 @@
   %thead
     %tr
       - for prop in props
-        %th= prop[:name]
+        %th= prop[:name].to_s.capitalize
       %th
   %tbody
     - for obj in list

data/lib/orange-more.rb

@@ -14,6 +14,7 @@ require File.join(libdir, 'orange-more', 'disqus')
 require File.join(libdir, 'orange-more', 'testimonials')
 require File.join(libdir, 'orange-more', 'adverts')
 require File.join(libdir, 'orange-more', 'contactforms')
+require File.join(libdir, 'orange-more', 'analytics')
 require File.join(libdir, 'orange-more', 'cloud')
 require File.join(libdir, 'orange-more', 'debugger')
 require File.join(libdir, 'orange-more', 'subsites')

data/lib/orange-more/analytics.rb

@@ -0,0 +1 @@
+require File.join('orange-more', 'analytics', 'plugin')

data/lib/orange-more/analytics/middleware/analytics.rb

@@ -0,0 +1,30 @@
+require 'orange-core/middleware/base'
+
+module Orange::Middleware
+  class Analytics < Base
+    
+    # Passes packet then parses the return
+    def packet_call(packet)
+      pass packet
+      unless packet['route.context'] != :live
+          ga_key = orange.options['google_analytics_key'];
+          ga = "<script type=\"text/javascript\">
+
+            var _gaq = _gaq || [];
+            _gaq.push(['_setAccount', '"+ga_key+"']);
+            _gaq.push(['_trackPageview']);
+
+            (function() {
+              var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+              ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+              var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+            })();
+
+          </script>"
+          packet[:content] = packet[:content].sub(/.*<\/body>$/, ga + '</body>')
+      end
+      packet.finish
+    end
+    
+  end
+end

data/lib/orange-more/analytics/plugin.rb

@@ -0,0 +1,11 @@
+Dir.glob(File.join(File.dirname(__FILE__), 'resources', '*.rb')).each {|f| require f }
+Dir.glob(File.join(File.dirname(__FILE__), 'middleware', '*.rb')).each {|f| require f }
+
+module Orange::Plugins
+  class Analytics < Base
+    resource    Orange::AnalyticsResource.new
+    prerouter   Orange::Middleware::Analytics
+  end
+end
+
+Orange.plugin(Orange::Plugins::Analytics.new)

data/lib/orange-more/analytics/resources/analytics_resource.rb

@@ -0,0 +1,32 @@
+require 'gattica'
+
+module Orange
+  class AnalyticsResource < Orange::Resource
+    call_me :analytics
+    
+    def pageviews(route)
+      r = route.to_s
+      # Strip of trailing slash if present. GA doesn't like it.
+      if r.rindex('/') > 0
+        r[r.rindex('/')] = ''
+      end
+      # authenticate with the API via email/password
+      ga = Gattica.new({:email => 'erictasticfosterama@gmail.com', :password => 'tailfish'})
+      accounts = ga.accounts
+      ga.profile_id = accounts.first.profile_id
+      views = ""
+      data = ga.get({ :start_date => '2009-01-01', 
+                      :end_date => Time.now.localtime.strftime("%Y-%m-%d"),
+                      :dimensions => ['pagePath'],
+                      :metrics => ['pageviews'],
+                      :filters => ['pagePath == '+route.to_s[0..-1]]
+                      })
+      unless data.points.length == 0
+        views = data.points[0].metrics[0][:pageviews]
+        views 
+      else
+        0
+      end
+    end
+  end
+end

data/lib/orange-more/news/cartons/news.rb

@@ -3,7 +3,7 @@ class OrangeNews < Orange::Carton
   id
   front do
     title :title
-    text :link
+    text :link, :length => 255
     fulltext :description
   end
 

data/lib/orange-more/news/resources/news_resource.rb

@@ -65,5 +65,9 @@ module Orange
       url = orange[:sitemap, true].url_for(packet, :resource => :news, :resource_action => :archive)
       url.gsub!(/\/$/, '')
     end
+    
+    def find_list(packet, mode, opts = {})
+      model_class.all(:order => [:updated_at.desc]) || []
+    end
   end
 end

data/lib/orange-more/pages/resources/page_resource.rb

@@ -50,7 +50,7 @@ module Orange
         end
       end
       packet.reroute(@my_orange_name, :orange) unless (packet.request.xhr? || no_reroute)
-     end
+    end
 
     # Creates a new model object and saves it (if a post), then reroutes to the main page
     # @param [Orange::Packet] packet the packet being routed
@@ -104,9 +104,17 @@ module Orange
       if mode == :show
         case packet['route.context']  
         when :live
+          # Automatically set title, if possible
+          unless orange[:page_parts].part(packet)[:title] != '' 
+            orange[:page_parts].part(packet)[:title] = m.title + " - " + packet['site'].name
+          end
           m = m.versions.last(:published => '1')
           raise Orange::NotFoundException unless m
         when :preview
+          # Automatically set title, if possible
+          unless orange[:page_parts].part(packet)[:title] != '' 
+            orange[:page_parts].part(packet)[:title] = m.title + " - " + packet['site'].name
+          end
           m
         end
       else {}

data/lib/orange-more/sitemap/views/default_resource/sitemap_row.haml

@@ -21,6 +21,9 @@
       %p 
         Linked to: 
         %a{:href => route.resource.blank? ?  '#' : route_to(route.resource, route.resource_id, 'edit')} [#{route.resource}] ##{route.resource_id}
+      %p  
+        Views:
+        = orange[:analytics].pageviews(route.full_path)
     .actions
       = form_link('Delete', route_to(:sitemap, route.id, 'delete'), 'Are you sure you want to delete this?', {:method => 'delete'})
       %a{:href => route_to(:sitemap, route.id, 'edit')} Edit

data/lib/orange-more/sitemap/views/sitemap/table_row.haml

@@ -21,6 +21,9 @@
       %p 
         Linked to: 
         %a{:href => model.resource.blank? ?  '#' : route_to(model.resource, model.resource_id, 'edit')} [#{model.resource}] ##{model.resource_id}
+      %p  
+        Views:
+        = orange[:analytics].pageviews(route.full_path)
     .actions
       = form_link('Delete', route_to(model_name, model.id, 'delete'), 'Are you sure you want to delete this?', {:method => 'delete'})
       %a{:href => route_to(model_name, model.id, 'edit')} Edit

data/lib/orange-more/subsites/resources/subsite_resource.rb

@@ -10,16 +10,16 @@ module Orange
     # @param [Orange::Packet] packet the packet being routed
     def new(packet, *opts)
       if packet.request.post?
-        m = packet['site'].subsites.new(packet.request.params[@my_orange_name.to_s])
-        m.save
-        orange[:sitemap].add_route_for(packet,
-          :orange_site_id => packet['site'].id, 
-          :resource => :subsites, 
-          :resource_id => m.id,
-          :slug => 'subsite', 
-          :link_text => 'Orange Subsite'
-        )
-      end
+          m = packet['site'].subsites.new(packet.request.params[@my_orange_name.to_s])
+          m.save
+          orange[:sitemap].add_route_for(packet,
+            :orange_site_id => packet['site'].id, 
+            :resource => :subsites, 
+            :resource_id => m.id,
+            :slug => 'subsite', 
+            :link_text => 'Orange Subsite'
+          )
+        end
       packet.reroute(@my_orange_name, :orange)
     end
     
@@ -31,6 +31,10 @@ module Orange
       orange[:sitemap].one_level(packet, :model => orange[:sitemap].home(packet, :subsite => true))
     end
     
+    def sitemap_row(packet, opts = {})
+      do_view(packet, :sitemap_row, opts)
+    end
+    
   end
   
   class Mapper < Resource

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 9
-  version: 0.2.9
+  - 11
+  version: 0.2.11
 platform: ruby
 authors: 
 - David Haslem
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-23 00:00:00 -04:00
+date: 2010-05-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -140,6 +140,10 @@ files:
 - lib/orange-more/adverts/plugin.rb
 - lib/orange-more/adverts/resources/adverts_resource.rb
 - lib/orange-more/adverts/views/adverts/adverts.haml
+- lib/orange-more/analytics.rb
+- lib/orange-more/analytics/middleware/analytics.rb
+- lib/orange-more/analytics/plugin.rb
+- lib/orange-more/analytics/resources/analytics_resource.rb
 - lib/orange-more/assets.rb
 - lib/orange-more/assets/cartons/asset_carton.rb
 - lib/orange-more/assets/plugin.rb