orange 0.2.11 → 0.3.0

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

@@ -6,8 +6,8 @@ module Orange::Middleware
     # 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_key = orange.options['google_analytics_key'] || false
+      if packet['route.context'] == :live && ga_key
           ga = "<script type=\"text/javascript\">
 
             var _gaq = _gaq || [];

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

@@ -3,15 +3,25 @@ require 'gattica'
 module Orange
   class AnalyticsResource < Orange::Resource
     call_me :analytics
+    def stack_init
+      options[:email] = orange.options['ga_email']
+      options[:password] = orange.options['ga_password']
+    end
+    
+    def gattica
+      return false unless options[:email]
+      @gattica ||= Gattica.new(options)
+    end
     
     def pageviews(route)
+      return "No GA" unless gattica
       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'})
+      ga = gattica
       accounts = ga.accounts
       ga.profile_id = accounts.first.profile_id
       views = ""

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

@@ -42,11 +42,27 @@ module Orange
           params = {}
           params[:published] = true
           m.update(params)
+          
           params = m.attributes.merge(params)
           params.delete(:id)
           max = m.versions.max(:version) || 0
           m.versions.new(params.merge(:version => max + 1))
           m.save
+          
+          r = orange[:sitemap].routes_for(packet, :resource_id => m.id, :resource => @my_orange_name)
+          if r.blank?
+            route_hash = {
+              :orange_site_id => m.orange_site_id, 
+              :resource => @my_orange_name, 
+              :resource_id => m.id,
+              :slug => orange[:sitemap].slug_for(m, params), 
+              :show_in_nav => false,
+              :link_text => m.title
+            }
+            parents = orange[:sitemap].routes_for(packet, :resource => '', :resource_id => '', :slug => "pages")
+            route_hash[:parent] = parents.first unless parents.blank?
+            orange[:sitemap].add_route_for(packet, route_hash)
+          end
         end
       end
       packet.reroute(@my_orange_name, :orange) unless (packet.request.xhr? || no_reroute)

data/lib/orange-more/pages/views/pages/edit.haml

@@ -9,11 +9,11 @@
       $(function(){
         $('button.link_button').click(
           function(){
-            $('input[name="pages[published]"]').val('true');
+            $('input[name="pages[published]"]').val('1');
           }
         );
       });
-    %input{:type => 'hidden', :id => 'pages[published]', :name => 'pages[published]', :value => 'false'}
+    %input{:type => 'hidden', :id => 'pages[published]', :name => 'pages[published]', :value => '0'}
     %input{:type => 'submit', :value => 'Save Changes'}
     / = route_to(model_name, model[:id], 'publish')
     = form_link('Publish', packet.route_to(model_name, model[:id], 'save'))

data/lib/orange-more/sitemap/resources/sitemap_resource.rb

@@ -166,6 +166,9 @@ module Orange
     def add_route_for(packet, opts = {})
       unless opts.blank?
         parent = opts.delete(:parent) || home(packet, opts)
+        unless parent.is_a? model_class
+          parent = model_class.get(parent) # Get parent object if parent was an id number
+        end
         me = model_class.new(opts)
         me.save
         me.move(:into => parent)

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 11
-  version: 0.2.11
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - David Haslem